@pierre/diffs 1.2.10 → 1.2.11

package/dist/components/VirtualizedFileDiff.d.ts

@@ -1,4 +1,4 @@
-import { ExpansionDirections, FileDiffMetadata, NumericScrollLineAnchor, PendingCodeViewLayoutReset, RenderWindow, SelectionSide, StickySpecs, ThemeTypes, VirtualFileMetrics } from "../types.js";
+import { DiffLineAnnotation, ExpansionDirections, FileDiffMetadata, NumericScrollLineAnchor, PendingCodeViewLayoutReset, RenderWindow, SelectionSide, StickySpecs, ThemeTypes, VirtualFileMetrics } from "../types.js";
 import { WorkerPoolManager } from "../worker/WorkerPoolManager.js";
 import "../worker/index.js";
 import { Virtualizer } from "./Virtualizer.js";
@@ -20,6 +20,10 @@ declare class VirtualizedFileDiff<LAnnotation = undefined> extends FileDiff<LAnn
   private currentCollapsed;
   constructor(options: FileDiffOptions<LAnnotation> | undefined, virtualizer: Virtualizer | CodeView<LAnnotation>, metrics?: Partial<VirtualFileMetrics>, workerManager?: WorkerPoolManager, isContainerManaged?: boolean);
   setMetrics(metrics?: Partial<VirtualFileMetrics>, force?: boolean): void;
+  setLineAnnotations(lineAnnotations: DiffLineAnnotation<LAnnotation>[]): void;
+  private syncLineAnnotations;
+  private setFileAnnotationHeight;
+  private hasFileAnnotations;
   private getLineHeight;
   private getEstimatedLineHeight;
   setOptions(options: FileDiffOptions<LAnnotation> | undefined): void;
@@ -27,7 +31,7 @@ declare class VirtualizedFileDiff<LAnnotation = undefined> extends FileDiff<LAnn
   private resetLayoutCache;
   reconcileHeights(): boolean;
   onRender: (dirty: boolean) => boolean;
-  prepareCodeViewItem(fileDiff: FileDiffMetadata, top: number, reset?: PendingCodeViewLayoutReset): number;
+  prepareCodeViewItem(fileDiff: FileDiffMetadata, top: number, reset?: PendingCodeViewLayoutReset, lineAnnotations?: DiffLineAnnotation<LAnnotation>[]): number;
   getLinePosition(lineNumber: number, side?: SelectionSide): {
     top: number;
     height: number;
@@ -49,6 +53,7 @@ declare class VirtualizedFileDiff<LAnnotation = undefined> extends FileDiff<LAnn
     newFile,
     fileDiff,
     forceRender,
+    lineAnnotations,
     ...props
   }?: FileDiffRenderProps<LAnnotation>): boolean;
   syncVirtualizedTop(): void;

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

