From 53ac7b93f456b471eaa7f03e015e2d8c0ef393e5 Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Tue, 18 Jul 2023 14:02:03 -0700
Subject: error handle on invalid config file, don't immediately show loading
 message

---
 extension/src/activation/activate.ts | 48 ++++++++++++++++++++++++++----------
 1 file changed, 35 insertions(+), 13 deletions(-)

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

diff --git a/extension/src/activation/activate.ts b/extension/src/activation/activate.ts
index 5c6ffa02..8ea08e89 100644
--- a/extension/src/activation/activate.ts
+++ b/extension/src/activation/activate.ts
@@ -36,22 +36,44 @@ export async function activateExtension(context: vscode.ExtensionContext) {
     })
     .catch((e) => console.log("Error checking for extension updates: ", e));
 
-  // Start the Python server
-  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);
+  // Wrap the server start logic in a new Promise
+  const serverStartPromise = new Promise((resolve, reject) => {
+    let serverStarted = false;
+
+    // Start the server and set serverStarted to true when done
+    startContinuePythonServer().then(() => {
+      serverStarted = true;
+      resolve(null);
+    });
+
+    // Wait for 2 seconds
+    setTimeout(() => {
+      // If the server hasn't started after 2 seconds, show the notification
+      if (!serverStarted) {
+        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) => {
+            // Wait for the server to start
+            while (!serverStarted) {
+              await new Promise((innerResolve) =>
+                setTimeout(innerResolve, 1000)
+              );
+            }
+            return Promise.resolve();
+          }
+        );
       }
-    );
+    }, 2000);
   });
 
+  // Await the server start promise
+  await serverStartPromise;
+
   // Register commands and providers
   sendTelemetryEvent(TelemetryEvent.ExtensionActivated);
   registerAllCodeLensProviders(context);
-- 
cgit v1.2.3-70-g09d2