From 953d7dc8ddbea6b534977d68f38415a6b149d9d6 Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Fri, 30 Jun 2023 17:25:35 -0700
Subject: the fix. and others.

---
 extension/src/activation/activate.ts | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'extension/src/activation/activate.ts')

diff --git a/extension/src/activation/activate.ts b/extension/src/activation/activate.ts
index cd8f0cf3..18650561 100644
--- a/extension/src/activation/activate.ts
+++ b/extension/src/activation/activate.ts
@@ -20,6 +20,21 @@ export async function activateExtension(
 ) {
   extensionContext = context;
 
+  await new Promise((resolve, reject) => {
+    vscode.window.withProgress(
+      {
+        location: vscode.ProgressLocation.Notification,
+        title:
+          "Starting Continue Server... (it may take a minute to download Python packages)",
+        cancellable: false,
+      },
+      async (progress, token) => {
+        await startContinuePythonServer();
+        resolve(null);
+      }
+    );
+  });
+
   sendTelemetryEvent(TelemetryEvent.ExtensionActivated);
   registerAllCodeLensProviders(context);
   registerAllCommands(context);
@@ -33,7 +48,7 @@ export async function activateExtension(
 
   // Setup the left panel
   (async () => {
-    const sessionIdPromise = ideProtocolClient.getSessionId();
+    const sessionIdPromise = await ideProtocolClient.getSessionId();
     const provider = new ContinueGUIWebviewViewProvider(sessionIdPromise);
 
     context.subscriptions.push(
@@ -46,21 +61,6 @@ export async function activateExtension(
       )
     );
   })();
-
-  await new Promise((resolve, reject) => {
-    vscode.window.withProgress(
-      {
-        location: vscode.ProgressLocation.Notification,
-        title:
-          "Starting Continue Server... (it may take a minute to download Python packages)",
-        cancellable: false,
-      },
-      async (progress, token) => {
-        await startContinuePythonServer();
-        resolve(null);
-      }
-    );
-  });
   // All opened terminals should be replaced by our own terminal
   // vscode.window.onDidOpenTerminal((terminal) => {});
 
-- 
cgit v1.2.3-70-g09d2