1 files changed, 11 insertions, 6 deletions

diff --git a/editors/code/src/main.ts b/editors/code/src/main.ts
index 22450060b..51dedd5ef 100644
--- a/editors/code/src/main.ts
+++ b/editors/code/src/main.ts
@@ -11,6 +11,17 @@ 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);
@@ -33,12 +44,6 @@ export async function activate(context: vscode.ExtensionContext) {
     activateStatusDisplay(ctx);
     activateHighlighting(ctx);
     activateInlayHints(ctx);
-    // Start the language server, finally!
-    try {
-        await ctx.restartServer();
-    } catch (e) {
-        vscode.window.showErrorMessage(e.message);
-    }
 }
 
 export async function deactivate() {