5 files changed, 15 insertions, 71 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": []
     },
diff --git a/editors/code/.vscode/launch.json b/editors/code/.vscode/launch.json
deleted file mode 100644
index c3578f476..000000000
--- a/editors/code/.vscode/launch.json
+++ /dev/null
@@ -1,31 +0,0 @@
-// A launch configuration that compiles the extension and then opens it inside a new window
-// Use IntelliSense to learn about possible attributes.
-// Hover to view descriptions of existing attributes.
-// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-{
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Extension",
-            "type": "extensionHost",
-            "request": "launch",
-            "runtimeExecutable": "${execPath}",
-            "args": ["--extensionDevelopmentPath=${workspaceFolder}"],
-            "outFiles": ["${workspaceFolder}/out/**/*.js"],
-            "preLaunchTask": "npm: watch"
-        },
-        {
-            "name": "Extension Tests",
-            "type": "extensionHost",
-            "request": "launch",
-            "runtimeExecutable": "${execPath}",
-            "args": [
-                "${workspaceFolder}/src/test/",
-                "--extensionDevelopmentPath=${workspaceFolder}",
-                "--extensionTestsPath=${workspaceFolder}/out/test"
-            ],
-            "outFiles": ["${workspaceFolder}/out/test/**/*.js"],
-            "preLaunchTask": "npm: watch"
-        }
-    ]
-}
diff --git a/editors/code/.vscode/settings.json b/editors/code/.vscode/settings.json
deleted file mode 100644
index fa0a10487..000000000
--- a/editors/code/.vscode/settings.json
+++ /dev/null
@@ -1,11 +0,0 @@
-// Place your settings in this file to overwrite default and user settings.
-{
-    "files.exclude": {
-        "out": false // set this to true to hide the "out" folder with the compiled JS files
-    },
-    "search.exclude": {
-        "out": true // set this to false to include "out" folder in search results
-    },
-    // Turn off tsc task auto detection since we have the necessary tasks as npm scripts
-    "typescript.tsc.autoDetect": "off"
-}
diff --git a/editors/code/.vscode/tasks.json b/editors/code/.vscode/tasks.json
deleted file mode 100644
index 5deb2bccd..000000000
--- a/editors/code/.vscode/tasks.json
+++ /dev/null
@@ -1,20 +0,0 @@
-// See https://go.microsoft.com/fwlink/?LinkId=733558
-// for the documentation about the tasks.json format
-{
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "type": "npm",
-            "script": "watch",
-            "problemMatcher": "$tsc-watch",
-            "isBackground": true,
-            "presentation": {
-                "reveal": "never"
-            },
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            }
-        }
-    ]
-}