@@ -1 +1 @@
-{"version":3,"file":"VirtualizedFileDiff.d.ts","names":["ExpansionDirections","FileDiffMetadata","NumericScrollLineAnchor","PendingCodeViewLayoutReset","RenderWindow","SelectionSide","StickySpecs","ThemeTypes","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, PendingCodeViewLayoutReset, RenderWindow, SelectionSide, StickySpecs, ThemeTypes, 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 layoutDirty;\n    private forceRenderOverride;\n    private currentCollapsed;\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    private getEstimatedLineHeight;\n    setOptions(options: FileDiffOptions<LAnnotation> | undefined): void;\n    setThemeType(themeType: ThemeTypes): void;\n    private resetLayoutCache;\n    reconcileHeights(): boolean;\n    onRender: (dirty: boolean) => boolean;\n    prepareCodeViewItem(fileDiff: FileDiffMetadata, top: number, reset?: PendingCodeViewLayoutReset): 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(windowSpecs?: RenderWindow): 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    private getActiveEstimatedHeight;\n    private ensureEstimatedDiffHeights;\n    private validateComputedHeight;\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 getHunkSeparatorType;\n    private approximateLayoutCheckpoints;\n    private getLayoutCheckpointBeforeLineIndex;\n    private getLayoutCheckpointBeforeTop;\n    private getExpandedLineCount;\n    private computeRenderRangeFromWindow;\n}\n//# sourceMappingURL=VirtualizedFileDiff.d.ts.map"],"mappings":";;;;;;;;cAKqBe,qDAAqDJ,SAASK;;;EAA9DD,MAAAA,EAAAA,MAAAA;EAA8DC,QAAAA,OAAAA;EAY1CA,QAAAA,KAAAA;EAAhBJ,QAAAA,SAAAA;EAAuDE,QAAAA,OAAAA;EAAuBE,QAAAA,WAAAA;EAATN,QAAAA,WAAAA;EAAyCF,QAAAA,mBAAAA;EAARS,QAAAA,gBAAAA;EAA6CR,WAAAA,CAAAA,OAAAA,EAAnJG,eAAmJH,CAAnIO,WAAmIP,CAAAA,GAAAA,SAAAA,EAAAA,WAAAA,EAA5FK,WAA4FL,GAA9EC,QAA8ED,CAArEO,WAAqEP,CAAAA,EAAAA,OAAAA,CAAAA,EAA7CQ,OAA6CR,CAArCD,kBAAqCC,CAAAA,EAAAA,aAAAA,CAAAA,EAAAA,iBAAAA,EAAAA,kBAAAA,CAAAA,EAAAA,OAAAA;EAC3ID,UAAAA,CAAAA,OAAAA,CAAAA,EAARS,OAAQT,CAAAA,kBAAAA,CAAAA,EAAAA,KAAAA,CAAAA,EAAAA,OAAAA,CAAAA,EAAAA,IAAAA;EAARS,QAAAA,aAAAA;EAGeD,QAAAA,sBAAAA;EAAhBJ,UAAAA,CAAAA,OAAAA,EAAAA,eAAAA,CAAgBI,WAAhBJ,CAAAA,GAAAA,SAAAA,CAAAA,EAAAA,IAAAA;EACIL,YAAAA,CAAAA,SAAAA,EAAAA,UAAAA,CAAAA,EAAAA,IAAAA;EAIMN,QAAAA,gBAAAA;EAAuCE,gBAAAA,CAAAA,CAAAA,EAAAA,OAAAA;EAC1BE,QAAAA,EAAAA,CAAAA,KAAAA,EAAAA,OAAAA,EAAAA,GAAAA,OAAAA;EAIOH,mBAAAA,CAAAA,QAAAA,EALpBD,gBAKoBC,EAAAA,GAAAA,EAAAA,MAAAA,EAAAA,KAAAA,CAAAA,EALmBC,0BAKnBD,CAAAA,EAAAA,MAAAA;EAEbE,eAAAA,CAAAA,UAAAA,EAAAA,MAAAA,EAAAA,IAAAA,CAAAA,EANMC,aAMND,CAAAA,EAAAA;IAAeE,GAAAA,EAAAA,MAAAA;IAETN,MAAAA,EAAAA,MAAAA;EAOlCkB,CAAAA,GAAAA,SAAAA;EAAeC,sBAAAA,CAAAA,gBAAAA,EAAAA,MAAAA,CAAAA,EAX0BjB,uBAW1BiB,GAAAA,SAAAA;EAASC,oBAAAA,CAAAA,CAAAA,EAAAA,MAAAA;EAASC,sBAAAA,CAAAA,WAAAA,CAAAA,EATLjB,YASKiB,CAAAA,EATUf,WASVe,GAAAA,SAAAA;EAAUC,OAAAA,CAAAA,OAAAA,CAAAA,EAAAA,OAAAA,CAAAA,EAAAA,IAAAA;EAA8CN,UAAAA,EAAAA,CAAAA,SAAAA,EAAAA,MAAAA,EAAAA,SAAAA,EAPvDhB,mBAOuDgB,EAAAA,0BAAAA,CAAAA,EAAAA,MAAAA,GAAAA,SAAAA,EAAAA,GAAAA,IAAAA;EAApBH,aAAAA,CAAAA,OAAAA,EAAAA,OAAAA,CAAAA,EAAAA,IAAAA;EArCRF,QAAAA,CAAAA,CAAAA,EAAAA,IAAAA;EAAQ,QAAA,sBAAA;;;;;;;;;;;MAqCAE,oBAAoBG"}
+{"version":3,"file":"VirtualizedFileDiff.d.ts","names":["DiffLineAnnotation","ExpansionDirections","FileDiffMetadata","NumericScrollLineAnchor","PendingCodeViewLayoutReset","RenderWindow","SelectionSide","StickySpecs","ThemeTypes","VirtualFileMetrics","WorkerPoolManager","CodeView","FileDiff","FileDiffOptions","FileDiffRenderProps","Virtualizer","VirtualizedFileDiff","LAnnotation","Partial","fileContainer","oldFile","newFile","fileDiff","forceRender","lineAnnotations"],"sources":["../../src/components/VirtualizedFileDiff.d.ts"],"sourcesContent":["import type { DiffLineAnnotation, ExpansionDirections, FileDiffMetadata, NumericScrollLineAnchor, PendingCodeViewLayoutReset, RenderWindow, SelectionSide, StickySpecs, ThemeTypes, 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 layoutDirty;\n    private forceRenderOverride;\n    private currentCollapsed;\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    setLineAnnotations(lineAnnotations: DiffLineAnnotation<LAnnotation>[]): void;\n    private syncLineAnnotations;\n    private setFileAnnotationHeight;\n    private hasFileAnnotations;\n    private getLineHeight;\n    private getEstimatedLineHeight;\n    setOptions(options: FileDiffOptions<LAnnotation> | undefined): void;\n    setThemeType(themeType: ThemeTypes): void;\n    private resetLayoutCache;\n    reconcileHeights(): boolean;\n    onRender: (dirty: boolean) => boolean;\n    prepareCodeViewItem(fileDiff: FileDiffMetadata, top: number, reset?: PendingCodeViewLayoutReset, lineAnnotations?: DiffLineAnnotation<LAnnotation>[]): 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(windowSpecs?: RenderWindow): 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    private getActiveEstimatedHeight;\n    private ensureEstimatedDiffHeights;\n    private validateComputedHeight;\n    render({ fileContainer, oldFile, newFile, fileDiff, forceRender, lineAnnotations, ...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 getHunkSeparatorType;\n    private approximateLayoutCheckpoints;\n    private getLayoutCheckpointBeforeLineIndex;\n    private getLayoutCheckpointBeforeTop;\n    private getExpandedLineCount;\n    private computeRenderRangeFromWindow;\n}\n//# sourceMappingURL=VirtualizedFileDiff.d.ts.map"],"mappings":";;;;;;;;cAKqBgB,qDAAqDJ,SAASK;;;EAA9DD,MAAAA,EAAAA,MAAAA;EAA8DC,QAAAA,OAAAA;EAY1CA,QAAAA,KAAAA;EAAhBJ,QAAAA,SAAAA;EAAuDE,QAAAA,OAAAA;EAAuBE,QAAAA,WAAAA;EAATN,QAAAA,WAAAA;EAAyCF,QAAAA,mBAAAA;EAARS,QAAAA,gBAAAA;EAA6CR,WAAAA,CAAAA,OAAAA,EAAnJG,eAAmJH,CAAnIO,WAAmIP,CAAAA,GAAAA,SAAAA,EAAAA,WAAAA,EAA5FK,WAA4FL,GAA9EC,QAA8ED,CAArEO,WAAqEP,CAAAA,EAAAA,OAAAA,CAAAA,EAA7CQ,OAA6CR,CAArCD,kBAAqCC,CAAAA,EAAAA,aAAAA,CAAAA,EAAAA,iBAAAA,EAAAA,kBAAAA,CAAAA,EAAAA,OAAAA;EAC3ID,UAAAA,CAAAA,OAAAA,CAAAA,EAARS,OAAQT,CAAAA,kBAAAA,CAAAA,EAAAA,KAAAA,CAAAA,EAAAA,OAAAA,CAAAA,EAAAA,IAAAA;EAARS,kBAAAA,CAAAA,eAAAA,EACelB,kBADfkB,CACkCD,WADlCC,CAAAA,EAAAA,CAAAA,EAAAA,IAAAA;EACkCD,QAAAA,mBAAAA;EAAnBjB,QAAAA,uBAAAA;EAMAiB,QAAAA,kBAAAA;EAAhBJ,QAAAA,aAAAA;EACIL,QAAAA,sBAAAA;EAIMN,UAAAA,CAAAA,OAAAA,EALVW,eAKUX,CALMe,WAKNf,CAAAA,GAAAA,SAAAA,CAAAA,EAAAA,IAAAA;EAAuCE,YAAAA,CAAAA,SAAAA,EAJ7CI,UAI6CJ,CAAAA,EAAAA,IAAAA;EAAiEa,QAAAA,gBAAAA;EAAnBjB,gBAAAA,CAAAA,CAAAA,EAAAA,OAAAA;EACxEM,QAAAA,EAAAA,CAAAA,KAAAA,EAAAA,OAAAA,EAAAA,GAAAA,OAAAA;EAIOH,mBAAAA,CAAAA,QAAAA,EALpBD,gBAKoBC,EAAAA,GAAAA,EAAAA,MAAAA,EAAAA,KAAAA,CAAAA,EALmBC,0BAKnBD,EAAAA,eAAAA,CAAAA,EALiEH,kBAKjEG,CALoFc,WAKpFd,CAAAA,EAAAA,CAAAA,EAAAA,MAAAA;EAEbE,eAAAA,CAAAA,UAAAA,EAAAA,MAAAA,EAAAA,IAAAA,CAAAA,EANMC,aAMND,CAAAA,EAAAA;IAAeE,GAAAA,EAAAA,MAAAA;IAETN,MAAAA,EAAAA,MAAAA;EAOlCkB,CAAAA,GAAAA,SAAAA;EAAeC,sBAAAA,CAAAA,gBAAAA,EAAAA,MAAAA,CAAAA,EAX0BjB,uBAW1BiB,GAAAA,SAAAA;EAASC,oBAAAA,CAAAA,CAAAA,EAAAA,MAAAA;EAASC,sBAAAA,CAAAA,WAAAA,CAAAA,EATLjB,YASKiB,CAAAA,EATUf,WASVe,GAAAA,SAAAA;EAAUC,OAAAA,CAAAA,OAAAA,CAAAA,EAAAA,OAAAA,CAAAA,EAAAA,IAAAA;EAAaC,UAAAA,EAAAA,CAAAA,SAAAA,EAAAA,MAAAA,EAAAA,SAAAA,EAPtBvB,mBAOsBuB,EAAAA,0BAAAA,CAAAA,EAAAA,MAAAA,GAAAA,SAAAA,EAAAA,GAAAA,IAAAA;EAAkDP,aAAAA,CAAAA,OAAAA,EAAAA,OAAAA,CAAAA,EAAAA,IAAAA;EAApBH,QAAAA,CAAAA,CAAAA,EAAAA,IAAAA;EAzCzBF,QAAAA,sBAAAA;EAAQ,QAAA,wBAAA;;;;;;;;;;;MAyCiBE,oBAAoBG"}

