Merge pull request #157 from augustocdias/issue_151

Fix dismissing the popup without selecting anything

Author: MarcelRobitaille

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## [1.19.1] 2025-07-02
+
+- Fix empty string perceived when dismissing the popup (#151)
+
 ## [1.19.0] 2025-07-02
 
 - Allow not filtering empty results (#155)

package-lock.json

@@ -3,7 +3,7 @@
   "displayName": "Tasks Shell Input",
   "description": "Use shell commands as input for your tasks",
   "icon": "icon.png",
-  "version": "1.19.0",
+  "version": "1.19.1",
   "publisher": "augustocdias",
   "repository": {
     "url": "https://github.com/augustocdias/vscode-shell-command"

package.json

@@ -9,17 +9,18 @@ import { ShellCommandException } from './util/exceptions';
 export function activate(this: any, context: vscode.ExtensionContext) {
     const userInputContext = new UserInputContext(context);
 
-    const handleExecute = (args: { [key: string]: unknown }) => {
+    const handleExecute = async (args: { [key: string]: unknown }) => {
         try {
             const handler = new CommandHandler(args, userInputContext, context, subprocess);
-            return handler.handle();
+            const result = await handler.handle();
+            return result;
         } catch (error) {
             const message = (error instanceof ShellCommandException)
                 ? error.message
                 : 'Error executing shell command: ' + error;
 
             console.error(error);
-            vscode.window.showErrorMessage(message);
+            throw message;
         }
     };
 

src/extension.ts

@@ -285,7 +285,7 @@ export class CommandHandler {
         const defaultValues = this.getDefault();
         let disposable: vscode.Disposable;
 
-        return new Promise<string[] | undefined>((resolve) => {
+        return new Promise<string[] | undefined>((resolve, reject) => {
             const picker = vscode.window.createQuickPick();
             picker.canSelectMany = this.args.multiselect!;
             picker.matchOnDescription = true;
@@ -323,7 +323,7 @@ export class CommandHandler {
                     const result = CommandHandler.transformSelection(picker);
 
                     if (didCancelQuickPickSession) {
-                        resolve(undefined);
+                        reject(new ShellCommandException("Cancelled"));
                     } else if (this.input.id && (undefined !== result)) {
                         resolve(result);
                     } else {