4 files changed, 48 insertions, 32 deletions

diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
index e4b706ce6..e6bcbfa60 100644
--- a/editors/code/package-lock.json
+++ b/editors/code/package-lock.json
@@ -87,9 +87,9 @@
             "dev": true
         },
         "acorn": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.0.0.tgz",
-            "integrity": "sha512-PaF/MduxijYYt7unVGRuds1vBC9bFxbNf+VWqhOClfdgy7RlVkQqt610ig1/yxTgsDIfW1cWDel5EBbOy3jdtQ==",
+            "version": "7.1.0",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz",
+            "integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==",
             "dev": true
         },
         "agent-base": {
@@ -1212,22 +1212,14 @@
             }
         },
         "rollup": {
-            "version": "1.21.4",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.21.4.tgz",
-            "integrity": "sha512-Pl512XVCmVzgcBz5h/3Li4oTaoDcmpuFZ+kdhS/wLreALz//WuDAMfomD3QEYl84NkDu6Z6wV9twlcREb4qQsw==",
+            "version": "1.23.1",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.23.1.tgz",
+            "integrity": "sha512-95C1GZQpr/NIA0kMUQmSjuMDQ45oZfPgDBcN0yZwBG7Kee//m7H68vgIyg+SPuyrTZ5PrXfyLK80OzXeKG5dAA==",
             "dev": true,
             "requires": {
-                "@types/estree": "0.0.39",
-                "@types/node": "^12.7.5",
-                "acorn": "^7.0.0"
-            },
-            "dependencies": {
-                "@types/node": {
-                    "version": "12.7.5",
-                    "resolved": "https://registry.npmjs.org/@types/node/-/node-12.7.5.tgz",
-                    "integrity": "sha512-9fq4jZVhPNW8r+UYKnxF1e2HkDWOWKM5bC2/7c9wPV835I0aOrVbS/Hw/pWPk2uKrNXQqg9Z959Kz+IYDd5p3w==",
-                    "dev": true
-                }
+                "@types/estree": "*",
+                "@types/node": "*",
+                "acorn": "^7.1.0"
             }
         },
         "rollup-plugin-commonjs": {
@@ -1315,9 +1307,9 @@
             }
         },
         "safe-buffer": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-            "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+            "version": "5.2.0",
+            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
+            "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==",
             "dev": true
         },
         "seedrandom": {
@@ -1410,12 +1402,12 @@
             }
         },
         "string_decoder": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz",
-            "integrity": "sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==",
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+            "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
             "dev": true,
             "requires": {
-                "safe-buffer": "~5.1.0"
+                "safe-buffer": "~5.2.0"
             }
         },
         "strip-ansi": {
@@ -1546,9 +1538,9 @@
             "dev": true
         },
         "vsce": {
-            "version": "1.66.0",
-            "resolved": "https://registry.npmjs.org/vsce/-/vsce-1.66.0.tgz",
-            "integrity": "sha512-Zf4+WD4PhEcOr7jkU08SI9lwFqDhmhk73YOCGQ/tNLaBy+PnnX4eSdqj9LdzDLuI2dsyomJLXzDSNgxuaInxCQ==",
+            "version": "1.67.1",
+            "resolved": "https://registry.npmjs.org/vsce/-/vsce-1.67.1.tgz",
+            "integrity": "sha512-Y/0fnfaLs2cCfytTGmy4Cp1bf9BaxHO7020YePdUwxjAlPlZ9+lm74M9yEFEWXTIug0L0sMax1WMz0TnozIqxg==",
             "dev": true,
             "requires": {
                 "azure-devops-node-api": "^7.2.0",
diff --git a/editors/code/package.json b/editors/code/package.json
index 35211bcc2..4b719aada 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -39,11 +39,11 @@
         "@types/mocha": "^5.2.7",
         "@types/node": "^10.14.13",
         "@types/seedrandom": "^2.4.28",
-        "@types/vscode": "^1.36.0",
+        "@types/vscode": "^1.37.0",
         "glob": "^7.1.4",
         "mocha": "^6.2.0",
         "prettier": "^1.18.2",
-        "rollup": "^1.21.4",
+        "rollup": "^1.23.1",
         "rollup-plugin-commonjs": "^10.1.0",
         "rollup-plugin-node-resolve": "^5.2.0",
         "rollup-plugin-typescript": "^1.0.1",
@@ -51,7 +51,7 @@
         "tslint": "^5.18.0",
         "tslint-config-prettier": "^1.18.0",
         "typescript": "^3.5.3",
-        "vsce": "^1.66.0",
+        "vsce": "^1.67.0",
         "vscode-test": "^1.2.0"
     },
     "activationEvents": [
@@ -224,6 +224,16 @@
                     "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.showWorkspaceLoadedNotification": {
+                    "type": "boolean",
+                    "description": "Controls whether rust-analyzer displays a notification when a project is loaded.",
+                    "default": false
+                },
                 "rust-analyzer.trace.server": {
                     "type": "string",
                     "scope": "window",
diff --git a/editors/code/src/commands/cargo_watch.ts b/editors/code/src/commands/cargo_watch.ts
index 00b24dbce..59d4ba97a 100644
--- a/editors/code/src/commands/cargo_watch.ts
+++ b/editors/code/src/commands/cargo_watch.ts
@@ -93,10 +93,15 @@ export class CargoWatchProvider implements vscode.Disposable {
             args = '"' + args + '"';
         }
 
+        const ignoreFlags = Server.config.cargoWatchOptions.ignore.reduce(
+            (flags, pattern) => [...flags, '--ignore', pattern],
+            [] as string[]
+        );
+
         // Start the cargo watch with json message
         this.cargoProcess = child_process.spawn(
             'cargo',
-            ['watch', '-x', args],
+            ['watch', '-x', args, ...ignoreFlags],
             {
                 stdio: ['ignore', 'pipe', 'pipe'],
                 cwd: vscode.workspace.rootPath,
diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index 2578bc6d1..331936b5e 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -12,6 +12,7 @@ export interface CargoWatchOptions {
     arguments: string;
     command: string;
     trace: CargoWatchTraceOptions;
+    ignore: string[];
 }
 
 export class Config {
@@ -30,7 +31,8 @@ export class Config {
         enableOnStartup: 'ask',
         trace: 'off',
         arguments: '',
-        command: ''
+        command: '',
+        ignore: []
     };
 
     private prevEnhancedTyping: null | boolean = null;
@@ -125,6 +127,13 @@ export class Config {
             );
         }
 
+        if (config.has('cargo-watch.ignore')) {
+            this.cargoWatchOptions.ignore = config.get<string[]>(
+                'cargo-watch.ignore',
+                []
+            );
+        }
+
         if (config.has('lruCapacity')) {
             this.lruCapacity = config.get('lruCapacity') as number;
         }