feat: diff for delete & rename

Author: zhangmo8

src/commands/diff.ts

@@ -3,7 +3,7 @@ import { executeCommand, useWorkspaceFolders } from 'reactive-vscode'
 
 import { useGitService } from '@/git'
 import { GIT_STATUS } from '@/constant'
-import { toGitUri } from '@/utils'
+import { getFileNameByPath, shortHash, toGitUri } from '@/utils'
 import { useDiffTreeView } from '@/views/diff'
 
 export default function diffCommand() {
@@ -23,11 +23,11 @@ export default function diffCommand() {
     }
 
     const uri = Uri.joinPath(workspaceRoot, fileInfo.path)
-    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 title = `${getFileNameByPath(fileInfo.path)} (${shortHash(fileInfo.commitHash)})`
         const previousCommit = await getPreviousCommit(fileInfo.commitHash)
         if (previousCommit) {
           const leftUri = toGitUri(uri, previousCommit)
@@ -42,10 +42,48 @@ export default function diffCommand() {
       }
     }
 
-    // For added files, show the entire file content
+    // For added files, show diff between empty untitled file and new file
     if (fileInfo.status === GIT_STATUS.ADDED) {
+      const title = `${getFileNameByPath(fileInfo.path)} (Add to ${shortHash(fileInfo.commitHash)})`
+      const emptyUri = Uri.parse(`untitled: ${fileInfo.path}`)
       const gitUri = toGitUri(uri, fileInfo.commitHash)
-      await executeCommand('vscode.open', gitUri)
+      await executeCommand('vscode.diff', emptyUri, gitUri, title)
+    }
+
+    // For deleted files, show diff between original file and empty untitled file
+    if (fileInfo.status === GIT_STATUS.DELETED) {
+      try {
+        const previousCommit = await getPreviousCommit(fileInfo.commitHash)
+
+        if (previousCommit) {
+          const title = `${getFileNameByPath(fileInfo.path)} (Remove to ${shortHash(previousCommit)})`
+          const gitUri = toGitUri(uri, previousCommit)
+          const emptyUri = Uri.parse(`untitled: ${fileInfo.path}`)
+          await executeCommand('vscode.diff', gitUri, emptyUri, title)
+        }
+      }
+      catch (error) {
+        window.showErrorMessage(`Fail to get parent commit: ${error}`)
+      }
+    }
+
+    // For renamed files, show diff between old file path and new file path
+    if (fileInfo.status === GIT_STATUS.RENAMED) {
+      try {
+        const previousCommit = await getPreviousCommit(fileInfo.commitHash)
+        if (previousCommit && fileInfo.oldPath) {
+          // Create URI for old file path
+          const oldUri = Uri.joinPath(workspaceRoot, fileInfo.oldPath)
+          const leftUri = toGitUri(oldUri, previousCommit)
+          const rightUri = toGitUri(uri, fileInfo.commitHash)
+
+          const renameTitle = `${getFileNameByPath(fileInfo.oldPath)} → ${getFileNameByPath(fileInfo.path)} (${shortHash(fileInfo.commitHash)})`
+          await executeCommand('vscode.diff', leftUri, rightUri, renameTitle)
+        }
+      }
+      catch (error) {
+        window.showErrorMessage(`Fail to get parent commit for renamed file: ${error}`)
+      }
     }
   }
 }

src/utils.ts

@@ -1,9 +1,9 @@
+import type { Uri } from 'vscode'
 import { useLogger } from 'reactive-vscode'
 import { extensions } from 'vscode'
 
-import type { Uri } from 'vscode'
-
 import { displayName } from './generated/meta'
+import type { GIT_STATUS } from './constant'
 
 const branchColorCache = new Map<string, string>()
 let colorCounter = 0
@@ -43,15 +43,15 @@ export function toGitUri(uri: Uri, ref: string): Uri {
   })
 }
 
-export function parseGitStatus(status: string): { type: string, similarity?: number } {
+export function parseGitStatus(status: string): { type: keyof typeof GIT_STATUS, similarity?: number } {
   const match = status.match(/^([A-Z])(\d+)?$/)
   if (match) {
     return {
-      type: match[1],
+      type: match[1] as keyof typeof GIT_STATUS,
       similarity: match[2] ? Number.parseInt(match[2], 10) : undefined,
     }
   }
-  return { type: status }
+  return { type: status as keyof typeof GIT_STATUS }
 }
 
 /**
@@ -82,3 +82,11 @@ export function getBranchColor(branchName: string): string {
 
   return color
 }
+
+export function shortHash(hash: string): string {
+  return hash.substring(0, 7)
+}
+
+export function getFileNameByPath(path: string): string {
+  return path.split('/').pop() || ''
+}