@pierre/diffs 1.3.0-beta.6 → 1.3.0-beta.8

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

@@ -1 +1 @@
-{"version":3,"file":"FileDiff.d.ts","names":[],"sources":["../../src/components/FileDiff.ts"],"mappings":";;;;;;;;UAkFiB,mBAAA;EACf,QAAA,GAAW,gBAAA;EACX,OAAA,GAAU,YAAA;EACV,OAAA,GAAU,YAAA;EACV,aAAA;EACA,OAAA;EACA,WAAA;EACA,WAAA;EACA,aAAA,GAAgB,WAAA;EAChB,gBAAA,GAAmB,WAAA;EACnB,eAAA,GAAkB,kBAAA,CAAmB,WAAA;EACrC,WAAA,GAAc,WAAA;AAAA;AAAA,UAGC,sBAAA,sBAA4C,IAAA,CAC3D,mBAAA,CAAoB,WAAA;EAGpB,aAAA,EAAe,WAAA;EACf,eAAA;AAAA;AAAA,KAGU,YAAA;AAAA,UAEK,eAAA,sBAEb,IAAA,CAAK,eAAA,qBACL,6BAAA;EACF,cAAA,GACI,OAAA,CAAQ,cAAA;EA3BZ;;;;EAAA,IAgCM,IAAA,EAAM,QAAA,EACN,QAAA,EAAU,QAAA,CAAS,WAAA,MAChB,WAAA,GAAc,gBAAA;EACvB,iBAAA;EACA,kBAAA,GAAqB,0BAAA;EACrB,0BAAA,GAA6B,kCAAA;EAC7B,oBAAA,GAAuB,4BAAA;EACvB,kBAAA,GAAqB,4BAAA;EAjCL;;;;;EAuChB,oBAAA;EACA,gBAAA,EACE,UAAA,EAAY,kBAAA,CAAmB,WAAA,IAC9B,WAAA;EACH,mBAAA,EACE,aAAA,QAAqB,oBAAA,uBACpB,WAAA;EAEH,YAAA,EACE,IAAA,EAAM,WAAA,EACN,QAAA,EAAU,QAAA,CAAS,WAAA,GACnB,KAAA,EAAO,eAAA;AAAA;AAAA,UAID,sBAAA;EACR,OAAA,EAAS,WAAA;EACT,UAAA,EAAY,kBAAA,CAAmB,WAAA;AAAA;AAAA,UAGvB,sBAAA;EACR,OAAA,EAAS,WAAA;EACT,QAAA,EAAU,QAAQ;AAAA;AAAA,UAyBV,cAAA;EACR,QAAA,EAAU,gBAAA;EACV,eAAA,EAAiB,kBAAA,CAAmB,WAAA;EACpC,OAAA,GAAU,YAAA;EACV,OAAA,GAAU,YAAA;AAAA;AAAA,cAKC,QAAA,qCAEA,sBAAA,CAAuB,WAAA;EA0DzB,OAAA,EAAS,eAAA,CAAgB,WAAA;EAAA,UACtB,aAAA,GAAgB,iBAAA;EAAA,UAChB,kBAAA;EAAA,OAzDL,qBAAA;EAAA,SAEE,IAAA;EAAA,SACA,IAAA,EAAM,YAAA;EAAA,UAEL,aAAA,EAAe,WAAA;EAAA,UACf,SAAA,EAAW,UAAA;EAAA,UACX,GAAA,EAAK,cAAA;EAAA,UACL,WAAA,EAAa,WAAA;EAAA,UACb,aAAA,EAAe,WAAA;EAAA,UACf,aAAA,EAAe,WAAA;EAAA,UACf,YAAA,EAAc,WAAA;EAAA,UACd,WAAA,EAAa,WAAA;EAAA,UACb,aAAA,EAAe,gBAAA;EAAA,UACf,eAAA,EAAiB,sBAAA;EAAA,UACjB,kBAAA;EAAA,UACA,cAAA,EAAgB,gBAAA;EAAA,UAChB,gBAAA;EAAA,UACA,oBAAA,EAAsB,WAAA;EAAA,UAEtB,aAAA,EAAe,WAAA;EAAA,UACf,YAAA,EAAc,WAAA;EAAA,UACd,oBAAA,EAAsB,WAAA;EAAA,UACtB,cAAA,EAAgB,WAAA;EAAA,UAChB,YAAA,EAAc,WAAA;EAAA,UACd,cAAA,EAAgB,GAAA,SAAY,sBAAA;EAAA,UAC5B,YAAA,EAAc,WAAA;EAAA,UACd,WAAA,EAAa,WAAA;EAAA,UAEb,aAAA,EAAe,iBAAA,CAAkB,WAAA;EAAA,UACjC,aAAA,EAAe,aAAA;EAAA,UACf,iBAAA,EAAmB,iBAAA;EAAA,UACnB,kBAAA,EAAoB,kBAAA;EAAA,UAEpB,eAAA,EAAiB,GAAA,SAAY,sBAAA,CAAuB,WAAA;EAAA,UAEpD,eAAA,EAAiB,kBAAA,CAAmB,WAAA;EAAA,UACpC,aAAA;EAAA,UAEA,YAAA,EAAc,YAAA;EAAA,UACd,YAAA,EAAc,YAAA;EACjB,QAAA,EAAU,gBAAA;EAAA,UACP,WAAA,EAAa,WAAA;EAAA,UACb,oBAAA,EAAsB,mBAAA;EAAA,UACtB,sBAAA;EAAA,UACA,gBAAA;EAAA,UACA,YAAA;EAAA,QACF,OAAA;EAAA,UAEE,OAAA;EAAA,UAEA,MAAA,EAAQ,WAAA,CAAY,WAAA;EAAA,UACpB,kBAAA,EAAoB,UAAA,QAAkB,UAAA;EAEhD,WAAA,CACS,OAAA,GAAS,eAAA,CAAgB,WAAA,GACtB,aAAA,GAAgB,iBAAA,cAChB,kBAAA;EAAA,UAqBF,qBAAA;EAAA,UAIA,uBAAA,CACR,OAAA,EAAS,eAAA,CAAgB,WAAA,IACxB,wBAAA;EAAA,UAIO,mBAAA,CACR,OAAA,EAAS,eAAA,CAAgB,WAAA,IACxB,iBAAA,CAAkB,WAAA;EAQd,YAAA,EAAc,mBAAA;EAyFd,UAAA,CAAW,OAAA,EAAS,eAAA,CAAgB,WAAA;EAAA,UAQjC,sBAAA;EAAA,QAcF,YAAA;EAID,YAAA,CAAa,SAAA,EAAW,UAAA;EAAA,QAQvB,qBAAA;EAAA,QAqBA,eAAA;EAUD,cAAA,QAAqB,oBAAA;EAIrB,kBAAA,CACL,eAAA,EAAiB,kBAAA,CAAmB,WAAA;EAAA,QAK9B,kBAAA;EAgBD,gBAAA,CACL,KAAA,EAAO,iBAAA,SACP,OAAA,GAAU,qBAAA;EAKL,aAAA;EAqBA,OAAA,CAAQ,OAAA;EAqER,gBAAA;EAKA,OAAA,CAAQ,KAAA,EAAO,sBAAA,CAAuB,WAAA;EAAA,UAuCnC,eAAA,CACR,aAAA,EAAe,WAAA,EACf,eAAA;EAAA,UA+DQ,cAAA;IACR,QAAA;IACA,OAAA;IACA,OAAA;IACA;EAAA,GACC,cAAA,CAAe,WAAA;EA2BX,QAAA;EAYA,aAAA;EAUA,gBAAA,GAAgB,SAAA,UACJ,SAAA,EACN,mBAAA,EAAmB,0BAAA;EAMzB,UAAA,GAAU,SAAA,UACE,SAAA,EACN,mBAAA,EAAmB,0BAAA;EAWzB,MAAA;IACL,OAAA;IACA,OAAA;IACA,QAAA;IACA,aAAA;IACA,WAAA;IACA,WAAA;IACA,eAAA;IACA,aAAA;IACA,gBAAA;IACA;EAAA,GACC,mBAAA,CAAoB,WAAA;EAAA,UAiNb,cAAA,CAAe,OAAA;EAAA,QA2BjB,sBAAA;EAsBD,YAAA,CAAa,MAAA,EAAQ,WAAA,CAAY,WAAA;EAYjC,mBAAA,CACL,YAAA,EAAc,iBAAA,EACd,kBAAA,GAAqB,kBAAA,CAAmB,WAAA;EA6BnC,oBAAA,CAAqB,YAAA,EAAc,iBAAA;EAUnC,iBAAA,CACL,UAAA,EAAY,GAAA,SAAY,KAAA,CAAM,gBAAA,IAC9B,SAAA,oBACA,iBAAA,YACA,iBAAA;EAAA,QAsBM,kBAAA;EAAA,QAwBA,mBAAA;EAeD,iBAAA,CAAkB,MAAA;EAmBlB,mBAAA;EAAA,QAoBC,eAAA;EAAA,QA8CA,gBAAA;EAAA,UAsCE,iBAAA;EAAA,UA4CA,mBAAA;EAAA,UAqBA,wBAAA,CACR,aAAA,GAAgB,WAAA,EAChB,UAAA,GAAa,WAAA,GACZ,WAAA;EAAA,QAgCK,0BAAA;EAAA,QAyBA,eAAA;EAAA,QAgBA,kBAAA;EAAA,UAyBE,oBAAA,CAAqB,GAAA,EAAK,cAAA;EAAA,QAkB5B,gBAAA;EAAA,QA+EA,gBAAA;EAAA,QAYA,uBAAA;EAAA,QAkBA,wBAAA;EAAA,QAYA,uBAAA;EAAA,UAME,eAAA;EAAA,QAiCF,eAAA;EAAA,QAqDA,wBAAA;EAAA,QAWA,eAAA;EAAA,QAyGA,kBAAA;EAAA,QA+HA,iBAAA;EAAA,QA2CA,mBAAA;EAAA,QA+DA,eAAA;EAAA,QAiDA,mBAAA;EAAA,QAsDA,uBAAA;EAAA,QA6BA,YAAA;EAAA,QAwBA,cAAA;EAAA,QA6KA,WAAA;EAAA,QA2DA,aAAA;EAAA,QAKA,gBAAA;EAAA,QAMA,cAAA;EAAA,UAuCE,aAAA,CAAc,WAAA,EAAa,WAAA;EAAA,QAM7B,YAAA;EAAA,UAkDE,kCAAA;EAAA,UAIA,sBAAA,CACR,GAAA,EAAK,cAAA;IACH,mBAAA;IAAqB,mBAAA;IAAqB;EAAA,GAAc,iBAAA,EAC1D,gBAAA,GAAmB,mBAAA;EAAA,QA6Bb,eAAA;EAAA,QAqBA,mBAAA;AAAA"}
+{"version":3,"file":"FileDiff.d.ts","names":[],"sources":["../../src/components/FileDiff.ts"],"mappings":"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"}

