@pierre/diffs 1.3.6 → 1.4.1

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 { 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 { 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 +19,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 +31,11 @@ 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;
+}
 let instanceId = -1;
 var File = class {
 	options;
@@ -66,6 +75,8 @@ var File = class {
 	lineAnnotations = [];
 	managersDirty = false;
 	file;
+	editSession;
+	renderedFile;
 	renderRange;
 	enabled = true;
 	editor;
@@ -73,11 +84,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.editSession?.annotations, annotation, getLineAnnotationName);
+	};
 	handleHighlightRender = () => {
 		this.rerender();
 	};
@@ -89,8 +103,44 @@ var File = class {
 			renderRange: this.renderRange
 		});
 	}
-	__getCurrentFile() {
-		return this.file;
+	getTheme() {
+		return this.workerManager?.getFileRenderOptions().theme ?? this.options.theme ?? DEFAULT_THEMES;
+	}
+	getLatestFile(file = this.file) {
+		return this.editSession?.file ?? file;
+	}
+	getRenderedFile() {
+		return this.renderedFile;
+	}
+	getLatestAnnotations() {
+		return this.editSession?.annotations?.current ?? this.lineAnnotations;
+	}
+	isNewAnnotations(lineAnnotations) {
+		const session = this.editSession?.annotations;
+		if (lineAnnotations === this.lineAnnotations) return false;
+		return session == null || lineAnnotations !== session.provided && lineAnnotations !== session.current;
+	}
+	updateExternalFile(incomingFile, lineAnnotations) {
+		if (areFileTargetsEqual(this.file, incomingFile)) return false;
+		const hadSession = this.editSession != null;
+		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);
+		}
+		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);
+		this.editSession = {
+			file,
+			externalReplacement: hostReplacement && usesExternalDocument,
+			annotations: this.editSession?.annotations ?? adoptEditSessionAnnotations(this.lineAnnotations, getLineAnnotationName)
+		};
+		this.fileRenderer.beginEditSession(file, usesExternalDocument ? externalFile : void 0);
 	}
 	onThemeChange() {
 		this.fileRenderer.clearRenderCache();
@@ -124,13 +174,28 @@ var File = class {
 		return true;
 	}
 	hasThemeChanged() {
-		return this.appliedThemeCSS != null && !areThemesEqual(this.appliedThemeCSS.theme, this.options.theme ?? DEFAULT_THEMES);
+		return this.appliedThemeCSS != null && !areThemesEqual(this.appliedThemeCSS.theme, this.getTheme());
 	}
 	getHoveredLine = () => {
 		return this.interactionManager.getHoveredLine();
 	};
 	setLineAnnotations(lineAnnotations) {
+		const sessionAnnotations = this.editSession?.annotations;
+		if (sessionAnnotations == null) {
+			this.lineAnnotations = lineAnnotations;
+			return;
+		}
+		if (!this.isNewAnnotations(lineAnnotations)) return;
 		this.lineAnnotations = lineAnnotations;
+		writeEditSessionAnnotations(sessionAnnotations, lineAnnotations, getLineAnnotationName);
+	}
+	syncEditSessionAnnotationsFromEditor(lineAnnotations) {
+		const session = this.editSession?.annotations;
+		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 +232,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 +279,8 @@ var File = class {
 			this.fileRenderer.cleanUp();
 			this.workerManager = void 0;
 			this.file = void 0;
+			this.editSession = void 0;
+			this.renderedFile = void 0;
 		}
 		this.enabled = false;
 	}
@@ -225,8 +293,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 +348,185 @@ 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;
+		const syncEditor = (highlighter) => {
+			if (!this.enabled || this.editor !== editor || this.fileContainer !== fileContainer || this.getLatestFile() !== file) return;
+			editor.__syncRenderView({
+				highlighter,
+				fileContainer,
+				file,
+				lineAnnotations,
+				renderRange,
+				externalDocument: this.editSession?.externalReplacement === true
+			});
+		};
+		const theme = this.getTheme();
+		const lang = file.lang ?? getFiletypeFromFileName(file.name);
+		const highlighter = getHighlighterIfLoaded({
+			theme,
+			lang
 		});
-	}
-	attachEditor(editor) {
-		this.editor?.cleanUp();
+		if (highlighter != null) syncEditor(highlighter);
+		else getSharedHighlighter({
+			themes: getThemes(theme),
+			langs: Array.from(/* @__PURE__ */ new Set(["text", lang])),
+			preferredHighlighter: this.workerManager?.getPreferredHighlighter() ?? this.options.preferredHighlighter
+		}).then(syncEditor);
+	}
+	/** @internal The editor applied or edited past the pending external replacement. */
+	__acknowledgeDocumentUpdate() {
+		if (this.editSession != null) this.editSession.externalReplacement = false;
+	}
+	/** @internal Settle annotations */
+	__acceptEditorChange(event) {
+		const { lineAnnotations } = event;
+		if (lineAnnotations != null) this.syncEditSessionAnnotationsFromEditor(lineAnnotations);
+	}
+	emitEditChange(event) {
+		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) {
+		if (this.editSession != null) this.fileRenderer.beginEditSession(this.editSession.file);
+		else if (this.file != null) this.installEditSession(this.file, editor.__getDocumentContents(this.file));
+		const editSessionFile = this.editSession?.file;
+		if (this.fileRenderer.editorRenderReady()) {
+			if (this.fileRenderer.fileCache === editSessionFile) this.renderedFile = 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 { editSession, file: externalFile, lineAnnotations: externalAnnotations } = this;
+		if (editSession == null || externalFile == null) return;
+		const { file: editSessionFile, annotations: editSessionAnnotations } = editSession;
+		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.editSession = 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.editSession?.file;
+		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.editSession?.file;
+		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);
-		if (!collapsed && !forceRender && areRenderRangesEqual(nextRenderRange, this.renderRange) && !didFileChange && !annotationsChanged && !themeChanged) return this.applyCachedThemeState(themeType);
+		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) {
+			const rendered = this.applyCachedThemeState(themeType);
+			if (rendered) this.finalizeRender();
+			return rendered;
+		}
 		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,29 +542,32 @@ 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;
 				console.error(error);
 				if (error instanceof Error) this.applyErrorToDOM(error, fileContainer);
 			}
