rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Push IO and error handling up

Browse Source
This commit is contained in:
Aleksey Kladov
2020-02-17 14:03:33 +01:00
parent 6167101302
commit ee4e41cbea
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
editors/code/src/client.ts
View File

@@ -2,18 +2,14 @@ import * as lc from 'vscode-languageclient';
import * as vscode from 'vscode';
import { Config } from './config';
import { ensureServerBinary } from './installation/server';
import { CallHierarchyFeature } from 'vscode-languageclient/lib/callHierarchy.proposed';
export async function createClient(config: Config): Promise<null | lc.LanguageClient> {
export async function createClient(config: Config, serverPath: string): Promise<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 = vscode.workspace.workspaceFolders?.[0]?.uri.fsPath ?? '.';
const serverPath = await ensureServerBinary(config.serverSource);
if (!serverPath) return null;
const run: lc.Executable = {
command: serverPath,
options: { cwd: workspaceFolderPath },