diff options
| author | Jonas Schievink <jonasschievink@gmail.com> | 2020-04-28 22:32:23 +0200 |
|---|---|---|
| committer | Jonas Schievink <jonasschievink@gmail.com> | 2020-04-28 22:32:23 +0200 |
| commit | 61c28c2b22207c14c1e74687ae49a9beab6e4206 (patch) | |
| tree | ef409f4d8d344a4dd4e7c6f6d37b24ce0f2e1e46 | |
| parent | 0ee12079bce0850a02d41d369795702ba69a709c (diff) | |
| download | rust-61c28c2b22207c14c1e74687ae49a9beab6e4206.tar.gz rust-61c28c2b22207c14c1e74687ae49a9beab6e4206.zip | |
Build extension too
| -rw-r--r-- | .vscode/launch.json | 4 | ||||
| -rw-r--r-- | .vscode/tasks.json | 24 | ||||
| -rw-r--r-- | editors/code/package.json | 1 |
3 files changed, 26 insertions, 3 deletions
diff --git a/.vscode/launch.json b/.vscode/launch.json index 408f8d580de..6a2fff90651 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -41,7 +41,7 @@ "outFiles": [ "${workspaceFolder}/editors/code/out/**/*.js" ], - "preLaunchTask": "Build Server", + "preLaunchTask": "Build Server and Extension", "skipFiles": [ "<node_internals>/**/*.js" ], @@ -62,7 +62,7 @@ "outFiles": [ "${workspaceFolder}/editors/code/out/**/*.js" ], - "preLaunchTask": "Build Server (Release)", + "preLaunchTask": "Build Server (Release) and Extension", "skipFiles": [ "<node_internals>/**/*.js" ], diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 922f66d8082..0969ce89a10 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -4,7 +4,7 @@ "version": "2.0.0", "tasks": [ { - "label": "Build Extension", + "label": "Build Extension in Background", "group": "build", "type": "npm", "script": "watch", @@ -16,6 +16,17 @@ "isBackground": true, }, { + "label": "Build Extension", + "group": "build", + "type": "npm", + "script": "build", + "path": "editors/code/", + "problemMatcher": { + "base": "$tsc", + "fileLocation": ["relative", "${workspaceFolder}/editors/code/"] + }, + }, + { "label": "Build Server", "group": "build", "type": "shell", @@ -29,5 +40,16 @@ "command": "cargo build --release --package rust-analyzer", "problemMatcher": "$rustc" }, + + { + "label": "Build Server and Extension", + "dependsOn": ["Build Server", "Build Extension"], + "problemMatcher": "$rustc" + }, + { + "label": "Build Server (Release) and Extension", + "dependsOn": ["Build Server (Release)", "Build Extension"], + "problemMatcher": "$rustc" + } ] } diff --git a/editors/code/package.json b/editors/code/package.json index b8aaa07d879..c4dfa7e13d5 100644 --- a/editors/code/package.json +++ b/editors/code/package.json @@ -27,6 +27,7 @@ "scripts": { "vscode:prepublish": "tsc && rollup -c", "package": "vsce package -o rust-analyzer.vsix", + "build": "tsc", "watch": "tsc --watch", "lint": "tsfmt --verify && eslint -c .eslintrc.js --ext ts ./src", "fix": " tsfmt -r && eslint -c .eslintrc.js --ext ts ./src --fix" |