@pierre/diffs 1.5.2 → 1.6.0

package/dist/components/File.d.ts

@@ -44,7 +44,8 @@ interface FileOptions<LAnnotation, Caret> extends BaseCodeOptions, InteractionMa
    * errors yourself.
    */
   disableErrorHandling?: boolean;
-  renderAnnotation?(annotation: LineAnnotation<LAnnotation>): HTMLElement | undefined;
+  /** Receives the matching file, including any editor changes. */
+  renderAnnotation?(annotation: LineAnnotation<LAnnotation>, file: FileContents): HTMLElement | undefined;
   renderGutterUtility?(getHoveredRow: () => GetHoveredLineResult<'file'> | undefined): HTMLElement | null | undefined;
   onPostRender?(node: HTMLElement, instance: File<LAnnotation, Caret>, phase: PostRenderPhase): unknown;
   /**
@@ -65,15 +66,24 @@ interface FileOptions<LAnnotation, Caret> extends BaseCodeOptions, InteractionMa
 interface AnnotationElementCache<LAnnotation> {
   element: HTMLElement;
   annotation: LineAnnotation<LAnnotation>;
+  file: FileContents;
 }
 interface HydrationSetup<LAnnotation> {
   file: FileContents;
   lineAnnotations: LineAnnotation<LAnnotation>[] | undefined;
 }
+interface FileRenderData<LAnnotation> {
+  file: FileContents;
+  lineAnnotations: LineAnnotation<LAnnotation>[];
+}
+interface FileRenderInput<LAnnotation> {
+  file: FileContents;
+  lineAnnotations: LineAnnotation<LAnnotation>[] | undefined;
+}
 declare class File<LAnnotation = undefined, Caret = undefined> {
   options: FileOptions<LAnnotation, Caret>;
   private workerManager?;
-  private isContainerManaged;
+  private requestOwnerRender?;
   static LoadedCustomComponent: boolean;
   readonly __id: string;
   readonly type = "file";
@@ -105,24 +115,36 @@ declare class File<LAnnotation = undefined, Caret = undefined> {
   protected resizeManager: ResizeManager;
   protected interactionManager: InteractionManager<'file'>;
   protected annotationCache: Map<string, AnnotationElementCache<LAnnotation>>;
-  protected lineAnnotations: LineAnnotation<LAnnotation>[];
+  protected get lineAnnotations(): LineAnnotation<LAnnotation>[];
   protected managersDirty: boolean;
   file: FileContents | undefined;
   private editSession;
-  protected renderedFile: FileContents | undefined;
+  private renderedData;
+  private pendingData;
+  protected forceRenderOverride: true | undefined;
   protected renderRange: RenderRange | undefined;
   protected enabled: boolean;
   protected editor: Editor<'file', LAnnotation, Caret> | undefined;
-  constructor(options?: FileOptions<LAnnotation, Caret>, workerManager?: WorkerPoolManager | undefined, isContainerManaged?: boolean);
+  constructor(options?: FileOptions<LAnnotation, Caret>, workerManager?: WorkerPoolManager | undefined, requestOwnerRender?: (() => void) | undefined);
   getAnnotationSlotName: (annotation: LineAnnotation<LAnnotation> | DiffLineAnnotation<LAnnotation>) => string;
   private handleHighlightRender;
   rerender(): void;
+  protected requestRender(): boolean;
+  protected get isComponentManaged(): boolean;
   private getTheme;
-  protected getLatestFile(file?: FileContents | undefined): FileContents | undefined;
+  protected getInputFile(): FileContents | undefined;
+  protected getWorkingFile(fallbackFile?: FileContents | undefined): FileContents | undefined;
   protected getRenderedFile(): FileContents | undefined;
+  /**
+   * @internal Data the next render() with this input will display. While a
+   * replacement file is being highlighted, this is still the displayed data.
+   */
+  __getNextRenderData({ file, lineAnnotations }: FileRenderInput<LAnnotation>): FileRenderData<LAnnotation>;
   protected getLatestAnnotations(): LineAnnotation<LAnnotation>[];
