Merge #7156

7156: Rename extension config r=matklad a=matklad

bors r+
🤖

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

2 files changed, 4 insertions, 2 deletions

diff --git a/editors/code/package.json b/editors/code/package.json
index 3e55a3523..63db87064 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -280,7 +280,7 @@
                     "default": true,
                     "description": "Whether to ask for permission before downloading any files from the Internet."
                 },
-                "rust-analyzer.serverPath": {
+                "rust-analyzer.server.path": {
                     "type": [
                         "null",
                         "string"
diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index fe9f3b4a8..ebe4de1ea 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -93,7 +93,9 @@ export class Config {
         return this.cfg.get<T>(path)!;
     }
 
-    get serverPath() { return this.get<null | string>("serverPath"); }
+    get serverPath() {
+        return this.get<null | string>("server.path") ?? this.get<null | string>("serverPath");
+    }
     get serverExtraEnv() { return this.get<Env | null>("server.extraEnv") ?? {}; }
     get channel() { return this.get<UpdatesChannel>("updates.channel"); }
     get askBeforeDownload() { return this.get<boolean>("updates.askBeforeDownload"); }