Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 13:03:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #7156

Browse source 
7156: Rename extension config r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2021-01-04 15:41:56 +00:00 committed by GitHub
commit b3b1f43ff9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
editors/code/package.json
View file

@ -280,7 +280,7 @@
"default": true, "default": true,
"description": "Whether to ask for permission before downloading any files from the Internet." "description": "Whether to ask for permission before downloading any files from the Internet."
}, },
"rust-analyzer.serverPath": { "rust-analyzer.server.path": {
"type": [ "type": [
"null", "null",
"string" "string"

4
editors/code/src/config.ts
View file

@ -93,7 +93,9 @@ export class Config {
return this.cfg.get<T>(path)!; 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 serverExtraEnv() { return this.get<Env | null>("server.extraEnv") ?? {}; }
get channel() { return this.get<UpdatesChannel>("updates.channel"); } get channel() { return this.get<UpdatesChannel>("updates.channel"); }
get askBeforeDownload() { return this.get<boolean>("updates.askBeforeDownload"); } get askBeforeDownload() { return this.get<boolean>("updates.askBeforeDownload"); }