Skip to content

feat: optimize Files Changed view to display renamed file #2021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benjamin-747 merged 1 commit into from
Mar 16, 2026
+20 −5
Merged

feat: optimize Files Changed view to display renamed file #2021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion moon/apps/web/components/DiffView/FileDiff.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ export default function FileDiff({
const DiffItemComponent = (index: number) => {
const { file, fileDiffMetadata, stats, changeType, isBinary, hasContent } = parsedFiles[index]
const isExpanded = expandedMap[file.path]
const isRenamed = changeType === 'rename-pure' || changeType === 'rename-changed'

return (
<div
Expand All @@ -247,7 +248,17 @@ export default function FileDiff({
) : (
<ExpandIcon className='align-middle text-xl' />
)}
<span className='ml-1'>{file.path}</span>
<span className='ml-1'>
{isRenamed && file.oldPath ? (
<span>
<span className='text-secondary line-through'>{file.oldPath}</span>
<span className='text-secondary mx-1'>→</span>
<span>{file.path}</span>
</span>
) : (
file.path
)}
Comment on lines 229 to +260
</span>
</span>
<span className='text-xs font-bold'>
<span className='text-green-500'>+{stats.additions}</span>{' '}
Expand Down
12 changes: 8 additions & 4 deletions moon/apps/web/components/DiffView/parsedDiffs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,19 @@ import { getLanguageForFile } from '@/utils/shikiLanguageFallback'
export interface DiffItem {
data: string
path: string
old_path?: string // Only present for renamed files
}

export interface ParsedFile {
file: { path: string; lang: string; diff: string }
file: { path: string; lang: string; diff: string; oldPath?: string }
fileDiffMetadata: FileDiffMetadata | null
stats: { additions: number; deletions: number }
changeType: ChangeTypes | null
isBinary: boolean
hasContent: boolean
}

export function parsedDiffs(diffText: DiffItem[]): { path: string; lang: string; diff: string }[] {
export function parsedDiffs(diffText: DiffItem[]): { path: string; lang: string; diff: string; oldPath?: string }[] {
if (diffText.length < 1) return []

return diffText.map((block) => {
Expand All @@ -26,12 +27,15 @@ export function parsedDiffs(diffText: DiffItem[]): { path: string; lang: string;
return {
path: block.path,
lang: isBinary ? 'binary' : 'auto',
diff
diff,
oldPath: block.old_path
}
})
Comment on lines 5 to 33
}

export function generateParsedFiles(diffFiles: { path: string; lang: string; diff: string }[]): ParsedFile[] {
export function generateParsedFiles(
diffFiles: { path: string; lang: string; diff: string; oldPath?: string }[]
): ParsedFile[] {
return diffFiles.map((file) => {
let fileDiffMetadata: FileDiffMetadata | null = null
let additions = 0
Expand Down
Loading