import { assert } from './util';
import { WorkspaceEdit } from 'vscode';
+export interface Env {
+ [name: string]: string;
+}
+
function renderCommand(cmd: ra.CommandLink) {
- return `[${cmd.title}](command:${cmd.command}?${encodeURIComponent(JSON.stringify(cmd.arguments))} '${cmd.tooltip!}')`;
+ return `[${cmd.title}](command:${cmd.command}?${encodeURIComponent(JSON.stringify(cmd.arguments))} '${cmd.tooltip}')`;
}
function renderHoverActions(actions: ra.CommandLinkGroup[]): vscode.MarkdownString {
return res;
}
-export function createClient(serverPath: string, cwd: string): lc.LanguageClient {
+export function createClient(serverPath: string, cwd: string, extraEnv: Env): lc.LanguageClient {
// '.' Is the fallback if no folder is open
// 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 run: lc.Executable = {
command: serverPath,
- options: { cwd },
+ options: { cwd, env: newEnv },
};
const serverOptions: lc.ServerOptions = {
run,
command: "rust-analyzer.applyActionGroup",
title: "",
arguments: [items.map((item) => {
- return { label: item.title, arguments: item.command!!.arguments!![0] };
+ return { label: item.title, arguments: item.command.arguments[0] };
})],
};
}
initialize(_capabilities: lc.ServerCapabilities<any>, _documentSelector: lc.DocumentSelector | undefined): void {
}
+ dispose(): void {
+ }
}
function isCodeActionWithoutEditsAndCommands(value: any): boolean {