Merge #1715

1715: Feature flags r=matklad a=matklad



Co-authored-by: Aleksey Kladov <[email protected]>

3 files changed, 10 insertions, 5 deletions

diff --git a/editors/code/package.json b/editors/code/package.json
index 98faf538f..95ec6cff6 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -165,10 +165,10 @@
                     "default": false,
                     "description": "When highlighting Rust code, use a unique color per identifier"
                 },
-                "rust-analyzer.showWorkspaceLoadedNotification": {
-                    "type": "boolean",
-                    "default": true,
-                    "description": "Show notification when workspace was loaded"
+                "rust-analyzer.featureFlags": {
+                    "type": "object",
+                    "default": {},
+                    "description": "Fine grained feature flags to disable annoying features"
                 },
                 "rust-analyzer.enableEnhancedTyping": {
                     "type": "boolean",
diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index 4df6b50ef..570ddca46 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 featureFlags = {};
     public cargoWatchOptions: CargoWatchOptions = {
         enableOnStartup: 'ask',
         trace: 'off',
@@ -132,5 +133,8 @@ export class Config {
         if (config.has('excludeGlobs')) {
             this.excludeGlobs = config.get('excludeGlobs') || [];
         }
+        if (config.has('featureFlags')) {
+            this.featureFlags = config.get('featureFlags') || {};
+        }
     }
 }
diff --git a/editors/code/src/server.ts b/editors/code/src/server.ts
index 3273d8749..0d2a99c70 100644
--- a/editors/code/src/server.ts
+++ b/editors/code/src/server.ts
@@ -45,7 +45,8 @@ export class Server {
                 showWorkspaceLoaded:
                     Server.config.showWorkspaceLoadedNotification,
                 lruCapacity: Server.config.lruCapacity,
-                excludeGlobs: Server.config.excludeGlobs
+                excludeGlobs: Server.config.excludeGlobs,
+                featureFlags: Server.config.featureFlags
             },
             traceOutputChannel
         };