3 files changed, 10 insertions, 0 deletions

diff --git a/editors/code/package.json b/editors/code/package.json
index e2bc72f32..7a48d6794 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -205,6 +205,11 @@
                     "default": [],
                     "description": "Paths to exclude from analysis"
                 },
+                "rust-analyzer.useClientWatching": {
+                    "type": "boolean",
+                    "default": false,
+                    "description": "client provided file watching instead of notify watching."
+                },
                 "rust-analyzer.cargo-watch.arguments": {
                     "type": "string",
                     "description": "`cargo-watch` arguments. (e.g: `--features=\"shumway,pdf\"` will run as `cargo watch -x \"check --features=\"shumway,pdf\"\"` )",
diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index 570ddca46..a4581485c 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -23,6 +23,7 @@ export class Config {
     public lruCapacity: null | number = null;
     public displayInlayHints = true;
     public excludeGlobs = [];
+    public useClientWatching = false;
     public featureFlags = {};
     public cargoWatchOptions: CargoWatchOptions = {
         enableOnStartup: 'ask',
@@ -133,6 +134,9 @@ export class Config {
         if (config.has('excludeGlobs')) {
             this.excludeGlobs = config.get('excludeGlobs') || [];
         }
+        if (config.has('useClientWatching')) {
+            this.useClientWatching = config.get('useClientWatching') || false;
+        }
         if (config.has('featureFlags')) {
             this.featureFlags = config.get('featureFlags') || {};
         }
diff --git a/editors/code/src/server.ts b/editors/code/src/server.ts
index 0d2a99c70..ff50fcd99 100644
--- a/editors/code/src/server.ts
+++ b/editors/code/src/server.ts
@@ -46,6 +46,7 @@ export class Server {
                     Server.config.showWorkspaceLoadedNotification,
                 lruCapacity: Server.config.lruCapacity,
                 excludeGlobs: Server.config.excludeGlobs,
+                useClientWatching: Server.config.useClientWatching,
                 featureFlags: Server.config.featureFlags
             },
             traceOutputChannel