@pierre/diffs 1.3.0-beta.9 → 1.3.0-rc.1

package/dist/utils/virtualDiffLayout.js

@@ -1,5 +1,10 @@
+import { getHunkSideEndBoundary, getHunkSideStartBoundary } from "./getHunkSideBoundaries.js";
 import { getDefaultHunkSeparatorHeight } from "./computeVirtualFileMetrics.js";
 //#region src/utils/virtualDiffLayout.ts
+/** One-based new-file line range covered by a hunk, as `[start, end)`. */
+function getHunkAdditionLineRange(hunk) {
+	return [getHunkSideStartBoundary(hunk.additionStart, hunk.additionCount) + 1, getHunkSideEndBoundary(hunk.additionStart, hunk.additionCount) + 1];
+}
 function getExpandedRegion({ isPartial, rangeSize, expandedHunks, hunkIndex, collapsedContextThreshold }) {
 	const normalizedRangeSize = Math.max(rangeSize, 0);
 	if (normalizedRangeSize === 0 || isPartial) return {
@@ -32,23 +37,23 @@ function getExpandedRegion({ isPartial, rangeSize, expandedHunks, hunkIndex, col
 function hasTrailingContext(fileDiff) {
 	const lastHunk = fileDiff.hunks[fileDiff.hunks.length - 1];
 	if (lastHunk == null || fileDiff.isPartial || fileDiff.additionLines.length === 0 || fileDiff.deletionLines.length === 0) return false;
-	const additionRemaining = fileDiff.additionLines.length - (lastHunk.additionLineIndex + lastHunk.additionCount);
-	const deletionRemaining = fileDiff.deletionLines.length - (lastHunk.deletionLineIndex + lastHunk.deletionCount);
+	const additionRemaining = fileDiff.additionLines.length - getHunkSideEndBoundary(lastHunk.additionStart, lastHunk.additionCount);
+	const deletionRemaining = fileDiff.deletionLines.length - getHunkSideEndBoundary(lastHunk.deletionStart, lastHunk.deletionCount);
 	return additionRemaining > 0 || deletionRemaining > 0;
 }
 function hasTrailingContextMismatch(fileDiff) {
 	const lastHunk = fileDiff.hunks[fileDiff.hunks.length - 1];
 	if (lastHunk == null || fileDiff.isPartial || fileDiff.additionLines.length === 0 || fileDiff.deletionLines.length === 0) return false;
-	const additionRemaining = fileDiff.additionLines.length - (lastHunk.additionLineIndex + lastHunk.additionCount);
-	const deletionRemaining = fileDiff.deletionLines.length - (lastHunk.deletionLineIndex + lastHunk.deletionCount);
+	const additionRemaining = fileDiff.additionLines.length - getHunkSideEndBoundary(lastHunk.additionStart, lastHunk.additionCount);
+	const deletionRemaining = fileDiff.deletionLines.length - getHunkSideEndBoundary(lastHunk.deletionStart, lastHunk.deletionCount);
 	if (additionRemaining <= 0 && deletionRemaining <= 0) return false;
 	return additionRemaining !== deletionRemaining;
 }
 function getTrailingContextRangeSize({ fileDiff, errorPrefix }) {
 	const lastHunk = fileDiff.hunks[fileDiff.hunks.length - 1];
 	if (lastHunk == null || fileDiff.isPartial || fileDiff.additionLines.length === 0 || fileDiff.deletionLines.length === 0) return 0;
-	const additionRemaining = fileDiff.additionLines.length - (lastHunk.additionLineIndex + lastHunk.additionCount);
-	const deletionRemaining = fileDiff.deletionLines.length - (lastHunk.deletionLineIndex + lastHunk.deletionCount);
+	const additionRemaining = fileDiff.additionLines.length - getHunkSideEndBoundary(lastHunk.additionStart, lastHunk.additionCount);
+	const deletionRemaining = fileDiff.deletionLines.length - getHunkSideEndBoundary(lastHunk.deletionStart, lastHunk.deletionCount);
 	if (additionRemaining <= 0 && deletionRemaining <= 0) return 0;
 	if (additionRemaining !== deletionRemaining) throw new Error(`${errorPrefix}: trailing context mismatch (additions=${additionRemaining}, deletions=${deletionRemaining}) for ${fileDiff.name}`);
 	return Math.min(additionRemaining, deletionRemaining);
@@ -77,6 +82,95 @@ function getTrailingExpandedRegion({ fileDiff, hunkIndex, expandedHunks, collaps
 		renderAll: fromStart >= trailingRangeSize
 	};
 }
+/**
+* Whether a one-based new-file line currently has (or will have on scroll) a
+* rendered row under the given expansion state — the editor-facing
+* visibility oracle. False only for lines hidden inside a collapsed
+* unchanged region; lines outside the diff's modeled range report true so
+* callers keep their existing missing-row handling. Computed from the same
+* inputs as `iterateOverDiff` so layout math and the oracle cannot diverge.
+*/
+function isAdditionLineRenderable({ fileDiff, lineNumber, expandedHunks, collapsedContextThreshold }) {
+	if (expandedHunks === true || fileDiff.isPartial) return true;
+	for (const [hunkIndex, hunk] of fileDiff.hunks.entries()) {
+		const [hunkStart, hunkEnd] = getHunkAdditionLineRange(hunk);
+		if (lineNumber < hunkStart) {
+			const region = getExpandedRegion({
+				isPartial: fileDiff.isPartial,
+				rangeSize: hunk.collapsedBefore,
+				expandedHunks,
+				hunkIndex,
+				collapsedContextThreshold
+			});
+			const gapStart = hunkStart - region.rangeSize;
+			return region.renderAll || lineNumber < gapStart + region.fromStart || lineNumber >= hunkStart - region.fromEnd;
+		}
+		if (lineNumber < hunkEnd) return true;
+	}
+	const trailingRegion = getTrailingExpandedRegion({
+		fileDiff,
+		hunkIndex: fileDiff.hunks.length - 1,
+		expandedHunks,
+		collapsedContextThreshold,
+		errorPrefix: "isAdditionLineRenderable"
+	});
+	if (trailingRegion == null || trailingRegion.renderAll) return true;
+	const lastHunk = fileDiff.hunks[fileDiff.hunks.length - 1];
+	const [, trailingStart] = getHunkAdditionLineRange(lastHunk);
+	return lineNumber < trailingStart + trailingRegion.fromStart || lineNumber >= trailingStart + trailingRegion.rangeSize;
+}
+/**
+* The nearest renderable new-file line at or beyond `lineNumber` in the
+* given direction (one-based), or undefined when every line that way is
+* hidden inside collapsed regions. Sequential caret motion uses this to skip
+* over collapsed regions like code folds; it walks the hunk metadata once
+* instead of probing line by line across a gap.
+*/
+function getNearestRenderableAdditionLine({ fileDiff, lineNumber, direction, expandedHunks, collapsedContextThreshold }) {
+	if (expandedHunks === true || fileDiff.isPartial) return lineNumber;
+	const ranges = [];
+	let modeledEnd = 1;
+	for (const [hunkIndex, hunk] of fileDiff.hunks.entries()) {
+		const [hunkStart, hunkEnd] = getHunkAdditionLineRange(hunk);
+		const region = getExpandedRegion({
+			isPartial: fileDiff.isPartial,
+			rangeSize: hunk.collapsedBefore,
+			expandedHunks,
+			hunkIndex,
+			collapsedContextThreshold
+		});
+		const gapStart = hunkStart - region.rangeSize;
+		if (region.renderAll) ranges.push([gapStart, hunkStart]);
+		else {
+			if (region.fromStart > 0) ranges.push([gapStart, gapStart + region.fromStart]);
+			if (region.fromEnd > 0) ranges.push([hunkStart - region.fromEnd, hunkStart]);
+		}
+		ranges.push([hunkStart, hunkEnd]);
+		modeledEnd = hunkEnd;
+	}
+	const trailingRegion = getTrailingExpandedRegion({
+		fileDiff,
+		hunkIndex: fileDiff.hunks.length - 1,
+		expandedHunks,
+		collapsedContextThreshold,
+		errorPrefix: "getNearestRenderableAdditionLine"
+	});
+	if (trailingRegion != null) {
+		const trailingStart = modeledEnd;
+		modeledEnd = trailingStart + trailingRegion.rangeSize;
+		if (trailingRegion.renderAll) ranges.push([trailingStart, modeledEnd]);
+		else if (trailingRegion.fromStart > 0) ranges.push([trailingStart, trailingStart + trailingRegion.fromStart]);
+	}
+	if (lineNumber >= modeledEnd) return lineNumber;
+	if (direction === "down") {
+		for (const [start, end] of ranges) if (end > lineNumber) return Math.max(start, lineNumber);
+		return;
+	}
+	for (let index = ranges.length - 1; index >= 0; index--) {
+		const [start, end] = ranges[index];
+		if (start <= lineNumber) return Math.min(end - 1, lineNumber);
+	}
+}
 function getHunkSeparatorHeight({ type, metrics }) {
 	return metrics.hunkSeparatorHeight ?? getDefaultHunkSeparatorHeight(type);
 }
@@ -136,6 +230,6 @@ function getTrailingHunkSeparatorLayout({ type, metrics }) {
 	};
 }
 //#endregion
-export { getExpandedRegion, getHunkSeparatorGap, getHunkSeparatorHeight, getLeadingHunkSeparatorLayout, getTrailingContextRangeSize, getTrailingExpandedRegion, getTrailingHunkSeparatorLayout, hasLeadingHunkSeparator, hasTrailingContext, hasTrailingContextMismatch, hasTrailingHunkSeparator };
+export { getExpandedRegion, getHunkAdditionLineRange, getHunkSeparatorGap, getHunkSeparatorHeight, getLeadingHunkSeparatorLayout, getNearestRenderableAdditionLine, getTrailingContextRangeSize, getTrailingExpandedRegion, getTrailingHunkSeparatorLayout, hasLeadingHunkSeparator, hasTrailingContext, hasTrailingContextMismatch, hasTrailingHunkSeparator, isAdditionLineRenderable };
 
 //# sourceMappingURL=virtualDiffLayout.js.map

package/dist/utils/virtualDiffLayout.js.map

@@ -1 +1 @@
-{"version":3,"file":"virtualDiffLayout.js","names":[],"sources":["../../src/utils/virtualDiffLayout.ts"],"sourcesContent":["import type {\n  FileDiffMetadata,\n  HunkExpansionRegion,\n  HunkSeparators,\n  VirtualFileMetrics,\n} from '../types';\nimport { getDefaultHunkSeparatorHeight } from './computeVirtualFileMetrics';\n\nexport interface ExpandedRegionResult {\n  fromStart: number;\n  fromEnd: number;\n  rangeSize: number;\n  collapsedLines: number;\n  renderAll: boolean;\n}\n\nexport interface GetExpandedRegionProps {\n  isPartial: boolean;\n  rangeSize: number;\n  expandedHunks: Map<number, HunkExpansionRegion> | true | undefined;\n  hunkIndex: number;\n  collapsedContextThreshold: number;\n}\n\nexport interface GetTrailingContextRangeSizeProps {\n  fileDiff: FileDiffMetadata;\n  errorPrefix: string;\n}\n\nexport interface GetTrailingExpandedRegionProps extends GetTrailingContextRangeSizeProps {\n  hunkIndex: number;\n  expandedHunks: GetExpandedRegionProps['expandedHunks'];\n  collapsedContextThreshold: number;\n}\n\nexport interface HunkSeparatorLayout {\n  height: number;\n  gapBefore: number;\n  gapAfter: number;\n  totalHeight: number;\n}\n\ninterface HunkSeparatorBaseProps {\n  type: HunkSeparators;\n  metrics: VirtualFileMetrics;\n}\n\ninterface LeadingHunkSeparatorLayoutProps extends HunkSeparatorBaseProps {\n  hunkIndex: number;\n  hunkSpecs: string | undefined;\n}\n\n// Converts a collapsed unchanged range into the slices that should render near\n// the start and end of that range for the active hunk expansion state.\nexport function getExpandedRegion({\n  isPartial,\n  rangeSize,\n  expandedHunks,\n  hunkIndex,\n  collapsedContextThreshold,\n}: GetExpandedRegionProps): ExpandedRegionResult {\n  const normalizedRangeSize = Math.max(rangeSize, 0);\n  if (normalizedRangeSize === 0 || isPartial) {\n    return {\n      fromStart: 0,\n      fromEnd: 0,\n      rangeSize: normalizedRangeSize,\n      collapsedLines: normalizedRangeSize,\n      renderAll: false,\n    };\n  }\n\n  if (\n    expandedHunks === true ||\n    normalizedRangeSize <= collapsedContextThreshold\n  ) {\n    return {\n      fromStart: normalizedRangeSize,\n      fromEnd: 0,\n      rangeSize: normalizedRangeSize,\n      collapsedLines: 0,\n      renderAll: true,\n    };\n  }\n\n  const region = expandedHunks?.get(hunkIndex);\n  const fromStart = Math.min(\n    Math.max(region?.fromStart ?? 0, 0),\n    normalizedRangeSize\n  );\n  const fromEnd = Math.min(\n    Math.max(region?.fromEnd ?? 0, 0),\n    normalizedRangeSize\n  );\n  const expandedCount = fromStart + fromEnd;\n  const renderAll = expandedCount >= normalizedRangeSize;\n  return {\n    fromStart: renderAll ? normalizedRangeSize : fromStart,\n    fromEnd: renderAll ? 0 : fromEnd,\n    rangeSize: normalizedRangeSize,\n    collapsedLines: Math.max(normalizedRangeSize - expandedCount, 0),\n    renderAll,\n  };\n}\n\nexport function hasTrailingContext(fileDiff: FileDiffMetadata): boolean {\n  const lastHunk = fileDiff.hunks[fileDiff.hunks.length - 1];\n  if (\n    lastHunk == null ||\n    fileDiff.isPartial ||\n    fileDiff.additionLines.length === 0 ||\n    fileDiff.deletionLines.length === 0\n  ) {\n    return false;\n  }\n\n  const additionRemaining =\n    fileDiff.additionLines.length -\n    (lastHunk.additionLineIndex + lastHunk.additionCount);\n  const deletionRemaining =\n    fileDiff.deletionLines.length -\n    (lastHunk.deletionLineIndex + lastHunk.deletionCount);\n\n  return additionRemaining > 0 || deletionRemaining > 0;\n}\n\n// Returns true when trailing-context line counts disagree between sides.\nexport function hasTrailingContextMismatch(\n  fileDiff: FileDiffMetadata\n): boolean {\n  const lastHunk = fileDiff.hunks[fileDiff.hunks.length - 1];\n  if (\n    lastHunk == null ||\n    fileDiff.isPartial ||\n    fileDiff.additionLines.length === 0 ||\n    fileDiff.deletionLines.length === 0\n  ) {\n    return false;\n  }\n\n  const additionRemaining =\n    fileDiff.additionLines.length -\n    (lastHunk.additionLineIndex + lastHunk.additionCount);\n  const deletionRemaining =\n    fileDiff.deletionLines.length -\n    (lastHunk.deletionLineIndex + lastHunk.deletionCount);\n\n  if (additionRemaining <= 0 && deletionRemaining <= 0) {\n    return false;\n  }\n\n  return additionRemaining !== deletionRemaining;\n}\n\n// Measures the unchanged tail after the final hunk. Both sides must have the\n// same remaining length because trailing context represents paired lines.\nexport function getTrailingContextRangeSize({\n  fileDiff,\n  errorPrefix,\n}: GetTrailingContextRangeSizeProps): number {\n  const lastHunk = fileDiff.hunks[fileDiff.hunks.length - 1];\n  if (\n    lastHunk == null ||\n    fileDiff.isPartial ||\n    fileDiff.additionLines.length === 0 ||\n    fileDiff.deletionLines.length === 0\n  ) {\n    return 0;\n  }\n\n  const additionRemaining =\n    fileDiff.additionLines.length -\n    (lastHunk.additionLineIndex + lastHunk.additionCount);\n  const deletionRemaining =\n    fileDiff.deletionLines.length -\n    (lastHunk.deletionLineIndex + lastHunk.deletionCount);\n\n  if (additionRemaining <= 0 && deletionRemaining <= 0) {\n    return 0;\n  }\n\n  if (additionRemaining !== deletionRemaining) {\n    throw new Error(\n      `${errorPrefix}: trailing context mismatch (additions=${additionRemaining}, deletions=${deletionRemaining}) for ${fileDiff.name}`\n    );\n  }\n  return Math.min(additionRemaining, deletionRemaining);\n}\n\nexport function getTrailingExpandedRegion({\n  fileDiff,\n  hunkIndex,\n  expandedHunks,\n  collapsedContextThreshold,\n  errorPrefix,\n}: GetTrailingExpandedRegionProps): ExpandedRegionResult | undefined {\n  if (hunkIndex !== fileDiff.hunks.length - 1) {\n    return undefined;\n  }\n\n  const trailingRangeSize = getTrailingContextRangeSize({\n    fileDiff,\n    errorPrefix,\n  });\n  if (trailingRangeSize <= 0) {\n    return undefined;\n  }\n\n  if (\n    expandedHunks === true ||\n    trailingRangeSize <= collapsedContextThreshold\n  ) {\n    return {\n      fromStart: trailingRangeSize,\n      fromEnd: 0,\n      rangeSize: trailingRangeSize,\n      collapsedLines: 0,\n      renderAll: true,\n    };\n  }\n\n  // The final trailing separator only exposes upward partial expansion. Treat it\n  // as a bottom-only pseudo-hunk and ignore unsupported downward expansion.\n  const region = expandedHunks?.get(fileDiff.hunks.length);\n  const fromStart = Math.min(\n    Math.max(region?.fromStart ?? 0, 0),\n    trailingRangeSize\n  );\n  return {\n    fromStart,\n    fromEnd: 0,\n    rangeSize: trailingRangeSize,\n    collapsedLines: trailingRangeSize - fromStart,\n    renderAll: fromStart >= trailingRangeSize,\n  };\n}\n\nexport function getHunkSeparatorHeight({\n  type,\n  metrics,\n}: HunkSeparatorBaseProps): number {\n  return metrics.hunkSeparatorHeight ?? getDefaultHunkSeparatorHeight(type);\n}\n\nexport function getHunkSeparatorGap({\n  type,\n  metrics,\n}: HunkSeparatorBaseProps): number {\n  return type === 'simple' || type === 'metadata' || type === 'line-info-basic'\n    ? 0\n    : metrics.spacing;\n}\n\nexport function hasLeadingHunkSeparator({\n  type,\n  hunkIndex,\n  hunkSpecs,\n}: Omit<LeadingHunkSeparatorLayoutProps, 'metrics'>): boolean {\n  switch (type) {\n    case 'simple':\n      return hunkIndex > 0;\n    case 'metadata':\n      return hunkSpecs != null;\n    case 'line-info':\n    case 'line-info-basic':\n    case 'custom':\n      return true;\n  }\n}\n\nexport function hasTrailingHunkSeparator(type: HunkSeparators): boolean {\n  return type !== 'simple' && type !== 'metadata';\n}\n\n// Mirrors the renderer/CSS spacing rules for the separator shown before a hunk.\nexport function getLeadingHunkSeparatorLayout({\n  type,\n  metrics,\n  hunkIndex,\n  hunkSpecs,\n}: LeadingHunkSeparatorLayoutProps): HunkSeparatorLayout | undefined {\n  if (!hasLeadingHunkSeparator({ type, hunkIndex, hunkSpecs })) {\n    return undefined;\n  }\n\n  const height = getHunkSeparatorHeight({ type, metrics });\n  const gap = getHunkSeparatorGap({ type, metrics });\n  const gapBefore = hunkIndex > 0 ? gap : 0;\n  const gapAfter = gap;\n  return {\n    height,\n    gapBefore,\n    gapAfter,\n    totalHeight: gapBefore + height + gapAfter,\n  };\n}\n\n// Mirrors the renderer/CSS spacing rules for the separator shown after the last\n// hunk when trailing unchanged context is collapsed.\nexport function getTrailingHunkSeparatorLayout({\n  type,\n  metrics,\n}: HunkSeparatorBaseProps): HunkSeparatorLayout | undefined {\n  if (!hasTrailingHunkSeparator(type)) {\n    return undefined;\n  }\n\n  const height = getHunkSeparatorHeight({ type, metrics });\n  const gapBefore = getHunkSeparatorGap({ type, metrics });\n  return {\n    height,\n    gapBefore,\n    gapAfter: 0,\n    totalHeight: gapBefore + height,\n  };\n}\n"],"mappings":"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"}
+{"version":3,"file":"virtualDiffLayout.js","names":[],"sources":["../../src/utils/virtualDiffLayout.ts"],"sourcesContent":["import type {\n  FileDiffMetadata,\n  Hunk,\n  HunkExpansionRegion,\n  HunkSeparators,\n  VirtualFileMetrics,\n} from '../types';\nimport { getDefaultHunkSeparatorHeight } from './computeVirtualFileMetrics';\nimport {\n  getHunkSideEndBoundary,\n  getHunkSideStartBoundary,\n} from './getHunkSideBoundaries';\n\nexport interface ExpandedRegionResult {\n  fromStart: number;\n  fromEnd: number;\n  rangeSize: number;\n  collapsedLines: number;\n  renderAll: boolean;\n}\n\nexport interface GetExpandedRegionProps {\n  isPartial: boolean;\n  rangeSize: number;\n  expandedHunks: Map<number, HunkExpansionRegion> | true | undefined;\n  hunkIndex: number;\n  collapsedContextThreshold: number;\n}\n\nexport interface GetTrailingContextRangeSizeProps {\n  fileDiff: FileDiffMetadata;\n  errorPrefix: string;\n}\n\nexport interface GetTrailingExpandedRegionProps extends GetTrailingContextRangeSizeProps {\n  hunkIndex: number;\n  expandedHunks: GetExpandedRegionProps['expandedHunks'];\n  collapsedContextThreshold: number;\n}\n\n/** One-based new-file line range covered by a hunk, as `[start, end)`. */\nexport function getHunkAdditionLineRange(hunk: Hunk): [number, number] {\n  return [\n    getHunkSideStartBoundary(hunk.additionStart, hunk.additionCount) + 1,\n    getHunkSideEndBoundary(hunk.additionStart, hunk.additionCount) + 1,\n  ];\n}\n\nexport interface HunkSeparatorLayout {\n  height: number;\n  gapBefore: number;\n  gapAfter: number;\n  totalHeight: number;\n}\n\ninterface HunkSeparatorBaseProps {\n  type: HunkSeparators;\n  metrics: VirtualFileMetrics;\n}\n\ninterface LeadingHunkSeparatorLayoutProps extends HunkSeparatorBaseProps {\n  hunkIndex: number;\n  hunkSpecs: string | undefined;\n}\n\n// Converts a collapsed unchanged range into the slices that should render near\n// the start and end of that range for the active hunk expansion state.\nexport function getExpandedRegion({\n  isPartial,\n  rangeSize,\n  expandedHunks,\n  hunkIndex,\n  collapsedContextThreshold,\n}: GetExpandedRegionProps): ExpandedRegionResult {\n  const normalizedRangeSize = Math.max(rangeSize, 0);\n  if (normalizedRangeSize === 0 || isPartial) {\n    return {\n      fromStart: 0,\n      fromEnd: 0,\n      rangeSize: normalizedRangeSize,\n      collapsedLines: normalizedRangeSize,\n      renderAll: false,\n    };\n  }\n\n  if (\n    expandedHunks === true ||\n    normalizedRangeSize <= collapsedContextThreshold\n  ) {\n    return {\n      fromStart: normalizedRangeSize,\n      fromEnd: 0,\n      rangeSize: normalizedRangeSize,\n      collapsedLines: 0,\n      renderAll: true,\n    };\n  }\n\n  const region = expandedHunks?.get(hunkIndex);\n  const fromStart = Math.min(\n    Math.max(region?.fromStart ?? 0, 0),\n    normalizedRangeSize\n  );\n  const fromEnd = Math.min(\n    Math.max(region?.fromEnd ?? 0, 0),\n    normalizedRangeSize\n  );\n  const expandedCount = fromStart + fromEnd;\n  const renderAll = expandedCount >= normalizedRangeSize;\n  return {\n    fromStart: renderAll ? normalizedRangeSize : fromStart,\n    fromEnd: renderAll ? 0 : fromEnd,\n    rangeSize: normalizedRangeSize,\n    collapsedLines: Math.max(normalizedRangeSize - expandedCount, 0),\n    renderAll,\n  };\n}\n\nexport function hasTrailingContext(fileDiff: FileDiffMetadata): boolean {\n  const lastHunk = fileDiff.hunks[fileDiff.hunks.length - 1];\n  if (\n    lastHunk == null ||\n    fileDiff.isPartial ||\n    fileDiff.additionLines.length === 0 ||\n    fileDiff.deletionLines.length === 0\n  ) {\n    return false;\n  }\n\n  const additionRemaining =\n    fileDiff.additionLines.length -\n    getHunkSideEndBoundary(lastHunk.additionStart, lastHunk.additionCount);\n  const deletionRemaining =\n    fileDiff.deletionLines.length -\n    getHunkSideEndBoundary(lastHunk.deletionStart, lastHunk.deletionCount);\n\n  return additionRemaining > 0 || deletionRemaining > 0;\n}\n\n// Returns true when trailing-context line counts disagree between sides.\nexport function hasTrailingContextMismatch(\n  fileDiff: FileDiffMetadata\n): boolean {\n  const lastHunk = fileDiff.hunks[fileDiff.hunks.length - 1];\n  if (\n    lastHunk == null ||\n    fileDiff.isPartial ||\n    fileDiff.additionLines.length === 0 ||\n    fileDiff.deletionLines.length === 0\n  ) {\n    return false;\n  }\n\n  const additionRemaining =\n    fileDiff.additionLines.length -\n    getHunkSideEndBoundary(lastHunk.additionStart, lastHunk.additionCount);\n  const deletionRemaining =\n    fileDiff.deletionLines.length -\n    getHunkSideEndBoundary(lastHunk.deletionStart, lastHunk.deletionCount);\n\n  if (additionRemaining <= 0 && deletionRemaining <= 0) {\n    return false;\n  }\n\n  return additionRemaining !== deletionRemaining;\n}\n\n// Measures the unchanged tail after the final hunk. Both sides must have the\n// same remaining length because trailing context represents paired lines.\nexport function getTrailingContextRangeSize({\n  fileDiff,\n  errorPrefix,\n}: GetTrailingContextRangeSizeProps): number {\n  const lastHunk = fileDiff.hunks[fileDiff.hunks.length - 1];\n  if (\n    lastHunk == null ||\n    fileDiff.isPartial ||\n    fileDiff.additionLines.length === 0 ||\n    fileDiff.deletionLines.length === 0\n  ) {\n    return 0;\n  }\n\n  const additionRemaining =\n    fileDiff.additionLines.length -\n    getHunkSideEndBoundary(lastHunk.additionStart, lastHunk.additionCount);\n  const deletionRemaining =\n    fileDiff.deletionLines.length -\n    getHunkSideEndBoundary(lastHunk.deletionStart, lastHunk.deletionCount);\n\n  if (additionRemaining <= 0 && deletionRemaining <= 0) {\n    return 0;\n  }\n\n  if (additionRemaining !== deletionRemaining) {\n    throw new Error(\n      `${errorPrefix}: trailing context mismatch (additions=${additionRemaining}, deletions=${deletionRemaining}) for ${fileDiff.name}`\n    );\n  }\n  return Math.min(additionRemaining, deletionRemaining);\n}\n\nexport function getTrailingExpandedRegion({\n  fileDiff,\n  hunkIndex,\n  expandedHunks,\n  collapsedContextThreshold,\n  errorPrefix,\n}: GetTrailingExpandedRegionProps): ExpandedRegionResult | undefined {\n  if (hunkIndex !== fileDiff.hunks.length - 1) {\n    return undefined;\n  }\n\n  const trailingRangeSize = getTrailingContextRangeSize({\n    fileDiff,\n    errorPrefix,\n  });\n  if (trailingRangeSize <= 0) {\n    return undefined;\n  }\n\n  if (\n    expandedHunks === true ||\n    trailingRangeSize <= collapsedContextThreshold\n  ) {\n    return {\n      fromStart: trailingRangeSize,\n      fromEnd: 0,\n      rangeSize: trailingRangeSize,\n      collapsedLines: 0,\n      renderAll: true,\n    };\n  }\n\n  // The final trailing separator only exposes upward partial expansion. Treat it\n  // as a bottom-only pseudo-hunk and ignore unsupported downward expansion.\n  const region = expandedHunks?.get(fileDiff.hunks.length);\n  const fromStart = Math.min(\n    Math.max(region?.fromStart ?? 0, 0),\n    trailingRangeSize\n  );\n  return {\n    fromStart,\n    fromEnd: 0,\n    rangeSize: trailingRangeSize,\n    collapsedLines: trailingRangeSize - fromStart,\n    renderAll: fromStart >= trailingRangeSize,\n  };\n}\n\nexport interface IsAdditionLineRenderableProps {\n  fileDiff: FileDiffMetadata;\n  /** One-based line number in the new file. */\n  lineNumber: number;\n  expandedHunks: Map<number, HunkExpansionRegion> | true | undefined;\n  collapsedContextThreshold: number;\n}\n\n/**\n * Whether a one-based new-file line currently has (or will have on scroll) a\n * rendered row under the given expansion state — the editor-facing\n * visibility oracle. False only for lines hidden inside a collapsed\n * unchanged region; lines outside the diff's modeled range report true so\n * callers keep their existing missing-row handling. Computed from the same\n * inputs as `iterateOverDiff` so layout math and the oracle cannot diverge.\n */\nexport function isAdditionLineRenderable({\n  fileDiff,\n  lineNumber,\n  expandedHunks,\n  collapsedContextThreshold,\n}: IsAdditionLineRenderableProps): boolean {\n  if (expandedHunks === true || fileDiff.isPartial) {\n    return true;\n  }\n\n  for (const [hunkIndex, hunk] of fileDiff.hunks.entries()) {\n    const [hunkStart, hunkEnd] = getHunkAdditionLineRange(hunk);\n    if (lineNumber < hunkStart) {\n      // Inside the collapsed gap before this hunk: renderable only within\n      // the expanded slices at the gap's edges.\n      const region = getExpandedRegion({\n        isPartial: fileDiff.isPartial,\n        rangeSize: hunk.collapsedBefore,\n        expandedHunks,\n        hunkIndex,\n        collapsedContextThreshold,\n      });\n      const gapStart = hunkStart - region.rangeSize;\n      return (\n        region.renderAll ||\n        lineNumber < gapStart + region.fromStart ||\n        lineNumber >= hunkStart - region.fromEnd\n      );\n    }\n    if (lineNumber < hunkEnd) {\n      return true;\n    }\n  }\n\n  const trailingRegion = getTrailingExpandedRegion({\n    fileDiff,\n    hunkIndex: fileDiff.hunks.length - 1,\n    expandedHunks,\n    collapsedContextThreshold,\n    errorPrefix: 'isAdditionLineRenderable',\n  });\n  if (trailingRegion == null || trailingRegion.renderAll) {\n    return true;\n  }\n  const lastHunk = fileDiff.hunks[fileDiff.hunks.length - 1];\n  const [, trailingStart] = getHunkAdditionLineRange(lastHunk);\n  return (\n    lineNumber < trailingStart + trailingRegion.fromStart ||\n    lineNumber >= trailingStart + trailingRegion.rangeSize\n  );\n}\n\nexport interface GetNearestRenderableAdditionLineProps extends IsAdditionLineRenderableProps {\n  direction: 'up' | 'down';\n}\n\n/**\n * The nearest renderable new-file line at or beyond `lineNumber` in the\n * given direction (one-based), or undefined when every line that way is\n * hidden inside collapsed regions. Sequential caret motion uses this to skip\n * over collapsed regions like code folds; it walks the hunk metadata once\n * instead of probing line by line across a gap.\n */\nexport function getNearestRenderableAdditionLine({\n  fileDiff,\n  lineNumber,\n  direction,\n  expandedHunks,\n  collapsedContextThreshold,\n}: GetNearestRenderableAdditionLineProps): number | undefined {\n  if (expandedHunks === true || fileDiff.isPartial) {\n    return lineNumber;\n  }\n\n  // Renderable [start, end) line ranges in ascending order, plus the\n  // exclusive end of the modeled range — anything past it (the editor's\n  // phantom document-end line) counts as renderable.\n  const ranges: Array<[start: number, end: number]> = [];\n  let modeledEnd = 1;\n  for (const [hunkIndex, hunk] of fileDiff.hunks.entries()) {\n    const [hunkStart, hunkEnd] = getHunkAdditionLineRange(hunk);\n    const region = getExpandedRegion({\n      isPartial: fileDiff.isPartial,\n      rangeSize: hunk.collapsedBefore,\n      expandedHunks,\n      hunkIndex,\n      collapsedContextThreshold,\n    });\n    const gapStart = hunkStart - region.rangeSize;\n    if (region.renderAll) {\n      ranges.push([gapStart, hunkStart]);\n    } else {\n      if (region.fromStart > 0) {\n        ranges.push([gapStart, gapStart + region.fromStart]);\n      }\n      if (region.fromEnd > 0) {\n        ranges.push([hunkStart - region.fromEnd, hunkStart]);\n      }\n    }\n    ranges.push([hunkStart, hunkEnd]);\n    modeledEnd = hunkEnd;\n  }\n  const trailingRegion = getTrailingExpandedRegion({\n    fileDiff,\n    hunkIndex: fileDiff.hunks.length - 1,\n    expandedHunks,\n    collapsedContextThreshold,\n    errorPrefix: 'getNearestRenderableAdditionLine',\n  });\n  if (trailingRegion != null) {\n    const trailingStart = modeledEnd;\n    modeledEnd = trailingStart + trailingRegion.rangeSize;\n    if (trailingRegion.renderAll) {\n      ranges.push([trailingStart, modeledEnd]);\n    } else if (trailingRegion.fromStart > 0) {\n      ranges.push([trailingStart, trailingStart + trailingRegion.fromStart]);\n    }\n  }\n\n  if (lineNumber >= modeledEnd) {\n    return lineNumber;\n  }\n  if (direction === 'down') {\n    for (const [start, end] of ranges) {\n      if (end > lineNumber) {\n        return Math.max(start, lineNumber);\n      }\n    }\n    return undefined;\n  }\n  for (let index = ranges.length - 1; index >= 0; index--) {\n    const [start, end] = ranges[index];\n    if (start <= lineNumber) {\n      return Math.min(end - 1, lineNumber);\n    }\n  }\n  return undefined;\n}\n\nexport function getHunkSeparatorHeight({\n  type,\n  metrics,\n}: HunkSeparatorBaseProps): number {\n  return metrics.hunkSeparatorHeight ?? getDefaultHunkSeparatorHeight(type);\n}\n\nexport function getHunkSeparatorGap({\n  type,\n  metrics,\n}: HunkSeparatorBaseProps): number {\n  return type === 'simple' || type === 'metadata' || type === 'line-info-basic'\n    ? 0\n    : metrics.spacing;\n}\n\nexport function hasLeadingHunkSeparator({\n  type,\n  hunkIndex,\n  hunkSpecs,\n}: Omit<LeadingHunkSeparatorLayoutProps, 'metrics'>): boolean {\n  switch (type) {\n    case 'simple':\n      return hunkIndex > 0;\n    case 'metadata':\n      return hunkSpecs != null;\n    case 'line-info':\n    case 'line-info-basic':\n    case 'custom':\n      return true;\n  }\n}\n\nexport function hasTrailingHunkSeparator(type: HunkSeparators): boolean {\n  return type !== 'simple' && type !== 'metadata';\n}\n\n// Mirrors the renderer/CSS spacing rules for the separator shown before a hunk.\nexport function getLeadingHunkSeparatorLayout({\n  type,\n  metrics,\n  hunkIndex,\n  hunkSpecs,\n}: LeadingHunkSeparatorLayoutProps): HunkSeparatorLayout | undefined {\n  if (!hasLeadingHunkSeparator({ type, hunkIndex, hunkSpecs })) {\n    return undefined;\n  }\n\n  const height = getHunkSeparatorHeight({ type, metrics });\n  const gap = getHunkSeparatorGap({ type, metrics });\n  const gapBefore = hunkIndex > 0 ? gap : 0;\n  const gapAfter = gap;\n  return {\n    height,\n    gapBefore,\n    gapAfter,\n    totalHeight: gapBefore + height + gapAfter,\n  };\n}\n\n// Mirrors the renderer/CSS spacing rules for the separator shown after the last\n// hunk when trailing unchanged context is collapsed.\nexport function getTrailingHunkSeparatorLayout({\n  type,\n  metrics,\n}: HunkSeparatorBaseProps): HunkSeparatorLayout | undefined {\n  if (!hasTrailingHunkSeparator(type)) {\n    return undefined;\n  }\n\n  const height = getHunkSeparatorHeight({ type, metrics });\n  const gapBefore = getHunkSeparatorGap({ type, metrics });\n  return {\n    height,\n    gapBefore,\n    gapAfter: 0,\n    totalHeight: gapBefore + height,\n  };\n}\n"],"mappings":"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"}

package/dist/worker/worker-portable.js

@@ -12536,7 +12536,14 @@ function getLineNodes(nodes) {
 	throw new Error("getLineNodes: Unable to find children");
 }
 //#endregion
-//#region src/utils/virtualDiffLayout.ts
+//#region src/utils/getHunkSideBoundaries.ts
+/** Converts a unified hunk side's start/count into its consumed-file range. */
+function getHunkSideStartBoundary(start, count) {
+	return start - (count === 0 ? 0 : 1);
+}
+function getHunkSideEndBoundary(start, count) {
+	return getHunkSideStartBoundary(start, count) + count;
+}
 function getExpandedRegion({ isPartial, rangeSize, expandedHunks, hunkIndex, collapsedContextThreshold }) {
 	const normalizedRangeSize = Math.max(rangeSize, 0);
 	if (normalizedRangeSize === 0 || isPartial) return {
@@ -12569,8 +12576,8 @@ function getExpandedRegion({ isPartial, rangeSize, expandedHunks, hunkIndex, col
 function getTrailingContextRangeSize({ fileDiff, errorPrefix }) {
 	const lastHunk = fileDiff.hunks[fileDiff.hunks.length - 1];
 	if (lastHunk == null || fileDiff.isPartial || fileDiff.additionLines.length === 0 || fileDiff.deletionLines.length === 0) return 0;
-	const additionRemaining = fileDiff.additionLines.length - (lastHunk.additionLineIndex + lastHunk.additionCount);
-	const deletionRemaining = fileDiff.deletionLines.length - (lastHunk.deletionLineIndex + lastHunk.deletionCount);
+	const additionRemaining = fileDiff.additionLines.length - getHunkSideEndBoundary(lastHunk.additionStart, lastHunk.additionCount);
+	const deletionRemaining = fileDiff.deletionLines.length - getHunkSideEndBoundary(lastHunk.deletionStart, lastHunk.deletionCount);
 	if (additionRemaining <= 0 && deletionRemaining <= 0) return 0;
 	if (additionRemaining !== deletionRemaining) throw new Error(`${errorPrefix}: trailing context mismatch (additions=${additionRemaining}, deletions=${deletionRemaining}) for ${fileDiff.name}`);
 	return Math.min(additionRemaining, deletionRemaining);
@@ -12661,6 +12668,10 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 		const hunk = diff.hunks[hunkIndex];
 		if (hunk == null) throw new Error("iterateOverDiff: invalid hunk index");
 		if (state.shouldBreak()) break;
+		const deletionBoundary = getHunkSideStartBoundary(hunk.deletionStart, hunk.deletionCount);
+		const additionBoundary = getHunkSideStartBoundary(hunk.additionStart, hunk.additionCount);
+		const deletionStartIndex = !diff.isPartial && hunk.deletionCount === 0 ? deletionBoundary : hunk.deletionLineIndex;
+		const additionStartIndex = !diff.isPartial && hunk.additionCount === 0 ? additionBoundary : hunk.additionLineIndex;
 		const leadingRegion = getExpandedRegion({
 			isPartial: diff.isPartial,
 			rangeSize: hunk.collapsedBefore,
@@ -12690,10 +12701,10 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 		if (!state.shouldSkip(expandedLineCount, expandedLineCount)) {
 			let unifiedLineIndex = hunk.unifiedLineStart - leadingRegion.rangeSize;
 			let splitLineIndex = hunk.splitLineStart - leadingRegion.rangeSize;
-			let deletionLineIndex = hunk.deletionLineIndex - leadingRegion.rangeSize;
-			let additionLineIndex = hunk.additionLineIndex - leadingRegion.rangeSize;
-			let deletionLineNumber = hunk.deletionStart - leadingRegion.rangeSize;
-			let additionLineNumber = hunk.additionStart - leadingRegion.rangeSize;
+			let deletionLineIndex = deletionStartIndex - leadingRegion.rangeSize;
+			let additionLineIndex = additionStartIndex - leadingRegion.rangeSize;
+			let deletionLineNumber = deletionBoundary + 1 - leadingRegion.rangeSize;
+			let additionLineNumber = additionBoundary + 1 - leadingRegion.rangeSize;
 			if (walkContextLines(state, leadingRegion.fromStart, diffStyle, (index) => {
 				return state.emit({
 					hunkIndex,
@@ -12719,10 +12730,10 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 			})) break hunkIterator;
 			unifiedLineIndex = hunk.unifiedLineStart - leadingRegion.fromEnd;
 			splitLineIndex = hunk.splitLineStart - leadingRegion.fromEnd;
-			deletionLineIndex = hunk.deletionLineIndex - leadingRegion.fromEnd;
-			additionLineIndex = hunk.additionLineIndex - leadingRegion.fromEnd;
-			deletionLineNumber = hunk.deletionStart - leadingRegion.fromEnd;
-			additionLineNumber = hunk.additionStart - leadingRegion.fromEnd;
+			deletionLineIndex = deletionStartIndex - leadingRegion.fromEnd;
+			additionLineIndex = additionStartIndex - leadingRegion.fromEnd;
+			deletionLineNumber = deletionBoundary + 1 - leadingRegion.fromEnd;
+			additionLineNumber = additionBoundary + 1 - leadingRegion.fromEnd;
 			if (walkContextLines(state, leadingRegion.fromEnd, diffStyle, (index) => {
 				return state.emit({
 					hunkIndex,
@@ -12754,10 +12765,10 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 		}
 		let unifiedLineIndex = hunk.unifiedLineStart;
 		let splitLineIndex = hunk.splitLineStart;
-		let deletionLineIndex = hunk.deletionLineIndex;
-		let additionLineIndex = hunk.additionLineIndex;
-		let deletionLineNumber = hunk.deletionStart;
-		let additionLineNumber = hunk.additionStart;
+		let deletionLineIndex = deletionStartIndex;
+		let additionLineIndex = additionStartIndex;
+		let deletionLineNumber = deletionBoundary + 1;
+		let additionLineNumber = additionBoundary + 1;
 		const lastContent = hunk.hunkContent.at(-1);
 		for (const content of hunk.hunkContent) {
 			if (state.shouldBreak()) break hunkIterator;
@@ -13366,16 +13377,45 @@ function renderTwoFiles({ deletionFile, additionFile, deletionInfo, additionInfo
 //#region src/utils/computeFileOffsets.ts
 const LINE_FEED = 10;
 const CARRIAGE_RETURN = 13;
+const DENSE_LINE_BREAK_BLOCK_SIZE = 4;
+const DENSE_LINE_BREAK_BLOCK_SPAN = 40;
 /**
 * Computes line start offsets for a string.
 */
 function computeLineOffsets(contents) {
 	const offsets = [0];
-	for (let i = 0; i < contents.length; i++) {
-		const char = contents.charCodeAt(i);
-		if (char === LINE_FEED || char === CARRIAGE_RETURN) {
-			if (char === CARRIAGE_RETURN && i + 1 < contents.length && contents.charCodeAt(i + 1) === LINE_FEED) i++;
-			offsets.push(i + 1);
+	let carriageReturn = contents.indexOf("\r");
+	let lineFeed = contents.indexOf("\n");
+	let blockStart = 0;
+	let blockBreaks = 0;
+	while (carriageReturn !== -1 || lineFeed !== -1) {
+		let nextOffset;
+		if (carriageReturn !== -1 && (lineFeed === -1 || carriageReturn < lineFeed)) if (lineFeed === carriageReturn + 1) {
+			nextOffset = lineFeed + 1;
+			carriageReturn = contents.indexOf("\r", nextOffset);
+			lineFeed = contents.indexOf("\n", nextOffset);
+		} else {
+			nextOffset = carriageReturn + 1;
+			carriageReturn = contents.indexOf("\r", nextOffset);
+		}
+		else {
+			nextOffset = lineFeed + 1;
+			lineFeed = contents.indexOf("\n", nextOffset);
+		}
+		offsets.push(nextOffset);
+		if (++blockBreaks === DENSE_LINE_BREAK_BLOCK_SIZE) {
+			if (nextOffset - blockStart <= DENSE_LINE_BREAK_BLOCK_SPAN) {
+				for (let i = nextOffset; i < contents.length; i++) {
+					const char = contents.charCodeAt(i);
+					if (char === LINE_FEED || char === CARRIAGE_RETURN) {
+						if (char === CARRIAGE_RETURN && i + 1 < contents.length && contents.charCodeAt(i + 1) === LINE_FEED) i++;
+						offsets.push(i + 1);
+					}
+				}
+				return offsets;
+			}
+			blockStart = nextOffset;
+			blockBreaks = 0;
 		}
 	}
 	return offsets;