@pierre/diffs 1.5.2 → 1.6.0

package/dist/components/FileDiff.js

@@ -1,10 +1,13 @@
-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 { CUSTOM_HEADER_SLOT_ID, DEFAULT_THEMES, EMPTY_LINE_ANNOTATIONS, EMPTY_RENDER_RANGE, HEADER_FILENAME_SUFFIX_SLOT_ID, HEADER_METADATA_SLOT_ID, HEADER_PREFIX_SLOT_ID } from "../constants.js";
+import { HighlighterDisposedError } from "../highlighter/highlighterType.js";
 import { getThemes } from "../utils/getThemes.js";
 import { getHighlighterIfLoaded, getSharedHighlighter } from "../highlighter/shared_highlighter.js";
 import { dequeueRender, queueRender } from "../managers/UniversalRenderingManager.js";
 import { areThemesEqual } from "../utils/areThemesEqual.js";
 import { isStyleNode } from "../utils/isStyleNode.js";
 import { isSafari } from "../utils/platform.js";
+import { resolvePreferredHighlighter } from "../utils/resolvePreferredHighlighter.js";
+import { hastToHtml } from "../utils/hastToHtml.js";
 import { InteractionManager, pluckInteractionOptions } from "../managers/InteractionManager.js";
 import { ResizeManager } from "../managers/ResizeManager.js";
 import { areRenderRangesEqual } from "../utils/areRenderRangesEqual.js";
@@ -45,7 +48,6 @@ import { DiffHunksRenderer } from "../renderers/DiffHunksRenderer.js";
 import { areDiffLineAnnotationsEqual } from "../utils/areDiffLineAnnotationsEqual.js";
 import { areHunkDataEqual } from "../utils/areHunkDataEqual.js";
 import { getDiffHunksRendererOptions } from "../utils/getDiffHunksRendererOptions.js";
