@pierre/diffs 1.3.5 → 1.4.0

package/dist/components/File.d.ts

@@ -1,8 +1,11 @@
-import { AppliedThemeStyleCache, BaseCodeOptions, DiffsEditableComponent, DiffsEditor, DiffsTextDocument, EditorActiveLineOptions, FileContents, HighlightedToken, LineAnnotation, PostRenderPhase, PrePropertiesConfig, RenderFileMetadata, RenderRange, SelectedLineRange, ThemeTypes } from "../types.js";
+import { AppliedThemeStyleCache, BaseCodeOptions, DiffLineAnnotation, FileContents, HighlightedToken, LineAnnotation, PostRenderPhase, PrePropertiesConfig, RenderFileMetadata, RenderRange, SelectedLineRange, ThemeTypes } from "../types.js";
+import { EditCompletionDecision, EditorActiveLineOptions, EditorChangeEvent, FileEditCompleteEvent } from "../editor/types.js";
+import { TextDocument } from "../editor/textDocument.js";
 import { GetHoveredLineResult, InteractionManager, InteractionManagerBaseOptions, SelectionWriteOptions } from "../managers/InteractionManager.js";
-import { WorkerPoolManager } from "../worker/WorkerPoolManager.js";
 import { ResizeManager } from "../managers/ResizeManager.js";
+import { WorkerPoolManager } from "../worker/WorkerPoolManager.js";
 import { FileRenderer } from "../renderers/FileRenderer.js";
+import { Editor } from "../editor/editor.js";
 
 //#region src/components/File.d.ts
 interface FileRenderProps<LAnnotation> {
@@ -19,7 +22,17 @@ interface FileHydrateProps<LAnnotation> extends Omit<FileRenderProps<LAnnotation
   fileContainer: HTMLElement;
   prerenderedHTML?: string;
 }
