Reorder workspace menu commands and improve workspace file selection QuickPick interaction

- prevent closing the quick pick on outside click (`apps/editor/src/commands/select-workspace-file-command.ts`), though allow when user browse parent folders

Author: robertpiosik

apps/editor/package.json

@@ -643,12 +643,12 @@
           "group": "1_more@2"
         },
         {
-          "command": "codeWebChat.selectClipboardPaths",
+          "command": "codeWebChat.selectWorkspaceFile",
           "when": "view == codeWebChatViewWorkspace",
           "group": "3_more@1"
         },
         {
-          "command": "codeWebChat.selectWorkspaceFile",
+          "command": "codeWebChat.selectClipboardPaths",
           "when": "view == codeWebChatViewWorkspace",
           "group": "3_more@2"
         },

apps/editor/src/commands/select-workspace-file-command.ts

@@ -36,14 +36,14 @@ export const select_workspace_file_command = (
         const selected = await new Promise<vscode.QuickPickItem | undefined>(
           (resolve) => {
             const quick_pick = vscode.window.createQuickPick()
-            quick_pick.ignoreFocusOut = true
             quick_pick.items = items
             quick_pick.placeholder = t(
               'command.select-workspace-file.select-workspace'
             )
             quick_pick.title = t(
               'command.select-workspace-file.workspace-folders'
             )
+            quick_pick.ignoreFocusOut = true
             quick_pick.buttons = [
               {
                 iconPath: new vscode.ThemeIcon('close'),
@@ -79,11 +79,11 @@ export const select_workspace_file_command = (
       }
 
       const quick_pick = vscode.window.createQuickPick<FileQuickPickItem>()
-      quick_pick.ignoreFocusOut = true
       quick_pick.title = t('command.select-workspace-file.workspace-files')
       quick_pick.placeholder = t('command.select-workspace-file.select-file')
       quick_pick.matchOnDescription = true
       quick_pick.value = last_search_query
+      quick_pick.ignoreFocusOut = true
       quick_pick.buttons = [
         {
           iconPath: new vscode.ThemeIcon('close'),
@@ -146,7 +146,6 @@ export const select_workspace_file_command = (
             label: string
             full_path: string
           }>()
-          folder_quick_pick.ignoreFocusOut = true
           folder_quick_pick.title = t(
             'command.select-workspace-file.parent-folders'
           )
@@ -157,12 +156,15 @@ export const select_workspace_file_command = (
             label: f.label,
             full_path: f.full_path
           }))
+          folder_quick_pick.ignoreFocusOut = false
           folder_quick_pick.buttons = [vscode.QuickInputButtons.Back]
 
           let folder_accepted = false
+          let go_back = false
 
           folder_quick_pick.onDidTriggerButton((button) => {
             if (button === vscode.QuickInputButtons.Back) {
+              go_back = true
               folder_quick_pick.hide()
             }
           })
@@ -200,22 +202,26 @@ export const select_workspace_file_command = (
             is_showing_folder_quick_pick = false
 
             if (!folder_accepted) {
-              if (file_items_cache.length > 0) {
-                quick_pick.items = file_items_cache
-              }
-              quick_pick.value = last_search_query
-              quick_pick.show()
-
-              const source_item = last_interacted_path
-                ? file_items_cache.find(
-                    (i) => i.full_path === last_interacted_path
-                  )
-                : undefined
-
-              if (source_item) {
-                setTimeout(() => {
-                  quick_pick.activeItems = [source_item]
-                }, 0)
+              if (go_back) {
+                if (file_items_cache.length > 0) {
+                  quick_pick.items = file_items_cache
+                }
+                quick_pick.value = last_search_query
+                quick_pick.show()
+
+                const source_item = last_interacted_path
+                  ? file_items_cache.find(
+                      (i) => i.full_path === last_interacted_path
+                    )
+                  : undefined
+
+                if (source_item) {
+                  setTimeout(() => {
+                    quick_pick.activeItems = [source_item]
+                  }, 0)
+                }
+              } else {
+                quick_pick.dispose()
               }
             }
           })
@@ -225,11 +231,11 @@ export const select_workspace_file_command = (
           folder_quick_pick.show()
         } else if (e.button.iconPath instanceof vscode.ThemeIcon) {
           if (e.button.iconPath.id == 'go-to-file') {
+            quick_pick.activeItems = [item]
             await vscode.commands.executeCommand(
               'vscode.open',
               vscode.Uri.file(item.full_path)
             )
-            quick_pick.hide()
           }
         }
       })