Skip to content

Commit e534040

Browse files
committed
fix(web): preserve original PR review line types
1 parent 20a3b3c commit e534040

3 files changed

Lines changed: 23 additions & 9 deletions

File tree

‎apps/web/src/components/pullRequest/PullRequestCodeTab.tsx‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,13 @@ function PullRequestCodeTab({
705705
// that silently lost its first line on the other hosts would be worse than one line.
706706
const path = resolveFileDiffPath(file);
707707
const previousPath = resolveFileDiffPreviousPath(file);
708-
const position = resolveDiffReviewPosition(file, range.end, range.endSide ?? range.side);
708+
const sourceFile = parsedSlices
709+
.flatMap((slice) => (slice?.kind === "files" ? slice.sourceFiles : []))
710+
.find((candidate) => resolveFileDiffPath(candidate) === path);
711+
const side = range.endSide ?? range.side;
712+
const position =
713+
(sourceFile && resolveDiffReviewPosition(sourceFile, range.end, side)) ??
714+
resolveDiffReviewPosition(file, range.end, side);
709715
if (position === null) return;
710716
setDraft({
711717
fileKey: item.id,
@@ -715,7 +721,7 @@ function PullRequestCodeTab({
715721
range,
716722
});
717723
},
718-
[canCommentOnLines, files],
724+
[canCommentOnLines, files, parsedSlices],
719725
);
720726

721727
// Built here because the parsed diff only lives here, and built by the same function the

‎apps/web/src/lib/diffRendering.test.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,14 @@ describe("getRenderablePatch", () => {
7070
expect(file.additionLines).toEqual(shown.files[0]!.additionLines);
7171
expect(file.deletionLines).toEqual(shown.files[0]!.deletionLines);
7272
expect(file.cacheKey).not.toBe(shown.files[0]!.cacheKey);
73+
expect(resolveDiffReviewPosition(hidden.sourceFiles[0]!, 43, "additions")).toEqual({
74+
kind: "added",
75+
newLine: 43,
76+
});
77+
expect(resolveDiffReviewPosition(hidden.sourceFiles[0]!, 42, "deletions")).toEqual({
78+
kind: "deleted",
79+
oldLine: 42,
80+
});
7381
expect(file.hunks[0]?.hunkContent).toContainEqual({
7482
type: "context",
7583
lines: 3,

‎apps/web/src/lib/diffRendering.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ export type RenderablePatch =
4747
| {
4848
kind: "files";
4949
files: FileDiffMetadata[];
50+
sourceFiles: FileDiffMetadata[];
5051
}
5152
| {
5253
kind: "raw";
@@ -176,14 +177,13 @@ export function getRenderablePatch(
176177
normalizedPatch,
177178
buildPatchCacheKey(normalizedPatch, cacheScope),
178179
);
179-
const files = parsedPatches.flatMap((parsedPatch) =>
180-
parsedPatch.files.map((file) => {
181-
const filtered = options.ignoreWhitespace ? hideWhitespaceChanges(file) : file;
182-
return options.compactPartialHunkOffsets ? compactPartialHunkOffsets(filtered) : filtered;
183-
}),
184-
);
180+
const sourceFiles = parsedPatches.flatMap((parsedPatch) => parsedPatch.files);
181+
const files = sourceFiles.map((file) => {
182+
const filtered = options.ignoreWhitespace ? hideWhitespaceChanges(file) : file;
183+
return options.compactPartialHunkOffsets ? compactPartialHunkOffsets(filtered) : filtered;
184+
});
185185
if (files.length > 0) {
186-
return { kind: "files", files };
186+
return { kind: "files", files, sourceFiles };
187187
}
188188

189189
return {

0 commit comments

Comments
 (0)