package/dist/components/VirtualizedFileDiff.js

@@ -2,6 +2,7 @@ import { DEFAULT_COLLAPSED_CONTEXT_THRESHOLD } from "../constants.js";
 import { areObjectsEqual } from "../utils/areObjectsEqual.js";
 import { areOptionsEqual } from "../utils/areOptionsEqual.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 { areDiffTargetsEqual } from "../utils/areDiffTargetsEqual.js";
 import { getExpandedRegion, getLeadingHunkSeparatorLayout, getTrailingExpandedRegion, getTrailingHunkSeparatorLayout } from "../utils/virtualDiffLayout.js";
 import { computeEstimatedDiffHeights } from "../utils/computeEstimatedDiffHeights.js";
@@ -23,7 +24,8 @@ var VirtualizedFileDiff = class extends FileDiff {
 		estimatedSplitHeight: void 0,
 		estimatedUnifiedHeight: void 0,
 		checkpoints: [],
-		totalLines: 0
+		totalLines: 0,
+		fileAnnotationHeight: 0
 	};
 	isVisible = false;
 	isSetup = false;
@@ -42,6 +44,30 @@ var VirtualizedFileDiff = class extends FileDiff {
 		this.metrics = nextMetrics;
 		this.resetLayoutCache({ includeEstimatedHeights: true });
 	}
