diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-04-28 22:09:37 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-04-28 22:09:37 +0100 |
commit | 0d7c9974b0e48de95b9ed016ef2d42dc11492831 (patch) | |
tree | bf622a9b81a045243eb7c4886f0d6ed53fc28ebc /.vscode/tasks.json | |
parent | 07f690ddf601eeff639ac83e0c9f5db1a895a47b (diff) | |
parent | 61c28c2b22207c14c1e74687ae49a9beab6e4206 (diff) |
Merge #4196
4196: Rebuild rust-analyzer when launching in VS Code r=matklad a=jonas-schievink
This is usually the right thing, and previously would launch a stale r-a server.
Co-authored-by: Jonas Schievink <[email protected]>
Diffstat (limited to '.vscode/tasks.json')
-rw-r--r-- | .vscode/tasks.json | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 4037e7cce..0969ce89a 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json | |||
@@ -4,7 +4,7 @@ | |||
4 | "version": "2.0.0", | 4 | "version": "2.0.0", |
5 | "tasks": [ | 5 | "tasks": [ |
6 | { | 6 | { |
7 | "label": "Build Extension", | 7 | "label": "Build Extension in Background", |
8 | "group": "build", | 8 | "group": "build", |
9 | "type": "npm", | 9 | "type": "npm", |
10 | "script": "watch", | 10 | "script": "watch", |
@@ -16,11 +16,40 @@ | |||
16 | "isBackground": true, | 16 | "isBackground": true, |
17 | }, | 17 | }, |
18 | { | 18 | { |
19 | "label": "Build Extension", | ||
20 | "group": "build", | ||
21 | "type": "npm", | ||
22 | "script": "build", | ||
23 | "path": "editors/code/", | ||
24 | "problemMatcher": { | ||
25 | "base": "$tsc", | ||
26 | "fileLocation": ["relative", "${workspaceFolder}/editors/code/"] | ||
27 | }, | ||
28 | }, | ||
29 | { | ||
19 | "label": "Build Server", | 30 | "label": "Build Server", |
20 | "group": "build", | 31 | "group": "build", |
21 | "type": "shell", | 32 | "type": "shell", |
22 | "command": "cargo build --package rust-analyzer", | 33 | "command": "cargo build --package rust-analyzer", |
23 | "problemMatcher": "$rustc" | 34 | "problemMatcher": "$rustc" |
24 | }, | 35 | }, |
36 | { | ||
37 | "label": "Build Server (Release)", | ||
38 | "group": "build", | ||
39 | "type": "shell", | ||
40 | "command": "cargo build --release --package rust-analyzer", | ||
41 | "problemMatcher": "$rustc" | ||
42 | }, | ||
43 | |||
44 | { | ||
45 | "label": "Build Server and Extension", | ||
46 | "dependsOn": ["Build Server", "Build Extension"], | ||
47 | "problemMatcher": "$rustc" | ||
48 | }, | ||
49 | { | ||
50 | "label": "Build Server (Release) and Extension", | ||
51 | "dependsOn": ["Build Server (Release)", "Build Extension"], | ||
52 | "problemMatcher": "$rustc" | ||
53 | } | ||
25 | ] | 54 | ] |
26 | } | 55 | } |