Skip to content

Commit 15702a9

Browse files
fix(mobile): reduce diff entry and source highlighting delays (pingdotgg#24770)
Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent 8d3261e commit 15702a9

13 files changed

Lines changed: 684 additions & 75 deletions

‎apps/mobile/src/features/diffs/nativeReviewDiffSource.test.ts‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,24 @@ const failureKeys = [
5858
["function", () => () => SOURCE],
5959
] as const;
6060

61-
it.each(failureKeys)("bounds transient retries for a %s key", async (_name, createKey) => {
62-
const key = createKey();
63-
const fetch = vi.fn(async () => {
64-
throw new Error("Offline");
65-
});
66-
const load = createNativeReviewDiffSourceLoader(fetch);
67-
await expect(load(key)).rejects.toThrow("Offline");
68-
expect(await load(key)).toBeNull();
69-
expect(await load(key)).toBeNull();
70-
expect(fetch).toHaveBeenCalledTimes(2);
71-
});
61+
it.each(failureKeys)(
62+
"recovers after two transient failures on a later load for a %s key",
63+
async (_name, createKey) => {
64+
const key = createKey();
65+
const fetch = vi
66+
.fn()
67+
.mockRejectedValueOnce(new Error("Offline"))
68+
.mockRejectedValueOnce(new Error("Still offline"))
69+
.mockResolvedValue(SOURCE);
70+
const load = createNativeReviewDiffSourceLoader(fetch);
71+
await expect(load(key)).rejects.toThrow("Offline");
72+
await expect(load(key)).rejects.toThrow("Still offline");
73+
expect(fetch).toHaveBeenCalledTimes(2);
74+
expect(await load(key)).toBe(SOURCE);
75+
expect(await load(key)).toBe(SOURCE);
76+
expect(fetch).toHaveBeenCalledTimes(3);
77+
},
78+
);
7279

7380
it.each(failureKeys)(
7481
"remembers permanent unavailability for a %s key",

‎apps/mobile/src/features/diffs/nativeReviewDiffSource.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ const MAX_SOURCE_FILES = 4;
55
// Bound retained UTF-16 text across files without discarding an already-fetched
66
// authoritative source just because it is large. Provider response limits still apply.
77
const MAX_CACHED_SOURCE_CHARACTERS = 8_000_000;
8-
const MAX_SOURCE_ATTEMPTS = 2;
98

109
function isWeakKey(value: unknown): value is object {
1110
return (typeof value === "object" && value !== null) || typeof value === "function";
@@ -158,12 +157,12 @@ export function createNativeReviewDiffSourceLoader<FileId>(
158157
permanent,
159158
reason: reason ?? "transient",
160159
});
161-
if (permanent || attempt >= MAX_SOURCE_ATTEMPTS) {
160+
if (permanent) {
162161
failure.unavailable = true;
163162
traceDiffHighlight("source-unavailable", {
164163
loader,
165164
file,
166-
reason: permanent ? "permanent-error" : "attempts",
165+
reason: "permanent-error",
167166
});
168167
return null;
169168
}

‎apps/mobile/src/features/pull-requests/PullRequestRouteScreen.tsx‎

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ import {
4343
import { usePullRequestDiffHighlightFiles } from "./usePullRequestDiffHighlightFiles";
4444
import { isPullRequestTestFile } from "./pullRequestFileFilters";
4545
import { useFocusEffect, useNavigation, type StaticScreenProps } from "@react-navigation/native";
46+
import type { NativeStackNavigationProp } from "@react-navigation/native-stack";
4647
import { RegistryContext, useAtomRefresh, useAtomValue } from "@effect/atom-react";
4748
import { pullRequestReviewKey } from "./pullRequestReviewDrafts";
4849
import { type PullRequestDetail, type PullRequestListEntry } from "@t3tools/contracts";
@@ -88,7 +89,7 @@ import {
8889
type NativeReviewDiffViewProps,
8990
} from "../diffs/nativeReviewDiffSurface";
9091
import {
91-
buildNativeReviewDiffData,
92+
getCachedNativeReviewDiffData,
9293
NATIVE_REVIEW_DIFF_CONTENT_WIDTH,
9394
} from "../review/nativeReviewDiffAdapter";
9495
import { useAppearancePreferences } from "../settings/appearance/AppearancePreferencesProvider";
@@ -99,6 +100,7 @@ import { PullRequestActionToolbar, PullRequestCardGroup } from "./PullRequestCon
99100
import {
100101
pullRequestTarget as requestTarget,
101102
usePullRequestDiff,
103+
usePullRequestDiffEntry,
102104
type PullRequestDiffParams,
103105
type PullRequestParams,
104106
} from "./usePullRequestDiff";
@@ -847,16 +849,35 @@ export function PullRequestRouteScreen({ route }: StaticScreenProps<PullRequestP
847849
);
848850
}
849851

850-
export function PullRequestFileRouteScreen({
851-
route,
852-
}: StaticScreenProps<
852+
type PullRequestFileRouteProps = StaticScreenProps<
853853
PullRequestDiffParams & {
854854
readonly path: string;
855855
readonly fileSelectionId?: string;
856856
readonly replacingDraftId?: string;
857857
readonly focus?: GuideDiffFocus;
858858
}
859-
>) {
859+
>;
860+
861+
export function PullRequestFileRouteScreen(props: PullRequestFileRouteProps) {
862+
const navigation =
863+
useNavigation<NativeStackNavigationProp<ReactNavigation.RootParamList, "PullRequestFile">>();
864+
const ready = usePullRequestDiffEntry(navigation);
865+
if (ready) return <PullRequestFileRouteContent {...props} />;
866+
const title = props.route.params.commit ? "Commit changes" : "Changes";
867+
return (
868+
<View className="flex-1 bg-screen">
869+
<NativeStackScreenOptions options={{ title, headerTitle: title }} />
870+
{Platform.OS === "android" ? (
871+
<AndroidScreenHeader title={title} onBack={() => navigation.goBack()} />
872+
) : null}
873+
<View className="flex-1 items-center justify-center">
874+
<AppActivityIndicator accessibilityLabel="Loading changes" />
875+
</View>
876+
</View>
877+
);
878+
}
879+
880+
function PullRequestFileRouteContent({ route }: PullRequestFileRouteProps) {
860881
const { layout } = useAdaptiveWorkspaceLayout();
861882
const navigation = useNavigation();
862883
const insets = useSafeAreaInsets();
@@ -894,7 +915,7 @@ export function PullRequestFileRouteScreen({
894915
!result.isPending &&
895916
!result.error;
896917
const activity = useEnvironmentQuery(composerPullRequests.activity(requestTarget(route.params)));
897-
const baseData = useMemo(() => buildNativeReviewDiffData(parsed), [parsed]);
918+
const baseData = useMemo(() => getCachedNativeReviewDiffData({ parsedDiff: parsed }), [parsed]);
898919
const highlightFiles = usePullRequestDiffHighlightFiles(route.params, parsed, baseData.files);
899920
const data = useMemo(
900921
() =>

‎apps/mobile/src/features/pull-requests/pullRequestDiffHighlightFiles.test.ts‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,12 @@ it.each(["permanent", "transient"])(
265265
fetch.mockRejectedValueOnce(error);
266266
if (failure === "transient") fetch.mockRejectedValueOnce(error);
267267
const first = createPullRequestDiffHighlightFiles({ target }, parsed, files, fetch, cache);
268-
if (failure === "transient") await expect(first[1]!.loadContents!()).rejects.toThrow("Offline");
269-
expect(await first[1]!.loadContents!()).toBeNull();
268+
if (failure === "transient") {
269+
await expect(first[1]!.loadContents!()).rejects.toThrow("Offline");
270+
await expect(first[1]!.loadContents!()).rejects.toThrow("Offline");
271+
} else {
272+
expect(await first[1]!.loadContents!()).toBeNull();
273+
}
270274
const second = createPullRequestDiffHighlightFiles(
271275
{ target },
272276
{ ...parsed, files: [parsed.files[0]!, { ...parsed.files[1]! }] },
@@ -275,8 +279,8 @@ it.each(["permanent", "transient"])(
275279
cache,
276280
);
277281
expect(await second[1]!.loadContents!()).toBe(contents);
278-
expect(await first[1]!.loadContents!()).toBeNull();
279-
expect(fetch).toHaveBeenCalledTimes(failure === "permanent" ? 2 : 3);
282+
expect(await first[1]!.loadContents!()).toBe(failure === "permanent" ? null : contents);
283+
expect(fetch).toHaveBeenCalledTimes(failure === "permanent" ? 2 : 4);
280284
},
281285
);
282286

‎apps/mobile/src/features/pull-requests/pullRequestDiffPages.test.ts‎

Lines changed: 66 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
1-
import { describe, expect, it } from "vite-plus/test";
1+
import { describe, expect, it, vi } from "vite-plus/test";
22
import type { PullRequestDiffResult } from "@t3tools/contracts";
33
import type { ReviewParsedDiff } from "../review/reviewModel";
44
import { sourceControlClients } from "@t3tools/client-runtime/source-control-clients";
5-
import { combinePullRequestDiffPages, retainPullRequestDiffPage } from "./pullRequestDiffPages";
5+
import * as reviewModel from "../review/reviewModel";
6+
import {
7+
combinePullRequestDiffPages,
8+
getCachedPullRequestDiffPages,
9+
retainPullRequestDiffPage,
10+
} from "./pullRequestDiffPages";
611

712
const GITHUB = sourceControlClients.get("github").changeRequest;
813

@@ -24,6 +29,65 @@ function withheldDiff(): PullRequestDiffResult {
2429
}
2530

2631
describe("paged mobile pull request diffs", () => {
32+
it("isolates scopes, cursors, and provider terminology for the same result", () => {
33+
const result = withheldDiff();
34+
const pages = [{ cursor: null, result }];
35+
const first = getCachedPullRequestDiffPages(pages, "first", GITHUB);
36+
const otherScope = getCachedPullRequestDiffPages(pages, "second", GITHUB);
37+
const otherCursor = getCachedPullRequestDiffPages(
38+
[{ cursor: "next", result }],
39+
"first",
40+
GITHUB,
41+
);
42+
const otherProvider = getCachedPullRequestDiffPages(
43+
pages,
44+
"first",
45+
sourceControlClients.get("gitlab").changeRequest,
46+
);
47+
expect(otherScope).not.toBe(first);
48+
expect(otherCursor).not.toBe(first);
49+
expect(otherProvider).not.toBe(first);
50+
if (first.kind !== "files" || otherScope.kind !== "files" || otherProvider.kind !== "files")
51+
throw new Error("Expected structured files");
52+
expect(otherScope.files[0]?.id).not.toBe(first.files[0]?.id);
53+
expect(first.notice).toContain("pull request");
54+
expect(otherProvider.notice).toContain("merge request");
55+
expect(getCachedPullRequestDiffPages(pages, "first", GITHUB)).toBe(first);
56+
});
57+
58+
it("reuses earlier pages on append and invalidates changed continuation results", () => {
59+
using parse = vi.spyOn(reviewModel, "buildReviewParsedDiff");
60+
const firstPage = { cursor: null, result: diff("first.ts") };
61+
const first = getCachedPullRequestDiffPages([firstPage], "append", GITHUB);
62+
const nextPage = { cursor: "next", result: withheldDiff() };
63+
const combined = getCachedPullRequestDiffPages([firstPage, nextPage], "append", GITHUB);
64+
expect(parse).toHaveBeenCalledTimes(2);
65+
if (first.kind !== "files" || combined.kind !== "files") throw new Error("Expected files");
66+
expect(combined.files[0]).toBe(first.files[0]);
67+
expect(combined.files.map((file) => file.path)).toEqual(["first.ts", "large.ts"]);
68+
expect(getCachedPullRequestDiffPages([firstPage, nextPage], "append", GITHUB)).toBe(combined);
69+
const refreshed = getCachedPullRequestDiffPages(
70+
[
71+
firstPage,
72+
{
73+
...nextPage,
74+
result: {
75+
...nextPage.result,
76+
omittedFileStats: [{ path: "large.ts", additions: 4000, deletions: 2000 }],
77+
},
78+
},
79+
],
80+
"append",
81+
GITHUB,
82+
);
83+
expect(parse).toHaveBeenCalledTimes(3);
84+
expect(refreshed).not.toBe(combined);
85+
if (refreshed.kind !== "files") throw new Error("Expected refreshed files");
86+
expect(refreshed.files[0]).toBe(first.files[0]);
87+
expect(refreshed.files[1]).toMatchObject({ additions: 4000, deletions: 2000 });
88+
expect(combined.files[1]?.additions).toBe(3000);
89+
});
90+
2791
it("withheld PR hunks must retain provider line counts", () => {
2892
const result = withheldDiff();
2993
const cache = new WeakMap<PullRequestDiffResult, ReviewParsedDiff>();

‎apps/mobile/src/features/pull-requests/pullRequestDiffPages.ts‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,46 @@ export interface PullRequestDiffPage {
77
readonly result: PullRequestDiffResult;
88
}
99

10+
interface CachedPullRequestDiffPages {
11+
readonly pages: readonly PullRequestDiffPage[];
12+
readonly cache: WeakMap<PullRequestDiffResult, ReviewParsedDiff>;
13+
readonly parsed: ReviewParsedDiff;
14+
}
15+
16+
// Keep only the latest combination per scoped first page; query results own its lifetime.
17+
const parsedSnapshots = new WeakMap<
18+
PullRequestDiffResult,
19+
Map<string, CachedPullRequestDiffPages>
20+
>();
21+
22+
export function getCachedPullRequestDiffPages(
23+
pages: readonly PullRequestDiffPage[],
24+
scope: string,
25+
terminology: ChangeRequestTerminology,
26+
): ReviewParsedDiff {
27+
const first = pages[0];
28+
if (!first) return { kind: "empty" };
29+
const key = JSON.stringify([scope, terminology.singular, first.cursor]);
30+
let snapshots = parsedSnapshots.get(first.result);
31+
if (!snapshots) {
32+
snapshots = new Map();
33+
parsedSnapshots.set(first.result, snapshots);
34+
}
35+
const previous = snapshots.get(key);
36+
if (
37+
previous?.pages.length === pages.length &&
38+
pages.every((page, index) => {
39+
const cached = previous.pages[index];
40+
return cached?.cursor === page.cursor && cached.result === page.result;
41+
})
42+
)
43+
return previous.parsed;
44+
const cache = previous?.cache ?? new WeakMap<PullRequestDiffResult, ReviewParsedDiff>();
45+
const parsed = combinePullRequestDiffPages(pages, cache, scope, terminology);
46+
snapshots.set(key, { pages, cache, parsed });
47+
return parsed;
48+
}
49+
1050
/** A changed page invalidates later cursors, which belong to the previous patch. */
1151
export function retainPullRequestDiffPage(
1252
pages: readonly PullRequestDiffPage[],

0 commit comments

Comments
 (0)