From 6c3e15aaa057ab3c18c5575aacf9e1e56951b8ce Mon Sep 17 00:00:00 2001
From: Mohsen Alizadeh <mohsen@alizadeh.us>
Date: Sun, 25 Jun 2023 17:26:04 -0700
Subject: [PATCH 1/2] 13583 rename runnable env to runnables extra env

---
 docs/user/manual.adoc      | 6 +++---
 editors/code/package.json  | 2 +-
 editors/code/src/config.ts | 4 ++--
 editors/code/src/debug.ts  | 2 +-
 editors/code/src/run.ts    | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/user/manual.adoc b/docs/user/manual.adoc
index 5a4078f16fe..bd924031e03 100644
--- a/docs/user/manual.adoc
+++ b/docs/user/manual.adoc
@@ -933,17 +933,17 @@ For example:
 More about `when` clause contexts https://code.visualstudio.com/docs/getstarted/keybindings#_when-clause-contexts[here].
 
 ==== Setting runnable environment variables
-You can use "rust-analyzer.runnableEnv" setting to define runnable environment-specific substitution variables.
+You can use "rust-analyzer.runnables.extraEnv" setting to define runnable environment-specific substitution variables.
 The simplest way for all runnables in a bunch:
 ```jsonc
-"rust-analyzer.runnableEnv": {
+"rust-analyzer.runnables.extraEnv": {
     "RUN_SLOW_TESTS": "1"
 }
 ```
 
 Or it is possible to specify vars more granularly:
 ```jsonc
-"rust-analyzer.runnableEnv": [
+"rust-analyzer.runnables.extraEnv": [
     {
         // "mask": null, // null mask means that this rule will be applied for all runnables
         env: {
diff --git a/editors/code/package.json b/editors/code/package.json
index a95689193da..cdf9365b0a0 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -320,7 +320,7 @@
                     "default": null,
                     "description": "Custom cargo runner extension ID."
                 },
-                "rust-analyzer.runnableEnv": {
+                "rust-analyzer.runnables.extraEnv": {
                     "anyOf": [
                         {
                             "type": "null"
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,
     };
 

From 3f70117d69251d01b0ca2de8324eb5dafa8ff193 Mon Sep 17 00:00:00 2001
From: Mohsen Alizadeh <mohsen@alizadeh.us>
Date: Wed, 28 Jun 2023 21:24:28 -0700
Subject: [PATCH 2/2] fallback to old key

---
 editors/code/src/config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index 13e6bbc1d25..ee9ba7465ab 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -225,7 +225,7 @@ export class Config {
     }
 
     get runnablesExtraEnv() {
-        const item = this.get<any>("runnables.extraEnv");
+        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) {