-import { toHtml } from "hast-util-to-html";
 //#region src/components/FileDiff.ts
 function canHydrateDiff(fileDiff) {
 	return fileDiff.isPartial && (fileDiff.type === "change" || fileDiff.type === "rename-changed" || fileDiff.type === "rename-pure");
@@ -67,16 +69,16 @@ function shouldResetUndoState(prevDiff, nextDiff) {
 function areLinesEqual(first, second) {
 	return first.length === second.length && first.every((line, index) => line === second[index]);
 }
-function canRestoreDiffSession(snapshot, externalDiff) {
+function canRestoreDiffSession(snapshot, inputDiff) {
 	const { oldFile } = snapshot;
-	if (oldFile == null) return externalDiff.type === "new";
-	return externalDiff.type !== "new" && oldFile.name === (externalDiff.prevName ?? externalDiff.name) && areLinesEqual(oldFile.lines, externalDiff.deletionLines);
+	if (oldFile == null) return inputDiff.type === "new";
+	return inputDiff.type !== "new" && oldFile.name === (inputDiff.prevName ?? inputDiff.name) && areLinesEqual(oldFile.lines, inputDiff.deletionLines);
 }
 let instanceId = -1;
 var FileDiff = class {
 	options;
 	workerManager;
-	isContainerManaged;
+	requestOwnerRender;
 	static LoadedCustomComponent = true;
 	__id = `file-diff:${++instanceId}`;
 	type = "file-diff";
@@ -107,13 +109,17 @@ var FileDiff = class {
 	scrollSyncManager;
 	interactionManager;
 	annotationCache = /* @__PURE__ */ new Map();
-	lineAnnotations = [];
+	get lineAnnotations() {
+		return this.renderedData?.lineAnnotations ?? EMPTY_LINE_ANNOTATIONS;
+	}
 	managersDirty = false;
 	deletionFile;
 	additionFile;
 	fileDiff;
 	editSession;
-	renderedDiff;
+	renderedData;
+	pendingData;
+	forceRenderOverride;
 	renderRange;
 	pendingFiles;
 	appliedPreAttributes;
@@ -130,10 +136,10 @@ var FileDiff = class {
 	lineStateRefreshPending = false;
 	deferredSelectedLines;
 	deferredEditorActiveLine;
-	constructor(options = { theme: DEFAULT_THEMES }, workerManager, isContainerManaged = false) {
+	constructor(options = { theme: DEFAULT_THEMES }, workerManager, requestOwnerRender) {
 		this.options = options;
 		this.workerManager = workerManager;
-		this.isContainerManaged = isContainerManaged;
+		this.requestOwnerRender = requestOwnerRender;
 		this.hunksRenderer = this.createHunksRenderer(options);
 		this.resizeManager = new ResizeManager();
 		this.scrollSyncManager = new ScrollSyncManager();
@@ -252,27 +258,35 @@ var FileDiff = class {
 		return resolveEditSessionSlotName(this.editSession?.annotations, annotation, getLineAnnotationName);
 	};
 	getLatestAnnotations() {
-		return this.editSession?.annotations?.current ?? this.lineAnnotations;
+		return this.pendingData?.lineAnnotations ?? this.editSession?.annotations?.current ?? this.lineAnnotations;
+	}
+	getAnnotationsForDiff(fileDiff) {
+		const { pendingData } = this;
+		return pendingData != null && areDiffTargetsEqual(fileDiff, pendingData.fileDiff) ? pendingData.lineAnnotations : this.lineAnnotations;
 	}
 	isNewAnnotations(lineAnnotations) {
 		const session = this.editSession?.annotations;
-		if (lineAnnotations === this.lineAnnotations) return false;
+		if (lineAnnotations === this.getLatestAnnotations()) return false;
 		return session == null || lineAnnotations !== session.provided && lineAnnotations !== session.current;
 	}
 	setLineAnnotations(lineAnnotations) {
 		const sessionAnnotations = this.editSession?.annotations;
-		if (sessionAnnotations == null) {
-			this.lineAnnotations = lineAnnotations;
-			return;
+		if (sessionAnnotations != null) {
+			if (!this.isNewAnnotations(lineAnnotations)) return;
+			writeEditSessionAnnotations(sessionAnnotations, lineAnnotations, getLineAnnotationName);
 		}
-		if (!this.isNewAnnotations(lineAnnotations)) return;
-		this.lineAnnotations = lineAnnotations;
-		writeEditSessionAnnotations(sessionAnnotations, lineAnnotations, getLineAnnotationName);
+		const fileDiff = this.getWorkingDiff();
+		if (fileDiff != null) this.pendingData = {
+			fileDiff,
+			lineAnnotations
+		};
 	}
 	syncEditSessionAnnotationsFromEditor(lineAnnotations) {
 		const session = this.editSession?.annotations;
 		if (session == null || lineAnnotations === session.current) return false;
 		session.current = lineAnnotations;
+		if (this.renderedData != null) this.renderedData.lineAnnotations = lineAnnotations;
+		this.pendingData = void 0;
 		this.hunksRenderer.setLineAnnotations(lineAnnotations);
 		this.renderAnnotations();
 		return true;
@@ -317,7 +331,7 @@ var FileDiff = class {
 	}
 	shouldApplyColumnVariables(overflow) {
 		if (typeof this.options.hunkSeparators === "function") return true;
-		return overflow === "scroll" && (this.getLatestAnnotations().length > 0 || this.pre?.hasAttribute("data-has-merge-conflict") === 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);
@@ -346,10 +360,13 @@ var FileDiff = class {
 		this.workerManager?.unsubscribeToThemeChanges(this);
 		this.renderRange = void 0;
 		if (!recycle) this.pendingFiles = void 0;
-		if (!this.isContainerManaged) this.fileContainer?.remove();
+		if (!this.isComponentManaged) this.fileContainer?.remove();
 		this.fileContainer = void 0;
 		this.mounted = false;
-		if (!recycle) this.lineAnnotations = [];
+		if (!recycle) {
+			this.renderedData = void 0;
+			this.pendingData = void 0;
+		}
 		this.clearAuxiliaryNodes();
 		this.annotationCache.clear();
 		this.pre = void 0;
@@ -385,7 +402,6 @@ var FileDiff = class {
 			this.workerManager = void 0;
 			this.fileDiff = void 0;
 			this.editSession = void 0;
-			this.renderedDiff = void 0;
 			this.deletionFile = void 0;
 			this.additionFile = void 0;
 		}
@@ -474,14 +490,19 @@ var FileDiff = class {
 		this.hydrateMeasuredScrollbar();
 	}
 	hydrationSetup({ fileDiff, oldFile, newFile, lineAnnotations }) {
-		this.lineAnnotations = lineAnnotations ?? this.lineAnnotations;
+		const hydratedAnnotations = lineAnnotations ?? this.getLatestAnnotations();
+		this.pendingData = void 0;
 		this.additionFile = newFile;
 		this.deletionFile = oldFile;
 		this.fileDiff = fileDiff ?? (oldFile !== void 0 && newFile !== void 0 ? parseDiffFromFile(oldFile, newFile, this.options.parseDiffOptions) : void 0);
+		this.renderedData = this.fileDiff != null ? {
+			fileDiff: this.fileDiff,
+			lineAnnotations: hydratedAnnotations
+		} : void 0;
+		if (this.fileDiff != null) this.adoptRenderData(this.fileDiff);
 		if (this.pre == null) return;
 		this.syncInteractionOptions();
 		this.hunksRenderer.hydrate(this.fileDiff);
-		this.renderedDiff = this.fileDiff;
 		this.renderAnnotations();
 		this.renderGutterUtility();
 		this.injectUnsafeCSS();
@@ -489,12 +510,23 @@ var FileDiff = class {
 		this.flushManagers();
 	}
 	rerender() {
-		if (!this.enabled || this.fileDiff == null && this.additionFile == null && this.deletionFile == null) return;
+		if (!this.enabled || this.getInputDiff() == null && this.additionFile == null && this.deletionFile == null) return;
+		if (this.requestRender()) return;
 		this.render({
 			forceRender: true,
 			renderRange: this.renderRange
 		});
 	}
+	requestRender() {
+		const { requestOwnerRender } = this;
+		if (this.editSession != null || requestOwnerRender == null) return false;
+		this.forceRenderOverride = true;
+		requestOwnerRender();
+		return true;
+	}
+	get isComponentManaged() {
+		return this.requestOwnerRender != null;
+	}
 	onThemeChange() {
 		this.hunksRenderer.clearRenderCache();
 		this.rerender();
@@ -508,7 +540,8 @@ var FileDiff = class {
 		this.rerender();
 	};
 	loadFilesIfNecessary() {
-		const { fileDiff, options: { loadDiffFiles } } = this;
+		const fileDiff = this.getInputDiff();
+		const { loadDiffFiles } = this.options;
 		if (fileDiff == null || !canHydrateDiff(fileDiff) || this.pendingFiles?.fileDiff === fileDiff) return;
 		if (loadDiffFiles == null) throw new Error("FileDiff: loadDiffFiles is required to load full files for a partial diff");
 		const promise = this.loadFilesForDiff(fileDiff, loadDiffFiles);
@@ -528,7 +561,8 @@ var FileDiff = class {
 	* `loadDiffFiles` was passed in to `options`
 	*/
 	__canAttachEditor() {
-		return this.fileDiff != null && !this.fileDiff.isPartial;
+		const fileDiff = this.getInputDiff();
+		return fileDiff != null && !fileDiff.isPartial;
 	}
 	/**
 	* Load a partial diff before starting a new edit session. Call this before
@@ -539,7 +573,8 @@ var FileDiff = class {
 		if (this.__canAttachEditor()) return;
 		const pending = this.__prepareForEditing();
 		if (pending == null) {
-			if (this.fileDiff?.isPartial === true && !canHydrateDiff(this.fileDiff)) throw new Error("FileDiff.prepareForEditing: this partial diff cannot be hydrated; provide a complete diff");
+			const fileDiff = this.getInputDiff();
+			if (fileDiff?.isPartial === true && !canHydrateDiff(fileDiff)) throw new Error("FileDiff.prepareForEditing: this partial diff cannot be hydrated; provide a complete diff");
 			throw new Error("FileDiff.prepareForEditing: a partial diff requires loadDiffFiles");
 		}
 		await pending;
@@ -548,14 +583,15 @@ var FileDiff = class {
 	/** Hydrate a diff if necessary  */
 	__prepareForEditing() {
 		if (this.__canAttachEditor()) return;
-		if (this.fileDiff?.isPartial === true && !canHydrateDiff(this.fileDiff)) throw new Error("FileDiff: this partial diff cannot be hydrated; provide a complete diff to edit");
+		const fileDiff = this.getInputDiff();
+		if (fileDiff?.isPartial === true && !canHydrateDiff(fileDiff)) throw new Error("FileDiff: this partial diff cannot be hydrated; provide a complete diff to edit");
 		this.loadFilesIfNecessary();
 		return this.pendingFiles?.promise;
 	}
 	async loadFilesForDiff(fileDiff, loadDiffFiles) {
 		try {
 			const files = await loadDiffFiles(fileDiff);
-			if (this.fileDiff !== fileDiff) return;
+			if (this.getInputDiff() !== fileDiff) return;
 			await this.handleFilesLoaded(fileDiff, files);
 		} catch (error) {
 			if (this.options.disableErrorHandling === true) throw error;
@@ -563,7 +599,7 @@ var FileDiff = class {
 		}
 	}
 	async handleFilesLoaded(expectedDiff, files) {
-		if (this.fileDiff !== expectedDiff || !expectedDiff.isPartial) return;
+		if (this.getInputDiff() !== expectedDiff || !expectedDiff.isPartial) return;
 		hydratePartialDiff("merge", expectedDiff, files);
 		this.setHydratedState(files);
 		if (this.installHydratedSessionDiff(expectedDiff)) {
@@ -571,58 +607,69 @@ var FileDiff = class {
 			return;
 		}
 		await awaitWithTimeout(() => this.primeHighlightCache(expectedDiff));
-		if (!this.enabled || this.fileDiff !== expectedDiff) return;
+		if (!this.enabled || this.getInputDiff() !== expectedDiff) return;
 		this.rerender();
 	}
 	installHydratedSessionDiff(expectedDiff) {
 		if (expectedDiff.isPartial) throw new Error("FileDiff.installHydratedSessionDiff: diffs cannot be partial for editing");
-		if (this.fileDiff !== expectedDiff) return false;
+		if (this.getInputDiff() !== expectedDiff) return false;
 		if (this.editSession?.outgoingDiff != null) {
 			this.installEditSession(expectedDiff);
 			return true;
 		}
 		return false;
 	}
-	updateExternalDiff(incomingExternalDiff, lineAnnotations) {
-		if (areDiffTargetsEqual(this.fileDiff, incomingExternalDiff)) return false;
-		const outgoingDiff = this.editSession?.outgoingDiff ?? this.editSession?.diff;
-		this.fileDiff = incomingExternalDiff;
-		if (outgoingDiff != null) {
-			if (incomingExternalDiff.isPartial) this.loadFilesIfNecessary();
-			else this.installEditSession(incomingExternalDiff);
+	updateInputDiff(incomingDiff, lineAnnotations) {
+		if (areDiffTargetsEqual(this.getInputDiff(), incomingDiff)) return false;
+		const previousAnnotations = this.getLatestAnnotations();
+		this.fileDiff = incomingDiff;
+		const { editSession: previousSession } = this;
+		const outgoingDiff = previousSession?.outgoingDiff ?? previousSession?.diff;
+		if (previousSession != null) {
+			if (incomingDiff.isPartial) previousSession.inputDiff = incomingDiff;
+			else this.installEditSession(incomingDiff);
 			if (this.editSession != null) this.editSession.outgoingDiff = outgoingDiff;
 		}
-		if (this.editSession?.annotations != null && lineAnnotations != null) {
-			this.lineAnnotations = lineAnnotations;
-			this.editSession.annotations = adoptEditSessionAnnotations(lineAnnotations, getLineAnnotationName, this.editSession.annotations);
-		}
+		if (this.editSession?.annotations != null && lineAnnotations != null) this.editSession.annotations = adoptEditSessionAnnotations(lineAnnotations, getLineAnnotationName, this.editSession.annotations);
+		this.pendingData = {
+			fileDiff: this.editSession?.diff ?? incomingDiff,
+			lineAnnotations: this.editSession?.annotations?.current ?? lineAnnotations ?? previousAnnotations
+		};
+		if (outgoingDiff != null && incomingDiff.isPartial) this.loadFilesIfNecessary();
 		return true;
 	}
-	installEditSession(externalDiff, retainedDocument, retainedSession) {
-		const externalContents = externalDiff.additionLines.join("");
+	installEditSession(inputDiff, retainedDocument, retainedSession) {
+		const inputContents = inputDiff.additionLines.join("");
 		const retainedLines = retainedDocument != null ? splitFileContents(retainedDocument.contents) : void 0;
-		const restoreRetainedSession = retainedSession != null && canRestoreDiffSession(retainedSession, externalDiff);
+		const restoreRetainedSession = retainedSession != null && canRestoreDiffSession(retainedSession, inputDiff);
 		if (retainedSession != null && !restoreRetainedSession) throw new Error("FileDiff: retained session cannot resume against a different old file");
-		if (retainedDocument != null && retainedDocument.contents !== externalContents && !restoreRetainedSession) throw new Error("FileDiff: retained edits are missing their diff session state");
-		const usesExternalDocument = retainedDocument == null || retainedDocument.name === externalDiff.name && retainedDocument.lang === externalDiff.lang && retainedDocument.contents === externalContents;
-		const sessionDiff = createEditSessionDiff(externalDiff);
-		if (retainedDocument != null && retainedLines != null && !usesExternalDocument) {
+		if (retainedDocument != null && retainedDocument.contents !== inputContents && !restoreRetainedSession) throw new Error("FileDiff: retained edits are missing their diff session state");
+		const usesInputDocument = retainedDocument == null || retainedDocument.name === inputDiff.name && retainedDocument.lang === inputDiff.lang && retainedDocument.contents === inputContents;
+		const sessionDiff = createEditSessionDiff(inputDiff);
+		if (retainedDocument != null && retainedLines != null && !usesInputDocument) {
 			sessionDiff.name = retainedDocument.name;
 			sessionDiff.lang = retainedDocument.lang;
 		}
-		if (restoreRetainedSession && retainedSession != null && retainedLines != null) {
+		if (restoreRetainedSession && retainedSession != null && retainedDocument != null && retainedLines != null) {
 			sessionDiff.additionLines = retainedLines;
+			sessionDiff.additionCharacterCount = retainedDocument.contents.length;
 			sessionDiff.type = retainedSession.type;
 			sessionDiff.hunks = retainedSession.hunks;
 			sessionDiff.editSessionDirty = true;
 			recomputeDiffRenderLineCounts(sessionDiff);
 		}
+		const annotations = this.editSession?.annotations ?? adoptEditSessionAnnotations(this.getLatestAnnotations(), getLineAnnotationName);
 		this.editSession = {
 			diff: sessionDiff,
-			annotations: this.editSession?.annotations ?? adoptEditSessionAnnotations(this.lineAnnotations, getLineAnnotationName),
+			inputDiff,
+			annotations,
 			outgoingDiff: this.editSession?.outgoingDiff
 		};
-		this.hunksRenderer.beginEditSession(sessionDiff, usesExternalDocument && !restoreRetainedSession ? externalDiff : void 0);
+		this.pendingData = {
+			fileDiff: sessionDiff,
+			lineAnnotations: annotations.current
+		};
+		this.hunksRenderer.beginEditSession(sessionDiff, usesInputDocument && !restoreRetainedSession ? inputDiff : void 0);
 	}
 	setHydratedState(files) {
 		this.deletionFile = files.oldFile;
@@ -632,6 +679,8 @@ var FileDiff = class {
 	}
 	render({ fileDiff, deferManagers = false, forceRender = false, preventEmit = false, lineAnnotations, fileContainer, containerWrapper, renderRange, ...fileInputProps }) {
 		if (!this.enabled) throw new Error("FileDiff.render: attempting to call render after cleaned up");
+		forceRender = this.forceRenderOverride ?? forceRender;
+		this.forceRenderOverride = void 0;
 		const fileInput = getDiffFileInput(fileInputProps, "FileDiff.render");
 		const oldFile = fileInput?.oldFile;
 		const newFile = fileInput?.newFile;
@@ -641,7 +690,7 @@ var FileDiff = class {
 		const themeChanged = this.hasThemeChanged();
 		const hasFileInput = fileInput != null;
 		const filesDidChange = hasFileInput && (!areOptionalFilesEqual(oldFile, this.deletionFile) || !areOptionalFilesEqual(newFile, this.additionFile));
-		let diffDidChange = fileDiff != null && !areDiffTargetsEqual(fileDiff, this.fileDiff);
+		let diffDidChange = fileDiff != null && !areDiffTargetsEqual(fileDiff, this.getInputDiff());
 		const annotationsChanged = lineAnnotations != null && (lineAnnotations.length > 0 || this.getLatestAnnotations().length > 0) ? this.isNewAnnotations(lineAnnotations) : false;
 		if (!collapsed && areRenderRangesEqual(nextRenderRange, this.renderRange) && !forceRender && !annotationsChanged && !themeChanged && (fileDiff != null && !diffDidChange || fileDiff == null && !filesDidChange)) {
 			const rendered = this.applyCachedThemeState(themeType);
@@ -649,7 +698,7 @@ var FileDiff = class {
 			return rendered;
 		}
 		let nextParsedFileDiff;
-		if (fileDiff == null && hasFileInput && (filesDidChange || this.fileDiff == null)) nextParsedFileDiff = parseDiffFromFile(fileInput.oldFile, fileInput.newFile, this.options.parseDiffOptions);
+		if (fileDiff == null && hasFileInput && (filesDidChange || this.getInputDiff() == null)) nextParsedFileDiff = parseDiffFromFile(fileInput.oldFile, fileInput.newFile, this.options.parseDiffOptions);
 		const { renderRange: previousRenderRange } = this;
 		this.renderRange = nextRenderRange;
 		if (hasFileInput) {
@@ -659,23 +708,23 @@ var FileDiff = class {
 			this.deletionFile = void 0;
 			this.additionFile = void 0;
 		}
-		if (fileDiff != null && diffDidChange) this.updateExternalDiff(fileDiff, lineAnnotations);
+		if (fileDiff != null && diffDidChange) this.updateInputDiff(fileDiff, lineAnnotations);
 		else if (nextParsedFileDiff != null) {
 			diffDidChange = true;
-			this.updateExternalDiff(nextParsedFileDiff, lineAnnotations);
+			this.updateInputDiff(nextParsedFileDiff, lineAnnotations);
 		}
 		if (diffDidChange) this.clearReusableHeader();
 		if (lineAnnotations != null) this.setLineAnnotations(lineAnnotations);
-		const latestDiff = this.getLatestDiff();
-		if (latestDiff == null) return false;
-		if (latestDiff.editSessionDirty === true && this.shouldSelfHealEditSession()) {
-			finishEditSessionForDiff(latestDiff, this.options.parseDiffOptions);
+		const workingDiff = this.getWorkingDiff();
+		if (workingDiff == null) return false;
+		if (workingDiff.editSessionDirty === true && this.shouldSelfHealEditSession()) {
+			finishEditSessionForDiff(workingDiff, this.options.parseDiffOptions);
 			this.hunksRenderer.refreshHighlightedResult();
 		}
 		if (expandUnchanged) this.loadFilesIfNecessary();
 		this.hunksRenderer.setOptions(this.getHunksRendererOptions(this.options));
 		this.syncInteractionOptions();
-		this.hunksRenderer.setLineAnnotations(this.getLatestAnnotations());
+		this.prepareRenderData(this.hunksRenderer.getDiffForNextRender(workingDiff));
 		const { disableErrorHandling = false, disableFileHeader = false } = this.options;
 		if (disableFileHeader) {
 			if (this.headerElement != null) {
@@ -691,11 +740,11 @@ var FileDiff = class {
 			this.removeRenderedCode();
 			this.clearAuxiliaryNodes();
 			try {
-				const hunksResult = this.hunksRenderer.renderDiff(latestDiff, EMPTY_RENDER_RANGE);
+				const hunksResult = this.hunksRenderer.renderDiff(workingDiff, EMPTY_RENDER_RANGE);
 				if (hunksResult != null) this.applyThemeState(fileContainer, hunksResult.themeStyles, themeType, hunksResult.baseThemeType);
 				if (hunksResult?.headerElement != null) this.applyHeaderToDOM(hunksResult.headerElement, fileContainer, hunksResult.fileDiff);
 				this.renderSeparators([]);
-				this.renderedDiff = hunksResult?.fileDiff ?? latestDiff;
+				this.adoptRenderData(hunksResult?.fileDiff ?? workingDiff);
 				this.injectUnsafeCSS();
 			} catch (error) {
 				if (disableErrorHandling) throw error;
@@ -708,12 +757,12 @@ var FileDiff = class {
 		}
 		try {
 			const pre = this.getOrCreatePreNode(fileContainer);
-			if (!(this.canPartiallyRender(forceRender, annotationsChanged, filesDidChange || diffDidChange || themeChanged || !areDiffTargetsEqual(this.renderedDiff, latestDiff)) && this.applyPartialRender({
-				fileDiff: latestDiff,
+			if (!(this.canPartiallyRender(forceRender, annotationsChanged, filesDidChange || diffDidChange || themeChanged || !areDiffTargetsEqual(this.getRenderedDiff(), workingDiff)) && this.applyPartialRender({
+				fileDiff: workingDiff,
 				previousRenderRange,
 				renderRange: nextRenderRange
 			}))) {
-				const hunksResult = this.hunksRenderer.renderDiff(latestDiff, nextRenderRange);
+				const hunksResult = this.hunksRenderer.renderDiff(workingDiff, nextRenderRange);
 				if (hunksResult == null) {
 					if (this.workerManager?.isInitialized() === false && this.workerManager.isWorkingPool()) this.workerManager.initialize().catch(() => {}).then(() => this.rerender());
 					return false;
@@ -726,7 +775,10 @@ var FileDiff = class {
 					this.pre = void 0;
 				}
 				this.renderSeparators(hunksResult.hunkData);
-				this.renderedDiff = hunksResult.fileDiff;
+				this.adoptRenderData(hunksResult.fileDiff);
+			} else {
+				const renderedDiff = this.getRenderedDiff();
+				if (renderedDiff != null) this.adoptRenderData(renderedDiff);
 			}
 			this.applyBuffers(pre, nextRenderRange);
 			this.injectUnsafeCSS();
@@ -759,24 +811,56 @@ var FileDiff = class {
 		this.mounted = true;
 		onPostRender?.(fileContainer, this, phase);
 	}
-	getLatestDiff(fileDiff = this.fileDiff) {
-		return this.editSession?.diff ?? fileDiff;
+	getInputDiff() {
+		return this.fileDiff;
+	}
+	getWorkingDiff(fallbackDiff = this.fileDiff) {
+		return this.editSession?.diff ?? fallbackDiff;
 	}
 	getRenderedDiff() {
-		return this.renderedDiff;
+		return this.renderedData?.fileDiff;
+	}
+	/**
+	* @internal Data the next render() with this input will display. While a
+	* replacement diff is being highlighted, this is still the displayed data.
+	*/
+	__getNextRenderData({ fileDiff, lineAnnotations }) {
+		const sessionAnnotations = this.editSession?.annotations;
+		if (sessionAnnotations != null) return {
+			fileDiff,
+			lineAnnotations: lineAnnotations != null && this.isNewAnnotations(lineAnnotations) ? lineAnnotations : sessionAnnotations.provided
+		};
+		const workingDiff = this.getWorkingDiff(fileDiff) ?? fileDiff;
+		const nextDiff = this.hunksRenderer.getDiffForNextRender(workingDiff);
+		return {
+			fileDiff: nextDiff,
+			lineAnnotations: lineAnnotations != null && areDiffTargetsEqual(nextDiff, workingDiff) ? lineAnnotations : this.getAnnotationsForDiff(nextDiff)
+		};
+	}
+	prepareRenderData(fileDiff) {
+		this.hunksRenderer.setLineAnnotations(this.getAnnotationsForDiff(fileDiff));
+	}
+	adoptRenderData(fileDiff) {
+		const { pendingData } = this;
+		const matchesPending = pendingData != null && areDiffTargetsEqual(fileDiff, pendingData.fileDiff);
+		this.renderedData = {
+			fileDiff,
+			lineAnnotations: matchesPending ? pendingData.lineAnnotations : this.lineAnnotations
+		};
+		if (matchesPending) this.pendingData = void 0;
 	}
 	syncRenderViewToEditor() {
 		const { editor, fileContainer } = this;
 		const lineAnnotations = this.getLatestAnnotations();
 		const renderRange = this.computeEditorRenderRange(this.renderRange);
-		const fileDiff = this.getLatestDiff();
+		const fileDiff = this.getWorkingDiff();
 		if (editor == null || fileContainer == null || fileDiff == null || fileDiff.isPartial) return;
 		const sync = (highlighter) => {
-			if (!this.enabled || this.editor !== editor || this.fileContainer !== fileContainer || this.getLatestDiff() !== fileDiff) return;
+			if (!this.enabled || this.editor !== editor || this.fileContainer !== fileContainer || this.getWorkingDiff() !== fileDiff) return;
 			const replacement = this.editSession?.outgoingDiff;
-			const { fileDiff: externalDiff } = this;
-			const externalDocument = replacement != null && externalDiff != null && replacement !== fileDiff;
-			const resetHistory = externalDocument && replacement != null && externalDiff != null ? shouldResetUndoState(replacement, externalDiff) : false;
+			const inputDiff = this.getInputDiff();
+			const externalDocument = replacement != null && inputDiff != null && replacement !== fileDiff;
+			const resetHistory = externalDocument && replacement != null && inputDiff != null ? shouldResetUndoState(replacement, inputDiff) : false;
 			editor.__syncRenderView({
 				highlighter,
 				fileContainer,
@@ -797,11 +881,13 @@ var FileDiff = class {
 		else getSharedHighlighter({
 			themes: getThemes(theme),
 			langs: ["text", lang],
-			preferredHighlighter: this.workerManager?.getPreferredHighlighter() ?? this.options.preferredHighlighter
-		}).then(sync);
+			preferredHighlighter: resolvePreferredHighlighter(this.workerManager, this.options)
+		}).then(sync).catch((error) => {
+			if (!(error instanceof HighlighterDisposedError)) console.error(error);
+		});
 	}
 	computeEditorRenderRange(renderRange) {
-		const fileDiff = this.getLatestDiff();
+		const fileDiff = this.getWorkingDiff();
 		if (renderRange == null || fileDiff == null || isDefaultRenderRange(renderRange)) return renderRange;
 		const { diffStyle = "split", expandUnchanged = false, collapsedContextThreshold = 1 } = this.options;
 		let firstLineNumber;
@@ -851,7 +937,8 @@ var FileDiff = class {
 	* When `clone` is true, the returned lines and hunks are copied.
 	*/
 	__captureDocumentSessionState(clone = true) {
-		let { fileDiff, editSession: { diff: sessionDiff, outgoingDiff } = {} } = this;
+		const fileDiff = this.getInputDiff();
+		let { diff: sessionDiff, outgoingDiff } = this.editSession ?? {};
 		if (outgoingDiff != null && fileDiff != null) {
 			if (!fileDiff.isPartial && shouldResetUndoState(outgoingDiff, fileDiff)) return;
 			sessionDiff = outgoingDiff;
@@ -892,17 +979,17 @@ var FileDiff = class {
 		this.resumeEditorRendering(editor);
 	}
 	resumeEditorRendering(editor) {
-		const { fileDiff: externalDiff } = this;
+		const inputDiff = this.getInputDiff();
 		const pendingReplacement = this.editSession?.outgoingDiff;
-		if (pendingReplacement != null && externalDiff != null && !externalDiff.isPartial && this.editSession?.diff === pendingReplacement) this.installEditSession(externalDiff);
-		const initialExternalDiff = this.editSession == null && externalDiff != null && !externalDiff.isPartial ? externalDiff : void 0;
-		if (initialExternalDiff != null) this.installEditSession(initialExternalDiff, editor.__getDocumentContents(getAdditionFile(initialExternalDiff)), editor.__getDocumentSessionState());
+		if (pendingReplacement != null && inputDiff != null && !inputDiff.isPartial && this.editSession?.diff === pendingReplacement) this.installEditSession(inputDiff);
+		const initialInputDiff = this.editSession == null && inputDiff != null && !inputDiff.isPartial ? inputDiff : void 0;
+		if (initialInputDiff != null) this.installEditSession(initialInputDiff, editor.__getDocumentContents(getAdditionFile(initialInputDiff)), editor.__getDocumentSessionState());
 		else if (this.editSession != null) this.hunksRenderer.beginEditSession(this.editSession.diff);
 		this.editor = editor;
-		if (this.fileDiff?.isPartial === true) this.loadFilesIfNecessary();
+		if (this.getInputDiff()?.isPartial === true) this.loadFilesIfNecessary();
 		const editSessionDiff = this.editSession?.diff;
 		if (this.hunksRenderer.editorRenderReady()) {
-			if (editSessionDiff != null && this.hunksRenderer.diffCache === editSessionDiff) this.renderedDiff = editSessionDiff;
+			if (editSessionDiff != null && this.hunksRenderer.diffCache === editSessionDiff) this.adoptRenderData(editSessionDiff);
 			this.syncRenderViewToEditor();
 		} else this.rerender();
 	}
@@ -917,7 +1004,7 @@ var FileDiff = class {
 	* Requires the editor to be detached first. Does nothing when no session
 	* exists, so callers can invoke it again safely after it has settled.
 	*
-	* `onEditComplete` receives the completed diff, current external diff,
+	* `onEditComplete` receives the completed diff, current input diff,
 	* complete file pair, and both annotation collections even when the final
 	* text is unchanged. In `install` mode, accepting installs the completed diff
 	* and its annotations; rejecting or having no handler restores the external
@@ -928,9 +1015,10 @@ var FileDiff = class {
 		this.settleEditSession(mode === "install", editor);
 	}
 	settleEditSession(installResult, editor) {
-		const { editSession, fileDiff: externalDiff, lineAnnotations: externalAnnotations } = this;
-		if (editSession == null || externalDiff == null) return;
-		const { diff: editSessionDiff, annotations: editSessionAnnotations } = editSession;
+		const { editSession } = this;
+		if (editSession == null) return;
+		const { diff: editSessionDiff, inputDiff, annotations: editSessionAnnotations } = editSession;
+		const inputAnnotations = editSessionAnnotations?.provided ?? this.lineAnnotations;
 		if (this.editor != null) throw new Error("FileDiff.__completeEditSession: detach the editor before completing the session");
 		this.hunksRenderer.endEditSession();
 		this.finalizeEditSessionHunks();
@@ -950,20 +1038,20 @@ var FileDiff = class {
 		const event = {
 			fileDiff: completedDiff,
 			editor,
-			originalFileDiff: externalDiff,
+			originalFileDiff: inputDiff,
 			oldFile: completedDiff.type === "new" ? null : {
 				name: completedDiff.prevName ?? completedDiff.name,
 				contents: completedDiff.deletionLines.join("")
 			},
 			newFile,
 			lineAnnotations: sessionAnnotationsCurrent,
-			originalLineAnnotations: externalAnnotations
+			originalLineAnnotations: inputAnnotations
 		};
 		Object.freeze(event);
 		try {
 			editor.__emitEditComplete(event);
 			if (this.options.onEditComplete?.(event) === "accept") {
-				if (completedDiff.cacheKey != null && completedDiff.cacheKey === externalDiff.cacheKey) throw new Error("FileDiff.__completeEditSession: an accepted diff must not reuse the replaced diff cacheKey");
+				if (completedDiff.cacheKey != null && completedDiff.cacheKey === inputDiff.cacheKey) throw new Error("FileDiff.__completeEditSession: an accepted diff must not reuse the replaced diff cacheKey");
 				acceptedDiff = completedDiff;
 				acceptedOldFile = event.oldFile;
 				acceptedNewFile = event.newFile;
@@ -973,14 +1061,17 @@ var FileDiff = class {
 			failure = error;
 		}
 		if (installResult && acceptedDiff != null) {
-			this.fileDiff = acceptedDiff;
 			if (this.additionFile != null) {
 				this.deletionFile = acceptedOldFile;
 				this.additionFile = acceptedNewFile;
 			}
-			if (sessionAnnotationsCurrent != null) this.lineAnnotations = sessionAnnotationsCurrent;
 		}
 		this.editSession = void 0;
+		this.fileDiff = installResult && acceptedDiff != null ? acceptedDiff : inputDiff;
+		this.pendingData = {
+			fileDiff: this.fileDiff,
+			lineAnnotations: installResult && acceptedDiff != null ? sessionAnnotationsCurrent ?? inputAnnotations : inputAnnotations
+		};
 		if (installResult && this.fileContainer != null) this.rerender();
 		if (failed) throw failure;
 	}
@@ -997,7 +1088,7 @@ var FileDiff = class {
 	* ran.
 	*/
 	finalizeEditSessionHunks() {
-		const fileDiff = this.getLatestDiff();
+		const fileDiff = this.getWorkingDiff();
 		if (fileDiff == null || fileDiff.editSessionDirty !== true) return false;
 		const { collapsedContextThreshold = 1 } = this.options;
 		const anchors = captureExpansionAnchors(fileDiff, this.hunksRenderer.getExpandedHunksMap(), collapsedContextThreshold);
@@ -1049,9 +1140,8 @@ var FileDiff = class {
 		}
 	}
 	detachAdditionLines() {
-		const editSessionDiff = this.editSession?.diff;
-		const { fileDiff } = this;
-		if (editSessionDiff != null && (editSessionDiff.additionLines === fileDiff?.additionLines || editSessionDiff.additionLines === editSessionDiff.deletionLines)) editSessionDiff.additionLines = [...editSessionDiff.additionLines];
+		const { diff: editSessionDiff, inputDiff } = this.editSession ?? {};
+		if (editSessionDiff != null && (editSessionDiff.additionLines === inputDiff?.additionLines || editSessionDiff.additionLines === editSessionDiff.deletionLines)) editSessionDiff.additionLines = [...editSessionDiff.additionLines];
 	}
 	isLineRenderable(lineNumber) {
 		const fileDiff = this.getRenderedDiff();
@@ -1169,7 +1259,7 @@ var FileDiff = class {
 		this.placeHolder.style.setProperty("height", `${height}px`);
 		return true;
 	}
-	async primeHighlightCache(fileDiff = this.fileDiff) {
+	async primeHighlightCache(fileDiff = this.getInputDiff()) {
 		const { workerManager } = this;
 		if (fileDiff == null || workerManager == null || !workerManager.isWorkingPool() || fileDiff.cacheKey == null || isDiffPlainText(fileDiff)) return;
 		const tokenizeMaxLength = this.options.tokenizeMaxLength ?? 1e5;
@@ -1223,7 +1313,7 @@ var FileDiff = class {
 	}
 	renderSeparators(hunkData) {
 		const { hunkSeparators } = this.options;
-		if (this.isContainerManaged || this.fileContainer == null || typeof hunkSeparators !== "function") {
+		if (this.isComponentManaged || this.fileContainer == null || typeof hunkSeparators !== "function") {
 			for (const { element } of this.separatorCache.values()) element.remove();
 			this.separatorCache.clear();
 			return;
@@ -1254,31 +1344,34 @@ var FileDiff = class {
 		}
 	}
 	renderAnnotations() {
-		if (this.isContainerManaged || this.fileContainer == null) {
+		if (this.isComponentManaged || this.fileContainer == null) {
 			for (const { element } of this.annotationCache.values()) element.remove();
 			this.annotationCache.clear();
 			return;
 		}
 		const staleAnnotations = new Map(this.annotationCache);
-		const { renderAnnotation } = this.options;
-		const lineAnnotations = this.getLatestAnnotations();
-		if (renderAnnotation != null && lineAnnotations.length > 0) for (const [index, annotation] of lineAnnotations.entries()) {
-			const name = this.getAnnotationSlotName(annotation);
-			const id = `${index}-${name}`;
-			let cache = this.annotationCache.get(id);
-			if (cache == null || !areDiffLineAnnotationsEqual(annotation, cache.annotation)) {
-				cache?.element.remove();
-				const content = renderAnnotation(annotation);
-				if (content == null) continue;
-				cache = {
-					element: createAnnotationWrapperNode(name),
-					annotation
-				};
-				cache.element.appendChild(content);
-				this.fileContainer.appendChild(cache.element);
-				this.annotationCache.set(id, cache);
+		const { renderedData, options: { renderAnnotation } } = this;
+		if (renderAnnotation != null && renderedData != null) {
+			const { fileDiff, lineAnnotations } = renderedData;
+			for (const [index, annotation] of lineAnnotations.entries()) {
+				const name = this.getAnnotationSlotName(annotation);
+				const id = `${index}-${name}`;
+				let cache = this.annotationCache.get(id);
+				if (cache == null || cache.fileDiff !== fileDiff || !areDiffLineAnnotationsEqual(annotation, cache.annotation)) {
+					cache?.element.remove();
+					const content = renderAnnotation(annotation, fileDiff);
+					if (content == null) continue;
+					cache = {
+						element: createAnnotationWrapperNode(name),
+						annotation,
+						fileDiff
+					};
+					cache.element.appendChild(content);
+					this.fileContainer.appendChild(cache.element);
+					this.annotationCache.set(id, cache);
+				}
+				staleAnnotations.delete(id);
 			}
-			staleAnnotations.delete(id);
 		}
 		for (const [id, { element }] of staleAnnotations.entries()) {
 			this.annotationCache.delete(id);
@@ -1376,7 +1469,7 @@ var FileDiff = class {
 		this.placeHolder?.remove();
 		this.placeHolder = void 0;
 		const { headerCache: { fileDiff: cachedHeaderDiff, html: cachedHeaderHTML, lastRenderedHTML } } = this;
-		const headerHTML = (fileDiff !== this.editSession?.diff && areDiffTargetsEqual(cachedHeaderDiff, fileDiff) ? cachedHeaderHTML : void 0) ?? toHtml(headerAST);
+		const headerHTML = (fileDiff !== this.editSession?.diff && areDiffTargetsEqual(cachedHeaderDiff, fileDiff) ? cachedHeaderHTML : void 0) ?? hastToHtml(headerAST);
 		this.headerCache.html = headerHTML;
 		this.headerCache.fileDiff = fileDiff;
 		if (headerHTML !== lastRenderedHTML) {
@@ -1389,7 +1482,7 @@ var FileDiff = class {
 			this.headerElement = newHeader;
 			this.headerCache.lastRenderedHTML = headerHTML;
 		}
-		if (this.isContainerManaged) return;
+		if (this.isComponentManaged) return;
 		const { renderCustomHeader, renderHeaderPrefix, renderHeaderFilenameSuffix, renderHeaderMetadata } = this.options;
 		if (renderCustomHeader != null) {
 			const content = renderCustomHeader(fileDiff) ?? void 0;
@@ -1447,6 +1540,7 @@ var FileDiff = class {
 	}
 	injectUnsafeCSS() {
 		const { unsafeCSS } = this.options;
+		this.pre?.toggleAttribute("data-custom-styles", Boolean(unsafeCSS));
 		const shadowRoot = this.fileContainer?.shadowRoot;
 		if (shadowRoot == null) return;
 		if (unsafeCSS == null || unsafeCSS === "") {
@@ -1515,8 +1609,8 @@ var FileDiff = class {
 		const gutterChildren = getElementChildren(ast[0]);
 		const contentChildren = getElementChildren(ast[1]);
 		if (gutterChildren == null || contentChildren == null) return false;
-		columns.gutter.innerHTML = toHtml(gutterChildren);
-		columns.content.innerHTML = toHtml(contentChildren);
+		columns.gutter.innerHTML = hastToHtml(gutterChildren);
+		columns.content.innerHTML = hastToHtml(contentChildren);
 		if (rowCount !== this.lastRowCount) {
 			columns.gutter.style.setProperty("grid-row", `span ${rowCount}`);
 			columns.content.style.setProperty("grid-row", `span ${rowCount}`);
@@ -1639,7 +1733,7 @@ var FileDiff = class {
 			else if (diffStyle === "split" && Array.isArray(codeElements)) this.insertPartialHTML(diffStyle, codeElements, result, insertPosition);
 			else throw new Error("FileDiff.applyPartialRender.applyChunk: invalid chunk application");
 			rowCount += result.rowCount;
-			this.renderedDiff = result.fileDiff;
+			this.adoptRenderData(result.fileDiff);
 		};
 		this.cleanupErrorWrapper();
 		applyChunk(prependResult, "afterbegin");
@@ -1662,7 +1756,7 @@ var FileDiff = class {
 		} else throw new Error("FileDiff.insertPartialHTML: Invalid argument composition");
 	}
 	refreshSplitDiffView() {
-		const fileDiff = this.getLatestDiff();
+		const fileDiff = this.getWorkingDiff();
 		if (this.options.diffStyle !== "split" || fileDiff == null) return;
 		const hunksResult = this.hunksRenderer.renderDiff(fileDiff, this.renderRange);
 		if (hunksResult == null) return;
@@ -1681,10 +1775,10 @@ var FileDiff = class {
 		};
 		applyLineType("deletions", columns[0]);
 		applyLineType("additions", columns[1]);
-		this.renderedDiff = hunksResult.fileDiff;
+		this.adoptRenderData(hunksResult.fileDiff);
 	}
 	refreshUnifiedDiffView() {
-		const fileDiff = this.getLatestDiff();
+		const fileDiff = this.getWorkingDiff();
 		if (this.options.diffStyle !== "unified" || fileDiff == null) return;
 		const hunksResult = this.hunksRenderer.renderDiff(fileDiff, this.renderRange);
 		if (hunksResult == null) return;
@@ -1694,12 +1788,12 @@ var FileDiff = class {
 		const gutterChildren = getElementChildren(ast?.[0]);
 		const contentChildren = getElementChildren(ast?.[1]);
 		const applyColumns = () => {
-			for (const [el, astChildren] of [[columns.gutter, gutterChildren], [columns.content, contentChildren]]) if (astChildren != null) el.innerHTML = toHtml(astChildren);
+			for (const [el, astChildren] of [[columns.gutter, gutterChildren], [columns.content, contentChildren]]) if (astChildren != null) el.innerHTML = hastToHtml(astChildren);
 			if (hunksResult.rowCount !== this.lastRowCount) {
 				this.applyRowSpan("unified", columns, hunksResult.rowCount);
 				this.lastRowCount = hunksResult.rowCount;
 			}
-			this.renderedDiff = hunksResult.fileDiff;
+			this.adoptRenderData(hunksResult.fileDiff);
 		};
 		if (this.shouldGuardRebuildScroll()) guardWebKitScrollDuringRebuild(this.pre, applyColumns);
 		else applyColumns();