@pierre/diffs 1.2.1 → 1.2.3

package/dist/components/VirtualizedFileDiff.js

@@ -1,7 +1,10 @@
 import { DEFAULT_COLLAPSED_CONTEXT_THRESHOLD } from "../constants.js";
 import { areObjectsEqual } from "../utils/areObjectsEqual.js";
 import { areOptionsEqual } from "../utils/areOptionsEqual.js";
-import { computeVirtualFileMetrics, getDefaultHunkSeparatorHeight, getVirtualFileHeaderRegion, getVirtualFilePaddingBottom } from "../utils/computeVirtualFileMetrics.js";
+import { computeVirtualFileMetrics, getVirtualFileHeaderRegion, getVirtualFilePaddingBottom } from "../utils/computeVirtualFileMetrics.js";
+import { areDiffTargetsEqual } from "../utils/areDiffTargetsEqual.js";
+import { getExpandedRegion, getLeadingHunkSeparatorLayout, getTrailingHunkSeparatorLayout } from "../utils/virtualDiffLayout.js";
+import { computeEstimatedDiffHeights } from "../utils/computeEstimatedDiffHeights.js";
 import { iterateOverDiff } from "../utils/iterateOverDiff.js";
 import { parseDiffFromFile } from "../utils/parseDiffFromFile.js";
 import { FileDiff } from "./FileDiff.js";
