1 files changed, 8 insertions, 44 deletions

diff --git a/editors/code/package.json b/editors/code/package.json
index 8e7046418..f28ce1772 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": "rollup -c && shx cp src/utils/terminateProcess.sh bundle/terminateProcess.sh",
+        "compile": "rollup -c",
         "watch": "tsc -watch -p ./",
         "fix": "prettier **/*.{json,ts} --write && tslint --project . --fix",
         "lint": "tslint --project .",
@@ -134,16 +134,6 @@
                 "command": "rust-analyzer.reload",
                 "title": "Restart server",
                 "category": "Rust Analyzer"
-            },
-            {
-                "command": "rust-analyzer.startCargoWatch",
-                "title": "Start Cargo Watch",
-                "category": "Rust Analyzer"
-            },
-            {
-                "command": "rust-analyzer.stopCargoWatch",
-                "title": "Stop Cargo Watch",
-                "category": "Rust Analyzer"
             }
         ],
         "keybindings": [
@@ -261,21 +251,6 @@
                     "default": "ra_lsp_server",
                     "description": "Path to ra_lsp_server executable"
                 },
-                "rust-analyzer.enableCargoWatchOnStartup": {
-                    "type": "string",
-                    "default": "ask",
-                    "enum": [
-                        "ask",
-                        "enabled",
-                        "disabled"
-                    ],
-                    "enumDescriptions": [
-                        "Asks each time whether to run `cargo watch`",
-                        "`cargo watch` is always started",
-                        "Don't start `cargo watch`"
-                    ],
-                    "description": "Whether to run `cargo watch` on startup"
-                },
                 "rust-analyzer.excludeGlobs": {
                     "type": "array",
                     "default": [],
@@ -286,21 +261,21 @@
                     "default": true,
                     "description": "client provided file watching instead of notify watching."
                 },
+                "rust-analyzer.cargo-watch.enable": {
+                    "type": "boolean",
+                    "default": true,
+                    "description": "Run `cargo check` for diagnostics on save"
+                },
                 "rust-analyzer.cargo-watch.arguments": {
-                    "type": "string",
+                    "type": "array",
                     "description": "`cargo-watch` arguments. (e.g: `--features=\"shumway,pdf\"` will run as `cargo watch -x \"check --features=\"shumway,pdf\"\"` )",
-                    "default": ""
+                    "default": []
                 },
                 "rust-analyzer.cargo-watch.command": {
                     "type": "string",
                     "description": "`cargo-watch` command. (e.g: `clippy` will run as `cargo watch -x clippy` )",
                     "default": "check"
                 },
-                "rust-analyzer.cargo-watch.ignore": {
-                    "type": "array",
-                    "description": "A list of patterns for cargo-watch to ignore (will be passed as `--ignore`)",
-                    "default": []
-                },
                 "rust-analyzer.cargo-watch.allTargets": {
                     "type": "boolean",
                     "description": "Check all targets and tests (will be passed as `--all-targets`)",
@@ -322,17 +297,6 @@
                     "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"
-                },
                 "rust-analyzer.lruCapacity": {
                     "type": "number",
                     "default": null,