nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-14 02:49:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

vscode: fix extraEnv handling numeric values

Browse Source
This commit is contained in:
Jake Heinz 2022-05-24 02:59:19 +00:00
parent 7be85a5b4a
commit d1aa6d3216
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
editors/code/package.json
View File

@ -308,6 +308,9 @@
"null", "null",
"object" "object"
], ],
"additionalProperties": {
"type": ["string", "number"]
},
"default": null, "default": null,
"markdownDescription": "Extra environment variables that will be passed to the rust-analyzer executable. Useful for passing e.g. `RA_LOG` for debugging." "markdownDescription": "Extra environment variables that will be passed to the rust-analyzer executable. Useful for passing e.g. `RA_LOG` for debugging."
}, },

5
editors/code/src/config.ts
View File

@ -100,8 +100,9 @@ export class Config {
get serverPath() { get serverPath() {
return this.get<null | string>("server.path") ?? this.get<null | string>("serverPath"); return this.get<null | string>("server.path") ?? this.get<null | string>("serverPath");
} }
get serverExtraEnv() { get serverExtraEnv(): Env {
return this.get<Env | null>("server.extraEnv") ?? {}; const extraEnv = this.get<{[key: string]: string | number} | null>("server.extraEnv") ?? {};
return Object.fromEntries(Object.entries(extraEnv).map(([k, v]) => [k, typeof v !== "string" ? v.toString(): v]));
} }
get traceExtension() { get traceExtension() {
return this.get<boolean>("trace.extension"); return this.get<boolean>("trace.extension");