Skip to content

fix(diff): improve sidebar deleted-file presentation #1451

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
arnestrickmann merged 2 commits into from
Mar 13, 2026
Merged

fix(diff): improve sidebar deleted-file presentation #1451

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b614e8
fix(diff): improve sidebar deleted-file presentation
jschwxrz Mar 12, 2026
62462a5
fix(diff): tighten deleted path and pill rendering
jschwxrz Mar 12, 2026
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
64 changes: 47 additions & 17 deletions src/renderer/components/FileChangesPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,18 +507,36 @@ const FileChangesPanelComponent: React.FC<FileChangesPanelProps> = ({
}
};

const renderPath = (p: string) => {
const renderPath = (p: string, status?: FileChange['status']) => {
const last = p.lastIndexOf('/');
const dir = last >= 0 ? p.slice(0, last + 1) : '';
const base = last >= 0 ? p.slice(last + 1) : p;
const isDeleted = status === 'deleted';
return (
<span className="flex min-w-0" title={p}>
<span className="shrink-0 font-medium text-foreground">{base}</span>
{dir && <span className="ml-1 truncate text-muted-foreground">{dir}</span>}
<span
className={['shrink-0 font-medium text-foreground', isDeleted ? 'line-through' : '']
.filter(Boolean)
.join(' ')}
>
{base}
</span>
{dir && (
<span
className={['ml-1 truncate text-muted-foreground', isDeleted ? 'line-through' : '']
.filter(Boolean)
.join(' ')}
>
{dir}
</span>
)}
</span>
);
};

const shouldShowDiffPill = (value: number | null | undefined) =>
typeof value === 'number' && value !== 0;

// Use PR diff changes when in PR review mode, otherwise use local file changes
const displayChanges = isPrReview ? prDiffChanges : fileChanges;
const displayLoading = isPrReview ? prDiffLoading : isLoading;
Expand Down Expand Up @@ -867,16 +885,22 @@ const FileChangesPanelComponent: React.FC<FileChangesPanelProps> = ({
<FileIcon filename={change.path} isDirectory={false} size={16} />
</span>
<div className="min-w-0 flex-1 overflow-hidden">
<div className="min-w-0 truncate text-sm">{renderPath(change.path)}</div>
<div className="min-w-0 truncate text-sm">
{renderPath(change.path, change.status)}
</div>
</div>
</div>
<div className="ml-3 flex shrink-0 items-center gap-2">
<span className="rounded bg-green-50 px-1.5 py-0.5 text-[11px] font-medium text-emerald-700 dark:bg-green-900/30 dark:text-emerald-300">
+{formatDiffCount(change.additions)}
</span>
<span className="rounded bg-rose-50 px-1.5 py-0.5 text-[11px] font-medium text-rose-700 dark:bg-rose-900/30 dark:text-rose-300">
-{formatDiffCount(change.deletions)}
</span>
{change.status !== 'deleted' && shouldShowDiffPill(change.additions) && (
<span className="rounded bg-green-50 px-1.5 py-0.5 text-[11px] font-medium text-emerald-700 dark:bg-green-900/30 dark:text-emerald-300">
+{formatDiffCount(change.additions)}
</span>
)}
{change.status !== 'deleted' && shouldShowDiffPill(change.deletions) && (
<span className="rounded bg-rose-50 px-1.5 py-0.5 text-[11px] font-medium text-rose-700 dark:bg-rose-900/30 dark:text-rose-300">
-{formatDiffCount(change.deletions)}
</span>
)}
</div>
</div>
))
Expand All @@ -895,16 +919,22 @@ const FileChangesPanelComponent: React.FC<FileChangesPanelProps> = ({
<FileIcon filename={change.path} isDirectory={false} size={16} />
</span>
<div className="min-w-0 flex-1 overflow-hidden">
<div className="min-w-0 truncate text-sm">{renderPath(change.path)}</div>
<div className="min-w-0 truncate text-sm">
{renderPath(change.path, change.status)}
</div>
</div>
</div>
<div className="ml-3 flex shrink-0 items-center gap-2">
<span className="rounded bg-green-50 px-1.5 py-0.5 text-[11px] font-medium text-emerald-700 dark:bg-green-900/30 dark:text-emerald-300">
+{formatDiffCount(change.additions)}
</span>
<span className="rounded bg-rose-50 px-1.5 py-0.5 text-[11px] font-medium text-rose-700 dark:bg-rose-900/30 dark:text-rose-300">
-{formatDiffCount(change.deletions)}
</span>
{change.status !== 'deleted' && shouldShowDiffPill(change.additions) && (
<span className="rounded bg-green-50 px-1.5 py-0.5 text-[11px] font-medium text-emerald-700 dark:bg-green-900/30 dark:text-emerald-300">
+{formatDiffCount(change.additions)}
</span>
)}
{change.status !== 'deleted' && shouldShowDiffPill(change.deletions) && (
<span className="rounded bg-rose-50 px-1.5 py-0.5 text-[11px] font-medium text-rose-700 dark:bg-rose-900/30 dark:text-rose-300">
-{formatDiffCount(change.deletions)}
</span>
)}
<div className="flex items-center gap-1">
<Tooltip>
<TooltipTrigger asChild>
Expand Down
Loading