From 5846221a39e3d33bdd848106ff8d9520eaa7455d Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Mon, 30 Dec 2019 02:22:52 +0100
Subject: Minimize TypeScript build

---
 .vscode/launch.json | 26 ++++++++++++++++++--------
 .vscode/tasks.json  | 27 ++++++++++-----------------
 2 files changed, 28 insertions(+), 25 deletions(-)

(limited to '.vscode')

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 442ebf6dd..55a2f10f2 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -10,18 +10,28 @@
       "request": "launch",
       "runtimeExecutable": "${execPath}",
       "args": [
-        "--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"
+        "${workspaceFolder}/editors/code/out/**/*.js"
+      ],
+      "preLaunchTask": "Build Extension"
+    },
+    {
+      "name": "Run Extension (Dev Server)",
+      "type": "extensionHost",
+      "request": "launch",
+      "runtimeExecutable": "${execPath}",
+      "args": [
+        "--extensionDevelopmentPath=${workspaceFolder}/editors/code"
+      ],
+      "outFiles": [
+        "${workspaceFolder}/editors/code/out/**/*.js"
       ],
-      "preLaunchTask": "Build All"
+      "preLaunchTask": "Build Extension",
+      "env": {
+        "__RA_LSP_SERVER_DEBUG": "${workspaceFolder}/target/debug/ra_lsp_server"
+      }
     },
     {
       "name": "Debug Lsp Server",
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 79c24b86f..7bd7e3706 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -5,32 +5,25 @@
   "tasks": [
     {
       "label": "Build Extension",
+      "group": "build",
       "type": "npm",
-      "script": "compile",
+      "script": "watch",
+      "path": "editors/code/",
       "problemMatcher": {
-        "owner": "typescript",
-        "pattern": "$tsc",
-        "fileLocation": [
-          "relative",
-          "${workspaceRoot}/editors/code"
-        ]
+        "base": "$tsc-watch",
+        "fileLocation": ["relative", "${workspaceFolder}/editors/code/"]
+      },
+      "isBackground": true,
+      "presentation": {
+        "reveal": "never"
       },
-      "path": "editors/code/"
     },
     {
       "label": "Build Server",
+      "group": "build",
       "type": "shell",
       "command": "cargo build --package ra_lsp_server",
       "problemMatcher": "$rustc"
     },
-    {
-      "label": "Build All",
-      "group": "build",
-      "dependsOn": [
-        "Build Extension",
-        "Build Server"
-      ],
-      "problemMatcher": []
-    },
   ]
 }
-- 
cgit v1.2.3