@pierre/diffs 1.3.0-beta.5 → 1.3.0-beta.7

package/dist/components/VirtualizedFileDiff.js

@@ -1,15 +1,18 @@
-import { DEFAULT_COLLAPSED_CONTEXT_THRESHOLD } from "../constants.js";
+import "../constants.js";
 import { areObjectsEqual } from "../utils/areObjectsEqual.js";
 import { areOptionsEqual } from "../utils/areOptionsEqual.js";
+import { areFilesEqual } from "../utils/areFilesEqual.js";
 import { computeVirtualFileMetrics, getVirtualFileHeaderRegion, getVirtualFilePaddingBottom } from "../utils/computeVirtualFileMetrics.js";
-import { FILE_ANNOTATION_DOM_KEY, FILE_ANNOTATION_LINE_NUMBER, includesFileAnnotations, shouldRenderFileAnnotations } from "../utils/includesFileAnnotations.js";
+import { FILE_ANNOTATION_DOM_KEY, includesFileAnnotations, shouldRenderFileAnnotations } from "../utils/includesFileAnnotations.js";
 import { areDiffTargetsEqual } from "../utils/areDiffTargetsEqual.js";
+import { awaitWithTimeout } from "../utils/awaitWithTimeout.js";
 import { getExpandedRegion, getLeadingHunkSeparatorLayout, getTrailingExpandedRegion, getTrailingHunkSeparatorLayout } from "../utils/virtualDiffLayout.js";
 import { computeEstimatedDiffHeights } from "../utils/computeEstimatedDiffHeights.js";
+import { getDiffFileInput } from "../utils/getDiffFileInput.js";
+import { hydratePartialDiff } from "../utils/hydratePartialDiff.js";
 import { iterateOverDiff } from "../utils/iterateOverDiff.js";
 import { parseDiffFromFile } from "../utils/parseDiffFromFile.js";
 import { FileDiff } from "./FileDiff.js";
-
 //#region src/components/VirtualizedFileDiff.ts
 const LAYOUT_CHECKPOINT_INTERVAL = 5e3;
 let instanceId = -1;
