@pierre/diffs 1.3.0-beta.8 → 1.3.0-rc.1

package/dist/components/FileDiff.js

@@ -1,5 +1,10 @@
 import { CUSTOM_HEADER_SLOT_ID, DEFAULT_THEMES, EMPTY_RENDER_RANGE, HEADER_FILENAME_SUFFIX_SLOT_ID, HEADER_METADATA_SLOT_ID, HEADER_PREFIX_SLOT_ID } from "../constants.js";
+import { dequeueRender, queueRender } from "../managers/UniversalRenderingManager.js";
 import { areThemesEqual } from "../utils/areThemesEqual.js";
+import { getHunkSideStartBoundary } from "../utils/getHunkSideBoundaries.js";
+import { parseDiffFromFile } from "../utils/parseDiffFromFile.js";
+import { getExpandedRegion, getHunkAdditionLineRange, getNearestRenderableAdditionLine, getTrailingExpandedRegion, isAdditionLineRenderable } from "../utils/virtualDiffLayout.js";
+import { captureExpansionAnchors, finishEditSessionForDiff, rebuildExpansionFromAnchors } from "../utils/editSessionHunks.js";
 import { isStyleNode } from "../utils/isStyleNode.js";
 import { areFilesEqual } from "../utils/areFilesEqual.js";
 import { InteractionManager, pluckInteractionOptions } from "../managers/InteractionManager.js";
@@ -21,8 +26,9 @@ import "./web-components.js";
 import { awaitWithTimeout } from "../utils/awaitWithTimeout.js";
 import { getDiffFileInput } from "../utils/getDiffFileInput.js";
 import { hydratePartialDiff } from "../utils/hydratePartialDiff.js";
-import { parseDiffFromFile } from "../utils/parseDiffFromFile.js";
+import { iterateOverDiff } from "../utils/iterateOverDiff.js";
 import { ScrollSyncManager } from "../managers/ScrollSyncManager.js";
+import { isDefaultRenderRange } from "../utils/isDefaultRenderRange.js";
 import { isDiffPlainText } from "../utils/isDiffPlainText.js";
 import { DiffHunksRenderer } from "../renderers/DiffHunksRenderer.js";
 import { areDiffLineAnnotationsEqual } from "../utils/areDiffLineAnnotationsEqual.js";
