Merge branch 'main' into config-py

1 files changed, 10 insertions, 20 deletions

diff --git a/extension/src/extension.ts b/extension/src/extension.ts
index de8f55e3..f2e580a1 100644
--- a/extension/src/extension.ts
+++ b/extension/src/extension.ts
@@ -3,29 +3,19 @@
  */
 
 import * as vscode from "vscode";
-import {
-  isPythonEnvSetup,
-  startContinuePythonServer,
-} from "./activation/environmentSetup";
 
-async function dynamicImportAndActivate(
-  context: vscode.ExtensionContext,
-  showTutorial: boolean
-) {
+async function dynamicImportAndActivate(context: vscode.ExtensionContext) {
   const { activateExtension } = await import("./activation/activate");
-  await activateExtension(context, showTutorial);
+  try {
+    await activateExtension(context);
+  } catch (e) {
+    console.log("Error activating extension: ", e);
+    vscode.window.showInformationMessage(
+      "Error activating the Continue extension."
+    );
+  }
 }
 
 export function activate(context: vscode.ExtensionContext) {
-  // Only show progress if we have to setup
-  vscode.window.withProgress(
-    {
-      location: vscode.ProgressLocation.Notification,
-      title: "Setting up Continue extension...",
-      cancellable: false,
-    },
-    async () => {
-      dynamicImportAndActivate(context, true);
-    }
-  );
+  dynamicImportAndActivate(context);
 }