Fix #288, Ext freeze after run command multi trigger

Signed-off-by: paulober <[email protected]>

Author: paulober

src/activator.mts

@@ -65,6 +65,7 @@ export default class Activator {
   private commandExecuting = false;
 
   private disableExtWarning = false;
+  private statusbarMsgDisposable?: vscode.Disposable;
 
   constructor() {
     this.logger = new Logger("Activator");
@@ -542,13 +543,16 @@ export default class Activator {
           }
         }
 
+        if (await this.checkForRunningOperation()) {
+          return;
+        }
+
         const forceDisableSoftReset =
           this.settings?.getBoolean(SettingsKey.noSoftResetOnRun) ?? false;
 
         if (!noSoftReset && !forceDisableSoftReset) {
           await PicoMpyCom.getInstance().softReset();
         }
-        await focusTerminal(this.terminalOptions);
         // TODO: maybe freeze terminal until this operation runs to prevent user input
         const data = await PicoMpyCom.getInstance().runFile(
           file,
@@ -557,6 +561,7 @@ export default class Activator {
               return;
             }
 
+            void focusTerminal(this.terminalOptions);
             this.commandExecuting = true;
             this.terminal?.cleanAndStore();
             this.ui?.userOperationStarted();
@@ -610,6 +615,11 @@ export default class Activator {
 
           return;
         }
+
+        if (await this.checkForRunningOperation()) {
+          return;
+        }
+
         const forceDisableSoftReset =
           this.settings?.getBoolean(SettingsKey.noSoftResetOnRun) ?? false;
 
@@ -2172,4 +2182,47 @@ export default class Activator {
       );
     }
   }
+
+  /**
+   * Checks if there is a running operation and asks the user if it should be canceled.
+   *
+   * @returns `true` if the user does not want to cancel the already running
+   * operation, `false` otherwise.
+   */
+  private async checkForRunningOperation(): Promise<boolean> {
+    if (this.commandExecuting) {
+      // ask user if it want to cancel running operation or cancel the new one
+      const choice = await vscode.window.showWarningMessage(
+        "An operation is already running. Do you want to cancel it?",
+        {
+          modal: true,
+        },
+        "Yes",
+        "No"
+      );
+
+      if (choice === "Yes") {
+        if (this.commandExecuting) {
+          PicoMpyCom.getInstance().interruptExecution();
+
+          // wait for 500ms for operation to stop and clean up local state
+          await new Promise(resolve => setTimeout(resolve, 500));
+        }
+      } else {
+        if (this.statusbarMsgDisposable) {
+          this.statusbarMsgDisposable.dispose();
+        }
+
+        // void vscode.window.showWarningMessage("Operation canceled.");
+        this.statusbarMsgDisposable = vscode.window.setStatusBarMessage(
+          "Operation canceled.",
+          5000
+        );
+
+        return true;
+      }
+    }
+
+    return false;
+  }
 }

src/logger.mts

@@ -1,5 +1,5 @@
-import { window } from "vscode";
-import type { LogOutputChannel } from "vscode";
+import { env, window } from "vscode";
+import { type LogOutputChannel, LogLevel as VSCodeLogLevel } from "vscode";
 
 type LogLevel = "info" | "warn" | "error" | "debug";
 
@@ -21,6 +21,19 @@ interface Stringable {
   toString(): string;
 }
 
+function customLogLevelToVscode(logLevel: LogLevel): VSCodeLogLevel {
+  switch (logLevel) {
+    case "info":
+      return VSCodeLogLevel.Info;
+    case "warn":
+      return VSCodeLogLevel.Warning;
+    case "error":
+      return VSCodeLogLevel.Error;
+    case "debug":
+      return VSCodeLogLevel.Debug;
+  }
+}
+
 export default class Logger {
   private className: string;
   private static outputChannel?: LogOutputChannel;
@@ -33,6 +46,7 @@ export default class Logger {
       /*Logger.outputChannel = window.createOutputChannel("Pico-W-Go", {
         log: true,
       });*/
+      //env.logLevel = customLogLevelToVscode(logLevel);
       Logger.outputChannel = window.createOutputChannel("MicroPico", {
         log: true,
       });

src/ui.mts

@@ -50,6 +50,7 @@ export default class UI {
         item.tooltip
       );
     }
+    this.statusbarItemPriority = Object.keys(this.items).length;
 
     this.setState(false);
 
@@ -128,7 +129,7 @@ export default class UI {
     return;
   }
 
-  private statusbarItemPriority = 11;
+  private statusbarItemPriority = 14;
 
   private createStatusBarItem(
     key: string,