diff options
Diffstat (limited to '.vscode')
-rw-r--r-- | .vscode/launch.json | 16 | ||||
-rw-r--r-- | .vscode/tasks.json | 8 |
2 files changed, 15 insertions, 9 deletions
diff --git a/.vscode/launch.json b/.vscode/launch.json index 1a8de4854..442ebf6dd 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json | |||
@@ -5,18 +5,22 @@ | |||
5 | "version": "0.2.0", | 5 | "version": "0.2.0", |
6 | "configurations": [ | 6 | "configurations": [ |
7 | { | 7 | { |
8 | "name": "Debug Extension", | 8 | "name": "Run Extension", |
9 | "type": "extensionHost", | 9 | "type": "extensionHost", |
10 | "request": "launch", | 10 | "request": "launch", |
11 | "runtimeExecutable": "${execPath}", | 11 | "runtimeExecutable": "${execPath}", |
12 | "args": [ | 12 | "args": [ |
13 | "--extensionDevelopmentPath=${workspaceFolder}/editors/code", | 13 | "--disable-extensions", |
14 | "--disable-extensions" | 14 | "--user-data-dir", |
15 | "${workspaceFolder}/target/vscode", | ||
16 | "--extensionDevelopmentPath=${workspaceFolder}/editors/code" | ||
15 | ], | 17 | ], |
16 | "env": { | 18 | "env": { |
17 | "__RA_LSP_SERVER_DEBUG": "${workspaceFolder}/target/debug/ra_lsp_server" | 19 | "__RA_LSP_SERVER_DEBUG": "${workspaceFolder}/target/debug/ra_lsp_server" |
18 | }, | 20 | }, |
19 | "outFiles": ["${workspaceFolder}/editors/code/bundle/**/*.js"], | 21 | "outFiles": [ |
22 | "${workspaceFolder}/editors/code/bundle/**/*.js" | ||
23 | ], | ||
20 | "preLaunchTask": "Build All" | 24 | "preLaunchTask": "Build All" |
21 | }, | 25 | }, |
22 | { | 26 | { |
@@ -25,7 +29,9 @@ | |||
25 | "request": "attach", | 29 | "request": "attach", |
26 | "program": "${workspaceFolder}/target/debug/ra_lsp_server", | 30 | "program": "${workspaceFolder}/target/debug/ra_lsp_server", |
27 | "pid": "${command:pickMyProcess}", | 31 | "pid": "${command:pickMyProcess}", |
28 | "sourceLanguages": ["rust"] | 32 | "sourceLanguages": [ |
33 | "rust" | ||
34 | ] | ||
29 | }, | 35 | }, |
30 | ] | 36 | ] |
31 | } | 37 | } |
diff --git a/.vscode/tasks.json b/.vscode/tasks.json index b483f4375..79c24b86f 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json | |||
@@ -4,9 +4,9 @@ | |||
4 | "version": "2.0.0", | 4 | "version": "2.0.0", |
5 | "tasks": [ | 5 | "tasks": [ |
6 | { | 6 | { |
7 | "label": "Build Extension", | ||
7 | "type": "npm", | 8 | "type": "npm", |
8 | "script": "compile", | 9 | "script": "compile", |
9 | "label": "Build Extension", | ||
10 | "problemMatcher": { | 10 | "problemMatcher": { |
11 | "owner": "typescript", | 11 | "owner": "typescript", |
12 | "pattern": "$tsc", | 12 | "pattern": "$tsc", |
@@ -18,9 +18,9 @@ | |||
18 | "path": "editors/code/" | 18 | "path": "editors/code/" |
19 | }, | 19 | }, |
20 | { | 20 | { |
21 | "label": "Build Lsp", | 21 | "label": "Build Server", |
22 | "type": "shell", | 22 | "type": "shell", |
23 | "command": "cargo build", | 23 | "command": "cargo build --package ra_lsp_server", |
24 | "problemMatcher": "$rustc" | 24 | "problemMatcher": "$rustc" |
25 | }, | 25 | }, |
26 | { | 26 | { |
@@ -28,7 +28,7 @@ | |||
28 | "group": "build", | 28 | "group": "build", |
29 | "dependsOn": [ | 29 | "dependsOn": [ |
30 | "Build Extension", | 30 | "Build Extension", |
31 | "Build Lsp" | 31 | "Build Server" |
32 | ], | 32 | ], |
33 | "problemMatcher": [] | 33 | "problemMatcher": [] |
34 | }, | 34 | }, |