feat: multiple select row

Author: zhangmo8

src/commands/diff.ts

@@ -9,11 +9,11 @@ import { useDiffTreeView } from '@/views/diff'
 export default function diffCommand() {
   const { getPreviousCommit } = useGitService()
   const workspaceFolders = useWorkspaceFolders()
-  const { selectedCommitHash } = useDiffTreeView()
+  const { selectedCommitHashes } = useDiffTreeView()
 
-  return async (fileInfo: { path: string, status: string }) => {
-    const commit = selectedCommitHash.value
-    if (!commit) {
+  return async (fileInfo: { path: string, status: string, commitHash: string, oldPath?: string }) => {
+    const commits = selectedCommitHashes.value
+    if (!commits || commits.length === 0) {
       return
     }
 
@@ -23,15 +23,15 @@ export default function diffCommand() {
     }
 
     const uri = Uri.joinPath(workspaceRoot, fileInfo.path)
-    const title = `${fileInfo.path} (${commit})`
+    const title = `${fileInfo.path} (${fileInfo.commitHash})`
 
     // For modified files, show diff between current commit and its parent
     if (fileInfo.status === GIT_STATUS.MODIFIED) {
       try {
-        const previousCommit = await getPreviousCommit(commit)
+        const previousCommit = await getPreviousCommit(fileInfo.commitHash)
         if (previousCommit) {
           const leftUri = toGitUri(uri, previousCommit)
-          const rightUri = toGitUri(uri, commit)
+          const rightUri = toGitUri(uri, fileInfo.commitHash)
           await executeCommand('vscode.diff', leftUri, rightUri, title)
           return
         }
@@ -44,7 +44,7 @@ export default function diffCommand() {
 
     // For added files, show the entire file content
     if (fileInfo.status === GIT_STATUS.ADDED) {
-      const gitUri = toGitUri(uri, commit)
+      const gitUri = toGitUri(uri, fileInfo.commitHash)
       await executeCommand('vscode.open', gitUri)
     }
   }

src/views/diff/DiffTreeView.ts

@@ -1,10 +1,12 @@
-import { TreeItemCollapsibleState } from 'vscode'
 import type { TreeViewNode } from 'reactive-vscode'
 import { computed, createSingletonComposable, ref, useTreeView } from 'reactive-vscode'
+import { TreeItemCollapsibleState } from 'vscode'
 
 import { CommitNode } from './entity/CommitNode'
 import { useFileTreeView } from './FileTreeView'
+
 import type { CommitDetails } from './types'
+
 import { useGitService } from '@/git'
 import { useStorage } from '@/storage'
 import { EXTENSION_SYMBOL } from '@/constant'
@@ -13,80 +15,155 @@ export const useDiffTreeView = createSingletonComposable(() => {
   const git = useGitService()
   const storage = useStorage()
   const fileTree = useFileTreeView()
-  const selectedCommitHash = ref('')
-  const commitDetails = ref<CommitDetails | null>(null)
+  const selectedCommitHashes = ref<string[]>([])
+  const commitDetailsList = ref<CommitDetails[]>([])
   const files = ref<TreeViewNode[]>([])
 
-  async function loadCommitDetails(hash: string) {
+  async function loadCommitDetails(hashes: string[]) {
     try {
-      let commit = storage.getCommit(hash)
+      if (hashes.length === 0) {
+        commitDetailsList.value = []
+        files.value = []
+        return
+      }
+
+      const commitList: CommitDetails[] = []
+      const allCommitFiles: Map<string, TreeViewNode[]> = new Map()
+      let totalFiles = 0
 
-      if (!commit) {
-        const { logResult, operations, branches } = await git.getHistory()
-        const historyCommit = logResult.all.find(c => c.hash === hash)
-        if (!historyCommit)
-          return
+      for (const hash of hashes) {
+        let commit = storage.getCommit(hash)
 
-        commit = {
-          ...historyCommit,
+        if (!commit) {
+          const { logResult, operations, branches } = await git.getHistory()
+          const historyCommit = logResult.all.find(c => c.hash === hash)
+          if (!historyCommit)
+            continue
+
+          commit = {
+            ...historyCommit,
+          }
+
+          storage.saveCommits({ operations, branches, logResult })
         }
 
-        storage.saveCommits({ operations, branches, logResult })
+        commitList.push(commit)
+
+        const { files: commitFiles, total } = await fileTree.getChildren(hash)
+
+        allCommitFiles.set(hash, commitFiles)
+        totalFiles += total
       }
 
-      commitDetails.value = commit
-      const { files: commitFiles, total } = await fileTree.getChildren(hash)
+      commitDetailsList.value = commitList
 
-      files.value = [
-        {
-          treeItem: new CommitNode(
-            'Changed Files',
-            `${total} Files Changed`,
-            total > 0 ? TreeItemCollapsibleState.Expanded : TreeItemCollapsibleState.None,
-            'files',
-          ),
-          children: commitFiles,
-        },
-      ]
+      // Aggregate file changes for all selected commits
+      if (hashes.length === 1) {
+        // Single commit view - show files directly
+        files.value = [
+          {
+            treeItem: new CommitNode(
+              'Changed Files',
+              `${totalFiles} Files Changed`,
+              TreeItemCollapsibleState.Expanded,
+              'files',
+            ),
+            children: allCommitFiles.get(hashes[0]) || [],
+          },
+        ]
+      }
+      else {
+        // Multiple commits view - group files by commit
+        const commitNodes: TreeViewNode[] = []
+
+        for (const hash of hashes) {
+          const commit = commitList.find(c => c.hash === hash)
+          if (!commit)
+            continue
+
+          const commitFiles = allCommitFiles.get(hash) || []
+          const shortHash = hash.substring(0, 7)
+
+          commitNodes.push({
+            treeItem: new CommitNode(
+              `${commitFiles.length} Files Changed`,
+              `${shortHash}`,
+              TreeItemCollapsibleState.Expanded,
+              'git-commit',
+            ),
+            children: commitFiles,
+          })
+        }
+
+        files.value = [
+          {
+            treeItem: new CommitNode(
+              'Selected Commits',
+              `${hashes.length} Commits Selected`,
+              TreeItemCollapsibleState.Expanded,
+              'git-commit',
+            ),
+            children: commitNodes,
+          },
+        ]
+      }
     }
     catch (error) {
       console.error('Error getting commit details:', error)
-      commitDetails.value = null
+      commitDetailsList.value = []
       files.value = []
     }
   }
 
   const treeNodes = computed<TreeViewNode[]>(() => {
-    if (!commitDetails.value)
+    if (commitDetailsList.value.length === 0)
       return []
 
-    return [
-      {
-        treeItem: new CommitNode(
-          'Author',
-          `${commitDetails.value.authorName} <${commitDetails.value.authorEmail}>`,
-          TreeItemCollapsibleState.None,
-          'person',
-        ),
-      },
-      {
-        treeItem: new CommitNode(
-          'Date',
-          new Date(commitDetails.value.date).toLocaleString(),
-          TreeItemCollapsibleState.None,
-          'calendar',
-        ),
-      },
-      {
-        treeItem: new CommitNode(
-          'Hash',
-          commitDetails.value.hash,
-          TreeItemCollapsibleState.None,
-          'git-commit',
-        ),
-      },
-      ...files.value,
-    ]
+    if (commitDetailsList.value.length === 1) {
+      // Single commit view
+      const commit = commitDetailsList.value[0]
+      return [
+        {
+          treeItem: new CommitNode(
+            'Author',
+            `${commit.authorName} <${commit.authorEmail}>`,
+            TreeItemCollapsibleState.None,
+            'person',
+          ),
+        },
+        {
+          treeItem: new CommitNode(
+            'Date',
+            new Date(commit.date).toLocaleString(),
+            TreeItemCollapsibleState.None,
+            'calendar',
+          ),
+        },
+        {
+          treeItem: new CommitNode(
+            'Hash',
+            commit.hash,
+            TreeItemCollapsibleState.None,
+            'git-commit',
+          ),
+        },
+        ...files.value,
+      ]
+    }
+    else {
+      // Multiple commits view - summary information
+      return [
+        {
+          treeItem: new CommitNode(
+            'Multiple Commits Selected',
+            `${commitDetailsList.value.length} commits`,
+            TreeItemCollapsibleState.None,
+            'git-commit',
+          ),
+        },
+        ...files.value,
+      ]
+    }
   })
 
   const tree = useTreeView(
@@ -97,18 +174,22 @@ export const useDiffTreeView = createSingletonComposable(() => {
     },
   )
 
-  async function refresh(hash: string) {
-    if (hash === selectedCommitHash.value)
+  async function refresh(hashes: string[]) {
+    const currentHashes = new Set(selectedCommitHashes.value)
+    const newHashes = new Set(hashes)
+
+    if (currentHashes.size === newHashes.size
+      && [...currentHashes].every(hash => newHashes.has(hash))) {
       return
+    }
 
-    selectedCommitHash.value = hash
-    fileTree.refresh(hash)
-    await loadCommitDetails(hash)
+    selectedCommitHashes.value = [...hashes]
+    await loadCommitDetails(hashes)
   }
 
   return {
     tree,
     refresh,
-    selectedCommitHash,
+    selectedCommitHashes,
   }
 })

src/views/diff/FileTreeView.ts

@@ -2,7 +2,6 @@ import type { TreeViewNode } from 'reactive-vscode'
 import { createSingletonComposable, ref } from 'reactive-vscode'
 import { FileNode } from './entity/FileNode'
 import { FolderNode } from './entity/FolderNode'
-import { EXTENSION_SYMBOL } from '@/constant'
 import { type CommitFile, useGitService } from '@/git'
 import { useStorage } from '@/storage'
 import { parseGitStatus } from '@/utils'
@@ -11,7 +10,7 @@ export const useFileTreeView = createSingletonComposable(() => {
   const git = useGitService()
   const storage = useStorage()
 
-  function buildFileTree(files: CommitFile[]): TreeViewNode[] {
+  function buildFileTree(files: CommitFile[], commitHash: string): TreeViewNode[] {
     const root = new Map<string, TreeViewNode>()
     const folderChildren = new Map<string, TreeViewNode[]>()
 
@@ -25,6 +24,7 @@ export const useFileTreeView = createSingletonComposable(() => {
           treeItem: new FileNode(
             normalizedPath,
             file.status,
+            commitHash,
             'oldPath' in file ? file.oldPath : undefined,
           ),
         })
@@ -75,6 +75,7 @@ export const useFileTreeView = createSingletonComposable(() => {
           treeItem: new FileNode(
             normalizedPath,
             file.status,
+            commitHash,
             'oldPath' in file ? file.oldPath : undefined,
           ),
         }
@@ -96,7 +97,7 @@ export const useFileTreeView = createSingletonComposable(() => {
 
       if (commit?.files) {
         return {
-          files: buildFileTree(commit.files),
+          files: buildFileTree(commit.files, commit?.hash),
           total: commit.files.length,
         }
       }
@@ -137,7 +138,7 @@ export const useFileTreeView = createSingletonComposable(() => {
         })
 
       return {
-        files: buildFileTree(files),
+        files: buildFileTree(files, commitHash),
         total: files.length,
       }
     }
@@ -147,12 +148,7 @@ export const useFileTreeView = createSingletonComposable(() => {
     }
   }
 
-  const refresh = (commitHash: string) => {
-    getChildren(commitHash)
-  }
-
   return {
     getChildren,
-    refresh,
   }
 })

src/views/diff/entity/FileNode.ts

@@ -1,11 +1,11 @@
 import { TreeItem, TreeItemCollapsibleState, Uri } from 'vscode'
-import type { FileTreeItem } from '../types'
 import { EXTENSION_SYMBOL } from '@/constant'
 
 export class FileNode extends TreeItem {
   constructor(
     public readonly path: string,
     public readonly status: string,
+    public readonly commitHash: string,
     public readonly oldPath?: string,
   ) {
     const label = path.split('/').pop() || path
@@ -28,15 +28,7 @@ export class FileNode extends TreeItem {
     this.command = {
       command: `${EXTENSION_SYMBOL}.openDiff`,
       title: 'Show Changes',
-      arguments: [{ path: this.path, status: this.status, oldPath: this.oldPath }],
+      arguments: [{ path: this.path, status: this.status, oldPath: this.oldPath, commitHash: this.commitHash }],
     }
   }
-
-  static fromFileItem(item: FileTreeItem): FileNode {
-    return new FileNode(
-      item.path,
-      item.status,
-      'oldPath' in item ? item.oldPath : undefined,
-    )
-  }
 }