@pierre/diffs 1.3.6 → 1.4.1

package/dist/components/VirtualizedFile.js

@@ -1,12 +1,13 @@
 import { DEFAULT_VIRTUAL_FILE_METRICS } from "../constants.js";
 import { areObjectsEqual } from "../utils/areObjectsEqual.js";
 import { areOptionsEqual } from "../utils/areOptionsEqual.js";
+import { areFileTargetsEqual } from "../utils/areFileTargetsEqual.js";
 import { computeVirtualFileMetrics, getVirtualFileHeaderRegion, getVirtualFilePaddingBottom } from "../utils/computeVirtualFileMetrics.js";
-import { areFilesEqual } from "../utils/areFilesEqual.js";
 import { FILE_ANNOTATION_DOM_KEY, includesFileAnnotations, shouldRenderFileAnnotations } from "../utils/includesFileAnnotations.js";
 import { File } from "./File.js";
 //#region src/components/VirtualizedFile.ts
 const LAYOUT_CHECKPOINT_INTERVAL = 5e3;
+const NO_GHOST_TEXT_ROWS = /* @__PURE__ */ new Map();
 let instanceId = -1;
 function hasFileLayoutOptionChanged(previousOptions, nextOptions) {
 	return (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.unsafeCSS !== nextOptions.unsafeCSS;
@@ -15,13 +16,16 @@ var VirtualizedFile = class extends File {
 	virtualizer;
 	metrics;
 	__id = `virtualized-file:${++instanceId}`;
+	renderType = "virtualized";
 	top;
 	height = 0;
 	cache = {
 		heights: /* @__PURE__ */ new Map(),
 		checkpoints: [],
-		fileAnnotationHeight: 0
+		fileAnnotationHeight: 0,
+		ghostTextRows: NO_GHOST_TEXT_ROWS
 	};
+	pendingRender;
 	isVisible = false;
 	isSetup = false;
 	layoutDirty = true;
@@ -42,13 +46,24 @@ var VirtualizedFile = class extends File {
 		if (this.syncLineAnnotations(lineAnnotations)) this.resetLayoutCache();
 	}
 	syncLineAnnotations(lineAnnotations) {
-		if (lineAnnotations == null || lineAnnotations === this.lineAnnotations) return false;
-		if (lineAnnotations.length === 0 && this.lineAnnotations.length === 0) return false;
+		if (lineAnnotations == null || !this.isNewAnnotations(lineAnnotations)) return false;
+		if (lineAnnotations.length === 0 && this.getLatestAnnotations().length === 0) return false;
 		super.setLineAnnotations(lineAnnotations);
 		return true;
 	}
+	syncEditSessionAnnotationsFromEditor(lineAnnotations) {
+		if (super.syncEditSessionAnnotationsFromEditor(lineAnnotations)) {
+			this.resetLayoutCache();
+			return true;
+		}
+		return false;
+	}
 	hasLineAnnotations() {
-		return this.lineAnnotations.some((annotation) => annotation.lineNumber > 0);
+		return this.getLatestAnnotations().some((annotation) => annotation.lineNumber > 0);
+	}
+	hasUniformLineHeights() {
+		const { overflow = "scroll" } = this.options;
+		return overflow === "scroll" && !this.hasLineAnnotations() && this.cache.heights.size === 0;
 	}
 	getLineHeight(lineIndex, hasMetadataLine = false) {
 		const cached = this.cache.heights.get(lineIndex);
@@ -76,23 +91,47 @@ var VirtualizedFile = class extends File {
 		this.cache.fileAnnotationHeight = 0;
 		if (this.cache.heights.size > 0) this.cache.heights.clear();
 		if (this.cache.checkpoints.length > 0) this.cache.checkpoints.length = 0;
+		this.cache.ghostTextRows = NO_GHOST_TEXT_ROWS;
 		if (this.renderRange != null && resetRenderRange) this.renderRange = void 0;
 		if (recompute && this.isSimpleMode()) this.computeApproximateSize();
 	}
+	applyGhostTextRows(ghostTextRows) {
+		const { heights, ghostTextRows: previous } = this.cache;
+		if (previous === ghostTextRows) return false;
+		const { lineHeight } = this.metrics;
+		let changed = false;
+		for (const lineIndex of /* @__PURE__ */ new Set([...previous.keys(), ...ghostTextRows.keys()])) {
+			const previousRows = previous.get(lineIndex) ?? 0;
+			const rows = ghostTextRows.get(lineIndex) ?? 0;
+			if (rows === previousRows) continue;
+			const height = (heights.get(lineIndex) ?? lineHeight) - previousRows * lineHeight + rows * lineHeight;
+			if (height === lineHeight) heights.delete(lineIndex);
+			else heights.set(lineIndex, height);
+			changed = true;
+		}
+		this.cache.ghostTextRows = ghostTextRows;
+		return changed;
+	}
 	reconcileHeights() {
 		let hasHeightChange = false;
-		if (this.fileContainer == null || this.file == null) {
+		if (this.fileContainer == null || this.getLayoutFile() == null) {
 			if (this.height !== 0) hasHeightChange = true;
 			this.height = 0;
 			return hasHeightChange;
 		}
 		const { overflow = "scroll" } = this.options;
 		this.top = this.getVirtualizedTop();
-		if (overflow === "scroll" && this.lineAnnotations.length === 0 && !this.isResizeDebuggingEnabled()) return hasHeightChange;
+		const ghostTextRows = this.editor?.__getGhostTextRows() ?? NO_GHOST_TEXT_ROWS;
+		hasHeightChange = this.applyGhostTextRows(ghostTextRows);
+		if (overflow === "scroll" && this.getLatestAnnotations().length === 0 && !this.isResizeDebuggingEnabled()) {
+			if (hasHeightChange) this.computeApproximateSize(true);
+			return hasHeightChange;
+		}
+		const { lineHeight } = this.metrics;
 		if (this.code == null) return hasHeightChange;
 		const content = this.code.children[1];
 		if (!(content instanceof HTMLElement)) return hasHeightChange;
-		const hasFileAnnotations = includesFileAnnotations(this.lineAnnotations);
+		const hasFileAnnotations = includesFileAnnotations(this.getLatestAnnotations());
 		if (this.renderRange != null && hasFileAnnotations && shouldRenderFileAnnotations(this.renderRange)) {
 			const nextFileAnnotationHeight = measureFileAnnotationHeight(content) ?? 0;
 			if (nextFileAnnotationHeight !== this.cache.fileAnnotationHeight) {
@@ -108,7 +147,7 @@ var VirtualizedFile = class extends File {
 			const lineIndexAttr = line.dataset.lineIndex;
 			if (lineIndexAttr == null) continue;
 			const lineIndex = Number(lineIndexAttr);
-			let measuredHeight = line.getBoundingClientRect().height;
+			let measuredHeight = line.getBoundingClientRect().height + (ghostTextRows.get(lineIndex) ?? 0) * lineHeight;
 			let hasMetadata = false;
 			if (line.nextElementSibling instanceof HTMLElement && ("lineAnnotation" in line.nextElementSibling.dataset || "noNewline" in line.nextElementSibling.dataset)) {
 				if ("noNewline" in line.nextElementSibling.dataset) hasMetadata = true;
@@ -128,10 +167,11 @@ var VirtualizedFile = class extends File {
 		if (dirty) this.top = this.getVirtualizedTop();
 		return this.render({ file: this.file });
 	};
-	prepareCodeViewItem(file, top, reset, lineAnnotations) {
-		const annotationsChanged = this.syncLineAnnotations(lineAnnotations);
-		const targetChanged = !areFilesEqual(this.file, file) || this.fileRenderer.hasUnkeyedFileContentsChanged(file);
-		let shouldResetLayoutCache = reset?.resetFileLayoutCache === true || targetChanged || annotationsChanged;
+	updateCodeViewLayout(file, top, reset, lineAnnotations) {
+		const targetChanged = !areFileTargetsEqual(this.file, file);
+		if (targetChanged) this.updateExternalFile(file, lineAnnotations);
+		const { pendingRenderFile, layoutFileChanged, renderedFileChanged, annotationsChanged } = this.updatePendingRender(file, lineAnnotations);
+		let shouldResetLayoutCache = reset?.resetFileLayoutCache === true || layoutFileChanged || annotationsChanged;
 		if (reset?.metrics != null) {
 			this.metrics = reset.metrics;
 			shouldResetLayoutCache = true;
@@ -142,26 +182,29 @@ var VirtualizedFile = class extends File {
 			shouldResetLayoutCache = true;
 		}
 		if (shouldResetLayoutCache) this.resetLayoutCache();
-		if (this.file !== file) this.layoutDirty = true;
-		this.file = file;
+		if (targetChanged) this.layoutDirty = true;
+		if (!this.forceRenderOverride && (targetChanged || renderedFileChanged || annotationsChanged)) this.forceRenderOverride = true;
 		this.top = top;
-		this.computeApproximateSize();
+		this.computeApproximateSize(false, pendingRenderFile);
 		return this.height;
 	}
+	getLayoutFile() {
+		return this.pendingRender?.file ?? this.getRenderedFile();
+	}
 	getLinePosition(lineNumber) {
-		if (this.file == null || lineNumber < 1) return;
+		const file = this.getLayoutFile();
+		if (file == null || lineNumber < 1) return;
 		const { disableFileHeader = false, collapsed = false } = this.options;
-		const lastLineIndex = this.fileRenderer.getLineCount(this.file) - 1;
+		const lastLineIndex = this.fileRenderer.getLineCount(file) - 1;
 		let top = getVirtualFileHeaderRegion(this.metrics, disableFileHeader);
 		if (collapsed || lastLineIndex < 0) return {
 			top,
 			height: 0
 		};
 		const clampedLineIndex = Math.min(Math.max(lineNumber - 1, 0), lastLineIndex);
-		const { overflow = "scroll" } = this.options;
 		const { lineHeight } = this.metrics;
 		top += this.cache.fileAnnotationHeight;
-		if (overflow === "scroll" && !this.hasLineAnnotations()) return {
+		if (this.hasUniformLineHeights()) return {
 			top: top + clampedLineIndex * lineHeight,
 			height: lineHeight
 		};
@@ -177,17 +220,18 @@ var VirtualizedFile = class extends File {
 		return this.virtualizer.type === "simple" ? this.virtualizer.getRoot() : this.virtualizer.getContainerElement();
 	}
 	getNumericScrollAnchor(localViewportTop) {
-		if (this.file == null || this.renderRange == null) return;
-		const { disableFileHeader = false, collapsed = false, overflow = "scroll" } = this.options;
+		const file = this.getLayoutFile();
+		if (file == null || this.renderRange == null) return;
+		const { disableFileHeader = false, collapsed = false } = this.options;
 		if (collapsed || this.renderRange.totalLines <= 0) return;
-		const lastLineIndex = this.fileRenderer.getLineCount(this.file) - 1;
+		const lastLineIndex = this.fileRenderer.getLineCount(file) - 1;
 		if (lastLineIndex < 0) return;
 		const headerRegion = getVirtualFileHeaderRegion(this.metrics, disableFileHeader);
 		const firstRenderedLineIndex = Math.min(this.renderRange.startingLine, lastLineIndex);
 		const lastRenderedLineIndex = Math.min(firstRenderedLineIndex + this.renderRange.totalLines - 1, lastLineIndex);
 		if (lastRenderedLineIndex < firstRenderedLineIndex) return;
 		const { fileAnnotationHeight } = this.cache;
-		if (overflow === "scroll" && !this.hasLineAnnotations()) {
+		if (this.hasUniformLineHeights()) {
 			const { lineHeight } = this.metrics;
 			const firstRenderedLineTop = headerRegion + (firstRenderedLineIndex === 0 ? fileAnnotationHeight : this.renderRange.bufferBefore);
 			const lineIndex = firstRenderedLineIndex + Math.max(Math.ceil((localViewportTop - firstRenderedLineTop) / lineHeight), 0);
@@ -210,12 +254,13 @@ var VirtualizedFile = class extends File {
 		return this.height;
 	}
 	getAdvancedStickySpecs(windowSpecs) {
-		if (this.top == null || this.file == null) return;
+		const file = this.getLayoutFile();
+		if (this.top == null || file == null) return;
 		if (this.options.collapsed === true) return {
 			topOffset: this.top,
 			height: this.height
 		};
-		const renderRange = windowSpecs != null ? this.computeRenderRangeFromWindow(this.file, this.top, windowSpecs) : this.renderRange;
+		const renderRange = windowSpecs != null ? this.computeRenderRangeFromWindow(file, this.top, windowSpecs) : this.renderRange;
 		if (renderRange == null) return;
 		const { bufferBefore, bufferAfter, totalLines } = renderRange;
 		let headerOnlyOffset = 0;
@@ -229,12 +274,17 @@ var VirtualizedFile = class extends File {
 		};
 	}
 	cleanUp(recycle = false) {
+		const hadGhostTextRows = this.cache.ghostTextRows.size > 0;
+		if (hadGhostTextRows) this.layoutDirty = true;
+		const shouldRecomputeLayout = recycle && this.isAdvancedMode() && this.fileContainer != null && (hadGhostTextRows || !areFileTargetsEqual(this.getRenderedFile(), this.getLatestFile()));
 		if (this.fileContainer != null && this.isSimpleMode()) this.getSimpleVirtualizer()?.disconnect(this.fileContainer);
 		if (!recycle) this.resetLayoutCache();
+		this.pendingRender = void 0;
 		this.isSetup = false;
 		super.cleanUp(recycle);
+		if (shouldRecomputeLayout) this.virtualizer.instanceChanged(this, true);
 	}
-	computeApproximateSize(force = false, file = this.file) {
+	computeApproximateSize(force = false, file = this.getLayoutFile()) {
 		const shouldValidateSize = this.isResizeDebuggingEnabled();
 		if (!force && !this.layoutDirty && !shouldValidateSize) return;
 		const isFirstCompute = this.height === 0;
@@ -244,7 +294,8 @@ var VirtualizedFile = class extends File {
 			this.layoutDirty = false;
 			return;
 		}
-		const { disableFileHeader = false, collapsed = false, overflow = "scroll" } = this.options;
+		this.applyGhostTextRows(this.editor?.__getGhostTextRows() ?? NO_GHOST_TEXT_ROWS);
+		const { disableFileHeader = false, collapsed = false } = this.options;
 		const { lineHeight } = this.metrics;
 		const lineCount = this.fileRenderer.getLineCount(file);
 		const headerRegion = getVirtualFileHeaderRegion(this.metrics, disableFileHeader);
@@ -255,7 +306,7 @@ var VirtualizedFile = class extends File {
 			return;
 		}
 		this.height += this.cache.fileAnnotationHeight;
-		if (overflow === "scroll" && !this.hasLineAnnotations()) this.height += lineCount * lineHeight;
+		if (this.hasUniformLineHeights()) this.height += lineCount * lineHeight;
 		else for (let lineIndex = 0; lineIndex < lineCount; lineIndex++) {
 			this.addLayoutCheckpoint(lineIndex, this.height);
 			this.height += this.getLineHeight(lineIndex, false);
@@ -285,8 +336,19 @@ var VirtualizedFile = class extends File {
 	}
 	rerender() {
 		if (!this.enabled || this.file == null) return;
+		const latestFile = this.getLatestFile();
+		const nextRenderFile = latestFile == null ? void 0 : this.fileRenderer.getFileForNextRender(latestFile);
+		if (this.isSimpleMode()) this.pendingRender = void 0;
 		this.forceRenderOverride = true;
-		this.virtualizer.instanceChanged(this, false);
+		this.virtualizer.instanceChanged(this, !areFileTargetsEqual(this.getRenderedFile(), nextRenderFile));
+	}
+	syncGhostTextRows() {
+		const codeView = this.getAdvancedVirtualizer();
+		if (codeView != null) {
+			codeView.capturePendingLayoutAnchor();
+			this.layoutDirty = true;
+			codeView.instanceChanged(this, true);
+		} else this.getSimpleVirtualizer()?.requestHeightReconcile(this);
 	}
 	applyDocumentChange(textDocument, newLineAnnotations, shouldUpdateBuffer = false) {
 		const { renderRange: previousRenderRange } = this;
@@ -294,28 +356,37 @@ var VirtualizedFile = class extends File {
 		super.applyDocumentChange(textDocument, newLineAnnotations);
 		this.getSimpleVirtualizer()?.markDOMDirty();
 		this.resetLayoutCache(this.isSimpleMode(), false);
+		const file = this.getRenderedFile();
 		if (!this.isSimpleMode()) this.computeApproximateSize(true);
-		else if (shouldUpdateBuffer && previousRenderRange !== void 0 && this.file !== void 0) {
+		else if (shouldUpdateBuffer && previousRenderRange != null && file != null) {
 			const windowSpecs = this.virtualizer.getWindowSpecs();
-			const renderRange = this.computeRenderRangeFromWindow(this.file, this.top ?? 0, windowSpecs);
+			const renderRange = this.computeRenderRangeFromWindow(file, this.top ?? 0, windowSpecs);
 			if (renderRange.bufferAfter !== previousRenderRange.bufferAfter) this.updateBuffers(renderRange);
 		}
 		this.forceRenderOverride = true;
 		this.virtualizer.instanceChanged(this, true);
 	}
-	renderPreparedFile({ fileContainer, file, forceRender = false, lineAnnotations, ...props }) {
-		const didFileChange = this.file == null || !areFilesEqual(this.file, file) || this.fileRenderer.hasUnkeyedFileContentsChanged(file);
+	render({ fileContainer, file, forceRender = false, lineAnnotations, ...props }) {
+		const didFileChange = !areFileTargetsEqual(this.file, file);
+		if (didFileChange) {
+			this.updateExternalFile(file, lineAnnotations);
+			this.cachedHeaderHTML = void 0;
+		}
+		const { pendingRenderFile, layoutFileChanged, renderedFileChanged, annotationsChanged } = (() => {
+			if (this.pendingRender != null && this.pendingRender.latestFile === (this.getLatestFile(file) ?? file)) return {
+				pendingRenderFile: this.pendingRender.file,
+				layoutFileChanged: false,
+				renderedFileChanged: false,
+				annotationsChanged: false
+			};
+			return this.updatePendingRender(file, lineAnnotations);
+		})();
 		const { forceRenderOverride, isSetup } = this;
 		this.forceRenderOverride = void 0;
-		const annotationsChanged = this.syncLineAnnotations(lineAnnotations);
-		if (annotationsChanged) this.resetLayoutCache();
+		if (annotationsChanged || layoutFileChanged) this.resetLayoutCache();
 		fileContainer = this.getOrCreateFileContainerNode(fileContainer);
-		if (file == null) {
-			console.error("VirtualizedFile.render: attempting to virtually render when we dont have file");
-			return false;
-		}
 		if (!isSetup) {
-			this.computeApproximateSize(false, file);
+			this.computeApproximateSize(false, pendingRenderFile);
 			const virtualizer = this.getSimpleVirtualizer();
 			this.top ??= this.getVirtualizedTop();
 			if (this.isAdvancedMode()) this.isVisible = true;
@@ -327,30 +398,48 @@ var VirtualizedFile = class extends File {
 			this.isSetup = true;
 		} else {
 			this.top ??= this.getVirtualizedTop();
-			if (didFileChange && this.isSimpleMode()) {
+			if (layoutFileChanged && this.isSimpleMode()) {
 				this.getSimpleVirtualizer()?.markDOMDirty();
 				this.resetLayoutCache(false);
-				this.computeApproximateSize(false, file);
+				this.computeApproximateSize(false, pendingRenderFile);
 			}
 		}
 		if (!this.isVisible && this.isSimpleMode() && (!didFileChange || !isSetup)) {
-			this.file = file;
-			if (didFileChange) this.cachedHeaderHTML = void 0;
+			this.pendingRender = void 0;
 			return this.renderPlaceholder(this.height);
 		}
 		const windowSpecs = this.virtualizer.getWindowSpecs();
 		const fileTop = this.top ?? 0;
-		const renderRange = this.computeRenderRangeFromWindow(file, fileTop, windowSpecs);
-		const rendered = super.renderPreparedFile({
+		const renderRange = this.computeRenderRangeFromWindow(pendingRenderFile, fileTop, windowSpecs);
+		return super.render({
 			file,
 			fileContainer,
 			renderRange,
 			lineAnnotations,
-			forceRender: (forceRenderOverride ?? forceRender) || annotationsChanged || didFileChange,
+			forceRender: (forceRenderOverride ?? forceRender) || annotationsChanged || renderedFileChanged || didFileChange,
 			...props
 		});
-		if (this.isSimpleMode() && rendered) this.getSimpleVirtualizer()?.requestHeightReconcile(this);
-		return rendered;
+	}
+	finalizeRender() {
+		if (this.getRenderedFile() !== this.pendingRender?.file) throw new Error("VirtualizedFile.render: rendered a different file than its prepared layout");
+		this.pendingRender = void 0;
+		if (this.isSimpleMode()) this.getSimpleVirtualizer()?.requestHeightReconcile(this);
+	}
+	updatePendingRender(nextFile, lineAnnotations) {
+		const latestFile = this.getLatestFile(nextFile) ?? nextFile;
+		const previousRenderedFile = this.getRenderedFile();
+		const previousLayoutFile = this.pendingRender?.file ?? previousRenderedFile;
+		const pendingRenderFile = this.fileRenderer.getFileForNextRender(latestFile);
+		this.pendingRender = {
+			latestFile,
+			file: pendingRenderFile
+		};
+		return {
+			pendingRenderFile,
+			annotationsChanged: this.syncLineAnnotations(lineAnnotations),
+			layoutFileChanged: !areFileTargetsEqual(previousLayoutFile, pendingRenderFile),
+			renderedFileChanged: !areFileTargetsEqual(previousRenderedFile, pendingRenderFile)
+		};
 	}
 	syncVirtualizedTop() {
 		this.top = this.getVirtualizedTop();
@@ -424,7 +513,7 @@ var VirtualizedFile = class extends File {
 		return this.getSimpleVirtualizer()?.config.resizeDebugging ?? false;
 	}
 	computeRenderRangeFromWindow(file, fileTop, { top, bottom }) {
-		const { disableFileHeader = false, overflow = "scroll" } = this.options;
+		const { disableFileHeader = false } = this.options;
 		const { hunkLineCount, lineHeight } = this.metrics;
 		const lineCount = this.fileRenderer.getLineCount(file);
 		const fileHeight = this.height;
@@ -433,7 +522,7 @@ var VirtualizedFile = class extends File {
 		const { fileAnnotationHeight } = this.cache;
 		const codeRegionTop = headerRegion + fileAnnotationHeight;
 		const codeRowsHeight = Math.max(0, fileHeight - headerRegion - fileAnnotationHeight - paddingBottom);
-		const hasFileAnnotations = includesFileAnnotations(this.lineAnnotations);
+		const hasFileAnnotations = includesFileAnnotations(this.getLatestAnnotations());
 		const fileAnnotationTop = fileTop + headerRegion;
 		const measuredFileAnnotationVisible = fileAnnotationHeight > 0 && hasFileAnnotations && fileAnnotationTop < bottom && fileAnnotationTop + fileAnnotationHeight > top;
 		if (fileTop < top - fileHeight || fileTop > bottom) return {
@@ -452,7 +541,7 @@ var VirtualizedFile = class extends File {
 		const totalLines = Math.ceil(estimatedTargetLines / hunkLineCount) * hunkLineCount + hunkLineCount;
 		const totalHunks = totalLines / hunkLineCount;
 		const viewportCenter = (top + bottom) / 2;
-		if (overflow === "scroll" && !this.hasLineAnnotations()) {
+		if (this.hasUniformLineHeights()) {
 			const sourceRowsTop = fileTop + codeRegionTop;
 			const sourceRowsBottom = sourceRowsTop + codeRowsHeight;
 			if (!measuredFileAnnotationVisible && !(sourceRowsTop < bottom && sourceRowsBottom > top)) return {