mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #13993 - OmarTawfik-forks:fix-server-path, r=Veykril

Browse Source 
fix: substitute vscode variables in `config.serverPath`

From comment by `@Veykril` in https://github.com/rust-lang/rust-analyzer/issues/13939#issuecomment-1398187320:

> Yep, we pull the server path first, then substitute the configs, that's the wrong order.

6e52c64031/editors/code/src/ctx.ts (L155-L161)

Fixes #13939
This commit is contained in:
bors 2023-01-20 22:17:08 +00:00
commit 9a6294d703
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editors/code/src/bootstrap.ts
View File

@ -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> {