language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 21:05:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix debug configuration querying not inheriting environment

Browse source
This commit is contained in:
Lukas Wirth 2024-12-02 12:58:43 +01:00
parent b65911d5ee
commit d75f996722
4 changed files with 42 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -261,9 +261,9 @@ export class Config {
return this.get<boolean | undefined>("testExplorer");
}
get runnablesExtraEnv() {
runnablesExtraEnv(label: string): Record<string, string> | undefined {
const item = this.get<any>("runnables.extraEnv") ?? this.get<any>("runnableEnv");
if (!item) return item;
if (!item) return undefined;
const fixRecord = (r: Record<string, any>) => {
for (const key in r) {
if (typeof r[key] !== "string") {
@ -271,11 +271,28 @@ export class Config {
}
}
};
const platform = process.platform;
const checkPlatform = (it: RunnableEnvCfgItem) => {
if (it.platform) {
const platforms = Array.isArray(it.platform) ? it.platform : [it.platform];
return platforms.indexOf(platform) >= 0;
}
return true;
};
if (item instanceof Array) {
item.forEach((x) => fixRecord(x.env));
} else {
fixRecord(item);
const env = {};
for (const it of item) {
const masked = !it.mask || new RegExp(it.mask).test(label);
if (masked && checkPlatform(it)) {
Object.assign(env, it.env);
}
}
fixRecord(env);
return env;
}
fixRecord(item);
return item;
}