aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--editors/code/package.json2
-rw-r--r--editors/code/src/config.ts4
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 @@
280 "default": true, 280 "default": true,
281 "description": "Whether to ask for permission before downloading any files from the Internet." 281 "description": "Whether to ask for permission before downloading any files from the Internet."
282 }, 282 },
283 "rust-analyzer.serverPath": { 283 "rust-analyzer.server.path": {
284 "type": [ 284 "type": [
285 "null", 285 "null",
286 "string" 286 "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 {
93 return this.cfg.get<T>(path)!; 93 return this.cfg.get<T>(path)!;
94 } 94 }
95 95
96 get serverPath() { return this.get<null | string>("serverPath"); } 96 get serverPath() {
97 return this.get<null | string>("server.path") ?? this.get<null | string>("serverPath");
98 }
97 get serverExtraEnv() { return this.get<Env | null>("server.extraEnv") ?? {}; } 99 get serverExtraEnv() { return this.get<Env | null>("server.extraEnv") ?? {}; }
98 get channel() { return this.get<UpdatesChannel>("updates.channel"); } 100 get channel() { return this.get<UpdatesChannel>("updates.channel"); }
99 get askBeforeDownload() { return this.get<boolean>("updates.askBeforeDownload"); } 101 get askBeforeDownload() { return this.get<boolean>("updates.askBeforeDownload"); }