+	setLineAnnotations(lineAnnotations) {
+		if (this.syncLineAnnotations(lineAnnotations)) this.resetLayoutCache({ includeEstimatedHeights: false });
+	}
+	syncLineAnnotations(lineAnnotations) {
+		if (lineAnnotations == null || lineAnnotations === this.lineAnnotations || lineAnnotations.length === 0 && this.lineAnnotations.length === 0) return false;
+		super.setLineAnnotations(lineAnnotations);
+		return true;
+	}
+	setFileAnnotationHeight(nextHeight) {
+		const previousHeight = this.cache.fileAnnotationHeight;
+		if (nextHeight === previousHeight) return false;
+		this.cache.fileAnnotationHeight = nextHeight;
+		this.cache.measuredHeightDeltaTotal += nextHeight - previousHeight;
+		return true;
+	}
+	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 (fileDiff.type === "new") return annotation.side === "additions";
+			if (fileDiff.type === "deleted") return annotation.side === "deletions";
+			return true;
+		});
+	}
 	getLineHeight(lineIndex, hasMetadataLine = false) {
 		return this.getEstimatedLineHeight(hasMetadataLine) + (this.cache.heightDeltas.get(lineIndex) ?? 0);
 	}
@@ -69,6 +95,7 @@ var VirtualizedFileDiff = class extends FileDiff {
 	}
 	resetLayoutCache({ forceSimpleRecompute = false, includeEstimatedHeights = false } = {}) {
 		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;
 		if (this.cache.checkpoints.length > 0) this.cache.checkpoints.length = 0;
@@ -92,6 +119,11 @@ var VirtualizedFileDiff = class extends FileDiff {
 		if (overflow === "scroll" && this.lineAnnotations.length === 0 && !this.isResizeDebuggingEnabled()) return hasHeightChange;
 		const diffStyle = this.getDiffStyle();
 		const codeGroups = diffStyle === "split" ? [this.codeDeletions, this.codeAdditions] : [this.codeUnified];
+		const hasFileAnnotations = this.hasFileAnnotations(this.fileDiff);
+		if (this.renderRange != null && hasFileAnnotations && shouldRenderFileAnnotations(this.renderRange)) {
+			const nextFileAnnotationHeight = measureFileAnnotationHeight(codeGroups) ?? 0;
+			if (this.setFileAnnotationHeight(nextFileAnnotationHeight)) hasHeightChange = true;
+		} else if (!hasFileAnnotations && this.setFileAnnotationHeight(0)) hasHeightChange = true;
 		for (const codeGroup of codeGroups) {
 			if (codeGroup == null) continue;
 			const content = codeGroup.children[1];
@@ -125,9 +157,10 @@ var VirtualizedFileDiff = class extends FileDiff {
 		if (dirty) this.top = this.getVirtualizedTop();
 		return this.render();
 	};
-	prepareCodeViewItem(fileDiff, top, reset) {
+	prepareCodeViewItem(fileDiff, top, reset, lineAnnotations) {
 		const targetChanged = !areDiffTargetsEqual(this.fileDiff, fileDiff);
-		let shouldResetLayoutCache = reset?.resetDiffLayoutCache === true || targetChanged;
+		const annotationsChanged = this.syncLineAnnotations(lineAnnotations);
+		let shouldResetLayoutCache = reset?.resetDiffLayoutCache === true || targetChanged || annotationsChanged;
 		let includeEstimatedHeights = targetChanged || reset?.resetDiffLayoutCache === true && reset.includeEstimatedDiffHeights;
 		if (reset?.metrics != null) {
 			this.metrics = computeVirtualFileMetrics(reset.metrics);
@@ -146,7 +179,7 @@ var VirtualizedFileDiff = class extends FileDiff {
 		return this.height;
 	}
 	getLinePosition(lineNumber, side = "additions") {
-		if (this.fileDiff == null) return;
+		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;
@@ -154,10 +187,11 @@ var VirtualizedFileDiff = class extends FileDiff {
 		const hunkSeparators = this.getHunkSeparatorType();
 		const targetLineIndex = diffStyle === "split" ? targetLineIndexes[1] : targetLineIndexes[0];
 		this.approximateLayoutCheckpoints();
+		const headerRegion = getVirtualFileHeaderRegion(this.metrics, disableFileHeader);
 		const checkpoint = this.getLayoutCheckpointBeforeLineIndex(targetLineIndex);
-		let top = checkpoint?.top ?? getVirtualFileHeaderRegion(this.metrics, disableFileHeader);
+		let top = checkpoint?.top ?? headerRegion + this.cache.fileAnnotationHeight;
 		if (collapsed) return {
-			top,
+			top: headerRegion,
 			height: 0
 		};
 		let position;
@@ -227,7 +261,7 @@ var VirtualizedFileDiff = class extends FileDiff {
 		const hunkSeparators = this.getHunkSeparatorType();
 		this.approximateLayoutCheckpoints();
 		const checkpoint = this.getLayoutCheckpointBeforeTop(localViewportTop);
-		let top = checkpoint?.top ?? getVirtualFileHeaderRegion(this.metrics, disableFileHeader);
+		let top = checkpoint?.top ?? getVirtualFileHeaderRegion(this.metrics, disableFileHeader) + this.cache.fileAnnotationHeight;
 		let anchor;
 		iterateOverDiff({
 			diff: this.fileDiff,
@@ -383,9 +417,11 @@ var VirtualizedFileDiff = class extends FileDiff {
 		});
 		else console.log("VirtualizedFileDiff.computeApproximateSize: computed height IS CORRECT");
 	}
-	render({ fileContainer, oldFile, newFile, fileDiff, forceRender = false,...props } = {}) {
+	render({ fileContainer, oldFile, newFile, fileDiff, forceRender = false, lineAnnotations,...props } = {}) {
 		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);
 		fileContainer = this.getOrCreateFileContainer(fileContainer);
 		if (this.fileDiff == null) {
@@ -414,7 +450,8 @@ var VirtualizedFileDiff = class extends FileDiff {
 			renderRange,
 			oldFile,
 			newFile,
-			forceRender: forceRenderOverride ?? forceRender,
+			lineAnnotations,
+			forceRender: (forceRenderOverride ?? forceRender) || annotationsChanged,
 			...props
 		});
 	}
@@ -454,7 +491,7 @@ var VirtualizedFileDiff = class extends FileDiff {
 		const hunkSeparators = this.getHunkSeparatorType();
 		const expandedHunks = expandUnchanged ? true : this.hunksRenderer.getExpandedHunksMap();
 		const heightDeltaPrefix = createHeightDeltaPrefix(this.cache.heightDeltas);
-		let top = getVirtualFileHeaderRegion(this.metrics, disableFileHeader);
+		let top = getVirtualFileHeaderRegion(this.metrics, disableFileHeader) + this.cache.fileAnnotationHeight;
 		let renderedLineIndex = 0;
 		const processRows = ({ rowCount, startLineIndex, preSeparatorHeight = 0, postSeparatorHeight = 0, metadataOffsets = [] }) => {
 			if (rowCount <= 0) return;
@@ -610,6 +647,12 @@ var VirtualizedFileDiff = class extends FileDiff {
 		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;
+		const { fileAnnotationHeight } = this.cache;
+		const codeRegionTop = headerRegion + fileAnnotationHeight;
+		const codeHeight = Math.max(0, fileHeight - headerRegion - fileAnnotationHeight - paddingBottom);
+		const hasFileAnnotations = this.hasFileAnnotations(fileDiff);
+		const fileAnnotationTop = fileTop + headerRegion;
+		const measuredFileAnnotationVisible = fileAnnotationHeight > 0 && hasFileAnnotations && fileAnnotationTop < bottom && fileAnnotationTop + fileAnnotationHeight > top;
 		if (fileTop < top - fileHeight || fileTop > bottom) return {
 			startingLine: 0,
 			totalLines: 0,
@@ -631,7 +674,7 @@ var VirtualizedFileDiff = class extends FileDiff {
 		const hunkOffsets = [];
 		const viewportCenter = (top + bottom) / 2;
 		const checkpoint = this.getLayoutCheckpointBeforeTop(Math.max(0, top - fileTop - totalLines * lineHeight * 2), hunkLineCount);
-		let absoluteLineTop = fileTop + (checkpoint?.top ?? headerRegion);
+		let absoluteLineTop = fileTop + (checkpoint?.top ?? codeRegionTop);
 		let currentLine = checkpoint?.renderedLineIndex ?? 0;
 		let firstVisibleHunk;
 		let centerHunk;
@@ -656,7 +699,7 @@ var VirtualizedFileDiff = class extends FileDiff {
 				const isAtHunkBoundary = currentLine % hunkLineCount === 0;
 				const currentHunk = Math.floor(currentLine / hunkLineCount);
 				if (isAtHunkBoundary) {
-					hunkOffsets[currentHunk] = absoluteLineTop - (fileTop + headerRegion + gapAdjustment);
+					hunkOffsets[currentHunk] = absoluteLineTop - (fileTop + codeRegionTop + gapAdjustment);
 					if (overflowCounter != null) {
 						if (overflowCounter <= 0) return true;
 						overflowCounter--;
@@ -675,7 +718,10 @@ var VirtualizedFileDiff = class extends FileDiff {
 				return false;
 			}
 		});
-		if (firstVisibleHunk == null) return {
+		if (firstVisibleHunk == null) if (measuredFileAnnotationVisible) {
+			firstVisibleHunk = 0;
+			centerHunk = 0;
+		} else return {
 			startingLine: 0,
 			totalLines: 0,
 			bufferBefore: 0,
@@ -687,16 +733,32 @@ var VirtualizedFileDiff = class extends FileDiff {
 		const startHunk = Math.max(0, Math.min(idealStartHunk, maxStartHunk));
 		const startingLine = startHunk * hunkLineCount;
 		const clampedTotalLines = idealStartHunk < 0 ? totalLines + idealStartHunk * hunkLineCount : totalLines;
-		const bufferBefore = hunkOffsets[startHunk] ?? 0;
+		const codeBufferBefore = hunkOffsets[startHunk] ?? 0;
+		const bufferBefore = startingLine === 0 ? 0 : fileAnnotationHeight + codeBufferBefore;
 		const finalHunkIndex = startHunk + clampedTotalLines / hunkLineCount;
+		const bufferAfter = finalHunkIndex < hunkOffsets.length ? codeHeight - hunkOffsets[finalHunkIndex] : codeHeight - (absoluteLineTop - fileTop - codeRegionTop);
 		return {
 			startingLine,
 			totalLines: clampedTotalLines,
 			bufferBefore,
-			bufferAfter: finalHunkIndex < hunkOffsets.length ? fileHeight - headerRegion - hunkOffsets[finalHunkIndex] - paddingBottom : fileHeight - (absoluteLineTop - fileTop) - paddingBottom
+			bufferAfter: Math.max(0, bufferAfter)
 		};
 	}
 };
+function measureFileAnnotationHeight(codeGroups) {
+	let height;
+	for (const codeGroup of codeGroups) {
+		if (codeGroup == null) continue;
+		const content = codeGroup.children[1];
+		if (!(content instanceof HTMLElement)) continue;
+		for (const child of content.children) {
+			if (!(child instanceof HTMLElement)) continue;
+			if (child.dataset.lineAnnotation !== FILE_ANNOTATION_DOM_KEY) continue;
+			height = Math.max(height ?? 0, child.getBoundingClientRect().height);
+		}
+	}
+	return height;
+}
 function createHeightDeltaPrefix(heightDeltas) {
 	const entries = Array.from(heightDeltas).sort((a, b) => a[0] - b[0]);
 	const lineIndexes = [];