aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.vscode/launch.json4
-rw-r--r--.vscode/tasks.json31
-rw-r--r--editors/code/package.json1
3 files changed, 33 insertions, 3 deletions
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 3f74d7566..6a2fff906 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -41,7 +41,7 @@
41 "outFiles": [ 41 "outFiles": [
42 "${workspaceFolder}/editors/code/out/**/*.js" 42 "${workspaceFolder}/editors/code/out/**/*.js"
43 ], 43 ],
44 "preLaunchTask": "Build Extension", 44 "preLaunchTask": "Build Server and Extension",
45 "skipFiles": [ 45 "skipFiles": [
46 "<node_internals>/**/*.js" 46 "<node_internals>/**/*.js"
47 ], 47 ],
@@ -62,7 +62,7 @@
62 "outFiles": [ 62 "outFiles": [
63 "${workspaceFolder}/editors/code/out/**/*.js" 63 "${workspaceFolder}/editors/code/out/**/*.js"
64 ], 64 ],
65 "preLaunchTask": "Build Extension", 65 "preLaunchTask": "Build Server (Release) and Extension",
66 "skipFiles": [ 66 "skipFiles": [
67 "<node_internals>/**/*.js" 67 "<node_internals>/**/*.js"
68 ], 68 ],
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}
diff --git a/editors/code/package.json b/editors/code/package.json
index b8aaa07d8..c4dfa7e13 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -27,6 +27,7 @@
27 "scripts": { 27 "scripts": {
28 "vscode:prepublish": "tsc && rollup -c", 28 "vscode:prepublish": "tsc && rollup -c",
29 "package": "vsce package -o rust-analyzer.vsix", 29 "package": "vsce package -o rust-analyzer.vsix",
30 "build": "tsc",
30 "watch": "tsc --watch", 31 "watch": "tsc --watch",
31 "lint": "tsfmt --verify && eslint -c .eslintrc.js --ext ts ./src", 32 "lint": "tsfmt --verify && eslint -c .eslintrc.js --ext ts ./src",
32 "fix": " tsfmt -r && eslint -c .eslintrc.js --ext ts ./src --fix" 33 "fix": " tsfmt -r && eslint -c .eslintrc.js --ext ts ./src --fix"