Skip to content

refactor: format diff line counts through one shared helper #17948

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
maria-rcks merged 4 commits into from
Oct 11, 2026
Merged

refactor: format diff line counts through one shared helper #17948

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e2a31e5
fix: group thousands in diff line counts
maria-rcks Oct 10, 2026
f179798
test(web): give git status mock its line counts
maria-rcks Oct 11, 2026
0d12db6
fix(web): group thousands in diff file header counts
maria-rcks Oct 11, 2026
8877bed
refactor: format diff line counts with a shared formatDiffCount
maria-rcks Oct 11, 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
6 changes: 4 additions & 2 deletions apps/mobile/src/features/review/ReviewSheet.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,9 +282,11 @@ const ReviewFileNavigatorRow = memo(function ReviewFileNavigatorRow(props: {
</Text>
<View className="mt-1 flex-row gap-2">
<Text className="text-2xs font-t3-bold text-adaptive-emerald-700-300">
+{file.additions}
+{file.additions.toLocaleString()}
</Text>
<Text className="text-2xs font-t3-bold text-adaptive-rose-700-300">
-{file.deletions.toLocaleString()}
</Text>
<Text className="text-2xs font-t3-bold text-adaptive-rose-700-300">-{file.deletions}</Text>
</View>
</Pressable>
);
Expand Down
9 changes: 6 additions & 3 deletions apps/mobile/src/features/review/useReviewDiffData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,15 @@ export function formatHeaderDiffSummary(
} {
if (files) {
return {
additions: `+${files.reduce((total, file) => total + file.additions, 0)}`,
deletions: `-${files.reduce((total, file) => total + file.deletions, 0)}`,
additions: `+${files.reduce((total, file) => total + file.additions, 0).toLocaleString()}`,
deletions: `-${files.reduce((total, file) => total + file.deletions, 0).toLocaleString()}`,
};
}
if (parsedDiff.kind !== "files") return { additions: null, deletions: null };
return { additions: `+${parsedDiff.additions}`, deletions: `-${parsedDiff.deletions}` };
return {
additions: `+${parsedDiff.additions.toLocaleString()}`,
deletions: `-${parsedDiff.deletions.toLocaleString()}`,
};
}

export function useReviewDiffData(input: {
Expand Down
11 changes: 6 additions & 5 deletions apps/mobile/src/features/threads/git/GitCommitSheet.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,8 @@ export function GitCommitSheet(_props: GitCommitSheetProps) {
Files
</Text>
<Text className="text-foreground-muted text-xs leading-normal">
{selectedFiles.length} selected · +{selectedInsertions} / -{selectedDeletions}
{selectedFiles.length} selected · +{selectedInsertions.toLocaleString()} / -
{selectedDeletions.toLocaleString()}
</Text>
</View>
<View className="flex-row items-center gap-2">
Expand Down Expand Up @@ -171,10 +172,10 @@ export function GitCommitSheet(_props: GitCommitSheetProps) {
{file.path}
</Text>
<Text className="text-xs font-t3-bold text-adaptive-emerald-700-300">
+{file.insertions}
+{file.insertions.toLocaleString()}
</Text>
<Text className="text-xs font-t3-bold text-adaptive-rose-700-300">
-{file.deletions}
-{file.deletions.toLocaleString()}
</Text>
</View>
))}
Expand Down Expand Up @@ -250,10 +251,10 @@ export function GitCommitSheet(_props: GitCommitSheetProps) {
</View>
<View className="items-end gap-1">
<Text className="text-xs font-t3-bold text-adaptive-emerald-700-300">
+{file.insertions}
+{file.insertions.toLocaleString()}
</Text>
<Text className="text-xs font-t3-bold text-adaptive-rose-700-300">
-{file.deletions}
-{file.deletions.toLocaleString()}
</Text>
</View>
</View>
Expand Down
7 changes: 5 additions & 2 deletions apps/mobile/src/lib/threadActivityInspector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ export function buildThreadActivityInspector(
if (item.additions !== undefined || item.deletions !== undefined) {
fields.push({
label: "Changes",
value: `+${item.additions ?? 0} −${item.deletions ?? 0}`,
value: `+${(item.additions ?? 0).toLocaleString()} −${(item.deletions ?? 0).toLocaleString()}`,
});
}
break;
Expand Down Expand Up @@ -206,7 +206,10 @@ export function buildThreadActivityInspector(
blocks,
"Files",
item.files
.map((file) => `${file.path} +${file.additions} −${file.deletions} ${file.kind}`)
.map(
(file) =>
`${file.path} +${file.additions.toLocaleString()} −${file.deletions.toLocaleString()} ${file.kind}`,
)
.join("\n"),
);
break;
Expand Down
4 changes: 3 additions & 1 deletion apps/web/src/components/GitActionsControl.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,9 @@ vi.mock("~/state/query", () => ({
isDefaultRef: false,
hasPrimaryRemote: true,
hasWorkingTreeChanges: true,
workingTree: { files: [{ path: "file.ts", status: "modified" }] },
workingTree: {
files: [{ path: "file.ts", status: "modified", insertions: 1, deletions: 0 }],
},
},
error: null,
}),
Expand Down
16 changes: 10 additions & 6 deletions apps/web/src/components/GitActionsControl.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1910,8 +1910,12 @@ export default function GitActionsControl({
<FileDiffIcon className={THREAD_DETAILS_PANEL_ICON_CLASS} aria-hidden />
<span className={cn("flex-1 text-left", THREAD_DETAILS_PANEL_LABEL_CLASS)}>Changes</span>
<span className="flex items-center gap-1 font-mono text-2xs tabular-nums">
<span className="text-success">+{changesTotals?.insertions ?? 0}</span>
<span className="text-destructive">-{changesTotals?.deletions ?? 0}</span>
<span className="text-success">
+{(changesTotals?.insertions ?? 0).toLocaleString()}
</span>
<span className="text-destructive">
-{(changesTotals?.deletions ?? 0).toLocaleString()}
</span>
</span>
</ThreadDetailsControl>
) : null}
Expand Down Expand Up @@ -2021,11 +2025,11 @@ export default function GitActionsControl({
) : (
<>
<span className="text-diff-addition">
+{file.insertions}
+{file.insertions.toLocaleString()}
Comment thread
maria-rcks marked this conversation as resolved.
Outdated
</span>
<span className="text-muted-foreground"> / </span>
<span className="text-diff-deletion">
-{file.deletions}
-{file.deletions.toLocaleString()}
</span>
</>
)}
Expand All @@ -2039,11 +2043,11 @@ export default function GitActionsControl({
</div>
<div className="flex justify-end font-mono">
<span className="text-diff-addition">
+{selectedFiles.reduce((sum, f) => sum + f.insertions, 0)}
+{selectedFiles.reduce((sum, f) => sum + f.insertions, 0).toLocaleString()}
</span>
<span className="text-muted-foreground"> / </span>
<span className="text-diff-deletion">
-{selectedFiles.reduce((sum, f) => sum + f.deletions, 0)}
-{selectedFiles.reduce((sum, f) => sum + f.deletions, 0).toLocaleString()}
</span>
</div>
</div>
Expand Down
8 changes: 6 additions & 2 deletions apps/web/src/components/Sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2186,8 +2186,12 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: {
{prBadge}
{diff ? (
<span className="shrink-0 font-mono">
<span className="text-diff-addition-foreground">+{diff.insertions}</span>{" "}
<span className="text-diff-deletion-foreground">−{diff.deletions}</span>
<span className="text-diff-addition-foreground">
+{diff.insertions.toLocaleString()}
</span>{" "}
<span className="text-diff-deletion-foreground">
−{diff.deletions.toLocaleString()}
</span>
</span>
) : null}
<span
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/components/chat/V2ItemInspector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,8 +261,8 @@ export const V2ItemInspector = memo(function V2ItemInspector(props: V2ItemInspec
</span>
{item.additions !== undefined || item.deletions !== undefined ? (
<span>
<span className="text-success">+{item.additions ?? 0}</span>{" "}
<span className="text-destructive">-{item.deletions ?? 0}</span>
<span className="text-success">+{(item.additions ?? 0).toLocaleString()}</span>{" "}
<span className="text-destructive">-{(item.deletions ?? 0).toLocaleString()}</span>
</span>
) : null}
{item.runId !== null ? (
Expand Down
19 changes: 19 additions & 0 deletions patches/@pierre%2Fdiffs@1.5.2.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -970,6 +970,25 @@ index 84c7915..d1930bf 100644
if (hasCustomHeader) managedOptions.renderCustomHeader = noopRender;
if (hasGutterRenderer) managedOptions.renderGutterUtility = noopRender;
if (hasCodeViewHeader) managedOptions.renderCodeViewHeader = noopRender;
diff --git a/dist/utils/createFileHeaderElement.js b/dist/utils/createFileHeaderElement.js
index 39fe30e..600442e 100644
--- a/dist/utils/createFileHeaderElement.js
+++ b/dist/utils/createFileHeaderElement.js
@@ -73,12 +73,12 @@ function createMetadataElement(fileDiff) {
}
if (deletions > 0 || additions === 0) children.push(createHastElement({
tagName: "span",
- children: [createTextNodeElement(`-${deletions}`)],
+ children: [createTextNodeElement(`-${deletions.toLocaleString()}`)],
properties: { "data-deletions-count": "" }
}));
if (additions > 0 || deletions === 0) children.push(createHastElement({
tagName: "span",
- children: [createTextNodeElement(`+${additions}`)],
+ children: [createTextNodeElement(`+${additions.toLocaleString()}`)],
properties: { "data-additions-count": "" }
}));
}
diff --git a/package.json b/package.json
index d9dc7b5..3c37bae 100644
--- a/package.json
Expand Down
10 changes: 5 additions & 5 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading