Pass plugin env variable to LS subprocess (#6176)

starkware-libs · Aug 8, 2024 · fdf3d70 · fdf3d70
1 parent 0f0f721
commit fdf3d70
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/vscode-cairo/src/cairols.ts b/vscode-cairo/src/cairols.ts
@@ -184,8 +184,13 @@ function setupEnv(serverExecutable: lc.Executable, ctx: Context) {
   const extraEnv = ctx.config.get("languageServerExtraEnv");
 
   serverExecutable.options ??= {};
-  serverExecutable.options.env ??= {};
-  Object.assign(serverExecutable.options.env, logEnv, extraEnv);
+  serverExecutable.options.env = {
+    // Inherit env from parent process.
+    ...process.env,
+    ...(serverExecutable.options.env ?? {}),
+    ...logEnv,
+    ...extraEnv,
+  };
 }
 
 function buildEnvFilter(ctx: Context): string {