@@ -15,7 +18,10 @@ var VirtualizedFileDiff = class extends FileDiff {
 	height = 0;
 	metrics;
 	cache = {
-		heights: /* @__PURE__ */ new Map(),
+		heightDeltas: /* @__PURE__ */ new Map(),
+		measuredHeightDeltaTotal: 0,
+		estimatedSplitHeight: void 0,
+		estimatedUnifiedHeight: void 0,
 		checkpoints: [],
 		totalLines: 0
 	};
@@ -24,6 +30,7 @@ var VirtualizedFileDiff = class extends FileDiff {
 	virtualizer;
 	layoutDirty = true;
 	forceRenderOverride;
+	currentCollapsed;
 	constructor(options, virtualizer, metrics, workerManager, isContainerManaged = false) {
 		super(options, workerManager, isContainerManaged);
 		this.virtualizer = virtualizer;
@@ -33,31 +40,45 @@ var VirtualizedFileDiff = class extends FileDiff {
 		const nextMetrics = computeVirtualFileMetrics(metrics);
 		if (!force && areObjectsEqual(this.metrics, nextMetrics)) return;
 		this.metrics = nextMetrics;
-		this.resetLayoutCache();
+		this.resetLayoutCache({ includeEstimatedHeights: true });
 	}
 	getLineHeight(lineIndex, hasMetadataLine = false) {
-		const cached = this.cache.heights.get(lineIndex);
-		if (cached != null) return cached;
+		return this.getEstimatedLineHeight(hasMetadataLine) + (this.cache.heightDeltas.get(lineIndex) ?? 0);
+	}
+	getEstimatedLineHeight(hasMetadataLine = false) {
 		const multiplier = hasMetadataLine ? 2 : 1;
 		return this.metrics.lineHeight * multiplier;
 	}
 	setOptions(options) {
+		if (this.isAdvancedMode()) throw new Error("VirtualizedFileDiff.setOptions cannot be used inside CodeView. Update CodeView options instead.");
 		if (options == null) return;
 		const { options: previousOptions } = this;
 		const optionsChanged = !areOptionsEqual(previousOptions, options);
 		const layoutChanged = optionsChanged && hasDiffLayoutOptionChanged(previousOptions, options);
 		super.setOptions(options);
-		if (layoutChanged) this.resetLayoutCache(true);
+		if (layoutChanged) this.resetLayoutCache({
+			forceSimpleRecompute: true,
+			includeEstimatedHeights: hasDiffEstimateOptionChanged(previousOptions, options)
+		});
 		if (optionsChanged) this.forceRenderOverride = true;
 		if (optionsChanged && this.isSimpleMode()) this.virtualizer.instanceChanged(this, layoutChanged);
 	}
-	resetLayoutCache(recompute = false) {
+	setThemeType(themeType) {
+		if (this.isAdvancedMode()) throw new Error("VirtualizedFileDiff.setThemeType cannot be used inside CodeView. Update CodeView options instead.");
+		super.setThemeType(themeType);
+	}
+	resetLayoutCache({ forceSimpleRecompute = false, includeEstimatedHeights = false } = {}) {
 		this.layoutDirty = true;
-		this.cache.heights.clear();
-		this.cache.checkpoints = [];
-		this.cache.totalLines = 0;
-		this.renderRange = void 0;
-		if (recompute && this.isSimpleMode()) this.computeApproximateSize();
+		if (this.cache.heightDeltas.size > 0) this.cache.heightDeltas.clear();
+		if (this.cache.measuredHeightDeltaTotal !== 0) this.cache.measuredHeightDeltaTotal = 0;
+		if (this.cache.checkpoints.length > 0) this.cache.checkpoints.length = 0;
+		if (this.cache.totalLines !== 0) this.cache.totalLines = 0;
+		if (includeEstimatedHeights) {
+			this.cache.estimatedSplitHeight = void 0;
+			this.cache.estimatedUnifiedHeight = void 0;
+		}
+		if (this.renderRange != null) this.renderRange = void 0;
+		if (forceSimpleRecompute && this.isSimpleMode()) this.computeApproximateSize();
 	}
 	reconcileHeights() {
 		let hasHeightChange = false;
@@ -86,11 +107,14 @@ var VirtualizedFileDiff = class extends FileDiff {
 					if ("noNewline" in line.nextElementSibling.dataset) hasMetadata = true;
 					measuredHeight += line.nextElementSibling.getBoundingClientRect().height;
 				}
-				const expectedHeight = this.getLineHeight(lineIndex, hasMetadata);
-				if (measuredHeight === expectedHeight) continue;
+				const estimatedHeight = this.getEstimatedLineHeight(hasMetadata);
+				const previousDelta = this.cache.heightDeltas.get(lineIndex) ?? 0;
+				const nextDelta = measuredHeight - estimatedHeight;
+				if (nextDelta === previousDelta) continue;
 				hasHeightChange = true;
-				if (measuredHeight === this.metrics.lineHeight * (hasMetadata ? 2 : 1)) this.cache.heights.delete(lineIndex);
-				else this.cache.heights.set(lineIndex, measuredHeight);
+				this.cache.measuredHeightDeltaTotal += nextDelta - previousDelta;
+				if (nextDelta === 0) this.cache.heightDeltas.delete(lineIndex);
+				else this.cache.heightDeltas.set(lineIndex, nextDelta);
 			}
 		}
 		if (hasHeightChange || this.isResizeDebuggingEnabled()) this.computeApproximateSize(true);
@@ -101,10 +125,23 @@ var VirtualizedFileDiff = class extends FileDiff {
 		if (dirty) this.top = this.getVirtualizedTop();
 		return this.render();
 	};
-	prepareVirtualizedItem(fileDiff) {
-		if (this.fileDiff !== fileDiff) this.resetLayoutCache();
+	prepareCodeViewItem(fileDiff, top, reset) {
+		const targetChanged = !areDiffTargetsEqual(this.fileDiff, fileDiff);
+		let shouldResetLayoutCache = reset?.resetDiffLayoutCache === true || targetChanged;
+		let includeEstimatedHeights = targetChanged || reset?.resetDiffLayoutCache === true && reset.includeEstimatedDiffHeights;
+		if (reset?.metrics != null) {
+			this.metrics = computeVirtualFileMetrics(reset.metrics);
+			shouldResetLayoutCache = true;
+			includeEstimatedHeights = true;
+		}
+		const { collapsed = false } = this.options;
+		if (this.currentCollapsed !== collapsed) {
+			this.currentCollapsed = collapsed;
+			shouldResetLayoutCache = true;
+		}
+		if (shouldResetLayoutCache) this.resetLayoutCache({ includeEstimatedHeights });
 		this.fileDiff = fileDiff;
-		this.top = this.getVirtualizedTop();
+		this.top = top;
 		this.computeApproximateSize();
 		return this.height;
 	}
@@ -115,9 +152,8 @@ var VirtualizedFileDiff = class extends FileDiff {
 		const { disableFileHeader = false, expandUnchanged = false, collapsed = false, collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD } = this.options;
 		const diffStyle = this.getDiffStyle();
 		const hunkSeparators = this.getHunkSeparatorType();
-		const hunkSeparatorHeight = this.getHunkSeparatorHeight(hunkSeparators);
-		const separatorGap = this.getSeparatorGap(hunkSeparators);
 		const targetLineIndex = diffStyle === "split" ? targetLineIndexes[1] : targetLineIndexes[0];
+		this.approximateLayoutCheckpoints();
 		const checkpoint = this.getLayoutCheckpointBeforeLineIndex(targetLineIndex);
 		let top = checkpoint?.top ?? getVirtualFileHeaderRegion(this.metrics, disableFileHeader);
 		if (collapsed) return {
@@ -134,16 +170,24 @@ var VirtualizedFileDiff = class extends FileDiff {
 			callback: ({ hunkIndex, hunk, collapsedBefore, collapsedAfter, deletionLine, additionLine }) => {
 				const lineIndex = diffStyle === "split" ? additionLine?.splitLineIndex ?? deletionLine?.splitLineIndex : additionLine?.unifiedLineIndex ?? deletionLine?.unifiedLineIndex;
 				if (lineIndex == null) throw new Error("VirtualizedFileDiff.getLinePosition: missing line index data");
-				if (collapsedBefore > 0 && this.hasLeadingHunkSeparator(hunkIndex, hunk?.hunkSpecs, hunkSeparators)) {
-					if (hunkIndex > 0) top += separatorGap;
-					if (targetLineIndex >= lineIndex - collapsedBefore && targetLineIndex < lineIndex) {
-						position = {
-							top,
-							height: hunkSeparatorHeight
-						};
-						return true;
+				if (collapsedBefore > 0) {
+					const separator = getLeadingHunkSeparatorLayout({
+						type: hunkSeparators,
+						metrics: this.metrics,
+						hunkIndex,
+						hunkSpecs: hunk?.hunkSpecs
+					});
+					if (separator != null) {
+						top += separator.gapBefore;
+						if (targetLineIndex >= lineIndex - collapsedBefore && targetLineIndex < lineIndex) {
+							position = {
+								top,
+								height: separator.height
+							};
+							return true;
+						}
+						top += separator.height + separator.gapAfter;
 					}
-					top += hunkSeparatorHeight + separatorGap;
 				}
 				const lineHeight = this.getLineHeight(lineIndex, (additionLine?.noEOFCR ?? false) || (deletionLine?.noEOFCR ?? false));
 				if (lineIndex === targetLineIndex) {
@@ -154,15 +198,21 @@ var VirtualizedFileDiff = class extends FileDiff {
 					return true;
 				}
 				top += lineHeight;
-				if (collapsedAfter > 0 && this.hasTrailingHunkSeparator(hunkSeparators)) {
-					if (targetLineIndex > lineIndex && targetLineIndex <= lineIndex + collapsedAfter) {
-						position = {
-							top: top + separatorGap,
-							height: hunkSeparatorHeight
-						};
-						return true;
+				if (collapsedAfter > 0) {
+					const separator = getTrailingHunkSeparatorLayout({
+						type: hunkSeparators,
+						metrics: this.metrics
+					});
+					if (separator != null) {
+						if (targetLineIndex > lineIndex && targetLineIndex <= lineIndex + collapsedAfter) {
+							position = {
+								top: top + separator.gapBefore,
+								height: separator.height
+							};
+							return true;
+						}
+						top += separator.totalHeight;
 					}
-					top += separatorGap + hunkSeparatorHeight;
 				}
 				return false;
 			}
@@ -175,8 +225,7 @@ var VirtualizedFileDiff = class extends FileDiff {
 		if (collapsed) return;
 		const diffStyle = this.getDiffStyle();
 		const hunkSeparators = this.getHunkSeparatorType();
-		const hunkSeparatorHeight = this.getHunkSeparatorHeight(hunkSeparators);
-		const separatorGap = this.getSeparatorGap(hunkSeparators);
+		this.approximateLayoutCheckpoints();
 		const checkpoint = this.getLayoutCheckpointBeforeTop(localViewportTop);
 		let top = checkpoint?.top ?? getVirtualFileHeaderRegion(this.metrics, disableFileHeader);
 		let anchor;
@@ -189,9 +238,14 @@ var VirtualizedFileDiff = class extends FileDiff {
 			callback: ({ hunkIndex, hunk, collapsedBefore, collapsedAfter, deletionLine, additionLine }) => {
 				const lineIndex = diffStyle === "split" ? additionLine?.splitLineIndex ?? deletionLine?.splitLineIndex : additionLine?.unifiedLineIndex ?? deletionLine?.unifiedLineIndex;
 				if (lineIndex == null) throw new Error("VirtualizedFileDiff.getNumericScrollAnchor: missing line index data");
-				if (collapsedBefore > 0 && this.hasLeadingHunkSeparator(hunkIndex, hunk?.hunkSpecs, hunkSeparators)) {
-					if (hunkIndex > 0) top += separatorGap;
-					top += hunkSeparatorHeight + separatorGap;
+				if (collapsedBefore > 0) {
+					const separator = getLeadingHunkSeparatorLayout({
+						type: hunkSeparators,
+						metrics: this.metrics,
+						hunkIndex,
+						hunkSpecs: hunk?.hunkSpecs
+					});
+					if (separator != null) top += separator.totalHeight;
 				}
 				if (top >= localViewportTop) {
 					if (deletionLine != null) anchor = {
@@ -208,7 +262,13 @@ var VirtualizedFileDiff = class extends FileDiff {
 				}
 				const lineHeight = this.getLineHeight(lineIndex, (additionLine?.noEOFCR ?? false) || (deletionLine?.noEOFCR ?? false));
 				top += lineHeight;
-				if (collapsedAfter > 0 && this.hasTrailingHunkSeparator(hunkSeparators)) top += separatorGap + hunkSeparatorHeight;
+				if (collapsedAfter > 0) {
+					const separator = getTrailingHunkSeparatorLayout({
+						type: hunkSeparators,
+						metrics: this.metrics
+					});
+					if (separator != null) top += separator.totalHeight;
+				}
 				return false;
 			}
 		});
@@ -233,15 +293,14 @@ var VirtualizedFileDiff = class extends FileDiff {
 	}
 	cleanUp(recycle = false) {
 		if (this.fileContainer != null && this.isSimpleMode()) this.getSimpleVirtualizer()?.disconnect(this.fileContainer);
-		if (!recycle) this.resetLayoutCache();
+		if (!recycle) this.resetLayoutCache({ includeEstimatedHeights: true });
 		this.isSetup = false;
 		super.cleanUp(recycle);
 	}
 	expandHunk = (hunkIndex, direction, expansionLineCountOverride) => {
 		this.hunksRenderer.expandHunk(hunkIndex, direction, expansionLineCountOverride);
-		this.layoutDirty = true;
+		this.resetLayoutCache({ includeEstimatedHeights: true });
 		this.computeApproximateSize();
-		this.renderRange = void 0;
 		this.virtualizer.instanceChanged(this, true);
 	};
 	setVisibility(visible) {
@@ -271,52 +330,53 @@ var VirtualizedFileDiff = class extends FileDiff {
 			this.layoutDirty = false;
 			return;
 		}
-		const { disableFileHeader = false, expandUnchanged = false, collapsed = false, collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD } = this.options;
-		const diffStyle = this.getDiffStyle();
-		const hunkSeparators = this.getHunkSeparatorType();
-		const hunkSeparatorHeight = this.getHunkSeparatorHeight(hunkSeparators);
-		const separatorGap = this.getSeparatorGap(hunkSeparators);
+		const { disableFileHeader = false, collapsed = false } = this.options;
 		const headerRegion = getVirtualFileHeaderRegion(this.metrics, disableFileHeader);
-		const paddingBottom = getVirtualFilePaddingBottom(this.metrics);
 		this.height += headerRegion;
 		if (collapsed) {
 			this.layoutDirty = false;
 			return;
 		}
-		let renderedLineIndex = 0;
-		iterateOverDiff({
-			diff: this.fileDiff,
-			diffStyle,
-			expandedHunks: expandUnchanged ? true : this.hunksRenderer.getExpandedHunksMap(),
-			collapsedContextThreshold,
-			callback: ({ hunkIndex, hunk, collapsedBefore, collapsedAfter, deletionLine, additionLine }) => {
-				const splitLineIndex = additionLine != null ? additionLine.splitLineIndex : deletionLine.splitLineIndex;
-				const unifiedLineIndex = additionLine != null ? additionLine.unifiedLineIndex : deletionLine.unifiedLineIndex;
-				const hasMetadata = (additionLine?.noEOFCR ?? false) || (deletionLine?.noEOFCR ?? false);
-				const lineIndex = diffStyle === "split" ? splitLineIndex : unifiedLineIndex;
-				this.addLayoutCheckpoint(renderedLineIndex, lineIndex, this.height);
-				if (collapsedBefore > 0 && this.hasLeadingHunkSeparator(hunkIndex, hunk?.hunkSpecs, hunkSeparators)) {
-					if (hunkIndex > 0) this.height += separatorGap;
-					this.height += hunkSeparatorHeight + separatorGap;
-				}
-				this.height += this.getLineHeight(lineIndex, hasMetadata);
-				if (collapsedAfter > 0 && this.hasTrailingHunkSeparator(hunkSeparators)) this.height += separatorGap + hunkSeparatorHeight;
-				renderedLineIndex++;
-			}
-		});
-		this.cache.totalLines = renderedLineIndex;
-		if (this.fileDiff.hunks.length > 0) this.height += paddingBottom;
-		if (this.fileContainer != null && shouldValidateSize && !isFirstCompute) {
-			const rect = this.fileContainer.getBoundingClientRect();
-			if (rect.height !== this.height) console.log("VirtualizedFileDiff.computeApproximateSize: computed height doesnt match", {
-				name: this.fileDiff.name,
-				elementHeight: rect.height,
-				computedHeight: this.height
-			});
-			else console.log("VirtualizedFileDiff.computeApproximateSize: computed height IS CORRECT");
-		}
+		this.height = this.getActiveEstimatedHeight() + this.cache.measuredHeightDeltaTotal;
+		if (shouldValidateSize && !isFirstCompute) this.validateComputedHeight();
 		this.layoutDirty = false;
 	}
+	getActiveEstimatedHeight() {
+		this.ensureEstimatedDiffHeights();
+		const estimatedHeight = this.getDiffStyle() === "split" ? this.cache.estimatedSplitHeight : this.cache.estimatedUnifiedHeight;
+		if (estimatedHeight == null) throw new Error("VirtualizedFileDiff.getActiveEstimatedHeight: missing estimated height");
+		return estimatedHeight;
+	}
+	ensureEstimatedDiffHeights() {
+		if (this.fileDiff == null) {
+			this.cache.estimatedSplitHeight = void 0;
+			this.cache.estimatedUnifiedHeight = void 0;
+			return;
+		}
+		if (this.cache.estimatedSplitHeight != null && this.cache.estimatedUnifiedHeight != null) return;
+		const { disableFileHeader = false, expandUnchanged = false, collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD } = this.options;
+		const { splitHeight, unifiedHeight } = computeEstimatedDiffHeights({
+			fileDiff: this.fileDiff,
+			metrics: this.metrics,
+			disableFileHeader,
+			hunkSeparators: this.getHunkSeparatorType(),
+			expandUnchanged,
+			expandedHunks: this.hunksRenderer.getExpandedHunksMap(),
+			collapsedContextThreshold
+		});
+		this.cache.estimatedSplitHeight = splitHeight;
+		this.cache.estimatedUnifiedHeight = unifiedHeight;
+	}
+	validateComputedHeight() {
+		if (this.fileContainer == null || this.fileDiff == null) return;
+		const rect = this.fileContainer.getBoundingClientRect();
+		if (rect.height !== this.height) console.log("VirtualizedFileDiff.computeApproximateSize: computed height doesnt match", {
+			name: this.fileDiff.name,
+			elementHeight: rect.height,
+			computedHeight: this.height
+		});
+		else console.log("VirtualizedFileDiff.computeApproximateSize: computed height IS CORRECT");
+	}
 	render({ fileContainer, oldFile, newFile, fileDiff, forceRender = false,...props } = {}) {
 		const { forceRenderOverride, isSetup } = this;
 		this.forceRenderOverride = void 0;
@@ -380,31 +440,92 @@ var VirtualizedFileDiff = class extends FileDiff {
 	getHunkSeparatorType() {
 		return getOptionHunkSeparatorType(this.options.hunkSeparators);
 	}
-	getHunkSeparatorHeight(type = this.getHunkSeparatorType()) {
-		return this.metrics.hunkSeparatorHeight ?? getDefaultHunkSeparatorHeight(type);
-	}
-	getSeparatorGap(type = this.getHunkSeparatorType()) {
-		return type === "simple" || type === "metadata" || type === "line-info-basic" ? 0 : this.metrics.spacing;
-	}
-	hasLeadingHunkSeparator(hunkIndex, hunkSpecs, type = this.getHunkSeparatorType()) {
-		switch (type) {
-			case "simple": return hunkIndex > 0;
-			case "metadata": return hunkSpecs != null;
-			case "line-info":
-			case "line-info-basic":
-			case "custom": return true;
+	approximateLayoutCheckpoints() {
+		if (this.cache.checkpoints.length > 0 || this.fileDiff == null || this.fileDiff.hunks.length === 0 || this.options.collapsed === true) return;
+		const { disableFileHeader = false, expandUnchanged = false, collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD } = this.options;
+		const diffStyle = this.getDiffStyle();
+		const hunkSeparators = this.getHunkSeparatorType();
+		const expandedHunks = expandUnchanged ? true : this.hunksRenderer.getExpandedHunksMap();
+		const heightDeltaPrefix = createHeightDeltaPrefix(this.cache.heightDeltas);
+		let top = getVirtualFileHeaderRegion(this.metrics, disableFileHeader);
+		let renderedLineIndex = 0;
+		const processRows = ({ rowCount, startLineIndex, preSeparatorHeight = 0, postSeparatorHeight = 0, metadataOffsets = [] }) => {
+			if (rowCount <= 0) return;
+			const blockStart = renderedLineIndex;
+			const blockEnd = renderedLineIndex + rowCount;
+			let nextCheckpoint = getNextCheckpointIndex(blockStart);
+			while (nextCheckpoint < blockEnd) {
+				const offset = nextCheckpoint - blockStart;
+				const checkpointTop = top + (offset > 0 ? preSeparatorHeight : 0) + offset * this.metrics.lineHeight + countMetadataOffsetsBefore(metadataOffsets, offset) * this.metrics.lineHeight + sumHeightDeltas(heightDeltaPrefix, startLineIndex, startLineIndex + offset);
+				this.cache.checkpoints.push({
+					renderedLineIndex: nextCheckpoint,
+					lineIndex: startLineIndex + offset,
+					top: checkpointTop
+				});
+				nextCheckpoint += LAYOUT_CHECKPOINT_INTERVAL;
+			}
+			top += preSeparatorHeight + rowCount * this.metrics.lineHeight + metadataOffsets.length * this.metrics.lineHeight + sumHeightDeltas(heightDeltaPrefix, startLineIndex, startLineIndex + rowCount) + postSeparatorHeight;
+			renderedLineIndex = blockEnd;
+		};
+		for (let hunkIndex = 0; hunkIndex < this.fileDiff.hunks.length; hunkIndex++) {
+			const hunk = this.fileDiff.hunks[hunkIndex];
+			if (hunk == null) throw new Error("VirtualizedFileDiff.approximateLayoutCheckpoints: invalid hunk index");
+			const leadingRegion = getExpandedRegion({
+				isPartial: this.fileDiff.isPartial,
+				rangeSize: hunk.collapsedBefore,
+				expandedHunks,
+				hunkIndex,
+				collapsedContextThreshold
+			});
+			const leadingSeparatorHeight = leadingRegion.collapsedLines > 0 ? getLeadingHunkSeparatorLayout({
+				type: hunkSeparators,
+				metrics: this.metrics,
+				hunkIndex,
+				hunkSpecs: hunk.hunkSpecs
+			})?.totalHeight ?? 0 : 0;
+			processRows({
+				rowCount: leadingRegion.fromStart,
+				startLineIndex: (diffStyle === "split" ? hunk.splitLineStart : hunk.unifiedLineStart) - leadingRegion.rangeSize
+			});
+			let pendingLeadingSeparatorHeight = leadingSeparatorHeight;
+			processRows({
+				rowCount: leadingRegion.fromEnd,
+				startLineIndex: (diffStyle === "split" ? hunk.splitLineStart : hunk.unifiedLineStart) - leadingRegion.fromEnd,
+				preSeparatorHeight: pendingLeadingSeparatorHeight
+			});
+			if (leadingRegion.fromEnd > 0) pendingLeadingSeparatorHeight = 0;
+			const trailingRegion = getTrailingExpandedRegion({
+				fileDiff: this.fileDiff,
+				hunk,
+				hunkIndex,
+				expandedHunks,
+				collapsedContextThreshold
+			});
+			const trailingSeparatorHeight = trailingRegion != null && trailingRegion.collapsedLines > 0 ? getTrailingHunkSeparatorLayout({
+				type: hunkSeparators,
+				metrics: this.metrics
+			})?.totalHeight ?? 0 : 0;
+			const trailingExpandedCount = trailingRegion != null ? trailingRegion.fromStart + trailingRegion.fromEnd : 0;
+			const hunkBodyRowCount = diffStyle === "split" ? hunk.splitLineCount : hunk.unifiedLineCount;
+			const hunkBodyStartLineIndex = diffStyle === "split" ? hunk.splitLineStart : hunk.unifiedLineStart;
+			processRows({
+				rowCount: hunkBodyRowCount,
+				startLineIndex: hunkBodyStartLineIndex,
+				preSeparatorHeight: pendingLeadingSeparatorHeight,
+				postSeparatorHeight: trailingExpandedCount === 0 ? trailingSeparatorHeight : 0,
+				metadataOffsets: getHunkMetadataOffsets({
+					diffStyle,
+					hunk,
+					rowCount: hunkBodyRowCount
+				})
+			});
+			if (trailingRegion != null && trailingExpandedCount > 0) processRows({
+				rowCount: trailingExpandedCount,
+				startLineIndex: hunkBodyStartLineIndex + hunkBodyRowCount,
+				postSeparatorHeight: trailingSeparatorHeight
+			});
 		}
-	}
-	hasTrailingHunkSeparator(type = this.getHunkSeparatorType()) {
-		return type !== "simple" && type !== "metadata";
-	}
-	addLayoutCheckpoint(renderedLineIndex, lineIndex, top) {
-		if (renderedLineIndex % LAYOUT_CHECKPOINT_INTERVAL !== 0) return;
-		this.cache.checkpoints.push({
-			renderedLineIndex,
-			lineIndex,
-			top
-		});
+		this.cache.totalLines = renderedLineIndex;
 	}
 	getLayoutCheckpointBeforeLineIndex(lineIndex) {
 		if (lineIndex <= 0 || this.cache.checkpoints.length === 0) return;
@@ -442,43 +563,25 @@ var VirtualizedFileDiff = class extends FileDiff {
 			if (checkpoint.renderedLineIndex % hunkLineCount === 0) return checkpoint;
 		}
 	}
-	getExpandedRegion(isPartial, hunkIndex, rangeSize) {
-		if (rangeSize <= 0 || isPartial) return {
-			fromStart: 0,
-			fromEnd: 0,
-			collapsedLines: Math.max(rangeSize, 0),
-			renderAll: false
-		};
-		const { expandUnchanged = false, collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD } = this.options;
-		if (expandUnchanged || rangeSize <= collapsedContextThreshold) return {
-			fromStart: rangeSize,
-			fromEnd: 0,
-			collapsedLines: 0,
-			renderAll: true
-		};
-		const region = this.hunksRenderer.getExpandedHunk(hunkIndex);
-		const fromStart = Math.min(Math.max(region.fromStart, 0), rangeSize);
-		const fromEnd = Math.min(Math.max(region.fromEnd, 0), rangeSize);
-		const expandedCount = fromStart + fromEnd;
-		const renderAll = expandedCount >= rangeSize;
-		return {
-			fromStart,
-			fromEnd,
-			collapsedLines: Math.max(rangeSize - expandedCount, 0),
-			renderAll
-		};
-	}
 	getExpandedLineCount(fileDiff, diffStyle) {
 		let count = 0;
 		if (fileDiff.isPartial) {
 			for (const hunk of fileDiff.hunks) count += diffStyle === "split" ? hunk.splitLineCount : hunk.unifiedLineCount;
 			return count;
 		}
+		const { expandUnchanged = false, collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD } = this.options;
+		const expandedHunks = expandUnchanged ? true : this.hunksRenderer.getExpandedHunksMap();
 		for (const [hunkIndex, hunk] of fileDiff.hunks.entries()) {
 			const hunkCount = diffStyle === "split" ? hunk.splitLineCount : hunk.unifiedLineCount;
 			count += hunkCount;
 			const collapsedBefore = Math.max(hunk.collapsedBefore, 0);
-			const { fromStart, fromEnd, renderAll } = this.getExpandedRegion(fileDiff.isPartial, hunkIndex, collapsedBefore);
+			const { fromStart, fromEnd, renderAll } = getExpandedRegion({
+				isPartial: fileDiff.isPartial,
+				rangeSize: collapsedBefore,
+				expandedHunks,
+				hunkIndex,
+				collapsedContextThreshold
+			});
 			if (collapsedBefore > 0) count += renderAll ? collapsedBefore : fromStart + fromEnd;
 		}
 		const lastHunk = fileDiff.hunks.at(-1);
@@ -488,7 +591,13 @@ var VirtualizedFileDiff = class extends FileDiff {
 			if (lastHunk != null && additionRemaining !== deletionRemaining) throw new Error(`VirtualizedFileDiff: trailing context mismatch (additions=${additionRemaining}, deletions=${deletionRemaining}) for ${fileDiff.name}`);
 			const trailingRangeSize = Math.min(additionRemaining, deletionRemaining);
 			if (lastHunk != null && trailingRangeSize > 0) {
-				const { fromStart, renderAll } = this.getExpandedRegion(fileDiff.isPartial, fileDiff.hunks.length, trailingRangeSize);
+				const { fromStart, renderAll } = getExpandedRegion({
+					isPartial: fileDiff.isPartial,
+					rangeSize: trailingRangeSize,
+					expandedHunks,
+					hunkIndex: fileDiff.hunks.length,
+					collapsedContextThreshold
+				});
 				count += renderAll ? trailingRangeSize : fromStart;
 			}
 		}
@@ -499,9 +608,8 @@ var VirtualizedFileDiff = class extends FileDiff {
 		const { hunkLineCount, lineHeight } = this.metrics;
 		const diffStyle = this.getDiffStyle();
 		const hunkSeparators = this.getHunkSeparatorType();
-		const hunkSeparatorHeight = this.getHunkSeparatorHeight(hunkSeparators);
 		const fileHeight = this.height;
-		const lineCount = this.cache.totalLines > 0 ? this.cache.totalLines : this.getExpandedLineCount(fileDiff, diffStyle);
+		let lineCount = this.cache.totalLines > 0 ? this.cache.totalLines : this.getExpandedLineCount(fileDiff, diffStyle);
 		const headerRegion = getVirtualFileHeaderRegion(this.metrics, disableFileHeader);
 		const paddingBottom = fileDiff.hunks.length > 0 ? getVirtualFilePaddingBottom(this.metrics) : 0;
 		if (fileTop < top - fileHeight || fileTop > bottom) return {
@@ -516,13 +624,14 @@ var VirtualizedFileDiff = class extends FileDiff {
 			bufferBefore: 0,
 			bufferAfter: 0
 		};
+		this.approximateLayoutCheckpoints();
+		lineCount = this.cache.totalLines > 0 ? this.cache.totalLines : lineCount;
 		const estimatedTargetLines = Math.ceil(Math.max(bottom - top, 0) / lineHeight);
 		const totalLines = Math.ceil(estimatedTargetLines / hunkLineCount) * hunkLineCount + hunkLineCount;
 		const totalHunks = totalLines / hunkLineCount;
 		const overflowHunks = totalHunks;
 		const hunkOffsets = [];
 		const viewportCenter = (top + bottom) / 2;
-		const separatorGap = this.getSeparatorGap(hunkSeparators);
 		const checkpoint = this.getLayoutCheckpointBeforeTop(Math.max(0, top - fileTop - totalLines * lineHeight * 2), hunkLineCount);
 		let absoluteLineTop = fileTop + (checkpoint?.top ?? headerRegion);
 		let currentLine = checkpoint?.renderedLineIndex ?? 0;
@@ -539,7 +648,12 @@ var VirtualizedFileDiff = class extends FileDiff {
 				const splitLineIndex = additionLine != null ? additionLine.splitLineIndex : deletionLine.splitLineIndex;
 				const unifiedLineIndex = additionLine != null ? additionLine.unifiedLineIndex : deletionLine.unifiedLineIndex;
 				const hasMetadata = (additionLine?.noEOFCR ?? false) || (deletionLine?.noEOFCR ?? false);
-				const gapAdjustment = collapsedBefore > 0 && this.hasLeadingHunkSeparator(hunkIndex, hunk?.hunkSpecs, hunkSeparators) ? hunkSeparatorHeight + separatorGap + (hunkIndex > 0 ? separatorGap : 0) : 0;
+				const gapAdjustment = (collapsedBefore > 0 ? getLeadingHunkSeparatorLayout({
+					type: hunkSeparators,
+					metrics: this.metrics,
+					hunkIndex,
+					hunkSpecs: hunk?.hunkSpecs
+				}) : void 0)?.totalHeight ?? 0;
 				absoluteLineTop += gapAdjustment;
 				const isAtHunkBoundary = currentLine % hunkLineCount === 0;
 				const currentHunk = Math.floor(currentLine / hunkLineCount);
@@ -556,7 +670,10 @@ var VirtualizedFileDiff = class extends FileDiff {
 				if (overflowCounter == null && absoluteLineTop >= bottom && isAtHunkBoundary) overflowCounter = overflowHunks;
 				currentLine++;
 				absoluteLineTop += lineHeight$1;
-				if (collapsedAfter > 0 && this.hasTrailingHunkSeparator(hunkSeparators)) absoluteLineTop += hunkSeparatorHeight + separatorGap;
+				if (collapsedAfter > 0) absoluteLineTop += getTrailingHunkSeparatorLayout({
+					type: hunkSeparators,
+					metrics: this.metrics
+				})?.totalHeight ?? 0;
 				return false;
 			}
 		});
@@ -582,9 +699,79 @@ var VirtualizedFileDiff = class extends FileDiff {
 		};
 	}
 };
+function createHeightDeltaPrefix(heightDeltas) {
+	const entries = Array.from(heightDeltas).sort((a, b) => a[0] - b[0]);
+	const lineIndexes = [];
+	const prefixTotals = [0];
+	let total = 0;
+	for (const [lineIndex, delta] of entries) {
+		lineIndexes.push(lineIndex);
+		total += delta;
+		prefixTotals.push(total);
+	}
+	return {
+		lineIndexes,
+		prefixTotals
+	};
+}
+function sumHeightDeltas({ lineIndexes, prefixTotals }, startLineIndex, endLineIndex) {
+	if (startLineIndex >= endLineIndex || lineIndexes.length === 0) return 0;
+	const start = lowerBound(lineIndexes, startLineIndex);
+	return (prefixTotals[lowerBound(lineIndexes, endLineIndex)] ?? 0) - (prefixTotals[start] ?? 0);
+}
+function lowerBound(values, target) {
+	let low = 0;
+	let high = values.length;
+	while (low < high) {
+		const mid = low + high >> 1;
+		const value = values[mid];
+		if (value == null) throw new Error("VirtualizedFileDiff: invalid prefix index");
+		if (value < target) low = mid + 1;
+		else high = mid;
+	}
+	return low;
+}
+function getNextCheckpointIndex(renderedLineIndex) {
+	return Math.ceil(renderedLineIndex / LAYOUT_CHECKPOINT_INTERVAL) * LAYOUT_CHECKPOINT_INTERVAL;
+}
+function countMetadataOffsetsBefore(metadataOffsets, offset) {
+	let count = 0;
+	for (const metadataOffset of metadataOffsets) if (metadataOffset < offset) count++;
+	return count;
+}
+function getHunkMetadataOffsets({ diffStyle, hunk, rowCount }) {
+	if (rowCount <= 0 || !hunk.noEOFCRAdditions && !hunk.noEOFCRDeletions) return [];
+	const lastContent = hunk.hunkContent.at(-1);
+	if (lastContent == null) return [];
+	if (lastContent.type === "context") return [rowCount - 1];
+	const splitCount = Math.max(lastContent.deletions, lastContent.additions);
+	const unifiedCount = lastContent.deletions + lastContent.additions;
+	if (diffStyle === "split") return splitCount > 0 && (hunk.noEOFCRAdditions || hunk.noEOFCRDeletions) ? [rowCount - 1] : [];
+	const offsets = [];
+	const contentStartOffset = rowCount - unifiedCount;
+	if (lastContent.deletions > 0 && hunk.noEOFCRDeletions) offsets.push(contentStartOffset + lastContent.deletions - 1);
+	if (lastContent.additions > 0 && hunk.noEOFCRAdditions) offsets.push(rowCount - 1);
+	return offsets;
+}
+function getTrailingExpandedRegion({ fileDiff, hunk, hunkIndex, expandedHunks, collapsedContextThreshold }) {
+	if (hunkIndex !== fileDiff.hunks.length - 1 || !hasFinalHunk(fileDiff)) return;
+	const additionRemaining = fileDiff.additionLines.length - (hunk.additionLineIndex + hunk.additionCount);
+	const deletionRemaining = fileDiff.deletionLines.length - (hunk.deletionLineIndex + hunk.deletionCount);
+	if (additionRemaining !== deletionRemaining) throw new Error(`VirtualizedFileDiff: trailing context mismatch (additions=${additionRemaining}, deletions=${deletionRemaining}) for ${fileDiff.name}`);
+	return getExpandedRegion({
+		isPartial: fileDiff.isPartial,
+		rangeSize: Math.min(additionRemaining, deletionRemaining),
+		expandedHunks,
+		hunkIndex: fileDiff.hunks.length,
+		collapsedContextThreshold
+	});
+}
 function hasDiffLayoutOptionChanged(previousOptions, nextOptions) {
 	return (previousOptions.diffStyle ?? "split") !== (nextOptions.diffStyle ?? "split") || (previousOptions.overflow ?? "scroll") !== (nextOptions.overflow ?? "scroll") || (previousOptions.collapsed ?? false) !== (nextOptions.collapsed ?? false) || (previousOptions.disableLineNumbers ?? false) !== (nextOptions.disableLineNumbers ?? false) || (previousOptions.disableFileHeader ?? false) !== (nextOptions.disableFileHeader ?? false) || (previousOptions.diffIndicators ?? "bars") !== (nextOptions.diffIndicators ?? "bars") || (previousOptions.hunkSeparators ?? "line-info") !== (nextOptions.hunkSeparators ?? "line-info") || (previousOptions.expandUnchanged ?? false) !== (nextOptions.expandUnchanged ?? false) || (previousOptions.collapsedContextThreshold ?? DEFAULT_COLLAPSED_CONTEXT_THRESHOLD) !== (nextOptions.collapsedContextThreshold ?? DEFAULT_COLLAPSED_CONTEXT_THRESHOLD) || previousOptions.unsafeCSS !== nextOptions.unsafeCSS;
 }
+function hasDiffEstimateOptionChanged(previousOptions, nextOptions) {
+	return (previousOptions.disableFileHeader ?? false) !== (nextOptions.disableFileHeader ?? false) || (previousOptions.hunkSeparators ?? "line-info") !== (nextOptions.hunkSeparators ?? "line-info") || (previousOptions.expandUnchanged ?? false) !== (nextOptions.expandUnchanged ?? false) || (previousOptions.collapsedContextThreshold ?? DEFAULT_COLLAPSED_CONTEXT_THRESHOLD) !== (nextOptions.collapsedContextThreshold ?? DEFAULT_COLLAPSED_CONTEXT_THRESHOLD);
+}
 function getOptionHunkSeparatorType(hunkSeparators) {
 	return typeof hunkSeparators === "function" ? "custom" : hunkSeparators ?? "line-info";
 }