about summary refs log tree commit diff
path: root/editors/code/src
diff options
context:
space:
mode:
authorOmarTawfik <15987992+OmarTawfik@users.noreply.github.com>2023-01-20 13:22:11 -0800
committerOmarTawfik <15987992+OmarTawfik@users.noreply.github.com>2023-01-20 13:22:11 -0800
commit7198cd04ac14a31fc9e401e6a4e411e401acc326 (patch)
tree87a6fb4f276c04ef9acf9b9c04928a01c3444376 /editors/code/src
parentce67dea2ac7e6b664731fe46e19f542e40b4bf0c (diff)
downloadrust-7198cd04ac14a31fc9e401e6a4e411e401acc326.tar.gz
rust-7198cd04ac14a31fc9e401e6a4e411e401acc326.zip
allow using vscode variables in `config.serverPath`
Diffstat (limited to 'editors/code/src')
-rw-r--r--editors/code/src/bootstrap.ts4
1 files changed, 2 insertions, 2 deletions
diff --git a/editors/code/src/bootstrap.ts b/editors/code/src/bootstrap.ts
index 374c3b8144c..cabc7407172 100644
--- a/editors/code/src/bootstrap.ts
+++ b/editors/code/src/bootstrap.ts
@@ -1,6 +1,6 @@
 import * as vscode from "vscode";
 import * as os from "os";
-import { Config } from "./config";
+import { Config, substituteVSCodeVariables } from "./config";
 import { log, isValidExecutable } from "./util";
 import { PersistentState } from "./persistent_state";
 import { exec } from "child_process";
@@ -132,7 +132,7 @@ async function getServer(
     return undefined;
 }
 function serverPath(config: Config): string | null {
-    return process.env.__RA_LSP_SERVER_DEBUG ?? config.serverPath;
+    return process.env.__RA_LSP_SERVER_DEBUG ?? substituteVSCodeVariables(config.serverPath);
 }
 
 async function isNixOs(): Promise<boolean> {