+  protected getAnnotationsForFile(file: FileContents): LineAnnotation<LAnnotation>[];
+  private adoptRenderData;
   protected isNewAnnotations(lineAnnotations: LineAnnotation<LAnnotation>[]): boolean;
-  protected updateExternalFile(incomingFile: FileContents, lineAnnotations?: LineAnnotation<LAnnotation>[]): boolean;
+  protected updateInputFile(incomingFile: FileContents, lineAnnotations?: LineAnnotation<LAnnotation>[]): boolean;
   private installEditSession;
   onThemeChange(): void;
   setOptions(options: FileOptions<LAnnotation, Caret> | undefined): void;
@@ -168,7 +190,7 @@ declare class File<LAnnotation = undefined, Caret = undefined> {
    * 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 file, current external file, and
+   * `onEditComplete` receives the completed file, current input file, and
    * both annotation collections even when the final text is unchanged. In
    * `install` mode, accepting installs the completed file and its annotations;
    * rejecting or having no handler restores the external values. `discard`
@@ -222,5 +244,5 @@ declare class File<LAnnotation = undefined, Caret = undefined> {
   private cleanupErrorWrapper;
 }
 //#endregion
-export { File, FileEditChangeHandler, type FileEditCompleteEvent, FileEditCompleteHandler, FileHydrateProps, FileOptions, FileRenderProps };
+export { File, FileEditChangeHandler, type FileEditCompleteEvent, FileEditCompleteHandler, FileHydrateProps, FileOptions, FileRenderData, FileRenderInput, FileRenderProps };
 //# sourceMappingURL=File.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"File.d.ts","names":[],"sources":["../../src/components/File.ts"],"mappings":"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"}
+{"version":3,"file":"File.d.ts","names":[],"sources":["../../src/components/File.ts"],"mappings":"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"}

package/dist/components/File.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 { areThemesEqual } from "../utils/areThemesEqual.js";
 import { isStyleNode } from "../utils/isStyleNode.js";
 import { isSafari } from "../utils/platform.js";
+import { resolvePreferredHighlighter } from "../utils/resolvePreferredHighlighter.js";
 import { areFileTargetsEqual } from "../utils/areFileTargetsEqual.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";
@@ -29,7 +32,6 @@ import { prerenderHTMLIfNecessary } from "../utils/prerenderHTMLIfNecessary.js";
 import { setPreNodeProperties } from "../utils/setWrapperNodeProps.js";
 import { isHandledWorkerPoolError } from "../worker/errors.js";
 import "./web-components.js";
-import { toHtml } from "hast-util-to-html";
 //#region src/components/File.ts
 const EMPTY_STRINGS = [""];
 function createEditSessionFile(file) {
@@ -41,7 +43,7 @@ let instanceId = -1;
 var File = class {
 	options;
 	workerManager;
-	isContainerManaged;
+	requestOwnerRender;
 	static LoadedCustomComponent = true;
 	__id = `file:${++instanceId}`;
 	type = "file";
@@ -73,18 +75,22 @@ var File = class {
 	resizeManager;
 	interactionManager;
 	annotationCache = /* @__PURE__ */ new Map();
-	lineAnnotations = [];
+	get lineAnnotations() {
+		return this.renderedData?.lineAnnotations ?? EMPTY_LINE_ANNOTATIONS;
+	}
 	managersDirty = false;
 	file;
 	editSession;
-	renderedFile;
+	renderedData;
+	pendingData;
+	forceRenderOverride;
 	renderRange;
 	enabled = true;
 	editor;
-	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.fileRenderer = new FileRenderer(options, this.getAnnotationSlotName, this.handleHighlightRender, this.workerManager);
 		this.resizeManager = new ResizeManager();
 		this.interactionManager = new InteractionManager("file", pluckInteractionOptions(options));
@@ -97,51 +103,104 @@ var File = class {
 		this.rerender();
 	};
 	rerender() {
-		if (!this.enabled || this.file == null) return;
+		const file = this.getInputFile();
+		if (!this.enabled || file == null) return;
+		if (this.requestRender()) return;
 		this.render({
-			file: this.file,
+			file,
 			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;
+	}
 	getTheme() {
 		return this.workerManager?.getFileRenderOptions().theme ?? this.options.theme ?? DEFAULT_THEMES;
 	}
-	getLatestFile(file = this.file) {
-		return this.editSession?.file ?? file;
+	getInputFile() {
+		return this.file;
+	}
+	getWorkingFile(fallbackFile = this.file) {
+		return this.editSession?.file ?? fallbackFile;
 	}
 	getRenderedFile() {
-		return this.renderedFile;
+		return this.renderedData?.file;
+	}
+	/**
+	* @internal Data the next render() with this input will display. While a
+	* replacement file is being highlighted, this is still the displayed data.
+	*/
+	__getNextRenderData({ file, lineAnnotations }) {
+		const sessionAnnotations = this.editSession?.annotations;
+		if (sessionAnnotations != null) return {
+			file,
+			lineAnnotations: lineAnnotations != null && this.isNewAnnotations(lineAnnotations) ? lineAnnotations : sessionAnnotations.provided
+		};
+		const workingFile = this.getWorkingFile(file) ?? file;
+		const nextFile = this.fileRenderer.getFileForNextRender(workingFile);
+		return {
+			file: nextFile,
+			lineAnnotations: lineAnnotations != null && areFileTargetsEqual(nextFile, workingFile) ? lineAnnotations : this.getAnnotationsForFile(nextFile)
+		};
 	}
 	getLatestAnnotations() {
-		return this.editSession?.annotations?.current ?? this.lineAnnotations;
+		return this.pendingData?.lineAnnotations ?? this.editSession?.annotations?.current ?? this.lineAnnotations;
+	}
+	getAnnotationsForFile(file) {
+		const { pendingData } = this;
+		return pendingData != null && areFileTargetsEqual(file, pendingData.file) ? pendingData.lineAnnotations : this.lineAnnotations;
+	}
+	adoptRenderData(file) {
+		const { pendingData } = this;
+		const matchesPending = pendingData != null && areFileTargetsEqual(file, pendingData.file);
+		this.renderedData = {
+			file,
+			lineAnnotations: matchesPending ? pendingData.lineAnnotations : this.lineAnnotations
+		};
+		if (matchesPending) this.pendingData = void 0;
 	}
 	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;
 	}
-	updateExternalFile(incomingFile, lineAnnotations) {
-		if (areFileTargetsEqual(this.file, incomingFile)) return false;
+	updateInputFile(incomingFile, lineAnnotations) {
+		if (areFileTargetsEqual(this.getInputFile(), incomingFile)) return false;
 		const hadSession = this.editSession != null;
+		const previousAnnotations = this.getLatestAnnotations();
 		this.file = incomingFile;
 		if (hadSession || this.editor != null) this.installEditSession(incomingFile, hadSession ? void 0 : this.editor?.__getDocumentContents(incomingFile), true);
 		else this.editSession = void 0;
-		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 = {
+			file: this.editSession?.file ?? incomingFile,
+			lineAnnotations: this.editSession?.annotations?.current ?? lineAnnotations ?? previousAnnotations
+		};
 		return true;
 	}
-	installEditSession(externalFile, retainedDocument, hostReplacement = false) {
-		const usesExternalDocument = retainedDocument == null || retainedDocument.name === externalFile.name && retainedDocument.lang === externalFile.lang && retainedDocument.contents === externalFile.contents;
-		const file = createEditSessionFile(retainedDocument ?? externalFile);
+	installEditSession(inputFile, retainedDocument, hostReplacement = false) {
+		const usesInputDocument = retainedDocument == null || retainedDocument.name === inputFile.name && retainedDocument.lang === inputFile.lang && retainedDocument.contents === inputFile.contents;
+		const file = createEditSessionFile(retainedDocument ?? inputFile);
+		const annotations = this.editSession?.annotations ?? adoptEditSessionAnnotations(this.getLatestAnnotations(), getLineAnnotationName);
 		this.editSession = {
 			file,
-			externalReplacement: hostReplacement && usesExternalDocument,
-			annotations: this.editSession?.annotations ?? adoptEditSessionAnnotations(this.lineAnnotations, getLineAnnotationName)
+			inputFile,
+			externalReplacement: hostReplacement && usesInputDocument,
+			annotations
 		};
-		this.fileRenderer.beginEditSession(file, usesExternalDocument ? externalFile : void 0);
+		this.pendingData = {
+			file,
+			lineAnnotations: annotations.current
+		};
+		this.fileRenderer.beginEditSession(file, usesInputDocument ? inputFile : void 0);
 	}
 	onThemeChange() {
 		this.fileRenderer.clearRenderCache();
@@ -182,18 +241,22 @@ var File = class {
 	};
 	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 file = this.getWorkingFile();
+		if (file != null) this.pendingData = {
+			file,
+			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.fileRenderer.setLineAnnotations(lineAnnotations);
 		this.renderAnnotations();
 		return true;
@@ -233,7 +296,7 @@ var File = class {
 		this.managersDirty = false;
 	}
 	shouldApplyColumnVariables(overflow) {
-		return overflow === "scroll" && this.getLatestAnnotations().length > 0;
+		return overflow === "scroll" && this.lineAnnotations.length > 0;
 	}
 	cleanUp(recycle = false) {
 		const editor = this.editor;
@@ -245,10 +308,13 @@ var File = class {
 		this.managersDirty = false;
 		this.workerManager?.unsubscribeToThemeChanges(this);
 		this.renderRange = 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.pre = void 0;
 		this.code = void 0;
@@ -281,7 +347,6 @@ var File = class {
 			this.workerManager = void 0;
 			this.file = void 0;
 			this.editSession = void 0;
-			this.renderedFile = void 0;
 		}
 		this.enabled = false;
 	}
@@ -343,20 +408,23 @@ var File = class {
 		this.hydrateMeasuredScrollbar();
 	}
 	hydrationSetup({ file, lineAnnotations }) {
-		this.lineAnnotations = lineAnnotations ?? this.lineAnnotations;
+		this.renderedData = {
+			file,
+			lineAnnotations: lineAnnotations ?? this.getLatestAnnotations()
+		};
+		this.pendingData = void 0;
 		this.file = file;
 		this.fileRenderer.setOptions(getFileRendererOptions(this.options));
 		this.syncInteractionOptions();
 		if (this.pre == null) return;
 		this.fileRenderer.hydrate(file);
-		this.renderedFile = file;
 		this.renderAnnotations();
 		this.renderGutterUtility();
 		this.injectUnsafeCSS();
 		this.managersDirty = true;
 		this.flushManagers();
 	}
-	getOrCreateLineCache(file = this.getLatestFile()) {
+	getOrCreateLineCache(file = this.getWorkingFile()) {
 		return file != null ? this.fileRenderer.getOrCreateLineCache(file) : EMPTY_STRINGS;
 	}
 	updateBuffers(renderRange) {
@@ -365,10 +433,10 @@ var File = class {
 	syncRenderViewToEditor() {
 		const { editor, fileContainer, renderRange } = this;
 		const lineAnnotations = this.getLatestAnnotations();
-		const file = this.getLatestFile();
+		const file = this.getWorkingFile();
 		if (editor == null || fileContainer == null || file == null) return;
 		const syncEditor = (highlighter) => {
-			if (!this.enabled || this.editor !== editor || this.fileContainer !== fileContainer || this.getLatestFile() !== file) return;
+			if (!this.enabled || this.editor !== editor || this.fileContainer !== fileContainer || this.getWorkingFile() !== file) return;
 			editor.__syncRenderView({
 				highlighter,
 				fileContainer,
@@ -388,8 +456,10 @@ var File = class {
 		else getSharedHighlighter({
 			themes: getThemes(theme),
 			langs: Array.from(/* @__PURE__ */ new Set(["text", lang])),
-			preferredHighlighter: this.workerManager?.getPreferredHighlighter() ?? this.options.preferredHighlighter
-		}).then(syncEditor);
+			preferredHighlighter: resolvePreferredHighlighter(this.workerManager, this.options)
+		}).then(syncEditor).catch((error) => {
+			if (!(error instanceof HighlighterDisposedError)) console.error(error);
+		});
 	}
 	/** @internal The editor applied or edited past the pending external replacement. */
 	__acknowledgeDocumentUpdate() {
@@ -429,10 +499,13 @@ var File = class {
 	}
 	resumeEditorRendering(editor) {
 		if (this.editSession != null) this.fileRenderer.beginEditSession(this.editSession.file);
-		else if (this.file != null) this.installEditSession(this.file, editor.__getDocumentContents(this.file));
+		else {
+			const inputFile = this.getInputFile();
+			if (inputFile != null) this.installEditSession(inputFile, editor.__getDocumentContents(inputFile));
+		}
 		const editSessionFile = this.editSession?.file;
 		if (this.fileRenderer.editorRenderReady()) {
-			if (this.fileRenderer.fileCache === editSessionFile) this.renderedFile = editSessionFile;
+			if (editSessionFile != null && this.fileRenderer.fileCache === editSessionFile) this.adoptRenderData(editSessionFile);
 			this.syncRenderViewToEditor();
 		} else this.rerender();
 	}
@@ -443,7 +516,7 @@ var File = 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 file, current external file, and
+	* `onEditComplete` receives the completed file, current input file, and
 	* both annotation collections even when the final text is unchanged. In
 	* `install` mode, accepting installs the completed file and its annotations;
 	* rejecting or having no handler restores the external values. `discard`
@@ -454,9 +527,10 @@ var File = class {
 		this.settleEditSession(mode === "install", editor);
 	}
 	settleEditSession(installResult, editor) {
-		const { editSession, file: externalFile, lineAnnotations: externalAnnotations } = this;
-		if (editSession == null || externalFile == null) return;
-		const { file: editSessionFile, annotations: editSessionAnnotations } = editSession;
+		const { editSession } = this;
+		if (editSession == null) return;
+		const { file: editSessionFile, inputFile, annotations: editSessionAnnotations } = editSession;
+		const inputAnnotations = editSessionAnnotations?.provided ?? this.lineAnnotations;
 		if (this.editor != null) throw new Error("File.__completeEditSession: detach the editor before completing the session");
 		const sessionAnnotationsCurrent = editSessionAnnotations?.current;
 		let acceptedFile;
@@ -467,29 +541,31 @@ var File = class {
 		const event = {
 			file: completedFile,
 			editor,
-			originalFile: externalFile,
+			originalFile: inputFile,
 			lineAnnotations: sessionAnnotationsCurrent,
-			originalLineAnnotations: externalAnnotations
+			originalLineAnnotations: inputAnnotations
 		};
 		Object.freeze(event);
 		try {
 			editor.__emitEditComplete(event);
 			if (this.options.onEditComplete?.(event) === "accept") {
-				if (completedFile.cacheKey != null && completedFile.cacheKey === externalFile.cacheKey) throw new Error("File.__completeEditSession: an accepted file must not reuse the replaced file cacheKey");
+				if (completedFile.cacheKey != null && completedFile.cacheKey === inputFile.cacheKey) throw new Error("File.__completeEditSession: an accepted file must not reuse the replaced file cacheKey");
 				acceptedFile = completedFile;
 			}
 		} catch (error) {
 			failed = true;
 			failure = error;
 		}
-		if (installResult && acceptedFile != null) {
-			this.file = acceptedFile;
-			if (sessionAnnotationsCurrent != null) this.lineAnnotations = sessionAnnotationsCurrent;
-		}
+		const settledFile = installResult && acceptedFile != null ? acceptedFile : inputFile;
+		const settledAnnotations = installResult && acceptedFile != null ? sessionAnnotationsCurrent ?? inputAnnotations : inputAnnotations;
 		this.editSession = void 0;
-		const { renderedFile, file: settledFile } = this;
+		this.file = settledFile;
+		this.pendingData = {
+			file: settledFile,
+			lineAnnotations: settledAnnotations
+		};
 		this.fileRenderer.endEditSession(settledFile);
-		if (renderedFile != null && settledFile != null && renderedFile !== settledFile && areFileTargetsEqual(renderedFile, settledFile)) this.renderedFile = settledFile;
+		if (areFileTargetsEqual(this.getRenderedFile(), settledFile)) this.adoptRenderData(settledFile);
 		if (installResult && this.fileContainer != null) this.rerender();
 		if (failed) throw failure;
 	}
@@ -514,15 +590,17 @@ var File = class {
 	}
 	render({ file, fileContainer, forceRender = false, preventEmit = false, containerWrapper, deferManagers = false, lineAnnotations, renderRange }) {
 		if (!this.enabled) throw new Error("File.render: attempting to call render after cleaned up");
+		forceRender = this.forceRenderOverride ?? forceRender;
+		this.forceRenderOverride = void 0;
 		this.editor?.__postponeBgTokenizeToNextFrame();
 		const { collapsed = false, themeType = "system" } = this.options;
 		const nextRenderRange = collapsed ? void 0 : renderRange;
 		const previousRenderRange = this.renderRange;
 		const themeChanged = this.hasThemeChanged();
 		const annotationsChanged = lineAnnotations != null && (lineAnnotations.length > 0 || this.getLatestAnnotations().length > 0) ? this.isNewAnnotations(lineAnnotations) : false;
-		const didFileChange = !areFileTargetsEqual(this.file, file);
-		if (didFileChange) this.updateExternalFile(file, lineAnnotations);
-		const latestFile = this.getLatestFile(file) ?? file;
+		const didFileChange = !areFileTargetsEqual(this.getInputFile(), file);
+		if (didFileChange) this.updateInputFile(file, lineAnnotations);
+		const workingFile = this.getWorkingFile(file) ?? file;
 		if (!collapsed && !forceRender && areRenderRangesEqual(nextRenderRange, this.renderRange) && !didFileChange && !annotationsChanged && !themeChanged) {
 			const rendered = this.applyCachedThemeState(themeType);
 			if (rendered) this.finalizeRender();
@@ -533,7 +611,8 @@ var File = class {
 		this.fileRenderer.setOptions(getFileRendererOptions(this.options));
 		this.syncInteractionOptions();
 		if (lineAnnotations != null) this.setLineAnnotations(lineAnnotations);
-		this.fileRenderer.setLineAnnotations(this.getLatestAnnotations());
+		const nextRenderFile = this.fileRenderer.getFileForNextRender(workingFile);
+		this.fileRenderer.setLineAnnotations(this.getAnnotationsForFile(nextRenderFile));
 		const { disableErrorHandling = false, disableFileHeader = false } = this.options;
 		if (disableFileHeader) {
 			if (this.headerElement != null) {
@@ -549,10 +628,10 @@ var File = class {
 			this.removeRenderedCode();
 			this.clearAuxiliaryNodes();
 			try {
-				const fileResult = this.fileRenderer.renderFile(latestFile, EMPTY_RENDER_RANGE);
+				const fileResult = this.fileRenderer.renderFile(workingFile, EMPTY_RENDER_RANGE);
 				if (fileResult != null) this.applyThemeState(fileContainer, fileResult.themeStyles, themeType, fileResult.baseThemeType);
 				if (fileResult?.headerAST != null) this.applyHeaderToDOM(fileResult.headerAST, fileContainer, fileResult.file);
-				this.renderedFile = fileResult?.file ?? latestFile;
+				this.adoptRenderData(fileResult?.file ?? workingFile);
 				this.injectUnsafeCSS();
 			} catch (error) {
 				if (disableErrorHandling) throw error;
@@ -565,8 +644,9 @@ var File = class {
 		}
 		try {
 			const pre = this.getOrCreatePreNode(fileContainer);
-			if (!this.canPartiallyRender(forceRender, annotationsChanged, didFileChange || themeChanged || !areFileTargetsEqual(this.renderedFile, latestFile)) || !this.applyPartialRender(latestFile, previousRenderRange, nextRenderRange)) {
-				const fileResult = this.fileRenderer.renderFile(latestFile, nextRenderRange);
+			let renderedFile = this.getRenderedFile();
+			if (!this.canPartiallyRender(forceRender, annotationsChanged, didFileChange || themeChanged || !areFileTargetsEqual(this.getRenderedFile(), workingFile)) || !this.applyPartialRender(workingFile, previousRenderRange, nextRenderRange)) {
+				const fileResult = this.fileRenderer.renderFile(workingFile, nextRenderRange);
 				if (fileResult == null) {
 					if (this.workerManager?.isInitialized() === false && this.workerManager.isWorkingPool()) this.workerManager.initialize().catch(() => {}).then(() => this.rerender());
 					return false;
@@ -574,10 +654,11 @@ var File = class {
 				this.applyThemeState(fileContainer, fileResult.themeStyles, themeType, fileResult.baseThemeType);
 				if (fileResult.headerAST != null) this.applyHeaderToDOM(fileResult.headerAST, fileContainer, fileResult.file);
 				this.applyFullRender(fileResult, pre);
-				this.renderedFile = fileResult.file;
+				renderedFile = fileResult.file;
 			}
 			this.applyBuffers(pre, nextRenderRange);
 			this.injectUnsafeCSS();
+			if (renderedFile != null) this.adoptRenderData(renderedFile);
 			this.renderAnnotations();
 			this.renderGutterUtility();
 			this.managersDirty = true;
@@ -648,7 +729,7 @@ var File = class {
 		this.placeHolder.style.setProperty("height", `${height}px`);
 		return true;
 	}
-	async primeHighlightCache(file = this.file) {
+	async primeHighlightCache(file = this.getInputFile()) {
 		const { workerManager } = this;
 		if (file == null || workerManager == null || !workerManager.isWorkingPool() || file.cacheKey == null || isFilePlainText(file)) return;
 		const tokenizeMaxLength = this.options.tokenizeMaxLength ?? 1e5;
@@ -696,31 +777,35 @@ var File = class {
 		this.mounted = false;
 	}
 	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 || !areLineAnnotationsEqual(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 } = this;
+		if (renderAnnotation != null && renderedData != null) {
+			const { file, 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.file !== file || !areLineAnnotationsEqual(annotation, cache.annotation)) {
+					cache?.element.remove();
+					const content = renderAnnotation(annotation, file);
+					if (content == null) continue;
+					cache = {
+						element: createAnnotationWrapperNode(name),
+						annotation,
+						file
+					};
+					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);
@@ -748,6 +833,7 @@ var File = 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 === "") {
@@ -816,10 +902,10 @@ var File = class {
 			if (code.childElementCount >= 2) for (let i = 0; i < 2; i++) {
 				const domEl = code.children[i];
 				const astEl = codeAst[i];
-				domEl.innerHTML = toHtml(astEl.children);
+				domEl.innerHTML = hastToHtml(astEl.children);
 				domEl.style.cssText = astEl.properties.style;
 			}
-			else code.innerHTML = toHtml(codeAst);
+			else code.innerHTML = hastToHtml(codeAst);
 			if (!pre.contains(code)) pre.replaceChildren(code);
 		};
 		if (this.shouldGuardRebuildScroll()) guardWebKitScrollDuringRebuild(pre, applyColumns);
@@ -967,7 +1053,7 @@ var File = class {
 		this.cleanupErrorWrapper();
 		this.placeHolder?.remove();
 		this.placeHolder = void 0;
-		const headerHTML = this.cachedHeaderHTML ?? toHtml(headerAST);
+		const headerHTML = this.cachedHeaderHTML ?? hastToHtml(headerAST);
 		this.cachedHeaderHTML = headerHTML;
 		if (headerHTML !== this.lastRenderedHeaderHTML) {
 			const tempDiv = document.createElement("div");
@@ -979,7 +1065,7 @@ var File = class {
 			this.headerElement = newHeader;
 			this.lastRenderedHeaderHTML = headerHTML;
 		}
-		if (this.isContainerManaged) return;
+		if (this.isComponentManaged) return;
 		const { renderHeaderPrefix, renderHeaderFilenameSuffix, renderCustomHeader, renderHeaderMetadata } = this.options;
 		if (renderCustomHeader != null) {
 			const content = renderCustomHeader(file) ?? void 0;