From ff688d096f62e538f181b9b5ae84b1b0f930c3bf Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Sun, 25 Jun 2023 14:19:07 -0700
Subject: run locally without interference

---
 extension/src/activation/activate.ts         | 12 ++++++------
 extension/src/activation/environmentSetup.ts |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'extension/src/activation')

diff --git a/extension/src/activation/activate.ts b/extension/src/activation/activate.ts
index c4bdbaa9..0c92f095 100644
--- a/extension/src/activation/activate.ts
+++ b/extension/src/activation/activate.ts
@@ -7,24 +7,26 @@ import IdeProtocolClient from "../continueIdeClient";
 import { getContinueServerUrl } from "../bridge";
 import { CapturedTerminal } from "../terminal/terminalEmulator";
 import { setupDebugPanel, ContinueGUIWebviewViewProvider } from "../debugPanel";
+import { startContinuePythonServer } from "./environmentSetup";
 // import { CapturedTerminal } from "../terminal/terminalEmulator";
 
 export let extensionContext: vscode.ExtensionContext | undefined = undefined;
 
 export let ideProtocolClient: IdeProtocolClient;
 
-export function activateExtension(
+export async function activateExtension(
   context: vscode.ExtensionContext,
   showTutorial: boolean
 ) {
-  sendTelemetryEvent(TelemetryEvent.ExtensionActivated);
+  extensionContext = context;
 
+  sendTelemetryEvent(TelemetryEvent.ExtensionActivated);
   registerAllCodeLensProviders(context);
   registerAllCommands(context);
 
   // vscode.window.registerWebviewViewProvider("continue.continueGUIView", setupDebugPanel);
-
-  let serverUrl = getContinueServerUrl();
+  await startContinuePythonServer();
+  const serverUrl = getContinueServerUrl();
 
   ideProtocolClient = new IdeProtocolClient(
     `${serverUrl.replace("http", "ws")}/ide/ws`,
@@ -52,6 +54,4 @@ export function activateExtension(
 
   // If any terminals are open to start, replace them
   // vscode.window.terminals.forEach((terminal) => {}
-
-  extensionContext = context;
 }
diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts
index 593b727e..54c263bd 100644
--- a/extension/src/activation/environmentSetup.ts
+++ b/extension/src/activation/environmentSetup.ts
@@ -180,7 +180,7 @@ export async function startContinuePythonServer() {
   await setupPythonEnv();
 
   // Check vscode settings
-  let serverUrl = getContinueServerUrl();
+  const serverUrl = getContinueServerUrl();
   if (serverUrl !== "http://localhost:8000") {
     return;
   }
-- 
cgit v1.2.3-70-g09d2