Skip to content

Commit b3b1f43

Browse files
bors[bot]matklad
andauthored
Merge #7156
7156: Rename extension config r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
2 parents 6f8af89 + 01a5b83 commit b3b1f43

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

editors/code/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@
280280
"default": true,
281281
"description": "Whether to ask for permission before downloading any files from the Internet."
282282
},
283-
"rust-analyzer.serverPath": {
283+
"rust-analyzer.server.path": {
284284
"type": [
285285
"null",
286286
"string"

editors/code/src/config.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,9 @@ export class Config {
9393
return this.cfg.get<T>(path)!;
9494
}
9595

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+
}
9799
get serverExtraEnv() { return this.get<Env | null>("server.extraEnv") ?? {}; }
98100
get channel() { return this.get<UpdatesChannel>("updates.channel"); }
99101
get askBeforeDownload() { return this.get<boolean>("updates.askBeforeDownload"); }

0 commit comments

Comments
 (0)