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

Auto merge of #15138 - mohsen-alizadeh:13583-rename-runnableEnv-to-runnables-extraEnv, r=Veykril

Browse source 
13583 rename runnable env to runnables extra env

closes #13583
This commit is contained in:
bors 2023-06-29 07:18:57 +00:00
commit d7f4c21950
5 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -224,8 +224,8 @@ export class Config {
return this.get<string | undefined>("cargoRunner");
}
get runnableEnv() {
const item = this.get<any>("runnableEnv");
get runnablesExtraEnv() {
const item = this.get<any>("runnables.extraEnv") ?? this.get<any>("runnableEnv");
if (!item) return item;
const fixRecord = (r: Record<string, any>) => {
for (const key in r) {

2
editors/code/src/debug.ts
View file

@ -118,7 +118,7 @@ async function getDebugConfiguration(
return path.normalize(p).replace(wsFolder, "${workspaceFolder" + workspaceQualifier + "}");
}
const env = prepareEnv(runnable, ctx.config.runnableEnv);
const env = prepareEnv(runnable, ctx.config.runnablesExtraEnv);
const executable = await getDebugExecutable(runnable, env);
let sourceFileMap = debugOptions.sourceFileMap;
if (sourceFileMap === "auto") {

2
editors/code/src/run.ts
View file

@ -140,7 +140,7 @@ export async function createTask(runnable: ra.Runnable, config: Config): Promise
command: args[0], // run, test, etc...
args: args.slice(1),
cwd: runnable.args.workspaceRoot || ".",
env: prepareEnv(runnable, config.runnableEnv),
env: prepareEnv(runnable, config.runnablesExtraEnv),
overrideCargo: runnable.args.overrideCargo,
};