language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 12:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Remove two stage constuction

Browse source
This commit is contained in:
Aleksey Kladov 2020-02-17 14:11:01 +01:00
parent 978bea2b31
commit 89afb1a841
2 changed files with 15 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

25
editors/code/src/ctx.ts
View file

@ -1,6 +1,5 @@
import * as vscode from 'vscode';
import * as lc from 'vscode-languageclient';
import { strict as assert } from "assert";
import { Config } from './config';
import { createClient } from './client';
@ -15,23 +14,21 @@ export class Ctx {
// FIXME: this actually needs syncronization of some kind (check how
// vscode deals with `deactivate()` call when extension has some work scheduled
// on the event loop to get a better picture of what we can do here)
client: lc.LanguageClient | null = null;
client: lc.LanguageClient;
private extCtx: vscode.ExtensionContext;
constructor(extCtx: vscode.ExtensionContext) {
this.config = new Config(extCtx);
this.extCtx = extCtx;
static async create(config: Config, extCtx: vscode.ExtensionContext, serverPath: string): Promise<Ctx> {
const client = await createClient(config, serverPath);
const res = new Ctx(config, extCtx, client);
res.pushCleanup(client.start());
await client.onReady();
return res;
}
async startServer(serverPath: string) {
assert(this.client == null);
const client = await createClient(this.config, serverPath);
this.pushCleanup(client.start());
await client.onReady();
this.client = client;
private constructor(config: Config, extCtx: vscode.ExtensionContext, client: lc.LanguageClient) {
this.config = config;
this.extCtx = extCtx;
this.client = client
}
get activeRustEditor(): vscode.TextEditor | undefined {