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 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "Debug Extension",
+      "name": "Run Extension",
       "type": "extensionHost",
       "request": "launch",
       "runtimeExecutable": "${execPath}",
       "args": [
-        "--extensionDevelopmentPath=${workspaceFolder}/editors/code",
-        "--disable-extensions"
+        "--disable-extensions",
+        "--user-data-dir",
+        "${workspaceFolder}/target/vscode",
+        "--extensionDevelopmentPath=${workspaceFolder}/editors/code"
       ],
       "env": {
         "__RA_LSP_SERVER_DEBUG": "${workspaceFolder}/target/debug/ra_lsp_server"
       },
-      "outFiles": ["${workspaceFolder}/editors/code/bundle/**/*.js"],
+      "outFiles": [
+        "${workspaceFolder}/editors/code/bundle/**/*.js"
+      ],
       "preLaunchTask": "Build All"
     },
     {
@@ -25,7 +29,9 @@
       "request": "attach",
       "program": "${workspaceFolder}/target/debug/ra_lsp_server",
       "pid": "${command:pickMyProcess}",
-      "sourceLanguages": ["rust"]
+      "sourceLanguages": [
+        "rust"
+      ]
     },
   ]
 }
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 @@
   "version": "2.0.0",
   "tasks": [
     {
+      "label": "Build Extension",
       "type": "npm",
       "script": "compile",
-      "label": "Build Extension",
       "problemMatcher": {
         "owner": "typescript",
         "pattern": "$tsc",
@@ -18,9 +18,9 @@
       "path": "editors/code/"
     },
     {
-      "label": "Build Lsp",
+      "label": "Build Server",
       "type": "shell",
-      "command": "cargo build",
+      "command": "cargo build --package ra_lsp_server",
       "problemMatcher": "$rustc"
     },
     {
@@ -28,7 +28,7 @@
       "group": "build",
       "dependsOn": [
         "Build Extension",
-        "Build Lsp"
+        "Build Server"
       ],
       "problemMatcher": []
     },