From b3683df0cd67ca97c83f5a7ea58a780dbe4e1b8e Mon Sep 17 00:00:00 2001
From: Edwin Cheng <edwin0cheng@gmail.com>
Date: Sun, 31 Mar 2019 20:00:50 +0800
Subject: Improve cargo-watch usage

---
 editors/code/package.json | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'editors/code/package.json')

diff --git a/editors/code/package.json b/editors/code/package.json
index facb633d9..240aff6c9 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -223,18 +223,6 @@
                     "${workspaceRoot}"
                 ],
                 "pattern": "$rustc"
-            },
-            {
-                "name": "rustc-watch",
-                "fileLocation": [
-                    "relative",
-                    "${workspaceRoot}"
-                ],
-                "background": {
-                    "beginsPattern": "^\\[Running\\b",
-                    "endsPattern": "^\\[Finished running\\b"
-                },
-                "pattern": "$rustc"
             }
         ]
     }
-- 
cgit v1.2.3


From b84d0fc1a307f6103ea2c2620a106db821696434 Mon Sep 17 00:00:00 2001
From: Edwin Cheng <edwin0cheng@gmail.com>
Date: Tue, 2 Apr 2019 01:11:22 +0800
Subject: Add proper process teminate method

---
 editors/code/package.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'editors/code/package.json')

diff --git a/editors/code/package.json b/editors/code/package.json
index 240aff6c9..ba9c9433a 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -18,7 +18,7 @@
     "scripts": {
         "vscode:prepublish": "npm run compile",
         "package": "vsce package",
-        "compile": "tsc -p ./",
+        "compile": "tsc -p ./ && shx cp src/utils/terminateProcess.sh out/utils/terminateProcess.sh",
         "watch": "tsc -watch -p ./",
         "postinstall": "node ./node_modules/vscode/bin/install",
         "fix": "prettier **/*.{json,ts} --write && tslint --project . --fix",
@@ -41,7 +41,8 @@
         "tslint-config-prettier": "^1.18.0",
         "typescript": "^3.3.1",
         "vsce": "^1.57.0",
-        "vscode": "^1.1.29"
+        "vscode": "^1.1.29",
+        "shx": "^0.3.1"
     },
     "activationEvents": [
         "onLanguage:rust",
-- 
cgit v1.2.3


From ee05eafe6c657c3d3710655e11d88d61bc5febf0 Mon Sep 17 00:00:00 2001
From: Edwin Cheng <edwin0cheng@gmail.com>
Date: Tue, 2 Apr 2019 13:07:40 +0800
Subject: Add config for cargo-watch trace

---
 editors/code/package.json | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'editors/code/package.json')

diff --git a/editors/code/package.json b/editors/code/package.json
index ba9c9433a..cc364d478 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -194,6 +194,17 @@
                     ],
                     "default": "off",
                     "description": "Trace requests to the ra_lsp_server"
+                },
+                "rust-analyzer.trace.cargo-watch": {
+                    "type": "string",
+                    "scope": "window",
+                    "enum": [
+                        "off",
+                        "error",
+                        "verbose"
+                    ],
+                    "default": "off",
+                    "description": "Trace output of cargo-watch"
                 }
             }
         },
-- 
cgit v1.2.3


From 02e450f354ccd978c90425929c635139210843a3 Mon Sep 17 00:00:00 2001
From: Edwin Cheng <edwin0cheng@gmail.com>
Date: Tue, 2 Apr 2019 14:43:02 +0800
Subject: Add cargo-watch.check-arguments

---
 editors/code/package.json | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'editors/code/package.json')

diff --git a/editors/code/package.json b/editors/code/package.json
index cc364d478..1c8caaa60 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -184,6 +184,11 @@
                     ],
                     "description": "Whether to run `cargo watch` on startup"
                 },
+                "rust-analyzer.cargo-watch.check-arguments": {
+                    "type": "string",
+                    "description": "`cargo-watch` check arguments. (e.g: `--features=\"shumway,pdf\"` will run as `cargo watch -x \"check --features=\"shumway,pdf\"\"` )",
+                    "default": ""
+                },
                 "rust-analyzer.trace.server": {
                     "type": "string",
                     "scope": "window",
@@ -192,6 +197,11 @@
                         "messages",
                         "verbose"
                     ],
+                    "enumDescriptions": [
+                        "No traces",
+                        "Error only",
+                        "Full log"
+                    ],
                     "default": "off",
                     "description": "Trace requests to the ra_lsp_server"
                 },
-- 
cgit v1.2.3