@@ -33,6 +36,8 @@ var VirtualizedFileDiff = class extends FileDiff {
 	layoutDirty = true;
 	forceRenderOverride;
 	currentCollapsed;
+	pendingHydratedDiff;
+	pendingExpansions;
 	constructor(options, virtualizer, metrics, workerManager, isContainerManaged = false) {
 		super(options, workerManager, isContainerManaged);
 		this.virtualizer = virtualizer;
@@ -62,7 +67,7 @@ var VirtualizedFileDiff = class extends FileDiff {
 	hasFileAnnotations(fileDiff = this.fileDiff) {
 		if (fileDiff == null || !includesFileAnnotations(this.lineAnnotations)) return false;
 		return this.lineAnnotations.some((annotation) => {
-			if (annotation.lineNumber !== FILE_ANNOTATION_LINE_NUMBER) return false;
+			if (annotation.lineNumber !== 0) return false;
 			if (fileDiff.type === "new") return annotation.side === "additions";
 			if (fileDiff.type === "deleted") return annotation.side === "deletions";
 			return true;
@@ -93,19 +98,23 @@ var VirtualizedFileDiff = class extends FileDiff {
 		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 } = {}) {
+	resetLayoutCache({ forceSimpleRecompute = false, includeEstimatedHeights = false, resetRenderRange = true } = {}) {
 		this.layoutDirty = true;
 		this.cache.fileAnnotationHeight = 0;
 		if (this.cache.heightDeltas.size > 0) this.cache.heightDeltas.clear();
 		if (this.cache.measuredHeightDeltaTotal !== 0) this.cache.measuredHeightDeltaTotal = 0;
+		this.invalidateDerivedLayoutCache(includeEstimatedHeights, resetRenderRange);
+		if (forceSimpleRecompute && this.isSimpleMode()) this.computeApproximateSize();
+	}
+	invalidateDerivedLayoutCache(includeEstimatedHeights, resetRenderRange = true) {
+		this.layoutDirty = true;
 		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();
+		if (this.renderRange != null && resetRenderRange) this.renderRange = void 0;
 	}
 	reconcileHeights() {
 		let hasHeightChange = false;
@@ -182,7 +191,7 @@ var VirtualizedFileDiff = class extends FileDiff {
 		if (this.fileDiff == null || lineNumber < 1) return;
 		const targetLineIndexes = this.getLineIndex(lineNumber, side);
 		if (targetLineIndexes == null) return;
-		const { disableFileHeader = false, expandUnchanged = false, collapsed = false, collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD } = this.options;
+		const { disableFileHeader = false, expandUnchanged = false, collapsed = false, collapsedContextThreshold = 1 } = this.options;
 		const diffStyle = this.getDiffStyle();
 		const hunkSeparators = this.getHunkSeparatorType();
 		const targetLineIndex = diffStyle === "split" ? targetLineIndexes[1] : targetLineIndexes[0];
@@ -255,7 +264,7 @@ var VirtualizedFileDiff = class extends FileDiff {
 	}
 	getNumericScrollAnchor(localViewportTop) {
 		if (this.fileDiff == null) return;
-		const { disableFileHeader = false, expandUnchanged = false, collapsed = false, collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD } = this.options;
+		const { disableFileHeader = false, expandUnchanged = false, collapsed = false, collapsedContextThreshold = 1 } = this.options;
 		if (collapsed) return;
 		const diffStyle = this.getDiffStyle();
 		const hunkSeparators = this.getHunkSeparatorType();
@@ -332,17 +341,88 @@ var VirtualizedFileDiff = class extends FileDiff {
 	}
 	cleanUp(recycle = false) {
 		if (this.fileContainer != null && this.isSimpleMode()) this.getSimpleVirtualizer()?.disconnect(this.fileContainer);
-		if (!recycle) this.resetLayoutCache({ includeEstimatedHeights: true });
+		if (!recycle) {
+			this.resetLayoutCache({ includeEstimatedHeights: true });
+			this.pendingExpansions = void 0;
+			this.pendingHydratedDiff = void 0;
+		}
 		this.isSetup = false;
 		super.cleanUp(recycle);
 	}
 	expandHunk = (hunkIndex, direction, expansionLineCountOverride) => {
-		this.hunksRenderer.expandHunk(hunkIndex, direction, expansionLineCountOverride);
+		if (this.fileDiff == null) return;
+		if (this.isAdvancedMode()) {
+			this.pendingExpansions ??= [];
+			this.pendingExpansions.push({
+				hunkIndex,
+				direction,
+				expansionLineCountOverride
+			});
+		} else {
+			this.hunksRenderer.expandHunk(hunkIndex, direction, expansionLineCountOverride);
+			this.resetLayoutCache({ includeEstimatedHeights: true });
+			this.computeApproximateSize();
+		}
+		this.loadFilesIfNecessary();
 		this.forceRenderOverride = true;
-		this.resetLayoutCache({ includeEstimatedHeights: true });
-		if (this.isSimpleMode()) this.computeApproximateSize();
 		this.virtualizer.instanceChanged(this, true);
 	};
+	async handleFilesLoaded(expectedDiff, files) {
+		if (this.fileDiff !== expectedDiff || !expectedDiff.isPartial) return;
+		if (this.isAdvancedMode()) {
+			const nextDiff = hydratePartialDiff("clone", expectedDiff, files);
+			await awaitWithTimeout(() => this.primeHighlightCache(nextDiff));
+			if (!this.enabled || this.fileDiff !== expectedDiff) return;
+			this.pendingHydratedDiff = {
+				expectedDiff,
+				nextDiff,
+				files
+			};
+		} else {
+			hydratePartialDiff("merge", expectedDiff, files);
+			this.setHydratedState(files);
+			await awaitWithTimeout(() => this.primeHighlightCache(expectedDiff));
+			if (!this.enabled || this.fileDiff !== expectedDiff) return;
+			this.resetLayoutCache({ includeEstimatedHeights: true });
+			this.computeApproximateSize();
+		}
+		this.forceRenderOverride = true;
+		this.virtualizer.instanceChanged(this, true);
+	}
+	consumeCodeViewLayoutChanges(expectedFileDiff) {
+		let hasLayoutChange = false;
+		let nextDiff;
+		const { pendingExpansions, pendingHydratedDiff } = this;
+		if (pendingExpansions != null) {
+			this.pendingExpansions = void 0;
+			for (const pendingExpansion of pendingExpansions) {
+				this.hunksRenderer.expandHunk(pendingExpansion.hunkIndex, pendingExpansion.direction, pendingExpansion.expansionLineCountOverride);
+				hasLayoutChange = true;
+			}
+		}
+		if (pendingHydratedDiff != null) {
+			this.pendingHydratedDiff = void 0;
+			if (pendingHydratedDiff.expectedDiff === expectedFileDiff) {
+				this.setHydratedState(pendingHydratedDiff.files);
+				nextDiff = pendingHydratedDiff.nextDiff;
+			}
+		}
+		if (nextDiff != null) {
+			this.forceRenderOverride = true;
+			this.resetLayoutCache({ includeEstimatedHeights: true });
+		} else if (hasLayoutChange) {
+			this.forceRenderOverride = true;
+			this.invalidateDerivedLayoutCache(true);
+		}
+		return nextDiff;
+	}
+	loadFilesIfNecessary() {
+		if (this.pendingHydratedDiff != null) {
+			if (this.pendingHydratedDiff.expectedDiff === this.fileDiff) return;
+			this.pendingHydratedDiff = void 0;
+		}
+		super.loadFilesIfNecessary();
+	}
 	setVisibility(visible) {
 		if (this.isAdvancedMode() || this.fileContainer == null) return;
 		this.renderRange = void 0;
@@ -365,22 +445,24 @@ var VirtualizedFileDiff = class extends FileDiff {
 		this.getSimpleVirtualizer()?.markDOMDirty();
 		this.resetLayoutCache({
 			forceSimpleRecompute: this.isSimpleMode(),
-			includeEstimatedHeights: true
+			includeEstimatedHeights: true,
+			resetRenderRange: false
 		});
+		if (!this.isSimpleMode()) this.computeApproximateSize(true);
 		if (shouldUpdateBuffer && previousRenderRange !== void 0 && this.fileDiff !== void 0) {
 			const windowSpecs = this.virtualizer.getWindowSpecs();
 			const renderRange = this.computeRenderRangeFromWindow(this.fileDiff, this.top ?? 0, windowSpecs);
 			if (renderRange.bufferAfter !== previousRenderRange.bufferAfter) this.updateBuffers(renderRange);
 		}
 	}
-	computeApproximateSize(force = false) {
+	computeApproximateSize(force = false, fileDiff = this.fileDiff) {
 		const shouldValidateSize = this.isResizeDebuggingEnabled();
 		if (!force && !this.layoutDirty && !shouldValidateSize) return;
 		const isFirstCompute = this.height === 0;
 		this.height = 0;
 		this.cache.checkpoints = [];
 		this.cache.totalLines = 0;
-		if (this.fileDiff == null) {
+		if (fileDiff == null) {
 			this.layoutDirty = false;
 			return;
 		}
@@ -391,59 +473,70 @@ var VirtualizedFileDiff = class extends FileDiff {
 			this.layoutDirty = false;
 			return;
 		}
-		this.height = this.getActiveEstimatedHeight() + this.cache.measuredHeightDeltaTotal;
-		if (shouldValidateSize && !isFirstCompute) this.validateComputedHeight();
+		this.height = this.getActiveEstimatedHeight(fileDiff) + this.cache.measuredHeightDeltaTotal;
+		if (shouldValidateSize && !isFirstCompute) this.validateComputedHeight(fileDiff);
 		this.layoutDirty = false;
 	}
-	getActiveEstimatedHeight() {
-		this.ensureEstimatedDiffHeights();
+	getActiveEstimatedHeight(fileDiff = this.fileDiff) {
+		this.ensureEstimatedDiffHeights(fileDiff);
 		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) {
+	ensureEstimatedDiffHeights(fileDiff = this.fileDiff) {
+		if (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 { disableFileHeader = false, expandUnchanged = false, collapsedContextThreshold = 1 } = this.options;
 		const { splitHeight, unifiedHeight } = computeEstimatedDiffHeights({
-			fileDiff: this.fileDiff,
+			fileDiff,
 			metrics: this.metrics,
 			disableFileHeader,
 			hunkSeparators: this.getHunkSeparatorType(),
 			expandUnchanged,
 			expandedHunks: this.hunksRenderer.getExpandedHunksMap(),
-			collapsedContextThreshold
+			collapsedContextThreshold,
+			canHydratePartialDiff: canHydrateCollapsedContext(fileDiff, this.options.loadDiffFiles != null)
 		});
 		this.cache.estimatedSplitHeight = splitHeight;
 		this.cache.estimatedUnifiedHeight = unifiedHeight;
 	}
-	validateComputedHeight() {
-		if (this.fileContainer == null || this.fileDiff == null) return;
+	validateComputedHeight(fileDiff = this.fileDiff) {
+		if (this.fileContainer == null || 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,
+			name: fileDiff.name,
 			elementHeight: rect.height,
 			computedHeight: this.height
 		});
 		else console.log("VirtualizedFileDiff.computeApproximateSize: computed height IS CORRECT");
 	}
-	render({ fileContainer, oldFile, newFile, fileDiff, forceRender = false, lineAnnotations,...props } = {}) {
+	render({ fileContainer, fileDiff, forceRender = false, lineAnnotations, ...fileInputProps } = {}) {
+		const fileInput = getDiffFileInput(fileInputProps, "VirtualizedFileDiff.render");
+		const hasFileInput = fileInput != null;
+		const oldFile = fileInput?.oldFile;
+		const newFile = fileInput?.newFile;
+		const filesDidChange = hasFileInput && (!areOptionalFilesEqual(oldFile, this.deletionFile) || !areOptionalFilesEqual(newFile, this.additionFile));
+		let nextFileDiff = fileDiff ?? this.fileDiff;
+		if (fileDiff == null && hasFileInput && (filesDidChange || this.fileDiff == null)) nextFileDiff = parseDiffFromFile(fileInput.oldFile, fileInput.newFile, this.options.parseDiffOptions);
 		const { forceRenderOverride, isSetup } = this;
 		this.forceRenderOverride = void 0;
 		const annotationsChanged = this.syncLineAnnotations(lineAnnotations);
 		if (annotationsChanged) this.resetLayoutCache({ includeEstimatedHeights: false });
-		this.fileDiff ??= fileDiff ?? (oldFile != null && newFile != null ? parseDiffFromFile(oldFile, newFile, this.options.parseDiffOptions) : void 0);
+		const diffInputChanged = fileDiff != null && fileDiff !== this.fileDiff;
+		const targetChanged = nextFileDiff != null && !areDiffTargetsEqual(this.fileDiff, nextFileDiff);
+		const dataChanged = diffInputChanged || filesDidChange;
+		if (targetChanged) this.resetLayoutCache({ includeEstimatedHeights: true });
 		fileContainer = this.getOrCreateFileContainer(fileContainer);
-		if (this.fileDiff == null) {
+		if (nextFileDiff == null) {
 			console.error("VirtualizedFileDiff.render: attempting to virtually render when we dont have the correct data");
 			return false;
 		}
 		if (!isSetup) {
-			this.computeApproximateSize();
+			this.computeApproximateSize(false, nextFileDiff);
 			const virtualizer = this.getSimpleVirtualizer();
 			this.top ??= this.getVirtualizedTop();
 			if (this.isAdvancedMode()) this.isVisible = true;
@@ -453,20 +546,30 @@ var VirtualizedFileDiff = class extends FileDiff {
 				this.isVisible = virtualizer.isInstanceVisible(this.top ?? 0, this.height);
 			}
 			this.isSetup = true;
-		} else this.top ??= this.getVirtualizedTop();
-		if (!this.isVisible && this.isSimpleMode()) return this.renderPlaceholder(this.height);
+		} else {
+			this.top ??= this.getVirtualizedTop();
+			if (targetChanged) this.computeApproximateSize(false, nextFileDiff);
+		}
+		if (!this.isVisible && this.isSimpleMode() && (!dataChanged || !isSetup)) {
+			this.fileDiff = nextFileDiff;
+			if (fileInput != null) {
+				this.deletionFile = oldFile;
+				this.additionFile = newFile;
+			}
+			if (targetChanged) this.cachedHeaderHTML = void 0;
+			return this.renderPlaceholder(this.height);
+		}
 		const windowSpecs = this.virtualizer.getWindowSpecs();
 		const fileTop = this.top ?? 0;
-		const renderRange = this.computeRenderRangeFromWindow(this.fileDiff, fileTop, windowSpecs);
+		const renderRange = this.computeRenderRangeFromWindow(nextFileDiff, fileTop, windowSpecs);
 		return super.render({
-			fileDiff: this.fileDiff,
+			fileDiff: nextFileDiff,
 			fileContainer,
 			renderRange,
-			oldFile,
-			newFile,
 			lineAnnotations,
-			forceRender: (forceRenderOverride ?? forceRender) || annotationsChanged,
-			...props
+			forceRender: (forceRenderOverride ?? forceRender) || annotationsChanged || targetChanged,
+			...fileInput,
+			...fileInputProps
 		});
 	}
 	syncVirtualizedTop() {
@@ -497,10 +600,11 @@ var VirtualizedFileDiff = class extends FileDiff {
 	getHunkSeparatorType() {
 		return getOptionHunkSeparatorType(this.options.hunkSeparators);
 	}
-	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 finalHunkIndex = this.fileDiff.hunks.length - 1;
+	approximateLayoutCheckpoints(fileDiff = this.fileDiff) {
+		if (!this.layoutDirty && this.cache.checkpoints.length > 0 || fileDiff == null || fileDiff.hunks.length === 0 || this.options.collapsed === true) return;
+		const { disableFileHeader = false, expandUnchanged = false, collapsedContextThreshold = 1 } = this.options;
+		const finalHunkIndex = fileDiff.hunks.length - 1;
+		const canHydratePartialDiff = canHydrateCollapsedContext(fileDiff, this.options.loadDiffFiles != null);
 		const diffStyle = this.getDiffStyle();
 		const hunkSeparators = this.getHunkSeparatorType();
 		const expandedHunks = expandUnchanged ? true : this.hunksRenderer.getExpandedHunksMap();
@@ -525,11 +629,11 @@ var VirtualizedFileDiff = class extends FileDiff {
 			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];
+		for (let hunkIndex = 0; hunkIndex < fileDiff.hunks.length; hunkIndex++) {
+			const hunk = fileDiff.hunks[hunkIndex];
 			if (hunk == null) throw new Error("VirtualizedFileDiff.approximateLayoutCheckpoints: invalid hunk index");
 			const leadingRegion = getExpandedRegion({
-				isPartial: this.fileDiff.isPartial,
+				isPartial: fileDiff.isPartial,
 				rangeSize: hunk.collapsedBefore,
 				expandedHunks,
 				hunkIndex,
@@ -553,7 +657,7 @@ var VirtualizedFileDiff = class extends FileDiff {
 			});
 			if (leadingRegion.fromEnd > 0) pendingLeadingSeparatorHeight = 0;
 			const trailingRegion = hunkIndex === finalHunkIndex ? getTrailingExpandedRegion({
-				fileDiff: this.fileDiff,
+				fileDiff,
 				hunkIndex,
 				expandedHunks,
 				collapsedContextThreshold,
@@ -562,6 +666,9 @@ var VirtualizedFileDiff = class extends FileDiff {
 			const trailingSeparatorHeight = trailingRegion != null && trailingRegion.collapsedLines > 0 ? getTrailingHunkSeparatorLayout({
 				type: hunkSeparators,
 				metrics: this.metrics
+			})?.totalHeight ?? 0 : hunkIndex === finalHunkIndex && canHydratePartialDiff ? 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;
@@ -627,7 +734,7 @@ var VirtualizedFileDiff = class extends FileDiff {
 			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 { expandUnchanged = false, collapsedContextThreshold = 1 } = 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;
@@ -652,13 +759,19 @@ var VirtualizedFileDiff = class extends FileDiff {
 		if (trailingRegion != null) count += trailingRegion.fromStart + trailingRegion.fromEnd;
 		return count;
 	}
+	getLayoutLineCount(fileDiff, diffStyle) {
+		const expandedLineCount = this.getExpandedLineCount(fileDiff, diffStyle);
+		const metadataLineCount = diffStyle === "split" ? fileDiff.splitLineCount : fileDiff.unifiedLineCount;
+		return Math.max(expandedLineCount, metadataLineCount, fileDiff.additionLines.length, fileDiff.deletionLines.length, this.cache.totalLines);
+	}
 	computeRenderRangeFromWindow(fileDiff, fileTop, { top, bottom }) {
-		const { disableFileHeader = false, expandUnchanged = false, collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD } = this.options;
+		const { disableFileHeader = false, expandUnchanged = false, collapsedContextThreshold = 1 } = this.options;
 		const { hunkLineCount, lineHeight } = this.metrics;
 		const diffStyle = this.getDiffStyle();
 		const hunkSeparators = this.getHunkSeparatorType();
+		const canHydratePartialDiff = canHydrateCollapsedContext(fileDiff, this.options.loadDiffFiles != null);
 		const fileHeight = this.height;
-		let lineCount = this.cache.totalLines > 0 ? this.cache.totalLines : this.getExpandedLineCount(fileDiff, diffStyle);
+		let lineCount = this.getLayoutLineCount(fileDiff, diffStyle);
 		const headerRegion = getVirtualFileHeaderRegion(this.metrics, disableFileHeader);
 		const paddingBottom = fileDiff.hunks.length > 0 ? getVirtualFilePaddingBottom(this.metrics) : 0;
 		const { fileAnnotationHeight } = this.cache;
@@ -679,8 +792,8 @@ var VirtualizedFileDiff = class extends FileDiff {
 			bufferBefore: 0,
 			bufferAfter: 0
 		};
-		this.approximateLayoutCheckpoints();
-		lineCount = this.cache.totalLines > 0 ? this.cache.totalLines : lineCount;
+		this.approximateLayoutCheckpoints(fileDiff);
+		lineCount = this.getLayoutLineCount(fileDiff, diffStyle);
 		const estimatedTargetLines = Math.ceil(Math.max(bottom - top, 0) / lineHeight);
 		const totalLines = Math.ceil(estimatedTargetLines / hunkLineCount) * hunkLineCount + hunkLineCount;
 		const totalHunks = totalLines / hunkLineCount;
@@ -703,6 +816,7 @@ 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 isFinalHunkRow = hunkIndex === fileDiff.hunks.length - 1 && hunk != null && (diffStyle === "split" ? splitLineIndex === hunk.splitLineStart + hunk.splitLineCount - 1 : unifiedLineIndex === hunk.unifiedLineStart + hunk.unifiedLineCount - 1);
 				const gapAdjustment = (collapsedBefore > 0 ? getLeadingHunkSeparatorLayout({
 					type: hunkSeparators,
 					metrics: this.metrics,
@@ -719,16 +833,23 @@ var VirtualizedFileDiff = class extends FileDiff {
 						overflowCounter--;
 					}
 				}
-				const lineHeight$1 = this.getLineHeight(diffStyle === "split" ? splitLineIndex : unifiedLineIndex, hasMetadata);
-				if (absoluteLineTop > top - lineHeight$1 && absoluteLineTop < bottom) firstVisibleHunk ??= currentHunk;
-				if (centerHunk == null && absoluteLineTop + lineHeight$1 > viewportCenter) centerHunk = currentHunk;
+				const lineHeight = this.getLineHeight(diffStyle === "split" ? splitLineIndex : unifiedLineIndex, hasMetadata);
+				if (absoluteLineTop > top - lineHeight && absoluteLineTop < bottom) firstVisibleHunk ??= currentHunk;
+				if (centerHunk == null && absoluteLineTop + lineHeight > viewportCenter) centerHunk = currentHunk;
 				if (overflowCounter == null && absoluteLineTop >= bottom && isAtHunkBoundary) overflowCounter = overflowHunks;
 				currentLine++;
-				absoluteLineTop += lineHeight$1;
-				if (collapsedAfter > 0) absoluteLineTop += getTrailingHunkSeparatorLayout({
-					type: hunkSeparators,
-					metrics: this.metrics
-				})?.totalHeight ?? 0;
+				absoluteLineTop += lineHeight;
+				if (collapsedAfter > 0 || isFinalHunkRow && canHydratePartialDiff) {
+					const trailingSeparator = getTrailingHunkSeparatorLayout({
+						type: hunkSeparators,
+						metrics: this.metrics
+					});
+					if (trailingSeparator != null) {
+						if (absoluteLineTop < bottom && absoluteLineTop + trailingSeparator.totalHeight > top) firstVisibleHunk ??= currentHunk;
+						if (centerHunk == null && absoluteLineTop + trailingSeparator.totalHeight > viewportCenter) centerHunk = currentHunk;
+						absoluteLineTop += trailingSeparator.totalHeight;
+					}
+				}
 				return false;
 			}
 		});
@@ -828,19 +949,26 @@ function getHunkMetadataOffsets({ diffStyle, hunk, rowCount }) {
 	return offsets;
 }
 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;
+	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") || Boolean(previousOptions.loadDiffFiles) !== Boolean(nextOptions.loadDiffFiles) || (previousOptions.expandUnchanged ?? false) !== (nextOptions.expandUnchanged ?? false) || (previousOptions.collapsedContextThreshold ?? 1) !== (nextOptions.collapsedContextThreshold ?? 1) || 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);
+	return (previousOptions.disableFileHeader ?? false) !== (nextOptions.disableFileHeader ?? false) || (previousOptions.hunkSeparators ?? "line-info") !== (nextOptions.hunkSeparators ?? "line-info") || Boolean(previousOptions.loadDiffFiles) !== Boolean(nextOptions.loadDiffFiles) || (previousOptions.expandUnchanged ?? false) !== (nextOptions.expandUnchanged ?? false) || (previousOptions.collapsedContextThreshold ?? 1) !== (nextOptions.collapsedContextThreshold ?? 1);
+}
+function canHydrateCollapsedContext(fileDiff, hasFileLoader) {
+	return fileDiff.isPartial && hasFileLoader && (fileDiff.type === "change" || fileDiff.type === "rename-changed");
 }
 function getOptionHunkSeparatorType(hunkSeparators) {
 	return typeof hunkSeparators === "function" ? "custom" : hunkSeparators ?? "line-info";
 }
+function areOptionalFilesEqual(fileA, fileB) {
+	if (fileA == null || fileB == null) return fileA == null && fileB == null;
+	return areFilesEqual(fileA, fileB);
+}
 function parseLineIndex(lineIndexAttr, diffStyle) {
 	const [unifiedIndex, splitIndex] = lineIndexAttr.split(",").map(Number);
 	return diffStyle === "split" ? splitIndex : unifiedIndex;
 }
-
 //#endregion
 export { VirtualizedFileDiff };
+
 //# sourceMappingURL=VirtualizedFileDiff.js.map