From ef24721640c4722ce47d491a6bf5dd0760da57bd Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 31 Dec 2019 21:13:30 +0100 Subject: Fixes to progress display --- editors/code/src/main.ts | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'editors/code/src/main.ts') diff --git a/editors/code/src/main.ts b/editors/code/src/main.ts index 51dedd5ef..430ad31b4 100644 --- a/editors/code/src/main.ts +++ b/editors/code/src/main.ts @@ -11,17 +11,6 @@ let ctx!: Ctx; export async function activate(context: vscode.ExtensionContext) { ctx = new Ctx(context); - // Note: we try to start the server before we register various commands, so - // that it registers its `onDidChangeDocument` handler before us. - // - // This a horribly, horribly wrong way to deal with this problem. - try { - await ctx.restartServer(); - } catch (e) { - vscode.window.showErrorMessage(e.message); - } - - // Commands which invokes manually via command pallet, shortcut, etc. ctx.registerCommand('analyzerStatus', commands.analyzerStatus); ctx.registerCommand('collectGarbage', commands.collectGarbage); @@ -42,7 +31,17 @@ export async function activate(context: vscode.ExtensionContext) { ctx.overrideCommand('type', commands.onEnter); } activateStatusDisplay(ctx); + activateHighlighting(ctx); + // 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.restartServer(); + } catch (e) { + vscode.window.showErrorMessage(e.message); + } activateInlayHints(ctx); } -- cgit v1.2.3