package/dist/components/FileDiff.js

@@ -18,6 +18,9 @@ import { upsertHostThemeStyle } from "../utils/hostTheme.js";
 import { prerenderHTMLIfNecessary } from "../utils/prerenderHTMLIfNecessary.js";
 import { setPreNodeProperties } from "../utils/setWrapperNodeProps.js";
 import "./web-components.js";
+import { awaitWithTimeout } from "../utils/awaitWithTimeout.js";
+import { getDiffFileInput } from "../utils/getDiffFileInput.js";
+import { hydratePartialDiff } from "../utils/hydratePartialDiff.js";
 import { parseDiffFromFile } from "../utils/parseDiffFromFile.js";
 import { ScrollSyncManager } from "../managers/ScrollSyncManager.js";
 import { isDiffPlainText } from "../utils/isDiffPlainText.js";
@@ -27,6 +30,9 @@ 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");
+}
 let instanceId = -1;
 var FileDiff = class {
 	options;
@@ -68,6 +74,7 @@ var FileDiff = class {
 	additionFile;
 	fileDiff;
 	renderRange;
+	pendingFiles;
 	appliedPreAttributes;
 	lastRenderedHeaderHTML;
 	cachedHeaderHTML;
@@ -75,7 +82,8 @@ var FileDiff = class {
 	mounted = false;
 	enabled = true;
 	editor;
-	fastRefreshTimeout;
+	refreshViewTimeout;
+	deferSetSelection;
 	constructor(options = { theme: DEFAULT_THEMES }, workerManager, isContainerManaged = false) {
 		this.options = options;
 		this.workerManager = workerManager;
@@ -97,7 +105,7 @@ var FileDiff = class {
 		return new DiffHunksRenderer(this.getHunksRendererOptions(options), this.handleHighlightRender, this.workerManager);
 	}
 	getLineIndex = (lineNumber, side = "additions") => {
-		const fileDiff = this.hunksRenderer.getRenderDiff() ?? this.fileDiff;
+		const fileDiff = this.fileDiffCache;
 		if (fileDiff == null) return;
 		const lastHunk = fileDiff.hunks.at(-1);
 		let targetUnifiedIndex;
@@ -192,7 +200,8 @@ var FileDiff = class {
 		return true;
 	}
 	setSelectedLines(range, options) {
-		this.interactionManager.setSelection(range, options);
+		if (this.refreshViewTimeout != null) this.deferSetSelection = [range, options];
+		else this.interactionManager.setSelection(range, options);
 	}
 	flushManagers() {
 		if (!this.managersDirty || this.pre == null) {
@@ -201,11 +210,18 @@ var FileDiff = class {
 		}
 		const { diffStyle = "split", overflow = "scroll" } = this.options;
 		this.interactionManager.setup(this.pre);
-		this.resizeManager.setup(this.pre, overflow === "wrap");
+		this.resizeManager.setup(this.pre, {
+			disableAnnotations: overflow === "wrap",
+			columnVariables: this.shouldApplyColumnVariables(overflow) ? "apply" : "measure"
+		});
 		if (overflow === "scroll" && diffStyle === "split") this.scrollSyncManager.setup(this.pre, this.codeDeletions, this.codeAdditions);
 		else this.scrollSyncManager.cleanUp();
 		this.managersDirty = false;
 	}
+	shouldApplyColumnVariables(overflow) {
+		if (typeof this.options.hunkSeparators === "function") return true;
+		return overflow === "scroll" && (this.lineAnnotations.length > 0 || this.pre?.hasAttribute("data-has-merge-conflict") === true);
+	}
 	cleanUp(recycle = false) {
 		this.emitPostRender(true);
 		this.resizeManager.cleanUp();
@@ -214,6 +230,7 @@ var FileDiff = class {
 		this.managersDirty = false;
 		this.workerManager?.unsubscribeToThemeChanges(this);
 		this.renderRange = void 0;
+		this.pendingFiles = void 0;
 		if (!this.isContainerManaged) this.fileContainer?.remove();
 		this.fileContainer = void 0;
 		this.mounted = false;
@@ -234,9 +251,11 @@ var FileDiff = class {
 		this.headerFilenameSuffix = void 0;
 		this.headerMetadata = void 0;
 		this.headerCustom = void 0;
+		this.placeHolder?.remove();
 		this.placeHolder = void 0;
 		this.lastRenderedHeaderHTML = void 0;
 		if (!recycle) this.cachedHeaderHTML = void 0;
+		this.errorWrapper?.remove();
 		this.errorWrapper = void 0;
 		this.spriteSVG = void 0;
 		this.lastRowCount = void 0;
@@ -254,19 +273,23 @@ var FileDiff = class {
 			this.additionFile = void 0;
 		}
 		this.enabled = false;
-		this.editor?.cleanUp();
+		this.editor?.cleanUp(recycle);
 		this.editor = void 0;
-		if (this.fastRefreshTimeout != null) {
-			clearTimeout(this.fastRefreshTimeout);
-			this.fastRefreshTimeout = void 0;
+		if (this.refreshViewTimeout != null) {
+			clearTimeout(this.refreshViewTimeout);
+			this.refreshViewTimeout = void 0;
 		}
 	}
 	virtualizedSetup() {
 		this.enabled = true;
 		this.workerManager?.subscribeToThemeChanges(this);
 	}
-	hydrate(props) {
-		const { fileContainer, prerenderedHTML, preventEmit = false, lineAnnotations, oldFile, newFile, fileDiff } = props;
+	hydrate({ fileContainer, prerenderedHTML, preventEmit = false, lineAnnotations, fileDiff, ...fileInputProps }) {
+		if (!this.enabled) throw new Error("FileDiff.hydrate: attempting to call hydrate after cleaned up");
+		if (this.fileContainer != null) throw new Error("FileDiff.hydrate: hydrate can only be called before the instance has rendered or hydrated");
+		const fileInput = getDiffFileInput(fileInputProps, "FileDiff.hydrate");
+		const oldFile = fileInput?.oldFile;
+		const newFile = fileInput?.newFile;
 		this.hydrateElements(fileContainer, prerenderedHTML);
 		if (shouldRenderCode(this.pre, hasDiffContent({
 			fileDiff,
@@ -277,14 +300,16 @@ var FileDiff = class {
 			oldFile,
 			newFile
 		}), this.options.disableFileHeader)) this.render({
-			...props,
+			...fileInputProps,
+			fileContainer,
+			lineAnnotations,
+			fileDiff,
 			preventEmit: true
 		});
 		else this.hydrationSetup({
 			fileDiff,
-			oldFile,
-			newFile,
-			lineAnnotations
+			lineAnnotations,
+			...fileInput
 		});
 		if (!preventEmit) this.emitPostRender();
 	}
@@ -332,7 +357,7 @@ var FileDiff = class {
 		this.lineAnnotations = lineAnnotations ?? this.lineAnnotations;
 		this.additionFile = newFile;
 		this.deletionFile = oldFile;
-		this.fileDiff = fileDiff ?? (oldFile != null && newFile != null ? parseDiffFromFile(oldFile, newFile, this.options.parseDiffOptions) : void 0);
+		this.fileDiff = fileDiff ?? (oldFile !== void 0 && newFile !== void 0 ? parseDiffFromFile(oldFile, newFile, this.options.parseDiffOptions) : void 0);
 		if (this.pre == null) return;
 		this.syncInteractionOptions();
 		this.hunksRenderer.hydrate(this.fileDiff);
@@ -358,30 +383,73 @@ var FileDiff = class {
 	};
 	expandHunk = (hunkIndex, direction, expansionLineCountOverride) => {
 		this.hunksRenderer.expandHunk(hunkIndex, direction, expansionLineCountOverride);
+		this.loadFilesIfNecessary();
 		this.rerender();
 	};
-	render({ oldFile, newFile, fileDiff, deferManagers = false, forceRender = false, preventEmit = false, lineAnnotations, fileContainer, containerWrapper, renderRange }) {
+	loadFilesIfNecessary() {
+		const { fileDiff, options: { loadDiffFiles } } = this;
+		if (fileDiff == null || loadDiffFiles == null || !canHydrateDiff(fileDiff) || this.pendingFiles?.fileDiff === fileDiff) return;
+		this.pendingFiles = {
+			fileDiff,
+			promise: this.loadFilesForDiff(fileDiff, loadDiffFiles)
+		};
+	}
+	async loadFilesForDiff(fileDiff, loadDiffFiles) {
+		try {
+			const files = await loadDiffFiles(fileDiff);
+			if (!this.enabled || this.fileDiff !== fileDiff) return;
+			await this.handleFilesLoaded(fileDiff, files);
+		} catch (error) {
+			if (this.options.disableErrorHandling === true) throw error;
+			console.error(error);
+		} finally {
+			if (this.pendingFiles?.fileDiff === fileDiff) this.pendingFiles = void 0;
+		}
+	}
+	async handleFilesLoaded(expectedDiff, files) {
+		if (this.fileDiff !== expectedDiff || !expectedDiff.isPartial) return;
+		hydratePartialDiff("merge", expectedDiff, files);
+		this.setHydratedState(files);
+		await awaitWithTimeout(() => this.primeHighlightCache(expectedDiff));
+		if (!this.enabled || this.fileDiff !== expectedDiff) return;
+		this.rerender();
+	}
+	setHydratedState(files) {
+		this.deletionFile = files.oldFile;
+		this.additionFile = files.newFile;
+		this.workerManager?.cleanUpTasks(this.hunksRenderer);
+		this.hunksRenderer.clearRenderCache();
+	}
+	render({ fileDiff, deferManagers = false, forceRender = false, preventEmit = false, lineAnnotations, fileContainer, containerWrapper, renderRange, ...fileInputProps }) {
+		const fileInput = getDiffFileInput(fileInputProps, "FileDiff.render");
+		const oldFile = fileInput?.oldFile;
+		const newFile = fileInput?.newFile;
 		if (!this.enabled) throw new Error("FileDiff.render: attempting to call render after cleaned up");
-		this.editor?.__postponeBackgroundTokenizeToNextFrame();
-		const { collapsed = false, themeType = "system" } = this.options;
+		if (fileDiff != null && fileDiff.cacheKey === void 0) fileDiff.cacheKey = fileDiff.prevName != null ? fileDiff.prevName + ":" + fileDiff.name : fileDiff.name;
+		this.editor?.__postponeBgTokenizeToNextFrame();
+		const { collapsed = false, themeType = "system", expandUnchanged = false } = this.options;
 		const nextRenderRange = collapsed ? void 0 : renderRange;
 		const themeChanged = this.hasThemeChanged();
-		const filesDidChange = oldFile != null && newFile != null && (!areFilesEqual(oldFile, this.deletionFile) || !areFilesEqual(newFile, this.additionFile));
+		const hasFileInput = fileInput != null;
+		const filesDidChange = hasFileInput && (!areOptionalFilesEqual(oldFile, this.deletionFile) || !areOptionalFilesEqual(newFile, this.additionFile));
 		let diffDidChange = fileDiff != null && fileDiff !== this.fileDiff;
 		const annotationsChanged = lineAnnotations != null && (lineAnnotations.length > 0 || this.lineAnnotations.length > 0) ? lineAnnotations !== this.lineAnnotations : false;
 		if (!collapsed && areRenderRangesEqual(nextRenderRange, this.renderRange) && !forceRender && !annotationsChanged && !themeChanged && (fileDiff != null && fileDiff === this.fileDiff || fileDiff == null && !filesDidChange)) return this.applyCachedThemeState(themeType);
+		let nextParsedFileDiff;
+		if (fileDiff == null && hasFileInput && (filesDidChange || this.fileDiff == null)) nextParsedFileDiff = parseDiffFromFile(fileInput.oldFile, fileInput.newFile, this.options.parseDiffOptions);
 		const { renderRange: previousRenderRange } = this;
 		this.renderRange = nextRenderRange;
 		this.deletionFile = oldFile;
 		this.additionFile = newFile;
 		if (fileDiff != null) this.fileDiff = fileDiff;
-		else if (oldFile != null && newFile != null && filesDidChange) {
+		else if (nextParsedFileDiff != null) {
 			diffDidChange = true;
-			this.fileDiff = parseDiffFromFile(oldFile, newFile, this.options.parseDiffOptions);
+			this.fileDiff = nextParsedFileDiff;
 		}
 		if (diffDidChange) this.cachedHeaderHTML = void 0;
 		if (lineAnnotations != null) this.setLineAnnotations(lineAnnotations);
 		if (this.fileDiff == null) return false;
+		if (expandUnchanged) this.loadFilesIfNecessary();
 		this.hunksRenderer.setOptions(this.getHunksRendererOptions(this.options));
 		this.syncInteractionOptions();
 		this.hunksRenderer.setLineAnnotations(this.lineAnnotations);
@@ -462,12 +530,18 @@ var FileDiff = class {
 		this.mounted = true;
 		onPostRender?.(fileContainer, this, phase);
 	}
+	get fileDiffCache() {
+		return this.hunksRenderer.diffCache ?? this.fileDiff;
+	}
 	syncRenderViewToEditor() {
 		const editor = this.editor;
 		const fileContainer = this.fileContainer;
-		const fileDiff = this.fileDiff;
+		const fileDiff = this.fileDiffCache;
+		const lineAnnotations = this.lineAnnotations;
+		const renderRange = this.renderRange;
 		if (editor != null && fileContainer != null && fileDiff != null && !fileDiff.isPartial) this.hunksRenderer.initializeHighlighter().then((highlighter) => {
-			editor.__syncRenderView(highlighter, fileContainer, fileDiff, this.lineAnnotations, this.renderRange);
+			if (!this.enabled || this.editor !== editor || this.fileContainer !== fileContainer || this.fileDiffCache !== fileDiff) return;
+			editor.__syncRenderView(highlighter, fileContainer, fileDiff, lineAnnotations, renderRange);
 		});
 	}
 	attachEditor(editor) {
@@ -482,32 +556,34 @@ var FileDiff = class {
 	}
 	applyDocumentChange(textDocument, newLineAnnotations) {
 		this.hunksRenderer.applyDocumentChange(textDocument);
-		const renderDiff = this.hunksRenderer.getRenderDiff();
-		if (renderDiff != null) this.fileDiff = renderDiff;
-		this.rerender();
-		this.interactionManager.setSelectionDirty();
+		const fileDiff = this.hunksRenderer.diffCache;
+		if (fileDiff != null) {
+			const cacheKey = this.fileDiff?.cacheKey;
+			if (cacheKey != null && fileDiff.cacheKey == null) fileDiff.cacheKey = cacheKey;
+			this.fileDiff = fileDiff;
+		}
 		if (newLineAnnotations !== void 0 && newLineAnnotations !== this.lineAnnotations) {
 			this.setLineAnnotations(newLineAnnotations);
 			this.hunksRenderer.setLineAnnotations(this.lineAnnotations);
 			this.renderAnnotations();
 		}
-	}
-	rerenderFromDocument(textDocument) {
-		this.hunksRenderer.applyDocumentChange(textDocument);
-		const renderDiff = this.hunksRenderer.getRenderDiff();
-		if (renderDiff != null) this.fileDiff = renderDiff;
-		this.hunksRenderer.clearRenderCache();
 		this.rerender();
+		this.interactionManager.setSelectionDirty();
 	}
-	updateRenderCache(dirtyLines, themeType, shouldRefreshView, skipDiffRecompute) {
-		this.hunksRenderer.updateRenderCache(dirtyLines, themeType, skipDiffRecompute);
-		if (shouldRefreshView === true) if (this.options.diffStyle === "split") {
-			if (this.fastRefreshTimeout != null) clearTimeout(this.fastRefreshTimeout);
-			this.fastRefreshTimeout = setTimeout(() => {
-				this.fastRefreshTimeout = void 0;
-				this.fastRefreshDiffView();
-			}, 100);
-		} else this.refreshDiffView();
+	updateRenderCache(dirtyLines, themeType, shouldRefreshView) {
+		this.hunksRenderer.updateRenderCache(dirtyLines, themeType);
+		if (shouldRefreshView) {
+			if (this.refreshViewTimeout != null) clearTimeout(this.refreshViewTimeout);
+			this.refreshViewTimeout = setTimeout(() => {
+				this.refreshViewTimeout = void 0;
+				if (this.options.diffStyle === "split") this.refreshSplitDiffView();
+				else this.refreshUnifiedDiffView();
+				if (this.deferSetSelection != null) {
+					this.interactionManager.setSelection(...this.deferSetSelection);
+					this.deferSetSelection = void 0;
+				}
+			}, 150);
+		}
 	}
 	removeRenderedCode() {
 		this.resizeManager.cleanUp();
@@ -549,12 +625,14 @@ var FileDiff = class {
 		this.placeHolder.style.setProperty("height", `${height}px`);
 		return true;
 	}
-	primeHighlightCache() {
-		const { fileDiff, workerManager } = this;
-		if (fileDiff == null || workerManager == null || isDiffPlainText(fileDiff)) return;
+	async primeHighlightCache(fileDiff = this.fileDiff) {
+		const { workerManager } = this;
+		if (fileDiff == null || workerManager == null || !workerManager.isWorkingPool() || fileDiff.cacheKey == null || isDiffPlainText(fileDiff)) return;
 		const tokenizeMaxLength = this.options.tokenizeMaxLength ?? 1e5;
 		if (Math.max(fileDiff.additionLines.length, fileDiff.deletionLines.length) > tokenizeMaxLength) return;
-		workerManager.primeDiffHighlightCache(fileDiff);
+		await workerManager.primeDiffHighlightCache(fileDiff).catch((error) => {
+			console.error(error);
+		});
 	}
 	cleanChildNodes() {
 		this.resizeManager.cleanUp();
@@ -1006,7 +1084,7 @@ var FileDiff = class {
 			this.renderPartialColumn(columns[1], additionsAST, insertPosition);
 		} else throw new Error("FileDiff.insertPartialHTML: Invalid argument composition");
 	}
-	fastRefreshDiffView() {
+	refreshSplitDiffView() {
 		if (this.options.diffStyle !== "split") return;
 		const hunksResult = this.hunksRenderer.renderDiff(this.fileDiff, this.renderRange);
 		if (hunksResult == null) return;
@@ -1026,22 +1104,23 @@ var FileDiff = class {
 		applyLineType("deletions", columns[0]);
 		applyLineType("additions", columns[1]);
 	}
-	refreshDiffView() {
+	refreshUnifiedDiffView() {
+		if (this.options.diffStyle !== "unified") return;
 		const hunksResult = this.hunksRenderer.renderDiff(this.fileDiff, this.renderRange);
 		if (hunksResult == null) return;
-		const columns = this.getCodeColumns(this.options.diffStyle ?? "split", this.codeUnified, this.codeDeletions, this.codeAdditions);
-		if (columns == null) return;
-		const render = (type, column) => {
-			if (column == null) return;
-			const ast = this.hunksRenderer.renderCodeAST(type, hunksResult);
-			const gutterChildren = getElementChildren(ast?.[0]);
-			const contentChildren = getElementChildren(ast?.[1]);
-			for (const [el, astChildren] of [[column.gutter, gutterChildren], [column.content, contentChildren]]) if (astChildren != null) el.innerHTML = toHtml(astChildren);
-		};
-		if (Array.isArray(columns)) {
-			render("deletions", columns[0]);
-			render("additions", columns[1]);
-		} else render("unified", columns);
+		const columns = this.getCodeColumns("unified", this.codeUnified, this.codeDeletions, this.codeAdditions);
+		if (columns == null || Array.isArray(columns)) return;
+		const ast = this.hunksRenderer.renderCodeAST("unified", hunksResult);
+		const gutterChildren = getElementChildren(ast?.[0]);
+		const contentChildren = getElementChildren(ast?.[1]);
+		for (const [el, astChildren] of [[columns.gutter, gutterChildren], [columns.content, contentChildren]]) if (astChildren != null) el.innerHTML = toHtml(astChildren);
+		if (hunksResult.rowCount !== this.lastRowCount) {
+			this.applyRowSpan("unified", columns, hunksResult.rowCount);
+			this.lastRowCount = hunksResult.rowCount;
+		}
+		this.renderSeparators(hunksResult.hunkData);
+		this.managersDirty = true;
+		this.flushManagers();
 		this.syncRenderViewToEditor();
 	}
 	renderPartialColumn(column, ast, insertPosition) {
@@ -1326,6 +1405,10 @@ var FileDiff = class {
 		this.errorWrapper = void 0;
 	}
 };
+function areOptionalFilesEqual(fileA, fileB) {
+	if (fileA == null || fileB == null) return fileA == null && fileB == null;
+	return areFilesEqual(fileA, fileB);
+}
 function hasDiffContent({ fileDiff, oldFile, newFile }) {
 	return fileDiff != null && fileDiff.hunks.length > 0 || oldFile != null || newFile != null;
 }