Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-28 05:53:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Enable variable substitutions before passing them over to R-A server

Browse source
This commit is contained in:
Andrei Listochkin 2022-05-11 13:37:40 +01:00
parent 684fa2794f
commit 33d2c8a3f9
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
editors/code/src/client.ts
View file

@ -6,6 +6,7 @@ import { assert } from './util';
import { WorkspaceEdit } from 'vscode';
import { Workspace } from './ctx';
import { updateConfig } from './config';
import { substituteVariablesInEnv } from './config';
export interface Env {
[name: string]: string;
@ -30,9 +31,9 @@ export async function createClient(serverPath: string, workspace: Workspace, ext
// TODO?: Workspace folders support Uri's (eg: file://test.txt).
// It might be a good idea to test if the uri points to a file.
const newEnv = Object.assign({}, process.env);
Object.assign(newEnv, extraEnv);
const newEnv = substituteVariablesInEnv(Object.assign(
{}, process.env, extraEnv
));
const run: lc.Executable = {
command: serverPath,
options: { env: newEnv },