Skip to content

perf(web): reuse the collator when sorting diff files #18420

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 1 commit into from
Oct 12, 2026
Merged

perf(web): reuse the collator when sorting diff files #18420

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
15 changes: 7 additions & 8 deletions apps/web/src/components/diffs/useReviewFilePatches.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ import {
import { getRenderablePatch, resolveFileDiffPath, type RenderablePatch } from "~/lib/diffRendering";
import { reviewEnvironment } from "~/state/review";

const filePathCollator = new Intl.Collator(undefined, {
numeric: true,
sensitivity: "base",
});

export function useReviewFilePatches({
environmentId,
cwd,
Expand Down Expand Up @@ -49,10 +54,7 @@ export function useReviewFilePatches({
[requested, scope],
);
const files = useMemo(
() =>
source?.files?.toSorted((a, b) =>
a.path.localeCompare(b.path, undefined, { numeric: true, sensitivity: "base" }),
) ?? [],
() => source?.files?.toSorted((a, b) => filePathCollator.compare(a.path, b.path)) ?? [],
[source?.files],
);
const queries = useMemo(
Expand Down Expand Up @@ -191,10 +193,7 @@ export function useReviewFilePatches({
};
})
: (preview?.kind === "files" ? preview.files : []).toSorted((a, b) =>
resolveFileDiffPath(a).localeCompare(resolveFileDiffPath(b), undefined, {
numeric: true,
sensitivity: "base",
}),
filePathCollator.compare(resolveFileDiffPath(a), resolveFileDiffPath(b)),
),
[source, files, patches, scope, preview],
);
Expand Down
Loading