Push IO and error handling up

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

View file

@ -5,18 +5,27 @@ import { activateInlayHints } from './inlay_hints';
import { activateStatusDisplay } from './status_display';
import { Ctx } from './ctx';
import { activateHighlighting } from './highlighting';
import { ensureServerBinary } from './installation/server';
let ctx: Ctx | undefined;
export async function activate(context: vscode.ExtensionContext) {
ctx = new Ctx(context);
const serverPath = await ensureServerBinary(ctx.config.serverSource);
if (serverPath == null) {
throw new Error(
"Rust Analyzer Language Server is not available. " +
"Please, ensure its [proper installation](https://github.com/rust-analyzer/rust-analyzer/tree/master/docs/user#vs-code)."
);
}
// Note: we try to start the server before we activate type hints so that it
// registers its `onDidChangeDocument` handler before us.
//
// This a horribly, horribly wrong way to deal with this problem.
try {
await ctx.startServer();
await ctx.startServer(serverPath);
} catch (e) {
vscode.window.showErrorMessage(e.message);
}