about summary refs log tree commit diff
path: root/editors/code/src/client.ts
diff options
context:
space:
mode:
authorAleksey Kladov <aleksey.kladov@gmail.com>2020-02-17 14:03:33 +0100
committerAleksey Kladov <aleksey.kladov@gmail.com>2020-02-17 14:03:33 +0100
commitee4e41cbea8ef3758ccebd9ffb35c5290aebfceb (patch)
tree7b377257a1f0e64611a31270b3dfd25d12acd96f /editors/code/src/client.ts
parent6167101302bcc2d7f1a345e0ee44e1411056b4b3 (diff)
downloadrust-ee4e41cbea8ef3758ccebd9ffb35c5290aebfceb.tar.gz
rust-ee4e41cbea8ef3758ccebd9ffb35c5290aebfceb.zip
Push IO and error handling up
Diffstat (limited to 'editors/code/src/client.ts')
-rw-r--r--editors/code/src/client.ts6
1 files changed, 1 insertions, 5 deletions
diff --git a/editors/code/src/client.ts b/editors/code/src/client.ts
index 11894973cd7..aaf2ef40e3e 100644
--- a/editors/code/src/client.ts
+++ b/editors/code/src/client.ts
@@ -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 },