Merge pull request #108 from augustocdias/fix_107

Fix #107

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## [1.12.1] 2024-10-02
+
+- Fix errors with default values (#107)
+
 ## [1.12.0] 2024-09-30
 
 - Add support for custom values (#33)

package.json

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

src/lib/CommandHandler.test.ts

@@ -269,6 +269,25 @@ describe("Errors", async () => {
         expect(() => handler.handle()).rejects.toThrowError(
             "The command for input 'inputTest' returned empty result.");
     });
+
+    test("It should NOT trigger an error with defaultOptions", async () => {
+        const testDataPath = path.join(__dirname, "../test/testData/errors");
+
+        const tasksJson = await import(path.join(testDataPath, ".vscode/tasks.json"));
+        const mockData = (await import(path.join(testDataPath, "mockData.ts"))).default;
+
+        mockVscode.setMockData(mockData);
+        const input = tasksJson.inputs[1].args;
+        const handler = new CommandHandler(
+            input,
+            new UserInputContext(),
+            mockExtensionContext as unknown as vscode.ExtensionContext,
+            child_process,
+        );
+
+        expect(() => handler.handle()).rejects.not.toThrowError(
+            "The command for input 'inputTest' returned empty result.");
+    });
 });
 
 describe("Argument parsing", () => {

src/lib/CommandHandler.ts

@@ -205,7 +205,7 @@ export class CommandHandler {
             result += stderr;
         }
 
-        if (result.trim().length == 0) {
+        if ((result.trim().length == 0) && (undefined === this.args.defaultOptions)) {
             throw new ShellCommandException(`The command for input '${this.input.id}' returned empty result.`);
         }
 

src/test/testData/errors/.vscode/tasks.json

@@ -6,6 +6,12 @@
       "type": "shell",
       "command": "echo ${input:inputTest}",
       "problemMatcher": []
+    },
+    {
+      "label": "This should not trigger an error",
+      "type": "shell",
+      "command": "echo ${input:inputTestWithDefaults}",
+      "problemMatcher": []
     }
   ],
   "inputs": [
@@ -22,6 +28,15 @@
           "PROJECT": "${workspaceFolderBasename}"
         }
       }
+    },
+    {
+      "id": "inputTestWithDefaults",
+      "type": "command",
+      "command": "shellCommand.execute",
+      "args": {
+        "command": "echo ''",
+        "defaultOptions": []
+      }
     }
   ]
 }