language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 04:19:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

vscode: amended config to use binary from globalStoragePath, added ui for downloading

Browse source
This commit is contained in:
Veetaha 2020-02-08 04:22:44 +02:00
parent 3e0e4e90ae
commit 5d88c1db38
10 changed files with 229 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,24 +1,18 @@
import { homedir } from 'os';
import * as lc from 'vscode-languageclient';
import { spawnSync } from 'child_process';
import { window, workspace } from 'vscode';
import { Config } from './config';
import { ensureLanguageServerBinary } from './installation/language_server';
export function createClient(config: Config): lc.LanguageClient {
export async function createClient(config: Config): Promise<null | 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 workspaceFolderPath = workspace.workspaceFolders?.[0]?.uri.fsPath ?? '.';
const raLspServerPath = expandPathResolving(config.raLspServerPath);
if (spawnSync(raLspServerPath, ["--version"]).status !== 0) {
window.showErrorMessage(
`Unable to execute '${raLspServerPath} --version'\n\n` +
`Perhaps it is not in $PATH?\n\n` +
`PATH=${process.env.PATH}\n`
);
}
const raLspServerPath = await ensureLanguageServerBinary(config.raLspServerSource);
if (!raLspServerPath) return null;
const run: lc.Executable = {
command: raLspServerPath,
options: { cwd: workspaceFolderPath },
@ -87,9 +81,3 @@ export function createClient(config: Config): lc.LanguageClient {
res.registerProposedFeatures();
return res;
}
function expandPathResolving(path: string) {
if (path.startsWith('~/')) {
return path.replace('~', homedir());
}
return path;
}