feat(quickpick): add move worktree action in the worktree quick pick menu

- Added separator items to group actions in the worktree quick pick menu
- Moved "View Git history" and "Open the repository in Source Control view" into new groups
- Implemented "Move Worktree" command action with appropriate icon and label
- Updated QuickPickAction interface to include 'separator' and Commands.moveWorktree types
- Handled moveWorktree command case in action switch statement

Author: jackiotyu

l10n/bundle.l10n.ja.json

@@ -7,6 +7,7 @@
     "Remove Folder from Workspace": "ワークスペースからフォルダを削除",
     "Open Settings": "設定を開く",
     "Remove Worktree": "ワークツリーを削除",
+    "Move Worktree": "ワークツリーを移動",
     "Find Worktree": "ワークツリーを検索",
     "Add Worktree": "ワークツリーを追加",
     "Report Issue": "問題を報告",

l10n/bundle.l10n.zh-cn.json

@@ -7,6 +7,7 @@
     "Remove Folder from Workspace": "从工作区中移除",
     "Open Settings": "打开设置",
     "Remove Worktree": "移除 Worktree",
+    "Move Worktree": "移动 Worktree",
     "Find Worktree": "查找 Worktree",
     "Add Worktree": "添加 Worktree",
     "Report Issue": "反馈问题",

l10n/bundle.l10n.zh-tw.json

@@ -6,7 +6,8 @@
     "Add Folder to Workspace": "新增至工作區",
     "Remove Folder from Workspace": "從工作區中移除",
     "Open Settings": "開啟設定",
-    "Remove Worktree": "移除 Worktree",
+    "Remove Worktree": "移動 Worktree",
+    "Move Worktree": "移动 Worktree",
     "Find Worktree": "尋找 Worktree",
     "Add Worktree": "新增 Worktree",
     "Report Issue": "回報問題",

src/core/quickPick/pickAction.ts

@@ -68,6 +68,7 @@ class WorktreeActionPicker {
         const [commitDetail] = await Promise.all([getLashCommitDetail(viewItem.fsPath, ['s', 'H'])]);
         const template = Config.get('worktreePick.copyTemplate', '$LABEL');
         const isCurrent = judgeIncludeFolder(viewItem.fsPath);
+        const separator: QuickPickAction = { kind: vscode.QuickPickItemKind.Separator, label: ' ', action: 'separator', hide: false };
 
         const templateVars: TemplateVars = {
             hash: commitDetail.H || '',
@@ -89,7 +90,7 @@ class WorktreeActionPicker {
         ];
 
         const commandActions: QuickPickAction[] = [
-            this.buildCommandAction({ icon: 'history', label: 'View Git history', action: Commands.viewHistory }),
+            separator,
             this.buildCommandAction({
                 icon: 'terminal-bash',
                 label: 'Open in External Terminal',
@@ -100,6 +101,14 @@ class WorktreeActionPicker {
                 label: 'Open in Built-in Terminal',
                 action: Commands.openTerminal,
             }),
+            separator,
+            this.buildCommandAction({ icon: 'history', label: 'View Git history', action: Commands.viewHistory }),
+            this.buildCommandAction({
+                icon: 'repo',
+                label: 'Open the repository in Source Control view',
+                action: Commands.openRepository,
+            }),
+            separator,
             this.buildCommandAction({
                 icon: 'multiple-windows',
                 label: 'Add Folder to Workspace',
@@ -117,10 +126,11 @@ class WorktreeActionPicker {
                 label: 'Reveal in System Explorer',
                 action: Commands.revealInSystemExplorerContext,
             }),
+            separator,
             this.buildCommandAction({
-                icon: 'repo',
-                label: 'Open the repository in Source Control view',
-                action: Commands.openRepository,
+                icon: 'move',
+                label: 'Move Worktree',
+                action: Commands.moveWorktree,
             }),
             this.buildCommandAction({
                 icon: 'trash',
@@ -169,20 +179,23 @@ class WorktreeActionPicker {
                 case 'copy':
                     await this.handleCopyAction(item.description || '');
                     break;
+                case Commands.moveWorktree:
                 case Commands.openExternalTerminalContext:
                 case Commands.openTerminal:
                 case Commands.revealInSystemExplorerContext:
                 case Commands.viewHistory:
                 case Commands.openRepository:
-                case Commands.removeWorktree:
-                    await this.handleCommandAction(item.action, viewItem);
-                    break;
+                    case Commands.removeWorktree:
+                        await this.handleCommandAction(item.action, viewItem);
+                        break;
                 case Commands.removeFromWorkspace:
                 case Commands.addToWorkspace:
                     reject();
                     quickPick.hide();
                     this.handleWorkspaceAction(item.action, viewItem);
                     return;
+                case 'separator':
+                    break;
                 default:
                     const value: never = item.action;
                     void value;

src/types.ts

@@ -138,6 +138,7 @@ export enum GitHistoryExtension {
 
 export interface QuickPickAction extends vscode.QuickPickItem {
     action:
+        | 'separator'
         | 'copy'
         | Commands.openTerminal
         | Commands.openExternalTerminalContext
@@ -146,6 +147,7 @@ export interface QuickPickAction extends vscode.QuickPickItem {
         | Commands.removeFromWorkspace
         | Commands.viewHistory
         | Commands.openRepository
+        | Commands.moveWorktree
         | Commands.removeWorktree;
     hide?: boolean;
 }