Auto merge of rust-lang#12371 - jhgg:fix/extra-env-non-string-value-h…

…andling, r=lnicola vscode: fix extraEnv handling numeric values fixes rust-lang#12363 by bringing the types more inline with the reality, and making `Env` not a lie.
rust-lang-ci · May 24, 2022 · cc8140a · cc8140a
2 parents 81805d4 + b8ee992
commit cc8140a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/editors/code/package.json b/editors/code/package.json
@@ -308,6 +308,12 @@
                         "null",
                         "object"
                     ],
+                    "additionalProperties": {
+                        "type": [
+                            "string",
+                            "number"
+                        ]
+                    },
                     "default": null,
                     "markdownDescription": "Extra environment variables that will be passed to the rust-analyzer executable. Useful for passing e.g. `RA_LOG` for debugging."
                 },

diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
@@ -100,8 +100,12 @@ export class Config {
     get serverPath() {
         return this.get<null | string>("server.path") ?? this.get<null | string>("serverPath");
     }
-    get serverExtraEnv() {
-        return this.get<Env | null>("server.extraEnv") ?? {};
+    get serverExtraEnv(): Env {
+        const extraEnv =
+            this.get<{ [key: string]: string | number } | null>("server.extraEnv") ?? {};
+        return Object.fromEntries(
+            Object.entries(extraEnv).map(([k, v]) => [k, typeof v !== "string" ? v.toString() : v])
+        );
     }
     get traceExtension() {
         return this.get<boolean>("trace.extension");