about summary refs log tree commit diff
path: root/editors/code/src/ctx.ts
diff options
context:
space:
mode:
authorLukas Wirth <lukastw97@gmail.com>2023-01-24 13:43:56 +0100
committerLukas Wirth <lukastw97@gmail.com>2023-01-24 13:46:56 +0100
commitec9476015ce966fc4238408baef7a7ad1b3db5d8 (patch)
tree80b5a547c6a1791dadbf1abcb60be788a13ee685 /editors/code/src/ctx.ts
parente46c242a38396c5dd1cb85b5002ca17f83c4c1b7 (diff)
downloadrust-ec9476015ce966fc4238408baef7a7ad1b3db5d8.tar.gz
rust-ec9476015ce966fc4238408baef7a7ad1b3db5d8.zip
Substitute VSCode variables more generally
Diffstat (limited to 'editors/code/src/ctx.ts')
-rw-r--r--editors/code/src/ctx.ts6
1 files changed, 2 insertions, 4 deletions
diff --git a/editors/code/src/ctx.ts b/editors/code/src/ctx.ts
index 1860924c6de..8b04182155d 100644
--- a/editors/code/src/ctx.ts
+++ b/editors/code/src/ctx.ts
@@ -2,7 +2,7 @@ import * as vscode from "vscode";
 import * as lc from "vscode-languageclient/node";
 import * as ra from "./lsp_ext";
 
-import { Config, substituteVariablesInEnv, substituteVSCodeVariables } from "./config";
+import { Config, substituteVSCodeVariables } from "./config";
 import { createClient } from "./client";
 import { isRustDocument, isRustEditor, log, RustEditor } from "./util";
 import { ServerStatusParams } from "./lsp_ext";
@@ -152,9 +152,7 @@ export class Ctx {
                     throw new Error(message);
                 }
             );
-            const newEnv = substituteVariablesInEnv(
-                Object.assign({}, process.env, this.config.serverExtraEnv)
-            );
+            const newEnv = Object.assign({}, process.env, this.config.serverExtraEnv);
             const run: lc.Executable = {
                 command: this._serverPath,
                 options: { env: newEnv },