@@ -83,7 +89,9 @@ var FileDiff = class {
 	enabled = true;
 	editor;
 	refreshViewTimeout;
-	deferSetSelection;
+	lineStateRefreshPending = false;
+	deferredSelectedLines;
+	deferredEditorActiveLine;
 	constructor(options = { theme: DEFAULT_THEMES }, workerManager, isContainerManaged = false) {
 		this.options = options;
 		this.workerManager = workerManager;
@@ -111,8 +119,9 @@ var FileDiff = class {
 		let targetUnifiedIndex;
 		let targetSplitIndex;
 		hunkIterator: for (const hunk of fileDiff.hunks) {
-			let currentLineNumber = side === "deletions" ? hunk.deletionStart : hunk.additionStart;
+			const hunkStart = side === "deletions" ? hunk.deletionStart : hunk.additionStart;
 			const hunkCount = side === "deletions" ? hunk.deletionCount : hunk.additionCount;
+			let currentLineNumber = getHunkSideStartBoundary(hunkStart, hunkCount) + 1;
 			let splitIndex = hunk.splitLineStart;
 			let unifiedIndex = hunk.unifiedLineStart;
 			if (lineNumber < currentLineNumber) {
@@ -200,9 +209,24 @@ var FileDiff = class {
 		return true;
 	}
 	setSelectedLines(range, options) {
-		if (this.refreshViewTimeout != null) this.deferSetSelection = [range, options];
+		if (this.lineStateRefreshPending) this.deferredSelectedLines = [range, options];
 		else this.interactionManager.setSelection(range, options);
 	}
+	setEditorActiveLine(lineNumber, options) {
+		if (this.lineStateRefreshPending) this.deferredEditorActiveLine = [lineNumber, options];
+		else this.interactionManager.setEditorActiveLine(lineNumber, {
+			lineNumberOnly: options?.lineNumberOnly,
+			side: options?.side ?? "additions"
+		});
+	}
+	flushDeferredLineState() {
+		const { deferredEditorActiveLine: editorActiveLine, deferredSelectedLines: selectedLines } = this;
+		this.lineStateRefreshPending = false;
+		this.deferredEditorActiveLine = void 0;
+		this.deferredSelectedLines = void 0;
+		if (editorActiveLine != null) this.setEditorActiveLine(...editorActiveLine);
+		if (selectedLines != null) this.interactionManager.setSelection(...selectedLines);
+	}
 	flushManagers() {
 		if (!this.managersDirty || this.pre == null) {
 			this.managersDirty = false;
@@ -222,8 +246,19 @@ var FileDiff = class {
 		if (typeof this.options.hunkSeparators === "function") return true;
 		return overflow === "scroll" && (this.lineAnnotations.length > 0 || this.pre?.hasAttribute("data-has-merge-conflict") === true);
 	}
+	getCodeScrollLeft() {
+		return Math.max(this.codeUnified?.scrollLeft ?? 0, this.codeDeletions?.scrollLeft ?? 0, this.codeAdditions?.scrollLeft ?? 0);
+	}
+	setCodeScrollLeft(position) {
+		if (this.codeUnified != null) this.codeUnified.scrollLeft = position;
+		if (this.codeAdditions != null) this.codeAdditions.scrollLeft = position;
+		if (this.codeDeletions != null) this.codeDeletions.scrollLeft = position;
+	}
 	cleanUp(recycle = false) {
+		dequeueRender(this.handleEditSessionRender);
 		this.emitPostRender(true);
+		this.editor?.cleanUp(recycle);
+		this.editor = void 0;
 		this.resizeManager.cleanUp();
 		this.interactionManager.cleanUp();
 		this.scrollSyncManager.cleanUp();
@@ -272,13 +307,14 @@ var FileDiff = class {
 			this.deletionFile = void 0;
 			this.additionFile = void 0;
 		}
-		this.enabled = false;
-		this.editor?.cleanUp(recycle);
-		this.editor = void 0;
 		if (this.refreshViewTimeout != null) {
 			clearTimeout(this.refreshViewTimeout);
 			this.refreshViewTimeout = void 0;
 		}
+		this.lineStateRefreshPending = false;
+		this.deferredEditorActiveLine = void 0;
+		this.deferredSelectedLines = void 0;
+		this.enabled = false;
 	}
 	virtualizedSetup() {
 		this.enabled = true;
@@ -449,6 +485,10 @@ var FileDiff = class {
 		if (diffDidChange) this.cachedHeaderHTML = void 0;
 		if (lineAnnotations != null) this.setLineAnnotations(lineAnnotations);
 		if (this.fileDiff == null) return false;
+		if (this.fileDiff.editSessionDirty === true && this.shouldSelfHealEditSession()) {
+			finishEditSessionForDiff(this.fileDiff, this.options.parseDiffOptions);
+			this.hunksRenderer.refreshHighlightedResult();
+		}
 		if (expandUnchanged) this.loadFilesIfNecessary();
 		this.hunksRenderer.setOptions(this.getHunksRendererOptions(this.options));
 		this.syncInteractionOptions();
@@ -538,22 +578,82 @@ var FileDiff = class {
 		const fileContainer = this.fileContainer;
 		const fileDiff = this.fileDiffCache;
 		const lineAnnotations = this.lineAnnotations;
-		const renderRange = this.renderRange;
+		const renderRange = this.computeEditorRenderRange(this.renderRange);
 		if (editor != null && fileContainer != null && fileDiff != null && !fileDiff.isPartial) this.hunksRenderer.initializeHighlighter().then((highlighter) => {
 			if (!this.enabled || this.editor !== editor || this.fileContainer !== fileContainer || this.fileDiffCache !== fileDiff) return;
 			editor.__syncRenderView(highlighter, fileContainer, fileDiff, lineAnnotations, renderRange);
 		});
 	}
+	computeEditorRenderRange(renderRange) {
+		const fileDiff = this.fileDiffCache;
+		if (renderRange == null || fileDiff == null || isDefaultRenderRange(renderRange)) return renderRange;
+		const { diffStyle = "split", expandUnchanged = false, collapsedContextThreshold = 1 } = this.options;
+		let firstLineNumber;
+		let lastLineNumber;
+		iterateOverDiff({
+			diff: fileDiff,
+			diffStyle,
+			startingLine: renderRange.startingLine,
+			totalLines: renderRange.totalLines,
+			expandedHunks: expandUnchanged ? true : this.hunksRenderer.getExpandedHunksMap(),
+			collapsedContextThreshold,
+			callback: ({ additionLine }) => {
+				if (additionLine != null) {
+					firstLineNumber ??= additionLine.lineNumber;
+					lastLineNumber = additionLine.lineNumber;
+				}
+			}
+		});
+		if (firstLineNumber == null || lastLineNumber == null) return {
+			...renderRange,
+			startingLine: 0,
+			totalLines: 0
+		};
+		return {
+			...renderRange,
+			startingLine: firstLineNumber - 1,
+			totalLines: lastLineNumber - firstLineNumber + 1
+		};
+	}
 	attachEditor(editor) {
+		if (this.type !== "file-diff") throw new Error(`FileDiff.attachEditor: cannot attach an editor to a "${this.type}" diff`);
 		this.editor?.cleanUp();
 		this.editor = editor;
-		this.interactionManager.setEditorAttached(true);
+		this.hunksRenderer.beginEditSession();
+		if (this.fileDiff?.isPartial === true) this.loadFilesIfNecessary();
 		this.syncRenderViewToEditor();
-		return () => {
+		return (recycle) => {
 			this.editor = void 0;
-			this.interactionManager.setEditorAttached(false);
+			if (recycle !== true) this.finishEditSession();
 		};
 	}
+	finishEditSession() {
+		this.hunksRenderer.endEditSession();
+		this.completeEditSession();
+	}
+	/**
+	* Run the genuine session-end recompute: restore recompute-shaped hunks (a
+	* context-only region collapses away, boundaries re-derive), preserve
+	* expansion state best-effort via old-side anchors, and repaint through
+	* the session render path — which also invalidates virtualized layout,
+	* since nothing else does at exit now that editing does not flip
+	* expandUnchanged. Marker-guarded and idempotent; CodeView also calls this
+	* when reaping a session whose detach closure was consumed by a recycle.
+	* Safe on a cleaned-up instance: the recompute is pure metadata work and
+	* the deferred rerender is enabled-guarded. Returns true when a recompute
+	* ran.
+	*/
+	completeEditSession() {
+		const fileDiff = this.fileDiffCache;
+		if (fileDiff == null || fileDiff.editSessionDirty !== true) return false;
+		const { collapsedContextThreshold = 1 } = this.options;
+		const anchors = captureExpansionAnchors(fileDiff, this.hunksRenderer.getExpandedHunksMap(), collapsedContextThreshold);
+		finishEditSessionForDiff(fileDiff, this.options.parseDiffOptions);
+		this.hunksRenderer.setExpandedHunksMap(rebuildExpansionFromAnchors(fileDiff, anchors));
+		this.hunksRenderer.refreshHighlightedResult();
+		this.escalateEditSessionRender();
+		return true;
+	}
 	applyDocumentChange(textDocument, newLineAnnotations) {
 		this.hunksRenderer.applyDocumentChange(textDocument);
 		const fileDiff = this.hunksRenderer.diffCache;
@@ -570,21 +670,99 @@ var FileDiff = class {
 		this.rerender();
 		this.interactionManager.setSelectionDirty();
 	}
-	updateRenderCache(dirtyLines, themeType, shouldRefreshView) {
-		this.hunksRenderer.updateRenderCache(dirtyLines, themeType);
+	updateRenderCache(dirtyLines, themeType, shouldRefreshView, lineCountChangeInFlight = false) {
+		if (this.hunksRenderer.updateRenderCache(dirtyLines, themeType, lineCountChangeInFlight)) {
+			if (this.refreshViewTimeout != null) {
+				clearTimeout(this.refreshViewTimeout);
+				this.refreshViewTimeout = void 0;
+			}
+			this.lineStateRefreshPending = true;
+			this.escalateEditSessionRender();
+			return;
+		}
 		if (shouldRefreshView) {
 			if (this.refreshViewTimeout != null) clearTimeout(this.refreshViewTimeout);
+			this.lineStateRefreshPending = true;
 			this.refreshViewTimeout = setTimeout(() => {
 				this.refreshViewTimeout = void 0;
 				if (this.options.diffStyle === "split") this.refreshSplitDiffView();
 				else this.refreshUnifiedDiffView();
-				if (this.deferSetSelection != null) {
-					this.interactionManager.setSelection(...this.deferSetSelection);
-					this.deferSetSelection = void 0;
-				}
+				this.flushDeferredLineState();
 			}, 150);
 		}
 	}
+	isLineRenderable(lineNumber) {
+		const fileDiff = this.fileDiffCache;
+		if (fileDiff == null) return true;
+		const { expandUnchanged = false, collapsedContextThreshold = 1 } = this.options;
+		return isAdditionLineRenderable({
+			fileDiff,
+			lineNumber,
+			expandedHunks: expandUnchanged ? true : this.hunksRenderer.getExpandedHunksMap(),
+			collapsedContextThreshold
+		});
+	}
+	getNearestRenderableLine(lineNumber, direction) {
+		const fileDiff = this.fileDiffCache;
+		if (fileDiff == null) return lineNumber;
+		const { expandUnchanged = false, collapsedContextThreshold = 1 } = this.options;
+		return getNearestRenderableAdditionLine({
+			fileDiff,
+			lineNumber,
+			direction,
+			expandedHunks: expandUnchanged ? true : this.hunksRenderer.getExpandedHunksMap(),
+			collapsedContextThreshold
+		});
+	}
+	revealLine(lineNumber) {
+		const fileDiff = this.fileDiffCache;
+		const { expandUnchanged = false, collapsedContextThreshold = 1, expansionLineCount = 100 } = this.options;
+		if (fileDiff == null || fileDiff.isPartial || expandUnchanged) return false;
+		const expandedHunks = this.hunksRenderer.getExpandedHunksMap();
+		for (const [hunkIndex, hunk] of fileDiff.hunks.entries()) {
+			const [hunkStart, hunkEnd] = getHunkAdditionLineRange(hunk);
+			if (lineNumber < hunkStart) {
+				const region = getExpandedRegion({
+					isPartial: fileDiff.isPartial,
+					rangeSize: hunk.collapsedBefore,
+					expandedHunks,
+					hunkIndex,
+					collapsedContextThreshold
+				});
+				const gapStart = hunkStart - region.rangeSize;
+				if (region.renderAll || lineNumber < gapStart + region.fromStart || lineNumber >= hunkStart - region.fromEnd) return false;
+				const fromStartDistance = lineNumber - (gapStart + region.fromStart) + 1;
+				const fromEndDistance = hunkStart - region.fromEnd - lineNumber;
+				if (fromStartDistance <= fromEndDistance) this.expandHunk(hunkIndex, "up", fromStartDistance + expansionLineCount);
+				else this.expandHunk(hunkIndex, "down", fromEndDistance + expansionLineCount);
+				return true;
+			}
+			if (lineNumber < hunkEnd) return false;
+		}
+		const trailingRegion = getTrailingExpandedRegion({
+			fileDiff,
+			hunkIndex: fileDiff.hunks.length - 1,
+			expandedHunks,
+			collapsedContextThreshold,
+			errorPrefix: "FileDiff.revealLine"
+		});
+		if (trailingRegion == null || trailingRegion.renderAll) return false;
+		const lastHunk = fileDiff.hunks[fileDiff.hunks.length - 1];
+		const [, trailingStart] = getHunkAdditionLineRange(lastHunk);
+		if (lineNumber < trailingStart + trailingRegion.fromStart || lineNumber >= trailingStart + trailingRegion.rangeSize) return false;
+		this.expandHunk(fileDiff.hunks.length, "up", lineNumber - (trailingStart + trailingRegion.fromStart) + 1 + expansionLineCount);
+		return true;
+	}
+	shouldSelfHealEditSession() {
+		return this.editor == null;
+	}
+	escalateEditSessionRender() {
+		queueRender(this.handleEditSessionRender);
+	}
+	handleEditSessionRender = () => {
+		this.rerender();
+		this.flushDeferredLineState();
+	};
 	removeRenderedCode() {
 		this.resizeManager.cleanUp();
 		this.scrollSyncManager.cleanUp();
@@ -761,6 +939,7 @@ var FileDiff = class {
 		const { fileContainer: previousContainer } = this;
 		const nextContainer = fileContainer ?? previousContainer ?? document.createElement("diffs-container");
 		const containerChanged = previousContainer !== nextContainer;
+		if (previousContainer != null && containerChanged) this.editor?.__captureFocusForDOMReplacement();
 		if (containerChanged) this.emitPostRender(true);
 		this.fileContainer = nextContainer;
 		if (previousContainer != null && containerChanged) {
@@ -804,6 +983,7 @@ var FileDiff = class {
 			this.codeAdditions = void 0;
 			shadowRoot.appendChild(this.pre);
 		} else if (this.pre.parentNode !== shadowRoot) {
+			this.editor?.__captureFocusForDOMReplacement();
 			shadowRoot.appendChild(this.pre);
 			this.appliedPreAttributes = void 0;
 		}
@@ -959,6 +1139,7 @@ var FileDiff = class {
 		const unifiedAST = this.hunksRenderer.renderCodeAST("unified", result);
 		const deletionsAST = this.hunksRenderer.renderCodeAST("deletions", result);
 		const additionsAST = this.hunksRenderer.renderCodeAST("additions", result);
+		this.editor?.__captureFocusForDOMReplacement();
 		if (unifiedAST != null) {
 			shouldReplace = this.codeUnified == null || this.codeAdditions != null || this.codeDeletions != null;
 			this.codeDeletions?.remove();