3 files changed, 26 insertions, 3 deletions

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 408f8d580..6a2fff906 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -41,7 +41,7 @@
       "outFiles": [
         "${workspaceFolder}/editors/code/out/**/*.js"
       ],
-      "preLaunchTask": "Build Server",
+      "preLaunchTask": "Build Server and Extension",
       "skipFiles": [
         "<node_internals>/**/*.js"
       ],
@@ -62,7 +62,7 @@
       "outFiles": [
         "${workspaceFolder}/editors/code/out/**/*.js"
       ],
-      "preLaunchTask": "Build Server (Release)",
+      "preLaunchTask": "Build Server (Release) and Extension",
       "skipFiles": [
         "<node_internals>/**/*.js"
       ],
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 922f66d80..0969ce89a 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -4,7 +4,7 @@
   "version": "2.0.0",
   "tasks": [
     {
-      "label": "Build Extension",
+      "label": "Build Extension in Background",
       "group": "build",
       "type": "npm",
       "script": "watch",
@@ -16,6 +16,17 @@
       "isBackground": true,
     },
     {
+      "label": "Build Extension",
+      "group": "build",
+      "type": "npm",
+      "script": "build",
+      "path": "editors/code/",
+      "problemMatcher": {
+        "base": "$tsc",
+        "fileLocation": ["relative", "${workspaceFolder}/editors/code/"]
+      },
+    },
+    {
       "label": "Build Server",
       "group": "build",
       "type": "shell",
@@ -29,5 +40,16 @@
       "command": "cargo build --release --package rust-analyzer",
       "problemMatcher": "$rustc"
     },
+
+    {
+      "label": "Build Server and Extension",
+      "dependsOn": ["Build Server", "Build Extension"],
+      "problemMatcher": "$rustc"
+    },
+    {
+      "label": "Build Server (Release) and Extension",
+      "dependsOn": ["Build Server (Release)", "Build Extension"],
+      "problemMatcher": "$rustc"
+    }
   ]
 }
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 @@
     "scripts": {
         "vscode:prepublish": "tsc && rollup -c",
         "package": "vsce package -o rust-analyzer.vsix",
+        "build": "tsc",
         "watch": "tsc --watch",
         "lint": "tsfmt --verify && eslint -c .eslintrc.js --ext ts ./src",
         "fix": " tsfmt -r       && eslint -c .eslintrc.js --ext ts ./src --fix"