Add close buttons and proper disposal to all quick pick dialogs

Author: robertpiosik

packages/vscode/src/commands/apply-context-command/apply-context-command.ts

@@ -81,6 +81,9 @@ export function apply_context_command(
         main_quick_pick.title = 'Select Context Source'
         main_quick_pick.items = final_quick_pick_options
         main_quick_pick.placeholder = 'Select option'
+        main_quick_pick.buttons = [
+          { iconPath: new vscode.ThemeIcon('close'), tooltip: 'Close' }
+        ]
         if (last_main_selection_value) {
           const active_item = final_quick_pick_options.find(
             (opt) => opt.value === last_main_selection_value
@@ -97,17 +100,24 @@ export function apply_context_command(
           | undefined
         >((resolve) => {
           let is_accepted = false
-          main_quick_pick.onDidAccept(() => {
-            is_accepted = true
-            resolve(main_quick_pick.selectedItems[0])
-            main_quick_pick.hide()
-          })
-          main_quick_pick.onDidHide(() => {
-            if (!is_accepted) {
-              resolve(undefined)
-            }
-            main_quick_pick.dispose()
-          })
+          const disposables: vscode.Disposable[] = []
+          disposables.push(
+            main_quick_pick.onDidTriggerButton((_button) => {
+              main_quick_pick.hide()
+            }),
+            main_quick_pick.onDidAccept(() => {
+              is_accepted = true
+              resolve(main_quick_pick.selectedItems[0])
+              main_quick_pick.hide()
+            }),
+            main_quick_pick.onDidHide(() => {
+              if (!is_accepted) {
+                resolve(undefined)
+              }
+              disposables.forEach((d) => d.dispose())
+              main_quick_pick.dispose()
+            })
+          )
           main_quick_pick.show()
         })
 

packages/vscode/src/commands/save-context-command.ts

@@ -411,6 +411,9 @@ export function save_context_command(
         quick_pick.title = 'Save Context'
         quick_pick.items = quick_pick_storage_options
         quick_pick.placeholder = 'Where do you want to save this context?'
+        quick_pick.buttons = [
+          { iconPath: new vscode.ThemeIcon('close'), tooltip: 'Close' }
+        ]
 
         if (last_save_location) {
           const active_item = quick_pick_storage_options.find(
@@ -425,17 +428,24 @@ export function save_context_command(
           (vscode.QuickPickItem & { value: 'internal' | 'file' }) | undefined
         >((resolve) => {
           let is_accepted = false
-          quick_pick.onDidAccept(() => {
-            is_accepted = true
-            resolve(quick_pick.selectedItems[0])
-            quick_pick.hide()
-          })
-          quick_pick.onDidHide(() => {
-            if (!is_accepted) {
-              resolve(undefined)
-            }
-            quick_pick.dispose()
-          })
+          const disposables: vscode.Disposable[] = []
+          disposables.push(
+            quick_pick.onDidTriggerButton((_button) => {
+              quick_pick.hide()
+            }),
+            quick_pick.onDidAccept(() => {
+              is_accepted = true
+              resolve(quick_pick.selectedItems[0])
+              quick_pick.hide()
+            }),
+            quick_pick.onDidHide(() => {
+              if (!is_accepted) {
+                resolve(undefined)
+              }
+              disposables.forEach((d) => d.dispose())
+              quick_pick.dispose()
+            })
+          )
           quick_pick.show()
         })
 

packages/vscode/src/views/panel/backend/message-handlers/handle-at-sign-quick-pick/handle-at-sign-quick-pick.ts

@@ -59,12 +59,38 @@ const at_sign_quick_pick = async (params: {
   const quick_pick_items_to_show = all_quick_pick_items
   quick_pick_items_to_show.sort((a, b) => natural_sort(a.fullPath, b.fullPath))
 
-  const selected_path_item = await vscode.window.showQuickPick(
-    quick_pick_items_to_show,
-    {
-      placeHolder: 'Select a path to place in the prompt field',
-      matchOnDescription: true,
-      title: 'Reference File'
+  const quick_pick = vscode.window.createQuickPick<QuickPickItem>()
+  quick_pick.items = quick_pick_items_to_show
+  quick_pick.placeholder = 'Select a path to place in the prompt field'
+  quick_pick.matchOnDescription = true
+  quick_pick.title = 'Reference File'
+  quick_pick.buttons = [
+    { iconPath: new vscode.ThemeIcon('close'), tooltip: 'Close' }
+  ]
+
+  const selected_path_item = await new Promise<QuickPickItem | undefined>(
+    (resolve) => {
+      let is_accepted = false
+      const disposables: vscode.Disposable[] = []
+
+      disposables.push(
+        quick_pick.onDidTriggerButton((_button) => {
+          quick_pick.hide()
+        }),
+        quick_pick.onDidAccept(() => {
+          is_accepted = true
+          resolve(quick_pick.selectedItems[0])
+          quick_pick.hide()
+        }),
+        quick_pick.onDidHide(() => {
+          if (!is_accepted) {
+            resolve(undefined)
+          }
+          disposables.forEach((d) => d.dispose())
+          quick_pick.dispose()
+        })
+      )
+      quick_pick.show()
     }
   )
 

packages/vscode/src/views/panel/backend/message-handlers/handle-show-prompt-template-quick-pick.ts

@@ -80,6 +80,9 @@ export const handle_show_prompt_template_quick_pick = async (
   templates_quick_pick.matchOnDetail = true
   templates_quick_pick.title = 'Prompt Templates'
   templates_quick_pick.placeholder = 'Manage and use your prompt templates'
+  templates_quick_pick.buttons = [
+    { iconPath: new vscode.ThemeIcon('close'), tooltip: 'Close' }
+  ]
 
   const edit_button = {
     iconPath: new vscode.ThemeIcon('edit'),
@@ -246,6 +249,9 @@ export const handle_show_prompt_template_quick_pick = async (
   let is_template_accepted = false
 
   disposables.push(
+    templates_quick_pick.onDidTriggerButton((_button) => {
+      templates_quick_pick.hide()
+    }),
     templates_quick_pick.onDidAccept(async () => {
       const [selected_template] = templates_quick_pick.selectedItems
       if (!selected_template) {