about summary refs log tree commit diff
path: root/editors/code/src
diff options
context:
space:
mode:
authorMohsen Alizadeh <mohsen@alizadeh.us>2023-06-25 17:26:04 -0700
committerMohsen Alizadeh <mohsen@alizadeh.us>2023-06-25 17:26:04 -0700
commit6c3e15aaa057ab3c18c5575aacf9e1e56951b8ce (patch)
tree8a1ffd8d6731e0aef7f89c97937ec563fae00825 /editors/code/src
parent4a2ceeff0fb53de168691b0f55d9808d221b867e (diff)
downloadrust-6c3e15aaa057ab3c18c5575aacf9e1e56951b8ce.tar.gz
rust-6c3e15aaa057ab3c18c5575aacf9e1e56951b8ce.zip
13583 rename runnable env to runnables extra env
Diffstat (limited to 'editors/code/src')
-rw-r--r--editors/code/src/config.ts4
-rw-r--r--editors/code/src/debug.ts2
-rw-r--r--editors/code/src/run.ts2
3 files changed, 4 insertions, 4 deletions
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<string | undefined>("cargoRunner");
     }
 
-    get runnableEnv() {
-        const item = this.get<any>("runnableEnv");
+    get runnablesExtraEnv() {
+        const item = this.get<any>("runnables.extraEnv");
         if (!item) return item;
         const fixRecord = (r: Record<string, any>) => {
             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,
     };