diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-02-14 23:05:12 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-02-14 23:05:12 +0000 |
commit | 58f4dcf79ecf3b8dcec83d46a27a29340900a0ef (patch) | |
tree | e40a833dd72df793cb3d81d298e4c5a2564ff552 /editors/code/src/client.ts | |
parent | 9ba801befd70892bf40429512e890389171aa59f (diff) | |
parent | 80d5ba68da2785280cf154d5d812915b99fc0e87 (diff) |
Merge #3152
3152: vscode: a couple of more intuitive names and shortening languageServer to langServer r=matklad a=Veetaha
God, naming is so hard. I'd like to extract this change from upcomming "Download latest language server" command PR.
Co-authored-by: Veetaha <[email protected]>
Diffstat (limited to 'editors/code/src/client.ts')
-rw-r--r-- | editors/code/src/client.ts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/editors/code/src/client.ts b/editors/code/src/client.ts index dcf9d0c06..12c97be2f 100644 --- a/editors/code/src/client.ts +++ b/editors/code/src/client.ts | |||
@@ -2,7 +2,7 @@ import * as lc from 'vscode-languageclient'; | |||
2 | import * as vscode from 'vscode'; | 2 | import * as vscode from 'vscode'; |
3 | 3 | ||
4 | import { Config } from './config'; | 4 | import { Config } from './config'; |
5 | import { ensureLanguageServerBinary } from './installation/language_server'; | 5 | import { ensureServerBinary } from './installation/server'; |
6 | import { CallHierarchyFeature } from 'vscode-languageclient/lib/callHierarchy.proposed'; | 6 | import { CallHierarchyFeature } from 'vscode-languageclient/lib/callHierarchy.proposed'; |
7 | 7 | ||
8 | export async function createClient(config: Config): Promise<null | lc.LanguageClient> { | 8 | export async function createClient(config: Config): Promise<null | lc.LanguageClient> { |
@@ -11,11 +11,11 @@ export async function createClient(config: Config): Promise<null | lc.LanguageCl | |||
11 | // It might be a good idea to test if the uri points to a file. | 11 | // It might be a good idea to test if the uri points to a file. |
12 | const workspaceFolderPath = vscode.workspace.workspaceFolders?.[0]?.uri.fsPath ?? '.'; | 12 | const workspaceFolderPath = vscode.workspace.workspaceFolders?.[0]?.uri.fsPath ?? '.'; |
13 | 13 | ||
14 | const langServerPath = await ensureLanguageServerBinary(config.langServerBinarySource); | 14 | const serverPath = await ensureServerBinary(config.serverBinarySource); |
15 | if (!langServerPath) return null; | 15 | if (!serverPath) return null; |
16 | 16 | ||
17 | const run: lc.Executable = { | 17 | const run: lc.Executable = { |
18 | command: langServerPath, | 18 | command: serverPath, |
19 | options: { cwd: workspaceFolderPath }, | 19 | options: { cwd: workspaceFolderPath }, |
20 | }; | 20 | }; |
21 | const serverOptions: lc.ServerOptions = { | 21 | const serverOptions: lc.ServerOptions = { |