Merge pull request #115 from augustocdias/fix_112

Fix #112 and release 1.12.4
augustocdias · Oct 3, 2024 · 8182914 · 8182914
2 parents 77e6e59 + d7daa20
commit 8182914
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## [1.12.4] 2024-10-03
+
+- Work around VSCode bug with activeItems and selectedItems (#112)
+
 ## [1.12.3] 2024-10-03
 
 - Fix custom values not being returned (#113)

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/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.3",
+  "version": "1.12.4",
   "publisher": "augustocdias",
   "repository": {
     "url": "https://github.com/augustocdias/vscode-shell-command"

diff --git a/src/lib/CommandHandler.ts b/src/lib/CommandHandler.ts
@@ -329,8 +329,15 @@ export class CommandHandler {
             disposable = vscode.Disposable.from(...disposableLikes);
 
             picker.items = constantItems;
-            picker.activeItems = picker.items.filter(
-                (item) => defaultValues.includes((item as QuickPickItem).value));
+
+            const activeItems = [...picker.items.filter(
+                (item) => defaultValues.includes((item as QuickPickItem).value))];
+
+            // Assigning unconditionally can break selectedItems in callbacks
+            // See #112
+            if (activeItems.length) {
+                picker.activeItems = activeItems;
+            }
 
             picker.show();
         }).finally(() => {