diff --git a/project/Build.scala b/project/Build.scala index 4d800f55d88d..bcdb46c0f339 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -877,7 +877,7 @@ object Build { settings( EclipseKeys.skipProject := true, - version := "0.1.0", // Keep in sync with package.json + version := "0.1.2", // Keep in sync with package.json autoScalaLibrary := false, publishArtifact := false, diff --git a/vscode-dotty/images/dotty-logo.png b/vscode-dotty/images/dotty-logo.png new file mode 100644 index 000000000000..b2fe56c83517 Binary files /dev/null and b/vscode-dotty/images/dotty-logo.png differ diff --git a/vscode-dotty/images/dotty-logo.svg b/vscode-dotty/images/dotty-logo.svg deleted file mode 100644 index a004372b1ee7..000000000000 --- a/vscode-dotty/images/dotty-logo.svg +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vscode-dotty/package-lock.json b/vscode-dotty/package-lock.json index 52cb194c31cd..1019d3347866 100644 --- a/vscode-dotty/package-lock.json +++ b/vscode-dotty/package-lock.json @@ -1,6 +1,6 @@ { "name": "dotty", - "version": "0.1.1", + "version": "0.1.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/vscode-dotty/package.json b/vscode-dotty/package.json index c3ecb3afbbd0..467102ec01a4 100644 --- a/vscode-dotty/package.json +++ b/vscode-dotty/package.json @@ -2,20 +2,26 @@ "name": "dotty", "displayName": "Dotty Language Server", "description": "IDE integration for Dotty, the experimental Scala compiler", - "version": "0.1.1", + "version": "0.1.2", "license": "BSD-3-Clause", "publisher": "lampepfl", "repository": { "type": "git", "url": "https://github.com/lampepfl/dotty.git" }, - "icon": "images/dotty-logo.svg", + "icon": "images/dotty-logo.png", "engines": { "vscode": "^1.12.0" }, "categories": [ "Languages" ], + "keywords": [ + "scala", + "dotty", + "jvm", + "language-server" + ], "main": "./out/src/extension", "activationEvents": [ "workspaceContains:.dotty-ide.json" @@ -31,6 +37,14 @@ ] } ], + "contributes": { + "configurationDefaults": { + "[scala]": { + "editor.tabSize": 2, + "editor.insertSpaces": true + } + } + }, "scripts": { "tsc": "./node_modules/.bin/tsc", "vscode:prepublish": "npm run update-all && ./node_modules/.bin/tsc -p ./",