-interface FileOptions<LAnnotation> extends BaseCodeOptions, InteractionManagerBaseOptions<'file'> {
+type FileEditChangeHandler<LAnnotation, Caret> = (event: EditorChangeEvent<'file', LAnnotation, Caret>) => void;
+/**
+ * Decides a completed edit synchronously: return `'accept'` to install the
+ * event's `file` and annotations, or `'reject'` to restore the original values.
+ * The event is frozen, so re-key the accepted file in place
+ * (`event.file.cacheKey = '…'`) before accepting. The event's editor is
+ * detached and returns its final state from `getViewState()`. A missing handler
+ * rejects.
+ */
+type FileEditCompleteHandler<LAnnotation, Caret> = (event: FileEditCompleteEvent<LAnnotation, Caret>) => EditCompletionDecision;
+interface FileOptions<LAnnotation, Caret> extends BaseCodeOptions, InteractionManagerBaseOptions<'file'> {
   disableFileHeader?: boolean;
   renderHeaderPrefix?: RenderFileMetadata;
   renderHeaderFilenameSuffix?: RenderFileMetadata;
@@ -33,7 +46,21 @@ interface FileOptions<LAnnotation> extends BaseCodeOptions, InteractionManagerBa
   disableErrorHandling?: boolean;
   renderAnnotation?(annotation: LineAnnotation<LAnnotation>): HTMLElement | undefined;
   renderGutterUtility?(getHoveredRow: () => GetHoveredLineResult<'file'> | undefined): HTMLElement | null | undefined;
-  onPostRender?(node: HTMLElement, instance: File<LAnnotation>, phase: PostRenderPhase): unknown;
+  onPostRender?(node: HTMLElement, instance: File<LAnnotation, Caret>, phase: PostRenderPhase): unknown;
+  /**
+   * Fired for every document change of an active edit session on this
+   * component, with the same `EditorChangeEvent` the editor reports through
+   * its own `onChange`. Do not feed the event's file back into the component
+   * while the session is active.
+   */
+  onEditChange?: FileEditChangeHandler<LAnnotation, Caret>;
+  /**
+   * Fired when `edit` toggles false or a component unmounts, including when the
+   * final contents are unchanged. If no callback is provided, the component
+   * reverts to the last `file` and annotations passed into it. The callback
+   * receives the detached editor with its final pre-detach state.
+   */
+  onEditComplete?: FileEditCompleteHandler<LAnnotation, Caret>;
 }
 interface AnnotationElementCache<LAnnotation> {
   element: HTMLElement;
@@ -43,8 +70,8 @@ interface HydrationSetup<LAnnotation> {
   file: FileContents;
   lineAnnotations: LineAnnotation<LAnnotation>[] | undefined;
 }
-declare class File<LAnnotation = undefined> implements DiffsEditableComponent<LAnnotation> {
-  options: FileOptions<LAnnotation>;
+declare class File<LAnnotation = undefined, Caret = undefined> {
+  options: FileOptions<LAnnotation, Caret>;
   private workerManager?;
   private isContainerManaged;
   static LoadedCustomComponent: boolean;
@@ -81,15 +108,25 @@ declare class File<LAnnotation = undefined> implements DiffsEditableComponent<LA
   protected lineAnnotations: LineAnnotation<LAnnotation>[];
   protected managersDirty: boolean;
   file: FileContents | undefined;
+  private editSessionFile;
+  private editSessionAnnotations;
+  private outgoingSessionFile;
+  protected renderedFile: FileContents | undefined;
   protected renderRange: RenderRange | undefined;
   protected enabled: boolean;
-  protected editor: DiffsEditor<LAnnotation> | undefined;
-  constructor(options?: FileOptions<LAnnotation>, workerManager?: WorkerPoolManager | undefined, isContainerManaged?: boolean);
+  protected editor: Editor<'file', LAnnotation, Caret> | undefined;
+  constructor(options?: FileOptions<LAnnotation, Caret>, workerManager?: WorkerPoolManager | undefined, isContainerManaged?: boolean);
+  getAnnotationSlotName: (annotation: LineAnnotation<LAnnotation> | DiffLineAnnotation<LAnnotation>) => string;
   private handleHighlightRender;
   rerender(): void;
-  __getCurrentFile(): FileContents | undefined;
+  protected getLatestFile(file?: FileContents | undefined): FileContents | undefined;
+  protected getRenderedFile(): FileContents | undefined;
+  protected getLatestAnnotations(): LineAnnotation<LAnnotation>[];
+  protected isNewAnnotations(lineAnnotations: LineAnnotation<LAnnotation>[]): boolean;
+  protected updateExternalFile(incomingFile: FileContents, lineAnnotations?: LineAnnotation<LAnnotation>[]): boolean;
+  private installEditSession;
   onThemeChange(): void;
-  setOptions(options: FileOptions<LAnnotation> | undefined): void;
+  setOptions(options: FileOptions<LAnnotation, Caret> | undefined): void;
   protected syncInteractionOptions(): void;
   private mergeOptions;
   setThemeType(themeType: ThemeTypes): void;
@@ -97,6 +134,7 @@ declare class File<LAnnotation = undefined> implements DiffsEditableComponent<LA
   private hasThemeChanged;
   getHoveredLine: () => GetHoveredLineResult<'file'> | undefined;
   setLineAnnotations(lineAnnotations: LineAnnotation<LAnnotation>[]): void;
+  protected syncEditSessionAnnotationsFromEditor(lineAnnotations: LineAnnotation<LAnnotation>[]): boolean;
   setSelectedLines(range: SelectedLineRange | null, options?: SelectionWriteOptions): void;
   setEditorActiveLine(lineNumber: number | null, options?: EditorActiveLineOptions): void;
   getCodeScrollLeft(): number;
@@ -115,13 +153,35 @@ declare class File<LAnnotation = undefined> implements DiffsEditableComponent<LA
   getOrCreateLineCache(file?: FileContents | undefined): string[];
   protected updateBuffers(renderRange: RenderRange): void;
   private syncRenderViewToEditor;
-  attachEditor(editor: DiffsEditor<LAnnotation>): () => void;
-  applyDocumentChange(textDocument: DiffsTextDocument, newLineAnnotations?: LineAnnotation<LAnnotation>[]): void;
+  emitEditChange(event: EditorChangeEvent<'file', LAnnotation, Caret>): void;
+  /** @internal Plain files have no component-owned diff session state. */
+  __captureDocumentSessionState(): undefined;
+  /** @internal Associate this component with its editor for a render lifecycle. */
+  __attachEditor(editor: Editor<'file', LAnnotation, Caret>): () => void;
+  /** @internal Resume rendering for the editor already associated with this component. */
+  __resumeEditor(editor: Editor<'file', LAnnotation, Caret>): void;
+  private resumeEditorRendering;
+  /**
+   * @internal
+   *
+   * Ends the edit session and settles which file this component renders.
+   * 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
+   * 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`
+   * mode always restores the external values. An accepted file cannot reuse
+   * the replaced file's `cacheKey`.
+   */
+  __completeEditSession(editor: Editor<'file', LAnnotation, Caret>, mode: 'install' | 'discard'): void;
+  private settleEditSession;
+  applyDocumentChange(textDocument: TextDocument<'file', LAnnotation>, newLineAnnotations?: LineAnnotation<LAnnotation>[]): void;
   updateRenderCache(dirtyLines: Map<number, Array<HighlightedToken>>, themeType: 'dark' | 'light', options?: {
     lineCountChangeInFlight?: boolean;
   }): void;
-  render(props: FileRenderProps<LAnnotation>): boolean;
-  protected renderPreparedFile({
+  render({
     file,
     fileContainer,
     forceRender,
@@ -167,5 +227,5 @@ declare class File<LAnnotation = undefined> implements DiffsEditableComponent<LA
   private cleanupErrorWrapper;
 }
 //#endregion
-export { File, FileHydrateProps, FileOptions, FileRenderProps };
+export { File, FileEditChangeHandler, type FileEditCompleteEvent, FileEditCompleteHandler, FileHydrateProps, FileOptions, 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,11 @@
 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 { areThemesEqual } from "../utils/areThemesEqual.js";
 import { isStyleNode } from "../utils/isStyleNode.js";
-import { areFilesEqual } from "../utils/areFilesEqual.js";
+import { areFileTargetsEqual } from "../utils/areFileTargetsEqual.js";
 import { InteractionManager, pluckInteractionOptions } from "../managers/InteractionManager.js";
 import { ResizeManager } from "../managers/ResizeManager.js";
 import { areRenderRangesEqual } from "../utils/areRenderRangesEqual.js";
+import { getFiletypeFromFileName } from "../utils/getFiletypeFromFileName.js";
 import { getLineAnnotationName } from "../utils/getLineAnnotationName.js";
 import { isFilePlainText } from "../utils/isFilePlainText.js";
 import { FileRenderer } from "../renderers/FileRenderer.js";
@@ -16,6 +17,7 @@ import { createGutterUtilityContentNode } from "../utils/createGutterUtilityCont
 import { createUnsafeCSSStyleNode } from "../utils/createUnsafeCSSStyleNode.js";
 import { getMeasuredScrollbarGutter } from "../utils/scrollbarGutter.js";
 import { patchScrollbarGutterSize, wrapThemeCSS, wrapUnsafeCSS } from "../utils/cssWrappers.js";
+import { adoptEditSessionAnnotations, resolveEditSessionSlotName, writeEditSessionAnnotations } from "../utils/editSessionAnnotations.js";
 import { getFileRendererOptions } from "../utils/getFileRendererOptions.js";
 import { getOrCreateCodeNode } from "../utils/getOrCreateCodeNode.js";
 import { guardWebKitScrollDuringRebuild } from "../utils/guardWebKitScrollDuringRebuild.js";
@@ -27,6 +29,16 @@ import "./web-components.js";
 import { toHtml } from "hast-util-to-html";
 //#region src/components/File.ts
 const EMPTY_STRINGS = [""];
+function createEditSessionFile(file) {
+	const editSessionFile = { ...file };
+	delete editSessionFile.cacheKey;
+	return editSessionFile;
+}
+function shouldResetUndoState(previousFile, nextFile) {
+	const previousLanguage = previousFile.lang ?? getFiletypeFromFileName(previousFile.name);
+	const nextLanguage = nextFile.lang ?? getFiletypeFromFileName(nextFile.name);
+	return previousFile.name !== nextFile.name || previousLanguage !== nextLanguage;
+}
 let instanceId = -1;
 var File = class {
 	options;
@@ -66,6 +78,10 @@ var File = class {
 	lineAnnotations = [];
 	managersDirty = false;
 	file;
+	editSessionFile;
+	editSessionAnnotations;
+	outgoingSessionFile;
+	renderedFile;
 	renderRange;
 	enabled = true;
 	editor;
@@ -73,11 +89,14 @@ var File = class {
 		this.options = options;
 		this.workerManager = workerManager;
 		this.isContainerManaged = isContainerManaged;
-		this.fileRenderer = new FileRenderer(options, this.handleHighlightRender, this.workerManager);
+		this.fileRenderer = new FileRenderer(options, this.getAnnotationSlotName, this.handleHighlightRender, this.workerManager);
 		this.resizeManager = new ResizeManager();
 		this.interactionManager = new InteractionManager("file", pluckInteractionOptions(options));
 		this.workerManager?.subscribeToThemeChanges(this);
 	}
+	getAnnotationSlotName = (annotation) => {
+		return resolveEditSessionSlotName(this.editSessionAnnotations, annotation, getLineAnnotationName);
+	};
 	handleHighlightRender = () => {
 		this.rerender();
 	};
@@ -89,8 +108,40 @@ var File = class {
 			renderRange: this.renderRange
 		});
 	}
-	__getCurrentFile() {
-		return this.file;
+	getLatestFile(file = this.file) {
+		return this.editSessionFile ?? file;
+	}
+	getRenderedFile() {
+		return this.renderedFile;
+	}
+	getLatestAnnotations() {
+		return this.editSessionAnnotations?.current ?? this.lineAnnotations;
+	}
+	isNewAnnotations(lineAnnotations) {
+		const { editSessionAnnotations: session, lineAnnotations: externalAnnotations } = this;
+		if (lineAnnotations === externalAnnotations) return false;
+		return session == null || lineAnnotations !== session.provided && lineAnnotations !== session.current;
+	}
+	updateExternalFile(incomingFile, lineAnnotations) {
+		if (areFileTargetsEqual(this.file, incomingFile)) return false;
+		const previousEditSessionFile = this.outgoingSessionFile ?? this.editSessionFile;
+		this.file = incomingFile;
+		this.outgoingSessionFile = void 0;
+		if (previousEditSessionFile != null || this.editor != null) {
+			this.outgoingSessionFile = previousEditSessionFile;
+			this.installEditSession(incomingFile, previousEditSessionFile == null ? this.editor?.__getDocumentContents(incomingFile) : void 0);
+		} else this.editSessionFile = void 0;
+		if (this.editSessionAnnotations != null && lineAnnotations != null) {
+			this.lineAnnotations = lineAnnotations;
+			this.editSessionAnnotations = adoptEditSessionAnnotations(lineAnnotations, getLineAnnotationName, this.editSessionAnnotations);
+		}
+		return true;
+	}
+	installEditSession(externalFile, retainedDocument) {
+		const usesExternalDocument = retainedDocument == null || retainedDocument.name === externalFile.name && retainedDocument.lang === externalFile.lang && retainedDocument.contents === externalFile.contents;
+		const editSessionFile = createEditSessionFile(retainedDocument ?? externalFile);
+		this.editSessionFile = editSessionFile;
+		this.fileRenderer.beginEditSession(editSessionFile, usesExternalDocument ? externalFile : void 0);
 	}
 	onThemeChange() {
 		this.fileRenderer.clearRenderCache();
@@ -130,7 +181,22 @@ var File = class {
 		return this.interactionManager.getHoveredLine();
 	};
 	setLineAnnotations(lineAnnotations) {
+		const { editSessionAnnotations: sessionAnnotations } = this;
+		if (sessionAnnotations == null) {
+			this.lineAnnotations = lineAnnotations;
+			return;
+		}
+		if (!this.isNewAnnotations(lineAnnotations)) return;
 		this.lineAnnotations = lineAnnotations;
+		writeEditSessionAnnotations(sessionAnnotations, lineAnnotations, getLineAnnotationName);
+	}
+	syncEditSessionAnnotationsFromEditor(lineAnnotations) {
+		const { editSessionAnnotations: session } = this;
+		if (session == null || lineAnnotations === session.current) return false;
+		session.current = lineAnnotations;
+		this.fileRenderer.setLineAnnotations(lineAnnotations);
+		this.renderAnnotations();
+		return true;
 	}
 	setSelectedLines(range, options) {
 		this.interactionManager.setSelection(range, options);
@@ -167,12 +233,13 @@ var File = class {
 		this.managersDirty = false;
 	}
 	shouldApplyColumnVariables(overflow) {
-		return overflow === "scroll" && this.lineAnnotations.length > 0;
+		return overflow === "scroll" && this.getLatestAnnotations().length > 0;
 	}
 	cleanUp(recycle = false) {
+		const editor = this.editor;
 		this.emitPostRender(true);
-		this.editor?.cleanUp(recycle);
-		this.editor = void 0;
+		editor?.cleanUp(recycle ? "recycle" : "discard");
+		if (!recycle) this.editor = void 0;
 		this.resizeManager.cleanUp();
 		this.interactionManager.cleanUp();
 		this.managersDirty = false;
@@ -213,6 +280,10 @@ var File = class {
 			this.fileRenderer.cleanUp();
 			this.workerManager = void 0;
 			this.file = void 0;
+			this.editSessionFile = void 0;
+			this.editSessionAnnotations = void 0;
+			this.outgoingSessionFile = void 0;
+			this.renderedFile = void 0;
 		}
 		this.enabled = false;
 	}
@@ -225,8 +296,10 @@ var File = class {
 		if (!this.enabled) throw new Error("File.hydrate: attempting to call hydrate after cleaned up");
 		if (this.fileContainer != null) throw new Error("File.hydrate: hydrate can only be called before the instance has rendered or hydrated");
 		this.hydrateElements(fileContainer, prerenderedHTML);
-		if (shouldRenderCode(this.pre, file, this.options.collapsed) || shouldRenderHeader(this.headerElement, file, this.options.disableFileHeader)) this.render({
+		const forceEditorRender = this.editor != null;
+		if (forceEditorRender || shouldRenderCode(this.pre, file, this.options.collapsed) || shouldRenderHeader(this.headerElement, file, this.options.disableFileHeader)) this.render({
 			...props,
+			forceRender: forceEditorRender || props.forceRender,
 			preventEmit: true
 		});
 		else this.hydrationSetup({
@@ -278,82 +351,168 @@ var File = class {
 		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.file) {
+	getOrCreateLineCache(file = this.getLatestFile()) {
 		return file != null ? this.fileRenderer.getOrCreateLineCache(file) : EMPTY_STRINGS;
 	}
 	updateBuffers(renderRange) {
 		if (this.pre != null) this.applyBuffers(this.pre, renderRange);
 	}
 	syncRenderViewToEditor() {
-		const editor = this.editor;
-		const fileContainer = this.fileContainer;
-		const file = this.file;
-		const lineAnnotations = this.lineAnnotations;
-		const renderRange = this.renderRange;
-		if (editor != null && fileContainer != null && file != null) this.fileRenderer.initializeHighlighter().then((highlighter) => {
-			if (!this.enabled || this.editor !== editor || this.fileContainer !== fileContainer || this.file !== file) return;
-			editor.__syncRenderView(highlighter, fileContainer, file, lineAnnotations, renderRange);
+		const { editor, fileContainer, renderRange } = this;
+		const lineAnnotations = this.getLatestAnnotations();
+		const file = this.getLatestFile();
+		if (editor == null || fileContainer == null || file == null) return;
+		this.fileRenderer.initializeHighlighter().then((highlighter) => {
+			if (!this.enabled || this.editor !== editor || this.fileContainer !== fileContainer || this.getLatestFile() !== file) return;
+			const { outgoingSessionFile: replacement, file: externalFile } = this;
+			const externalDocument = replacement != null && externalFile != null && replacement !== file;
+			const resetHistory = externalDocument ? shouldResetUndoState(replacement, externalFile) : false;
+			if (externalDocument) this.outgoingSessionFile = void 0;
+			editor.__syncRenderView({
+				highlighter,
+				fileContainer,
+				file,
+				lineAnnotations,
+				renderRange,
+				externalDocument,
+				resetHistory
+			});
 		});
 	}
-	attachEditor(editor) {
-		this.editor?.cleanUp();
+	emitEditChange(event) {
+		const { lineAnnotations } = event;
+		if (lineAnnotations != null) this.syncEditSessionAnnotationsFromEditor(lineAnnotations);
+		const { onEditChange } = this.options;
+		onEditChange?.(event);
+	}
+	/** @internal Plain files have no component-owned diff session state. */
+	__captureDocumentSessionState() {}
+	/** @internal Associate this component with its editor for a render lifecycle. */
+	__attachEditor(editor) {
+		if (this.editor != null) throw new Error("File.__attachEditor: an editor is already attached");
 		this.editor = editor;
-		this.fileRenderer.beginEditSession();
-		const preparedFile = this.file == null ? void 0 : editor.__prepareFile?.(this.file);
-		if (preparedFile !== void 0 && preparedFile !== this.file) this.renderPreparedFile({
-			file: preparedFile,
-			forceRender: true,
-			preventEmit: true,
-			renderRange: this.renderRange
-		});
-		else if (this.fileRenderer.editorRenderReady()) this.syncRenderViewToEditor();
-		else this.rerender();
-		return () => {
+		const detach = () => {
 			this.editor = void 0;
 			this.fileRenderer.endEditSession();
 		};
+		try {
+			this.resumeEditorRendering(editor);
+			return detach;
+		} catch (error) {
+			detach();
+			throw error;
+		}
+	}
+	/** @internal Resume rendering for the editor already associated with this component. */
+	__resumeEditor(editor) {
+		if (this.editor !== editor) throw new Error("File.__resumeEditor: editor association changed");
+		this.resumeEditorRendering(editor);
+	}
+	resumeEditorRendering(editor) {
+		this.editSessionAnnotations ??= adoptEditSessionAnnotations(this.lineAnnotations, getLineAnnotationName);
+		if (this.editSessionFile == null && this.file != null) this.installEditSession(this.file, editor.__getDocumentContents(this.file));
+		else this.fileRenderer.beginEditSession(this.editSessionFile);
+		if (this.fileRenderer.editorRenderReady()) {
+			if (this.fileRenderer.fileCache === this.editSessionFile) this.renderedFile = this.editSessionFile;
+			this.syncRenderViewToEditor();
+		} else this.rerender();
+	}
+	/**
+	* @internal
+	*
+	* Ends the edit session and settles which file this component renders.
+	* 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
+	* 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`
+	* mode always restores the external values. An accepted file cannot reuse
+	* the replaced file's `cacheKey`.
+	*/
+	__completeEditSession(editor, mode) {
+		this.settleEditSession(mode === "install", editor);
+	}
+	settleEditSession(installResult, editor) {
+		const { editSessionFile, editSessionAnnotations, file: externalFile, lineAnnotations: externalAnnotations } = this;
+		if (editSessionFile == null || externalFile == null) return;
+		if (this.editor != null) throw new Error("File.__completeEditSession: detach the editor before completing the session");
+		const sessionAnnotationsCurrent = editSessionAnnotations?.current;
+		let acceptedFile;
+		let failed = false;
+		let failure;
+		if (editor == null) throw new Error("File.__completeEditSession: editor is required for completion");
+		const completedFile = { ...editSessionFile };
+		const event = {
+			file: completedFile,
+			editor,
+			originalFile: externalFile,
+			lineAnnotations: sessionAnnotationsCurrent,
+			originalLineAnnotations: externalAnnotations
+		};
+		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");
+				acceptedFile = completedFile;
+			}
+		} catch (error) {
+			failed = true;
+			failure = error;
+		}
+		if (installResult && acceptedFile != null) {
+			this.file = acceptedFile;
+			if (sessionAnnotationsCurrent != null) this.lineAnnotations = sessionAnnotationsCurrent;
+		}
+		this.editSessionFile = void 0;
+		this.editSessionAnnotations = void 0;
+		this.outgoingSessionFile = void 0;
+		const { renderedFile, file: settledFile } = this;
+		this.fileRenderer.endEditSession(settledFile);
+		if (renderedFile != null && settledFile != null && renderedFile !== settledFile && areFileTargetsEqual(renderedFile, settledFile)) this.renderedFile = settledFile;
+		if (installResult && this.fileContainer != null) this.rerender();
+		if (failed) throw failure;
 	}
 	applyDocumentChange(textDocument, newLineAnnotations) {
+		const { editSessionFile } = this;
+		if (editSessionFile == null) throw new Error("File.applyDocumentChange: requires an active edit session");
+		this.fileRenderer.beginEditSession(editSessionFile);
 		this.fileRenderer.applyDocumentChange(textDocument);
-		if (newLineAnnotations != null && newLineAnnotations !== this.lineAnnotations && this.file != null) {
-			this.setLineAnnotations(newLineAnnotations);
-			this.fileRenderer.setLineAnnotations(this.lineAnnotations);
-			this.renderAnnotations();
-		}
+		if (newLineAnnotations != null) this.syncEditSessionAnnotationsFromEditor(newLineAnnotations);
 	}
 	updateRenderCache(dirtyLines, themeType, options) {
+		const { editSessionFile } = this;
+		if (editSessionFile == null) throw new Error("File.updateRenderCache: requires an active edit session");
+		this.fileRenderer.beginEditSession(editSessionFile);
 		this.fileRenderer.updateRenderCache(dirtyLines, themeType, options?.lineCountChangeInFlight);
 	}
-	render(props) {
+	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");
-		const file = this.editor?.__prepareFile?.(props.file) ?? props.file;
-		return this.renderPreparedFile(file === props.file ? props : {
-			...props,
-			file
-		});
-	}
-	renderPreparedFile({ file, fileContainer, forceRender = false, preventEmit = false, containerWrapper, deferManagers = false, lineAnnotations, renderRange }) {
 		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.lineAnnotations.length > 0) ? lineAnnotations !== this.lineAnnotations : false;
-		const didFileChange = !areFilesEqual(this.file, file) || this.fileRenderer.hasUnkeyedFileContentsChanged(file);
+		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;
 		if (!collapsed && !forceRender && areRenderRangesEqual(nextRenderRange, this.renderRange) && !didFileChange && !annotationsChanged && !themeChanged) return this.applyCachedThemeState(themeType);
 		this.renderRange = nextRenderRange;
 		if (didFileChange) this.cachedHeaderHTML = void 0;
-		this.file = file;
 		this.fileRenderer.setOptions(getFileRendererOptions(this.options));
 		this.syncInteractionOptions();
 		if (lineAnnotations != null) this.setLineAnnotations(lineAnnotations);
-		this.fileRenderer.setLineAnnotations(this.lineAnnotations);
+		this.fileRenderer.setLineAnnotations(this.getLatestAnnotations());
 		const { disableErrorHandling = false, disableFileHeader = false } = this.options;
 		if (disableFileHeader) {
 			if (this.headerElement != null) {
@@ -369,9 +528,10 @@ var File = class {
 			this.removeRenderedCode();
 			this.clearAuxiliaryNodes();
 			try {
-				const fileResult = this.fileRenderer.renderFile(file, EMPTY_RENDER_RANGE);
+				const fileResult = this.fileRenderer.renderFile(latestFile, EMPTY_RENDER_RANGE);
 				if (fileResult != null) this.applyThemeState(fileContainer, fileResult.themeStyles, themeType, fileResult.baseThemeType);
-				if (fileResult?.headerAST != null) this.applyHeaderToDOM(fileResult.headerAST, fileContainer);
+				if (fileResult?.headerAST != null) this.applyHeaderToDOM(fileResult.headerAST, fileContainer, fileResult.file);
+				this.renderedFile = fileResult?.file ?? latestFile;
 				this.injectUnsafeCSS();
 			} catch (error) {
 				if (disableErrorHandling) throw error;
@@ -383,15 +543,16 @@ var File = class {
 		}
 		try {
 			const pre = this.getOrCreatePreNode(fileContainer);
-			if (!this.canPartiallyRender(forceRender, annotationsChanged, didFileChange || themeChanged) || !this.applyPartialRender(previousRenderRange, nextRenderRange)) {
-				const fileResult = this.fileRenderer.renderFile(file, nextRenderRange);
+			if (!this.canPartiallyRender(forceRender, annotationsChanged, didFileChange || themeChanged || !areFileTargetsEqual(this.renderedFile, latestFile)) || !this.applyPartialRender(latestFile, previousRenderRange, nextRenderRange)) {
+				const fileResult = this.fileRenderer.renderFile(latestFile, nextRenderRange);
 				if (fileResult == null) {
-					if (this.workerManager?.isInitialized() === false) this.workerManager.initialize().then(() => this.rerender());
+					if (this.workerManager?.isInitialized() === false && this.workerManager.isWorkingPool()) this.workerManager.initialize().catch(() => {}).then(() => this.rerender());
 					return false;
 				}
 				this.applyThemeState(fileContainer, fileResult.themeStyles, themeType, fileResult.baseThemeType);
-				if (fileResult.headerAST != null) this.applyHeaderToDOM(fileResult.headerAST, fileContainer);
+				if (fileResult.headerAST != null) this.applyHeaderToDOM(fileResult.headerAST, fileContainer, fileResult.file);
 				this.applyFullRender(fileResult, pre);
+				this.renderedFile = fileResult.file;
 			}
 			this.applyBuffers(pre, nextRenderRange);
 			this.injectUnsafeCSS();
@@ -513,15 +674,17 @@ var File = class {
 		}
 		const staleAnnotations = new Map(this.annotationCache);
 		const { renderAnnotation } = this.options;
-		if (renderAnnotation != null && this.lineAnnotations.length > 0) for (const [index, annotation] of this.lineAnnotations.entries()) {
-			const id = `${index}-${getLineAnnotationName(annotation)}`;
+		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(getLineAnnotationName(annotation)),
+					element: createAnnotationWrapperNode(name),
 					annotation
 				};
 				cache.element.appendChild(content);
@@ -634,11 +797,11 @@ var File = class {
 		else applyColumns();
 		this.lastRowCount = result.rowCount;
 	}
-	applyPartialRender(previousRenderRange, renderRange) {
+	applyPartialRender(file, previousRenderRange, renderRange) {
 		if (previousRenderRange == null || renderRange == null) return false;
-		const { file, code } = this;
+		const { code } = this;
 		const columns = code != null ? this.getColumns(code) : void 0;
-		if (file == null || code == null || columns == null) return false;
+		if (code == null || columns == null) return false;
 		const previousStart = previousRenderRange.startingLine;
 		const nextStart = renderRange.startingLine;
 		const previousEnd = previousRenderRange.totalLines === Infinity ? Number.POSITIVE_INFINITY : previousStart + previousRenderRange.totalLines;
@@ -771,9 +934,7 @@ var File = class {
 	shouldDisableVirtualizationBuffers() {
 		return this.options.disableVirtualizationBuffers ?? false;
 	}
-	applyHeaderToDOM(headerAST, container) {
-		const { file } = this;
-		if (file == null) return;
+	applyHeaderToDOM(headerAST, container, file) {
 		this.cleanupErrorWrapper();
 		this.placeHolder?.remove();
 		this.placeHolder = void 0;