Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .changeset/neat-rows-dispatch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
131 changes: 48 additions & 83 deletions packages/hunk/src/ui/diff/DiffRowView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,71 +10,6 @@ import { DiffMetaRowView, type PlannedDiffMetaReviewRow } from "./DiffMetaRowVie
import type { DiffRow } from "./diffRows";
import type { LineHighlightPaintIndex } from "./lineHighlightPaint";

/** Dispatch one planned diff row to its focused metadata or code view. */
function renderRow(
plannedRow: PlannedDiffReviewRow,
width: number,
lineNumberDigits: number,
showLineNumbers: boolean,
showHunkHeaders: boolean,
wrapLines: boolean,
codeHorizontalOffset: number,
theme: AppTheme,
selected: boolean,
copySelectedRowRange: CopySelectedRowRange | undefined,
copySelectedSide: "left" | "right" | undefined,
cursorHighlight: CursorHighlight | undefined,
lineHighlights: LineHighlightPaintIndex | undefined,
showAddNoteBadge = false,
onHoverRow?: (rowKey: string) => void,
onStartUserNoteAtHunk?: (hunkIndex: number, target?: UserNoteLineTarget) => void,
onToggleGap?: (gapKey: string) => void,
) {
if (plannedRow.row.type === "collapsed" || plannedRow.row.type === "hunk-header") {
return (
<DiffMetaRowView
plannedRow={plannedRow as PlannedDiffMetaReviewRow}
width={width}
theme={theme}
selected={selected || copySelectedRowRange !== undefined}
showHunkHeaders={showHunkHeaders}
showAddNoteBadge={showAddNoteBadge}
onHoverRow={onHoverRow}
onStartUserNoteAtHunk={onStartUserNoteAtHunk}
onToggleGap={onToggleGap}
/>
);
}

if (plannedRow.row.type === "split-line" || plannedRow.row.type === "stack-line") {
return (
<CodeRowView
plannedRow={plannedRow as PlannedCodeReviewRow}
width={width}
lineNumberDigits={lineNumberDigits}
showLineNumbers={showLineNumbers}
wrapLines={wrapLines}
codeHorizontalOffset={codeHorizontalOffset}
theme={theme}
selected={selected}
copySelectedRowRange={copySelectedRowRange}
copySelectedSide={copySelectedSide}
cursorHighlight={cursorHighlight}
lineHighlights={lineHighlights}
showAddNoteBadge={showAddNoteBadge}
onHoverRow={onHoverRow}
onStartUserNoteAtHunk={onStartUserNoteAtHunk}
/>
);
}

return (
<box style={{ width: "100%", height: 1 }}>
<text fg={theme.muted}>Unsupported row.</text>
</box>
);
}

/** Inputs accepted by the memoized diff-row facade. */
export interface DiffRowViewProps {
/** Complete review-stream row; preferred when the caller owns the shared render plan. */
Expand Down Expand Up @@ -137,23 +72,53 @@ export const DiffRowView = memo(function DiffRowViewComponent({
return null;
}

return renderRow(
resolvedPlannedRow,
width,
lineNumberDigits,
showLineNumbers,
showHunkHeaders,
wrapLines,
codeHorizontalOffset,
theme,
selected,
copySelectedRowRange,
copySelectedSide,
cursorHighlight,
lineHighlights,
showAddNoteBadge,
onHoverRow,
onStartUserNoteAtHunk,
onToggleGap,
if (
resolvedPlannedRow.row.type === "collapsed" ||
resolvedPlannedRow.row.type === "hunk-header"
) {
return (
<DiffMetaRowView
plannedRow={resolvedPlannedRow as PlannedDiffMetaReviewRow}
width={width}
theme={theme}
selected={selected || copySelectedRowRange !== undefined}
showHunkHeaders={showHunkHeaders}
showAddNoteBadge={showAddNoteBadge}
onHoverRow={onHoverRow}
onStartUserNoteAtHunk={onStartUserNoteAtHunk}
onToggleGap={onToggleGap}
/>
);
}

if (
resolvedPlannedRow.row.type === "split-line" ||
resolvedPlannedRow.row.type === "stack-line"
) {
return (
<CodeRowView
plannedRow={resolvedPlannedRow as PlannedCodeReviewRow}
width={width}
lineNumberDigits={lineNumberDigits}
showLineNumbers={showLineNumbers}
wrapLines={wrapLines}
codeHorizontalOffset={codeHorizontalOffset}
theme={theme}
selected={selected}
copySelectedRowRange={copySelectedRowRange}
copySelectedSide={copySelectedSide}
cursorHighlight={cursorHighlight}
lineHighlights={lineHighlights}
showAddNoteBadge={showAddNoteBadge}
onHoverRow={onHoverRow}
onStartUserNoteAtHunk={onStartUserNoteAtHunk}
/>
);
}

return (
<box style={{ width: "100%", height: 1 }}>
<text fg={theme.muted}>Unsupported row.</text>
</box>
);
});
Loading