2 files changed, 13 insertions, 11 deletions
diff --git a/extension/src/activation/activate.ts b/extension/src/activation/activate.ts
index 8ea08e89..a7f6c55b 100644
--- a/extension/src/activation/activate.ts
+++ b/extension/src/activation/activate.ts
@@ -36,8 +36,8 @@ export async function activateExtension(context: vscode.ExtensionContext) {
     })
     .catch((e) => console.log("Error checking for extension updates: ", e));
 
-  // Wrap the server start logic in a new Promise
-  const serverStartPromise = new Promise((resolve, reject) => {
+  // Start the server and display loader if taking > 2 seconds
+  await new Promise((resolve) => {
     let serverStarted = false;
 
     // Start the server and set serverStarted to true when done
@@ -71,15 +71,6 @@ export async function activateExtension(context: vscode.ExtensionContext) {
     }, 2000);
   });
 
-  // Await the server start promise
-  await serverStartPromise;
-
-  // Register commands and providers
-  sendTelemetryEvent(TelemetryEvent.ExtensionActivated);
-  registerAllCodeLensProviders(context);
-  registerAllCommands(context);
-  registerQuickFixProvider();
-
   // Initialize IDE Protocol Client
   const serverUrl = getContinueServerUrl();
   ideProtocolClient = new IdeProtocolClient(
@@ -87,6 +78,7 @@ export async function activateExtension(context: vscode.ExtensionContext) {
     context
   );
 
+  // Register Continue GUI as sidebar webview, and beging a new session
   {
     const sessionIdPromise = await ideProtocolClient.getSessionId();
     const provider = new ContinueGUIWebviewViewProvider(sessionIdPromise);
diff --git a/extension/src/continueIdeClient.ts b/extension/src/continueIdeClient.ts
index 14a8df72..a1370a01 100644
--- a/extension/src/continueIdeClient.ts
+++ b/extension/src/continueIdeClient.ts
@@ -16,6 +16,10 @@ import fs = require("fs");
 import { WebsocketMessenger } from "./util/messenger";
 import { diffManager } from "./diffs";
 import path = require("path");
+import { sendTelemetryEvent, TelemetryEvent } from "./telemetry";
+import { registerAllCodeLensProviders } from "./lang-server/codeLens";
+import { registerAllCommands } from "./commands";
+import registerQuickFixProvider from "./lang-server/codeActions";
 
 const continueVirtualDocumentScheme = "continue";
 
@@ -76,6 +80,12 @@ class IdeProtocolClient {
     this._serverUrl = serverUrl;
     this._newWebsocketMessenger();
 
+    // Register commands and providers
+    sendTelemetryEvent(TelemetryEvent.ExtensionActivated);
+    registerAllCodeLensProviders(context);
+    registerAllCommands(context);
+    registerQuickFixProvider();
+
     // Setup listeners for any file changes in open editors
     // vscode.workspace.onDidChangeTextDocument((event) => {
     //   if (this._makingEdit === 0) {