+			this.finalizeRender();
 			if (!preventEmit) this.emitPostRender();
 			return true;
 		}
 		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();
@@ -399,6 +575,7 @@ var File = class {
 			this.renderGutterUtility();
 			this.managersDirty = true;
 			if (!deferManagers) this.flushManagers();
+			this.finalizeRender();
 			if (this.editor != null) this.syncRenderViewToEditor();
 		} catch (error) {
 			if (disableErrorHandling) throw error;
@@ -408,6 +585,7 @@ var File = class {
 		if (!preventEmit) this.emitPostRender();
 		return true;
 	}
+	finalizeRender() {}
 	emitPostRender(unmount = false) {
 		const { fileContainer, options: { onPostRender } } = this;
 		if (unmount) {
@@ -513,15 +691,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);
@@ -575,7 +755,7 @@ var File = class {
 	applyThemeState(container, themeStyles, themeType, baseThemeType) {
 		const shadowRoot = container.shadowRoot ?? container.attachShadow({ mode: "open" });
 		const effectiveThemeType = baseThemeType ?? themeType;
-		const currentTheme = this.options.theme ?? DEFAULT_THEMES;
+		const currentTheme = this.getTheme();
 		const theme = typeof currentTheme === "string" ? currentTheme : { ...currentTheme };
 		const scrollbarGutter = getMeasuredScrollbarGutter(shadowRoot);
 		if (this.themeCSSStyle?.parentNode === shadowRoot && this.appliedThemeCSS?.themeStyles === themeStyles && this.appliedThemeCSS.themeType === effectiveThemeType && this.appliedThemeCSS.scrollbarGutter === scrollbarGutter) {
@@ -634,11 +814,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 +951,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;