@pierre/diffs 1.1.20 → 1.2.0-beta.1

package/dist/components/VirtualizedFileDiff.d.ts

@@ -1,8 +1,9 @@
-import { ExpansionDirections, VirtualFileMetrics } from "../types.js";
+import { ExpansionDirections, FileDiffMetadata, NumericScrollLineAnchor, SelectionSide, StickySpecs, VirtualFileMetrics } from "../types.js";
 import { WorkerPoolManager } from "../worker/WorkerPoolManager.js";
 import "../worker/index.js";
 import { Virtualizer } from "./Virtualizer.js";
 import { FileDiff, FileDiffOptions, FileDiffRenderProps } from "./FileDiff.js";
+import { CodeView } from "./CodeView.js";
 
 //#region src/components/VirtualizedFileDiff.d.ts
 declare class VirtualizedFileDiff<LAnnotation = undefined> extends FileDiff<LAnnotation> {
@@ -10,27 +11,49 @@ declare class VirtualizedFileDiff<LAnnotation = undefined> extends FileDiff<LAnn
   top: number | undefined;
   height: number;
   private metrics;
-  private heightCache;
+  private cache;
   private isVisible;
   private isSetup;
   private virtualizer;
-  constructor(options: FileDiffOptions<LAnnotation> | undefined, virtualizer: Virtualizer, metrics?: Partial<VirtualFileMetrics>, workerManager?: WorkerPoolManager, isContainerManaged?: boolean);
+  private forceRenderOverride;
+  constructor(options: FileDiffOptions<LAnnotation> | undefined, virtualizer: Virtualizer | CodeView<LAnnotation>, metrics?: Partial<VirtualFileMetrics>, workerManager?: WorkerPoolManager, isContainerManaged?: boolean);
+  setMetrics(metrics?: Partial<VirtualFileMetrics>, force?: boolean): void;
   private getLineHeight;
   setOptions(options: FileDiffOptions<LAnnotation> | undefined): void;
-  reconcileHeights(): void;
+  reconcileHeights(): boolean;
   onRender: (dirty: boolean) => boolean;
-  cleanUp(): void;
+  prepareVirtualizedItem(fileDiff: FileDiffMetadata): number;
+  getLinePosition(lineNumber: number, side?: SelectionSide): {
+    top: number;
+    height: number;
+  } | undefined;
+  getNumericScrollAnchor(localViewportTop: number): NumericScrollLineAnchor | undefined;
+  getVirtualizedHeight(): number;
+  getAdvancedStickySpecs(): StickySpecs | undefined;
+  cleanUp(recycle?: boolean): void;
   expandHunk: (hunkIndex: number, direction: ExpansionDirections, expansionLineCountOverride?: number | undefined) => void;
   setVisibility(visible: boolean): void;
+  rerender(): void;
   private computeApproximateSize;
   render({
     fileContainer,
     oldFile,
     newFile,
     fileDiff,
+    forceRender,
     ...props
   }?: FileDiffRenderProps<LAnnotation>): boolean;
+  syncVirtualizedTop(): void;
+  protected shouldDisableVirtualizationBuffers(): boolean;
+  private isSimpleMode;
+  private isAdvancedMode;
+  private getVirtualizedTop;
+  private getSimpleVirtualizer;
+  private isResizeDebuggingEnabled;
   private getDiffStyle;
+  private addLayoutCheckpoint;
+  private getLayoutCheckpointBeforeLineIndex;
+  private getLayoutCheckpointBeforeTop;
   private getExpandedRegion;
   private getExpandedLineCount;
   private computeRenderRangeFromWindow;

package/dist/components/VirtualizedFileDiff.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VirtualizedFileDiff.d.ts","names":["ExpansionDirections","VirtualFileMetrics","WorkerPoolManager","FileDiff","FileDiffOptions","FileDiffRenderProps","Virtualizer","VirtualizedFileDiff","LAnnotation","Partial","fileContainer","oldFile","newFile","fileDiff"],"sources":["../../src/components/VirtualizedFileDiff.d.ts"],"sourcesContent":["import type { ExpansionDirections, VirtualFileMetrics } from '../types';\nimport type { WorkerPoolManager } from '../worker';\nimport { FileDiff, type FileDiffOptions, type FileDiffRenderProps } from './FileDiff';\nimport type { Virtualizer } from './Virtualizer';\nexport declare class VirtualizedFileDiff<LAnnotation = undefined> extends FileDiff<LAnnotation> {\n    readonly __id: string;\n    top: number | undefined;\n    height: number;\n    private metrics;\n    private heightCache;\n    private isVisible;\n    private isSetup;\n    private virtualizer;\n    constructor(options: FileDiffOptions<LAnnotation> | undefined, virtualizer: Virtualizer, metrics?: Partial<VirtualFileMetrics>, workerManager?: WorkerPoolManager, isContainerManaged?: boolean);\n    private getLineHeight;\n    setOptions(options: FileDiffOptions<LAnnotation> | undefined): void;\n    reconcileHeights(): void;\n    onRender: (dirty: boolean) => boolean;\n    cleanUp(): void;\n    expandHunk: (hunkIndex: number, direction: ExpansionDirections, expansionLineCountOverride?: number | undefined) => void;\n    setVisibility(visible: boolean): void;\n    private computeApproximateSize;\n    render({ fileContainer, oldFile, newFile, fileDiff, ...props }?: FileDiffRenderProps<LAnnotation>): boolean;\n    private getDiffStyle;\n    private getExpandedRegion;\n    private getExpandedLineCount;\n    private computeRenderRangeFromWindow;\n}\n//# sourceMappingURL=VirtualizedFileDiff.d.ts.map"],"mappings":";;;;;;;cAIqBO,qDAAqDJ,SAASK;;;EAA9DD,MAAAA,EAAAA,MAAAA;EAA8DC,QAAAA,OAAAA;EAS1CA,QAAAA,WAAAA;EAAhBJ,QAAAA,SAAAA;EAAuDE,QAAAA,OAAAA;EAA+BL,QAAAA,WAAAA;EAARQ,WAAAA,CAAAA,OAAAA,EAA9EL,eAA8EK,CAA9DD,WAA8DC,CAAAA,GAAAA,SAAAA,EAAAA,WAAAA,EAAvBH,WAAuBG,EAAAA,OAAAA,CAAAA,EAAAA,OAAAA,CAAQR,kBAARQ,CAAAA,EAAAA,aAAAA,CAAAA,EAA6CP,iBAA7CO,EAAAA,kBAAAA,CAAAA,EAAAA,OAAAA;EAA6CP,QAAAA,aAAAA;EAE5GM,UAAAA,CAAAA,OAAAA,EAAhBJ,eAAgBI,CAAAA,WAAAA,CAAAA,GAAAA,SAAAA,CAAAA,EAAAA,IAAAA;EAAhBJ,gBAAAA,CAAAA,CAAAA,EAAAA,IAAAA;EAIuBJ,QAAAA,EAAAA,CAAAA,KAAAA,EAAAA,OAAAA,EAAAA,GAAAA,OAAAA;EAGlCU,OAAAA,CAAAA,CAAAA,EAAAA,IAAAA;EAAeC,UAAAA,EAAAA,CAAAA,SAAAA,EAAAA,MAAAA,EAAAA,SAAAA,EAHmBX,mBAGnBW,EAAAA,0BAAAA,CAAAA,EAAAA,MAAAA,GAAAA,SAAAA,EAAAA,GAAAA,IAAAA;EAASC,aAAAA,CAAAA,OAAAA,EAAAA,OAAAA,CAAAA,EAAAA,IAAAA;EAASC,QAAAA,sBAAAA;EAA2CL,MAAAA,CAAAA;IAAAA,aAAAA;IAAAA,OAAAA;IAAAA,OAAAA;IAAAA,QAAAA;IAAAA,GAAAA;EAAAA,CAAAA,CAAAA,EAApBH,mBAAoBG,CAAAA,WAAAA,CAAAA,CAAAA,EAAAA,OAAAA;EAApBH,QAAAA,YAAAA;EAlBKF,QAAAA,iBAAAA;EAAQ,QAAA,oBAAA"}
+{"version":3,"file":"VirtualizedFileDiff.d.ts","names":["ExpansionDirections","FileDiffMetadata","NumericScrollLineAnchor","SelectionSide","StickySpecs","VirtualFileMetrics","WorkerPoolManager","CodeView","FileDiff","FileDiffOptions","FileDiffRenderProps","Virtualizer","VirtualizedFileDiff","LAnnotation","Partial","fileContainer","oldFile","newFile","fileDiff","forceRender"],"sources":["../../src/components/VirtualizedFileDiff.d.ts"],"sourcesContent":["import type { ExpansionDirections, FileDiffMetadata, NumericScrollLineAnchor, SelectionSide, StickySpecs, VirtualFileMetrics } from '../types';\nimport type { WorkerPoolManager } from '../worker';\nimport type { CodeView } from './CodeView';\nimport { FileDiff, type FileDiffOptions, type FileDiffRenderProps } from './FileDiff';\nimport type { Virtualizer } from './Virtualizer';\nexport declare class VirtualizedFileDiff<LAnnotation = undefined> extends FileDiff<LAnnotation> {\n    readonly __id: string;\n    top: number | undefined;\n    height: number;\n    private metrics;\n    private cache;\n    private isVisible;\n    private isSetup;\n    private virtualizer;\n    private forceRenderOverride;\n    constructor(options: FileDiffOptions<LAnnotation> | undefined, virtualizer: Virtualizer | CodeView<LAnnotation>, metrics?: Partial<VirtualFileMetrics>, workerManager?: WorkerPoolManager, isContainerManaged?: boolean);\n    setMetrics(metrics?: Partial<VirtualFileMetrics>, force?: boolean): void;\n    private getLineHeight;\n    setOptions(options: FileDiffOptions<LAnnotation> | undefined): void;\n    reconcileHeights(): boolean;\n    onRender: (dirty: boolean) => boolean;\n    prepareVirtualizedItem(fileDiff: FileDiffMetadata): number;\n    getLinePosition(lineNumber: number, side?: SelectionSide): {\n        top: number;\n        height: number;\n    } | undefined;\n    getNumericScrollAnchor(localViewportTop: number): NumericScrollLineAnchor | undefined;\n    getVirtualizedHeight(): number;\n    getAdvancedStickySpecs(): StickySpecs | undefined;\n    cleanUp(recycle?: boolean): void;\n    expandHunk: (hunkIndex: number, direction: ExpansionDirections, expansionLineCountOverride?: number | undefined) => void;\n    setVisibility(visible: boolean): void;\n    rerender(): void;\n    private computeApproximateSize;\n    render({ fileContainer, oldFile, newFile, fileDiff, forceRender, ...props }?: FileDiffRenderProps<LAnnotation>): boolean;\n    syncVirtualizedTop(): void;\n    protected shouldDisableVirtualizationBuffers(): boolean;\n    private isSimpleMode;\n    private isAdvancedMode;\n    private getVirtualizedTop;\n    private getSimpleVirtualizer;\n    private isResizeDebuggingEnabled;\n    private getDiffStyle;\n    private addLayoutCheckpoint;\n    private getLayoutCheckpointBeforeLineIndex;\n    private getLayoutCheckpointBeforeTop;\n    private getExpandedRegion;\n    private getExpandedLineCount;\n    private computeRenderRangeFromWindow;\n}\n//# sourceMappingURL=VirtualizedFileDiff.d.ts.map"],"mappings":";;;;;;;;cAKqBY,qDAAqDJ,SAASK;;;EAA9DD,MAAAA,EAAAA,MAAAA;EAA8DC,QAAAA,OAAAA;EAU1CA,QAAAA,KAAAA;EAAhBJ,QAAAA,SAAAA;EAAuDE,QAAAA,OAAAA;EAAuBE,QAAAA,WAAAA;EAATN,QAAAA,mBAAAA;EAAyCF,WAAAA,CAAAA,OAAAA,EAA9GI,eAA8GJ,CAA9FQ,WAA8FR,CAAAA,GAAAA,SAAAA,EAAAA,WAAAA,EAAvDM,WAAuDN,GAAzCE,QAAyCF,CAAhCQ,WAAgCR,CAAAA,EAAAA,OAAAA,CAAAA,EAARS,OAAQT,CAAAA,kBAAAA,CAAAA,EAAAA,aAAAA,CAAAA,EAAqCC,iBAArCD,EAAAA,kBAAAA,CAAAA,EAAAA,OAAAA;EAARS,UAAAA,CAAAA,OAAAA,CAAAA,EACtGA,OADsGA,CAC9FT,kBAD8FS,CAAAA,EAAAA,KAAAA,CAAAA,EAAAA,OAAAA,CAAAA,EAAAA,IAAAA;EAA6CR,QAAAA,aAAAA;EAC3ID,UAAAA,CAAAA,OAAAA,EAETI,eAFSJ,CAEOQ,WAFPR,CAAAA,GAAAA,SAAAA,CAAAA,EAAAA,IAAAA;EAARS,gBAAAA,CAAAA,CAAAA,EAAAA,OAAAA;EAEeD,QAAAA,EAAAA,CAAAA,KAAAA,EAAAA,OAAAA,EAAAA,GAAAA,OAAAA;EAAhBJ,sBAAAA,CAAAA,QAAAA,EAGaR,gBAHbQ,CAAAA,EAAAA,MAAAA;EAGaR,eAAAA,CAAAA,UAAAA,EAAAA,MAAAA,EAAAA,IAAAA,CAAAA,EACUE,aADVF,CAAAA,EAAAA;IACUE,GAAAA,EAAAA,MAAAA;IAIOD,MAAAA,EAAAA,MAAAA;EAExBE,CAAAA,GAAAA,SAAAA;EAEiBJ,sBAAAA,CAAAA,gBAAAA,EAAAA,MAAAA,CAAAA,EAJOE,uBAIPF,GAAAA,SAAAA;EAIlCe,oBAAAA,CAAAA,CAAAA,EAAAA,MAAAA;EAAeC,sBAAAA,CAAAA,CAAAA,EANEZ,WAMFY,GAAAA,SAAAA;EAASC,OAAAA,CAAAA,OAAAA,CAAAA,EAAAA,OAAAA,CAAAA,EAAAA,IAAAA;EAASC,UAAAA,EAAAA,CAAAA,SAAAA,EAAAA,MAAAA,EAAAA,SAAAA,EAJClB,mBAIDkB,EAAAA,0BAAAA,CAAAA,EAAAA,MAAAA,GAAAA,SAAAA,EAAAA,GAAAA,IAAAA;EAAUC,aAAAA,CAAAA,OAAAA,EAAAA,OAAAA,CAAAA,EAAAA,IAAAA;EAA8CN,QAAAA,CAAAA,CAAAA,EAAAA,IAAAA;EAApBH,QAAAA,sBAAAA;EA7BRF,MAAAA,CAAAA;IAAAA,aAAAA;IAAAA,OAAAA;IAAAA,OAAAA;IAAAA,QAAAA;IAAAA,WAAAA;IAAAA,GAAAA;EAAAA,CAAAA,CAAAA,EA6BQE,mBA7BRF,CA6B4BK,WA7B5BL,CAAAA,CAAAA,EAAAA,OAAAA;EAAQ,kBAAA,CAAA,CAAA,EAAA,IAAA"}

package/dist/components/VirtualizedFileDiff.js

@@ -1,28 +1,45 @@
 import { DEFAULT_COLLAPSED_CONTEXT_THRESHOLD } from "../constants.js";
+import { areObjectsEqual } from "../utils/areObjectsEqual.js";
+import { getVirtualFileHeaderRegion, getVirtualFilePaddingBottom, resolveVirtualFileMetrics } from "../utils/resolveVirtualFileMetrics.js";
 import { iterateOverDiff } from "../utils/iterateOverDiff.js";
 import { parseDiffFromFile } from "../utils/parseDiffFromFile.js";
 import { FileDiff } from "./FileDiff.js";
-import { resolveVirtualFileMetrics } from "../utils/resolveVirtualFileMetrics.js";
 
 //#region src/components/VirtualizedFileDiff.ts
+const LAYOUT_CHECKPOINT_INTERVAL = 5e3;
 let instanceId = -1;
 var VirtualizedFileDiff = class extends FileDiff {
 	__id = `little-virtualized-file-diff:${++instanceId}`;
 	top;
 	height = 0;
 	metrics;
-	heightCache = /* @__PURE__ */ new Map();
+	cache = {
+		heights: /* @__PURE__ */ new Map(),
+		checkpoints: [],
+		totalLines: 0
+	};
 	isVisible = false;
 	isSetup = false;
 	virtualizer;
+	forceRenderOverride;
 	constructor(options, virtualizer, metrics, workerManager, isContainerManaged = false) {
 		super(options, workerManager, isContainerManaged);
 		const { hunkSeparators = "line-info" } = this.options;
 		this.virtualizer = virtualizer;
 		this.metrics = resolveVirtualFileMetrics(typeof hunkSeparators === "function" ? "custom" : hunkSeparators, metrics);
 	}
+	setMetrics(metrics, force = false) {
+		const { hunkSeparators = "line-info" } = this.options;
+		const nextMetrics = resolveVirtualFileMetrics(typeof hunkSeparators === "function" ? "custom" : hunkSeparators, metrics);
+		if (!force && areObjectsEqual(this.metrics, nextMetrics)) return;
+		this.metrics = nextMetrics;
+		this.cache.heights.clear();
+		this.cache.checkpoints = [];
+		this.cache.totalLines = 0;
+		this.renderRange = void 0;
+	}
 	getLineHeight(lineIndex, hasMetadataLine = false) {
-		const cached = this.heightCache.get(lineIndex);
+		const cached = this.cache.heights.get(lineIndex);
 		if (cached != null) return cached;
 		const multiplier = hasMetadataLine ? 2 : 1;
 		return this.metrics.lineHeight * multiplier;
@@ -34,22 +51,25 @@ var VirtualizedFileDiff = class extends FileDiff {
 		const previousCollapsed = this.options.collapsed;
 		super.setOptions(options);
 		if (previousDiffStyle !== this.options.diffStyle || previousOverflow !== this.options.overflow || previousCollapsed !== this.options.collapsed) {
-			this.heightCache.clear();
-			this.computeApproximateSize();
+			this.cache.heights.clear();
+			this.cache.checkpoints = [];
+			this.cache.totalLines = 0;
+			if (this.isSimpleMode()) this.computeApproximateSize();
 			this.renderRange = void 0;
 		}
-		this.virtualizer.instanceChanged(this);
+		if (this.isSimpleMode()) this.virtualizer.instanceChanged(this, true);
 	}
 	reconcileHeights() {
+		let hasHeightChange = false;
 		const { overflow = "scroll" } = this.options;
-		if (this.fileContainer != null) this.top = this.virtualizer.getOffsetInScrollContainer(this.fileContainer);
 		if (this.fileContainer == null || this.fileDiff == null) {
+			if (this.height !== 0) hasHeightChange = true;
 			this.height = 0;
-			return;
+			return hasHeightChange;
 		}
-		if (overflow === "scroll" && this.lineAnnotations.length === 0 && !this.virtualizer.config.resizeDebugging) return;
+		this.top = this.getVirtualizedTop();
+		if (overflow === "scroll" && this.lineAnnotations.length === 0 && !this.isResizeDebuggingEnabled()) return hasHeightChange;
 		const diffStyle = this.getDiffStyle();
-		let hasLineHeightChange = false;
 		const codeGroups = diffStyle === "split" ? [this.codeDeletions, this.codeAdditions] : [this.codeUnified];
 		for (const codeGroup of codeGroups) {
 			if (codeGroup == null) continue;
@@ -68,51 +88,187 @@ var VirtualizedFileDiff = class extends FileDiff {
 				}
 				const expectedHeight = this.getLineHeight(lineIndex, hasMetadata);
 				if (measuredHeight === expectedHeight) continue;
-				hasLineHeightChange = true;
-				if (measuredHeight === this.metrics.lineHeight * (hasMetadata ? 2 : 1)) this.heightCache.delete(lineIndex);
-				else this.heightCache.set(lineIndex, measuredHeight);
+				hasHeightChange = true;
+				if (measuredHeight === this.metrics.lineHeight * (hasMetadata ? 2 : 1)) this.cache.heights.delete(lineIndex);
+				else this.cache.heights.set(lineIndex, measuredHeight);
 			}
 		}
-		if (hasLineHeightChange || this.virtualizer.config.resizeDebugging) this.computeApproximateSize();
+		if (hasHeightChange || this.isResizeDebuggingEnabled()) this.computeApproximateSize();
+		return hasHeightChange;
 	}
 	onRender = (dirty) => {
 		if (this.fileContainer == null) return false;
-		if (dirty) this.top = this.virtualizer.getOffsetInScrollContainer(this.fileContainer);
+		if (dirty) this.top = this.getVirtualizedTop();
 		return this.render();
 	};
-	cleanUp() {
-		if (this.fileContainer != null) this.virtualizer.disconnect(this.fileContainer);
+	prepareVirtualizedItem(fileDiff) {
+		this.fileDiff = fileDiff;
+		this.top = this.getVirtualizedTop();
+		this.computeApproximateSize();
+		return this.height;
+	}
+	getLinePosition(lineNumber, side = "additions") {
+		if (this.fileDiff == null) return;
+		const targetLineIndexes = this.getLineIndex(lineNumber, side);
+		if (targetLineIndexes == null) return;
+		const { disableFileHeader = false, expandUnchanged = false, collapsed = false, collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, hunkSeparators = "line-info" } = this.options;
+		const { hunkSeparatorHeight, spacing } = this.metrics;
+		const diffStyle = this.getDiffStyle();
+		const separatorGap = hunkSeparators !== "simple" && hunkSeparators !== "metadata" && hunkSeparators !== "line-info-basic" ? spacing : 0;
+		const targetLineIndex = diffStyle === "split" ? targetLineIndexes[1] : targetLineIndexes[0];
+		const checkpoint = this.getLayoutCheckpointBeforeLineIndex(targetLineIndex);
+		let top = checkpoint?.top ?? getVirtualFileHeaderRegion(this.metrics, disableFileHeader);
+		if (collapsed) return {
+			top,
+			height: 0
+		};
+		let position;
+		iterateOverDiff({
+			diff: this.fileDiff,
+			diffStyle,
+			startingLine: checkpoint?.renderedLineIndex ?? 0,
+			expandedHunks: expandUnchanged ? true : this.hunksRenderer.getExpandedHunksMap(),
+			collapsedContextThreshold,
+			callback: ({ hunkIndex, 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) {
+					if (hunkIndex > 0) top += separatorGap;
+					if (targetLineIndex >= lineIndex - collapsedBefore && targetLineIndex < lineIndex) {
+						position = {
+							top,
+							height: hunkSeparatorHeight
+						};
+						return true;
+					}
+					top += hunkSeparatorHeight + separatorGap;
+				}
+				const lineHeight = this.getLineHeight(lineIndex, (additionLine?.noEOFCR ?? false) || (deletionLine?.noEOFCR ?? false));
+				if (lineIndex === targetLineIndex) {
+					position = {
+						top,
+						height: lineHeight
+					};
+					return true;
+				}
+				top += lineHeight;
+				if (collapsedAfter > 0 && hunkSeparators !== "simple") {
+					if (targetLineIndex > lineIndex && targetLineIndex <= lineIndex + collapsedAfter) {
+						position = {
+							top: top + separatorGap,
+							height: hunkSeparatorHeight
+						};
+						return true;
+					}
+					top += separatorGap + hunkSeparatorHeight;
+				}
+				return false;
+			}
+		});
+		return position;
+	}
+	getNumericScrollAnchor(localViewportTop) {
+		if (this.fileDiff == null) return;
+		const { disableFileHeader = false, expandUnchanged = false, collapsed = false, collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, hunkSeparators = "line-info" } = this.options;
+		if (collapsed) return;
+		const { hunkSeparatorHeight, spacing } = this.metrics;
+		const diffStyle = this.getDiffStyle();
+		const separatorGap = hunkSeparators !== "simple" && hunkSeparators !== "metadata" && hunkSeparators !== "line-info-basic" ? spacing : 0;
+		const checkpoint = this.getLayoutCheckpointBeforeTop(localViewportTop);
+		let top = checkpoint?.top ?? getVirtualFileHeaderRegion(this.metrics, disableFileHeader);
+		let anchor;
+		iterateOverDiff({
+			diff: this.fileDiff,
+			diffStyle,
+			startingLine: checkpoint?.renderedLineIndex ?? 0,
+			expandedHunks: expandUnchanged ? true : this.hunksRenderer.getExpandedHunksMap(),
+			collapsedContextThreshold,
+			callback: ({ hunkIndex, 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) {
+					if (hunkIndex > 0) top += separatorGap;
+					top += hunkSeparatorHeight + separatorGap;
+				}
+				if (top >= localViewportTop) {
+					if (deletionLine != null) anchor = {
+						lineNumber: deletionLine.lineNumber,
+						side: "deletions",
+						top
+					};
+					else if (additionLine != null) anchor = {
+						lineNumber: additionLine.lineNumber,
+						side: "additions",
+						top
+					};
+					if (anchor != null) return true;
+				}
+				const lineHeight = this.getLineHeight(lineIndex, (additionLine?.noEOFCR ?? false) || (deletionLine?.noEOFCR ?? false));
+				top += lineHeight;
+				if (collapsedAfter > 0 && hunkSeparators !== "simple") top += separatorGap + hunkSeparatorHeight;
+				return false;
+			}
+		});
+		return anchor;
+	}
+	getVirtualizedHeight() {
+		return this.height;
+	}
+	getAdvancedStickySpecs() {
+		if (this.top == null) return;
+		if (this.options.collapsed === true) return {
+			topOffset: this.top,
+			height: this.height
+		};
+		if (this.renderRange == null) return;
+		const { bufferBefore, bufferAfter, totalLines } = this.renderRange;
+		return {
+			topOffset: this.top + bufferBefore + (totalLines === 0 ? bufferAfter : 0),
+			height: this.height - (bufferBefore + bufferAfter)
+		};
+	}
+	cleanUp(recycle = false) {
+		if (this.fileContainer != null && this.isSimpleMode()) this.getSimpleVirtualizer()?.disconnect(this.fileContainer);
 		this.isSetup = false;
-		super.cleanUp();
+		super.cleanUp(recycle);
 	}
 	expandHunk = (hunkIndex, direction, expansionLineCountOverride) => {
 		this.hunksRenderer.expandHunk(hunkIndex, direction, expansionLineCountOverride);
 		this.computeApproximateSize();
 		this.renderRange = void 0;
-		this.virtualizer.instanceChanged(this);
+		this.virtualizer.instanceChanged(this, true);
 	};
 	setVisibility(visible) {
-		if (this.fileContainer == null) return;
+		if (this.isAdvancedMode() || this.fileContainer == null) return;
 		this.renderRange = void 0;
 		if (visible && !this.isVisible) {
-			this.top = this.virtualizer.getOffsetInScrollContainer(this.fileContainer);
+			this.top = this.getVirtualizedTop();
 			this.isVisible = true;
 		} else if (!visible && this.isVisible) {
 			this.isVisible = false;
 			this.rerender();
 		}
 	}
+	rerender() {
+		if (!this.enabled || this.fileDiff == null && this.additionFile == null && this.deletionFile == null) return;
+		this.forceRenderOverride = true;
+		this.virtualizer.instanceChanged(this, false);
+	}
 	computeApproximateSize() {
 		const isFirstCompute = this.height === 0;
 		this.height = 0;
+		this.cache.checkpoints = [];
+		this.cache.totalLines = 0;
 		if (this.fileDiff == null) return;
 		const { disableFileHeader = false, expandUnchanged = false, collapsed = false, collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, hunkSeparators = "line-info" } = this.options;
-		const { diffHeaderHeight, fileGap, hunkSeparatorHeight } = this.metrics;
+		const { spacing, hunkSeparatorHeight } = this.metrics;
 		const diffStyle = this.getDiffStyle();
-		const separatorGap = hunkSeparators !== "simple" && hunkSeparators !== "metadata" && hunkSeparators !== "line-info-basic" ? fileGap : 0;
-		if (!disableFileHeader) this.height += diffHeaderHeight;
-		else if (hunkSeparators !== "simple" && hunkSeparators !== "metadata") this.height += fileGap;
+		const separatorGap = hunkSeparators !== "simple" && hunkSeparators !== "metadata" && hunkSeparators !== "line-info-basic" ? spacing : 0;
+		const headerRegion = getVirtualFileHeaderRegion(this.metrics, disableFileHeader);
+		const paddingBottom = getVirtualFilePaddingBottom(this.metrics);
+		this.height += headerRegion;
 		if (collapsed) return;
+		let renderedLineIndex = 0;
 		iterateOverDiff({
 			diff: this.fileDiff,
 			diffStyle,
@@ -122,16 +278,20 @@ 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 lineIndex = diffStyle === "split" ? splitLineIndex : unifiedLineIndex;
+				this.addLayoutCheckpoint(renderedLineIndex, lineIndex, this.height);
 				if (collapsedBefore > 0) {
 					if (hunkIndex > 0) this.height += separatorGap;
 					this.height += hunkSeparatorHeight + separatorGap;
 				}
-				this.height += this.getLineHeight(diffStyle === "split" ? splitLineIndex : unifiedLineIndex, hasMetadata);
+				this.height += this.getLineHeight(lineIndex, hasMetadata);
 				if (collapsedAfter > 0 && hunkSeparators !== "simple") this.height += separatorGap + hunkSeparatorHeight;
+				renderedLineIndex++;
 			}
 		});
-		if (this.fileDiff.hunks.length > 0) this.height += fileGap;
-		if (this.fileContainer != null && this.virtualizer.config.resizeDebugging && !isFirstCompute) {
+		this.cache.totalLines = renderedLineIndex;
+		if (this.fileDiff.hunks.length > 0) this.height += paddingBottom;
+		if (this.fileContainer != null && this.isResizeDebuggingEnabled() && !isFirstCompute) {
 			const rect = this.fileContainer.getBoundingClientRect();
 			if (rect.height !== this.height) console.log("VirtualizedFileDiff.computeApproximateSize: computed height doesnt match", {
 				name: this.fileDiff.name,
@@ -141,8 +301,9 @@ var VirtualizedFileDiff = class extends FileDiff {
 			else console.log("VirtualizedFileDiff.computeApproximateSize: computed height IS CORRECT");
 		}
 	}
-	render({ fileContainer, oldFile, newFile, fileDiff,...props } = {}) {
-		const { isSetup } = this;
+	render({ fileContainer, oldFile, newFile, fileDiff, forceRender = false,...props } = {}) {
+		const { forceRenderOverride, isSetup } = this;
+		this.forceRenderOverride = void 0;
 		this.fileDiff ??= fileDiff ?? (oldFile != null && newFile != null ? parseDiffFromFile(oldFile, newFile, this.options.parseDiffOptions) : void 0);
 		fileContainer = this.getOrCreateFileContainer(fileContainer);
 		if (this.fileDiff == null) {
@@ -151,26 +312,99 @@ var VirtualizedFileDiff = class extends FileDiff {
 		}
 		if (!isSetup) {
 			this.computeApproximateSize();
-			this.virtualizer.connect(fileContainer, this);
-			this.top ??= this.virtualizer.getOffsetInScrollContainer(fileContainer);
-			this.isVisible = this.virtualizer.isInstanceVisible(this.top, this.height);
+			const virtualizer = this.getSimpleVirtualizer();
+			this.top ??= this.getVirtualizedTop();
+			if (this.isAdvancedMode()) this.isVisible = true;
+			else {
+				if (virtualizer == null) throw new Error("VirtualizedFileDiff.render: simple virtualizer is not available");
+				virtualizer.connect(fileContainer, this);
+				this.isVisible = virtualizer.isInstanceVisible(this.top ?? 0, this.height);
+			}
 			this.isSetup = true;
-		} else this.top ??= this.virtualizer.getOffsetInScrollContainer(fileContainer);
-		if (!this.isVisible) return this.renderPlaceholder(this.height);
+		} else this.top ??= this.getVirtualizedTop();
+		if (!this.isVisible && this.isSimpleMode()) return this.renderPlaceholder(this.height);
 		const windowSpecs = this.virtualizer.getWindowSpecs();
-		const renderRange = this.computeRenderRangeFromWindow(this.fileDiff, this.top, windowSpecs);
+		const fileTop = this.top ?? 0;
+		const renderRange = this.computeRenderRangeFromWindow(this.fileDiff, fileTop, windowSpecs);
 		return super.render({
 			fileDiff: this.fileDiff,
 			fileContainer,
 			renderRange,
 			oldFile,
 			newFile,
+			forceRender: forceRenderOverride ?? forceRender,
 			...props
 		});
 	}
+	syncVirtualizedTop() {
+		this.top = this.getVirtualizedTop();
+	}
+	shouldDisableVirtualizationBuffers() {
+		return this.isAdvancedMode() || super.shouldDisableVirtualizationBuffers();
+	}
+	isSimpleMode() {
+		return this.virtualizer.type === "simple";
+	}
+	isAdvancedMode() {
+		return this.virtualizer.type === "advanced";
+	}
+	getVirtualizedTop() {
+		if (this.virtualizer.type === "advanced") return this.virtualizer.getTopForInstance(this);
+		return this.fileContainer != null ? this.virtualizer.getOffsetInScrollContainer(this.fileContainer) : 0;
+	}
+	getSimpleVirtualizer() {
+		return this.virtualizer.type === "simple" ? this.virtualizer : void 0;
+	}
+	isResizeDebuggingEnabled() {
+		return this.getSimpleVirtualizer()?.config.resizeDebugging ?? false;
+	}
 	getDiffStyle() {
 		return this.options.diffStyle ?? "split";
 	}
+	addLayoutCheckpoint(renderedLineIndex, lineIndex, top) {
+		if (renderedLineIndex % LAYOUT_CHECKPOINT_INTERVAL !== 0) return;
+		this.cache.checkpoints.push({
+			renderedLineIndex,
+			lineIndex,
+			top
+		});
+	}
+	getLayoutCheckpointBeforeLineIndex(lineIndex) {
+		if (lineIndex <= 0 || this.cache.checkpoints.length === 0) return;
+		let low = 0;
+		let high = this.cache.checkpoints.length - 1;
+		let result;
+		while (low <= high) {
+			const mid = low + high >> 1;
+			const checkpoint = this.cache.checkpoints[mid];
+			if (checkpoint == null) throw new Error("VirtualizedFileDiff: invalid checkpoint index");
+			if (checkpoint.lineIndex <= lineIndex) {
+				result = checkpoint;
+				low = mid + 1;
+			} else high = mid - 1;
+		}
+		return result;
+	}
+	getLayoutCheckpointBeforeTop(top, hunkLineCount) {
+		let low = 0;
+		let high = this.cache.checkpoints.length - 1;
+		let resultIndex = -1;
+		while (low <= high) {
+			const mid = low + high >> 1;
+			const checkpoint = this.cache.checkpoints[mid];
+			if (checkpoint == null) throw new Error("VirtualizedFileDiff: invalid checkpoint index");
+			if (checkpoint.top <= top) {
+				resultIndex = mid;
+				low = mid + 1;
+			} else high = mid - 1;
+		}
+		if (hunkLineCount == null) return resultIndex >= 0 ? this.cache.checkpoints[resultIndex] : void 0;
+		for (let index = resultIndex; index >= 0; index--) {
+			const checkpoint = this.cache.checkpoints[index];
+			if (checkpoint == null) throw new Error("VirtualizedFileDiff: invalid checkpoint index");
+			if (checkpoint.renderedLineIndex % hunkLineCount === 0) return checkpoint;
+		}
+	}
 	getExpandedRegion(isPartial, hunkIndex, rangeSize) {
 		if (rangeSize <= 0 || isPartial) return {
 			fromStart: 0,
@@ -225,16 +459,17 @@ var VirtualizedFileDiff = class extends FileDiff {
 	}
 	computeRenderRangeFromWindow(fileDiff, fileTop, { top, bottom }) {
 		const { disableFileHeader = false, expandUnchanged = false, collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, hunkSeparators = "line-info" } = this.options;
-		const { diffHeaderHeight, fileGap, hunkLineCount, hunkSeparatorHeight, lineHeight } = this.metrics;
+		const { spacing, hunkLineCount, hunkSeparatorHeight, lineHeight } = this.metrics;
 		const diffStyle = this.getDiffStyle();
 		const fileHeight = this.height;
-		const lineCount = this.getExpandedLineCount(fileDiff, diffStyle);
-		const headerRegion = disableFileHeader ? fileGap : diffHeaderHeight;
+		const 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 {
 			startingLine: 0,
 			totalLines: 0,
 			bufferBefore: 0,
-			bufferAfter: fileHeight - headerRegion - fileGap
+			bufferAfter: fileHeight - headerRegion - paddingBottom
 		};
 		if (lineCount <= hunkLineCount || fileDiff.hunks.length === 0) return {
 			startingLine: 0,
@@ -248,15 +483,17 @@ var VirtualizedFileDiff = class extends FileDiff {
 		const overflowHunks = totalHunks;
 		const hunkOffsets = [];
 		const viewportCenter = (top + bottom) / 2;
-		const separatorGap = hunkSeparators === "simple" || hunkSeparators === "metadata" || hunkSeparators === "line-info-basic" ? 0 : fileGap;
-		let absoluteLineTop = fileTop + headerRegion;
-		let currentLine = 0;
+		const separatorGap = hunkSeparators === "simple" || hunkSeparators === "metadata" || hunkSeparators === "line-info-basic" ? 0 : spacing;
+		const checkpoint = this.getLayoutCheckpointBeforeTop(Math.max(0, top - fileTop - totalLines * lineHeight * 2), hunkLineCount);
+		let absoluteLineTop = fileTop + (checkpoint?.top ?? headerRegion);
+		let currentLine = checkpoint?.renderedLineIndex ?? 0;
 		let firstVisibleHunk;
 		let centerHunk;
 		let overflowCounter;
 		iterateOverDiff({
 			diff: fileDiff,
 			diffStyle,
+			startingLine: checkpoint?.renderedLineIndex ?? 0,
 			expandedHunks: expandUnchanged ? true : this.hunksRenderer.getExpandedHunksMap(),
 			collapsedContextThreshold,
 			callback: ({ hunkIndex, collapsedBefore, collapsedAfter, deletionLine, additionLine }) => {
@@ -267,15 +504,15 @@ var VirtualizedFileDiff = class extends FileDiff {
 				if (hunkIndex === 0 && hunkSeparators === "simple") gapAdjustment = 0;
 				absoluteLineTop += gapAdjustment;
 				const isAtHunkBoundary = currentLine % hunkLineCount === 0;
+				const currentHunk = Math.floor(currentLine / hunkLineCount);
 				if (isAtHunkBoundary) {
-					hunkOffsets.push(absoluteLineTop - (fileTop + headerRegion + gapAdjustment));
+					hunkOffsets[currentHunk] = absoluteLineTop - (fileTop + headerRegion + gapAdjustment);
 					if (overflowCounter != null) {
 						if (overflowCounter <= 0) return true;
 						overflowCounter--;
 					}
 				}
 				const lineHeight$1 = this.getLineHeight(diffStyle === "split" ? splitLineIndex : unifiedLineIndex, hasMetadata);
-				const currentHunk = Math.floor(currentLine / hunkLineCount);
 				if (absoluteLineTop > top - lineHeight$1 && absoluteLineTop < bottom) firstVisibleHunk ??= currentHunk;
 				if (centerHunk == null && absoluteLineTop + lineHeight$1 > viewportCenter) centerHunk = currentHunk;
 				if (overflowCounter == null && absoluteLineTop >= bottom && isAtHunkBoundary) overflowCounter = overflowHunks;
@@ -289,12 +526,11 @@ var VirtualizedFileDiff = class extends FileDiff {
 			startingLine: 0,
 			totalLines: 0,
 			bufferBefore: 0,
-			bufferAfter: fileHeight - headerRegion - fileGap
+			bufferAfter: fileHeight - headerRegion - paddingBottom
 		};
-		const collectedHunks = hunkOffsets.length;
 		centerHunk ??= firstVisibleHunk;
 		const idealStartHunk = Math.round(centerHunk - totalHunks / 2);
-		const maxStartHunk = Math.max(0, collectedHunks - totalHunks);
+		const maxStartHunk = Math.max(0, Math.ceil(lineCount / hunkLineCount) - totalHunks);
 		const startHunk = Math.max(0, Math.min(idealStartHunk, maxStartHunk));
 		const startingLine = startHunk * hunkLineCount;
 		const clampedTotalLines = idealStartHunk < 0 ? totalLines + idealStartHunk * hunkLineCount : totalLines;
@@ -304,7 +540,7 @@ var VirtualizedFileDiff = class extends FileDiff {
 			startingLine,
 			totalLines: clampedTotalLines,
 			bufferBefore,
-			bufferAfter: finalHunkIndex < hunkOffsets.length ? fileHeight - headerRegion - hunkOffsets[finalHunkIndex] - fileGap : fileHeight - (absoluteLineTop - fileTop) - fileGap
+			bufferAfter: finalHunkIndex < hunkOffsets.length ? fileHeight - headerRegion - hunkOffsets[finalHunkIndex] - paddingBottom : fileHeight - (absoluteLineTop - fileTop) - paddingBottom
 		};
 	}
 };