From 6c3e15aaa057ab3c18c5575aacf9e1e56951b8ce Mon Sep 17 00:00:00 2001 From: Mohsen Alizadeh Date: Sun, 25 Jun 2023 17:26:04 -0700 Subject: 13583 rename runnable env to runnables extra env --- editors/code/src/config.ts | 4 ++-- editors/code/src/debug.ts | 2 +- editors/code/src/run.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'editors/code/src') diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts index c6d2bcc2b2a..13e6bbc1d25 100644 --- a/editors/code/src/config.ts +++ b/editors/code/src/config.ts @@ -224,8 +224,8 @@ export class Config { return this.get("cargoRunner"); } - get runnableEnv() { - const item = this.get("runnableEnv"); + get runnablesExtraEnv() { + const item = this.get("runnables.extraEnv"); if (!item) return item; const fixRecord = (r: Record) => { for (const key in r) { diff --git a/editors/code/src/debug.ts b/editors/code/src/debug.ts index cffee1de6af..8fbd427039e 100644 --- a/editors/code/src/debug.ts +++ b/editors/code/src/debug.ts @@ -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") { diff --git a/editors/code/src/run.ts b/editors/code/src/run.ts index 623fb102953..cc2ecfa2d80 100644 --- a/editors/code/src/run.ts +++ b/editors/code/src/run.ts @@ -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, }; -- cgit 1.4.1-3-g733a5