Refactor and Rearrange Extension activation to handle cases of no effekt exe, old effekt exe and current effekt exe without blocking lsp

Author: JakubSchwenkbeck

src/effektManager.ts

@@ -19,6 +19,13 @@ interface EffektExecutableInfo {
     version: string;
 }
 
+export class EffektExecutableNotFoundError extends Error {
+    constructor(message: string = "Effekt executable not found") {
+        super(message);
+        this.name = "EffektExecutableNotFoundError";
+    }
+}
+
 /**
  * Manages Effekt installation, updates, and status within VS Code.
  */
@@ -171,7 +178,7 @@ export class EffektManager {
             }
         }
 
-        throw new Error('Effekt executable not found');
+        throw new EffektExecutableNotFoundError('Effekt executable not found');
     }
 
     /**
@@ -180,7 +187,7 @@ export class EffektManager {
      * @param action The action being performed ('install' or 'update').
      * @returns A promise that resolves with the installed/updated version or an empty string.
      */
-    private async installOrUpdateEffekt(version: string, action: 'install' | 'update', client : EffektLanguageClient): Promise<string> {
+    private async installOrUpdateEffekt(version: string, action: 'install' | 'update', client? : EffektLanguageClient): Promise<string> {
         if (!(await this.checkJava())) {
             this.logMessage('INFO', 'Java is not installed.');
             return '';
@@ -196,10 +203,9 @@ export class EffektManager {
             cancellable: false
         }, async (progress) => {
             try {
-                console.log("Right before the try stop")
-                await client.stop(10000)
-                console.log("right after the try -  stop")
-
+                if (client) {
+                    await client.stop();
+                }
                 progress.report({ increment: 0, message: 'Preparing...' });
                 await this.runNpmInstall();
                 progress.report({ increment: 50, message: 'Verifying installation...' });
@@ -208,19 +214,18 @@ export class EffektManager {
                 progress.report({ increment: 100, message: 'Completed' });
 
                 this.handleInstallationResult(verificationResult, action);
-                console.log("right before the try start")
-                await client.start();
-                console.log("right after the try start")
-
+                
+                if (client) {
+                    await client.start();
+                }
                 return verificationResult.success ? verificationResult.version || '' : '';
             } catch (error) {
                 this.showErrorWithLogs(`Failed to ${action} Effekt: ${error}`);
                 this.updateStatusBar();
-                console.log("right before the catch start")
-
-                await client.start();
-                console.log("right after the catch start")
 
+                if (client) {
+                    await client.start();
+                }
                 return '';
             }
         });
@@ -329,14 +334,14 @@ export class EffektManager {
      * Checks for Effekt updates and offers to install/update if necessary.
      * @returns A promise that resolves with the current Effekt version.
      */
-    public async checkForUpdatesAndInstall(client: EffektLanguageClient): Promise<string> {
+    public async checkForUpdatesAndInstall(client?: EffektLanguageClient): Promise<string> {
         try {
             let currentVersion = await this.getEffektVersion();
             const latestVersion = await this.getLatestNPMVersion(this.effektNPMPackage);
 
             // check if the latest version strictly newer than the current version
             if (!currentVersion || compareVersion(latestVersion, currentVersion, '>')) {
-                return this.promptForAction(latestVersion, 'update',client);
+                return this.promptForAction(latestVersion, 'update', client );
             } else {
                 vscode.window.showInformationMessage(`Effekt is up-to-date (version ${currentVersion}).`);
             }
@@ -360,7 +365,7 @@ export class EffektManager {
      * @param action The action to perform ('install' or 'update').
      * @returns A promise that resolves with the installed/updated version or an empty string.
      */
-    private async promptForAction(version: string, action: 'install' | 'update', client : EffektLanguageClient): Promise<string> {
+    private async promptForAction(version: string, action: 'install' | 'update', client? : EffektLanguageClient): Promise<string> {
         const message = action === 'update'
             ? `A new version of Effekt is available (${version}). Would you like to update?`
             : `Effekt ${version} is available. Would you like to install it?`;

src/extension.ts

@@ -7,7 +7,7 @@ import {
     StreamInfo,
     State as ClientState
 } from 'vscode-languageclient/node';
-import { EffektManager } from './effektManager';
+import { EffektManager, EffektExecutableNotFoundError } from './effektManager';
 import { EffektIRContentProvider } from './irProvider';
 import { InlayHintProvider } from './inlayHintsProvider';
 import { EffektLanguageClient } from './effektLanguageClient';
@@ -107,24 +107,47 @@ class EffektRunCodeLensProvider implements vscode.CodeLensProvider {
 export async function activate(context: vscode.ExtensionContext) {
     effektManager = new EffektManager();
 
-    await startEffektLanguageServer(context);
+    try {
+        // If effekt exists (no matter which version) start lsp
+        await ensureEffektIsAvailable();
+        await initializeLSPAndProviders(context);
+
+        await handleEffektUpdates();
+    } catch (error) {
+        if (error instanceof EffektExecutableNotFoundError) {
+            // Handle the case where Effekt is not installed
+            await handleEffektUpdates();
+            await initializeLSPAndProviders(context);
+        } else {
+            // Handle unexpected errors
+            console.error("An unexpected error occurred:", error);
+            vscode.window.showErrorMessage('An unexpected error occurred. Check the logs for details.');
+        }
+    }
+}
 
+async function ensureEffektIsAvailable() {
+    await effektManager.locateEffektExecutable();
+}
+
+async function initializeLSPAndProviders(context: vscode.ExtensionContext) {
+    await startEffektLanguageServer(context);
     registerCommands(context);
     registerCodeLensProviders(context);
     registerIRProvider(context);
     registerInlayProvider();
-
     initializeHoleDecorations(context);
+}
 
+async function handleEffektUpdates() {
     const installedEffektVersion = await effektManager.checkForUpdatesAndInstall(client);
     if (!installedEffektVersion) {
-        vscode.window.showWarningMessage('Effekt is not installed. LSP features may not work correctly.');
-    }/* else if (installedEffektVersion !== await effektManager.getEffektVersion()) { 
-        await restartEffektLanguageServer(context);
-    } */else {
-        logMessage('INFO', "Using the existing version of Effekt");        
+        vscode.window.showWarningMessage(
+            'Effekt is not installed. LSP features may not work correctly.'
+        );
+    } else {
+        logMessage('INFO', "Using the existing version of Effekt");
     }
-   
 }
 
 async function startEffektLanguageServer(context: vscode.ExtensionContext) {
@@ -142,7 +165,9 @@ async function startEffektLanguageServer(context: vscode.ExtensionContext) {
             return Promise.resolve(result);
         };
     } else {
+       
         const effektExecutable = await effektManager.locateEffektExecutable();
+       
         const args = ["--server", ...effektManager.getEffektArgs()];
 
         /* > Node.js will now error with EINVAL if a .bat or .cmd file is passed to child_process.spawn and child_process.spawnSync without the shell option set.
@@ -189,16 +214,6 @@ async function startEffektLanguageServer(context: vscode.ExtensionContext) {
     context.subscriptions.push(client);
 }
 
-/*
-async function restartEffektLanguageServer(context: vscode.ExtensionContext) {
-    if (client) {
-        console.log("restart stop")
-        await client.stop();
-        
-    }
-    await startEffektLanguageServer(context);
-}*/
-
 function registerCodeLensProviders(context: vscode.ExtensionContext) {
     context.subscriptions.push(
         vscode.languages.registerCodeLensProvider(