@pierre/diffs 1.6.0-beta.1 → 1.6.1

package/dist/renderers/DiffHunksRenderer.js

@@ -17,6 +17,7 @@ import { getFiletypeFromFileName } from "../utils/getFiletypeFromFileName.js";
 import { getHighlighterOptions } from "../utils/getHighlighterOptions.js";
 import { getLineAnnotationName } from "../utils/getLineAnnotationName.js";
 import { isDefaultRenderRange } from "../utils/isDefaultRenderRange.js";
+import { isHandledWorkerPoolError } from "../worker/errors.js";
 import { areDiffTargetsEqual } from "../utils/areDiffTargetsEqual.js";
 import { getTrailingContextRangeSize } from "../utils/virtualDiffLayout.js";
 import { iterateOverDiff } from "../utils/iterateOverDiff.js";
@@ -39,7 +40,6 @@ var DiffHunksRenderer = class {
 	onRenderUpdate;
 	workerManager;
 	__id = `diff-hunks-renderer:${++instanceId}`;
-	highlighter;
 	diff;
 	expandedHunks = /* @__PURE__ */ new Map();
 	deletionAnnotations = {};
@@ -54,7 +54,6 @@ var DiffHunksRenderer = class {
 		this.annotationSlotName = annotationSlotName;
 		this.onRenderUpdate = onRenderUpdate;
 		this.workerManager = workerManager;
-		if (workerManager?.isWorkingPool() !== true) this.highlighter = getHighlighterIfLoaded({ theme: options.theme ?? DEFAULT_THEMES });
 	}
 	cleanUp() {
 		this.endEditSession();
@@ -64,7 +63,6 @@ var DiffHunksRenderer = class {
 		this.onRenderUpdate = void 0;
 	}
 	recycle() {
-		this.highlighter = void 0;
 		this.diff = void 0;
 		if (this.editSessionActive) {
 			if (this.renderCache != null) this.renderCache.renderRange = void 0;
@@ -150,7 +148,9 @@ var DiffHunksRenderer = class {
 			workerManager.evictDiffFromCache(diff.cacheKey);
 			return workerManager.primeDiffHighlightCache(diff).then(() => {
 				this.applyRefreshedResult(diff, workerManager.getDiffResultCache(diff));
-			}).catch((error) => this.onHighlightError(error));
+			}).catch((error) => {
+				if (!isHandledWorkerPoolError(error)) this.onHighlightError(error);
+			});
 		}
 		return this.asyncHighlight(diff).then((fresh) => this.applyRefreshedResult(diff, fresh)).catch((error) => this.onHighlightError(error));
 	}
@@ -244,6 +244,7 @@ var DiffHunksRenderer = class {
 				const previous = diff.additionLines[line] ?? "";
 				if (previous !== text) {
 					diff.additionLines[line] = text;
+					diff.additionCharacterCount += text.length - previous.length;
 					changedAdditionLines.push(line);
 					previousAdditionLines.set(line, previous);
 					if (!dirtyLines.has(line)) hastLines[line] = createPlainAdditionLineElement(line, cleanLastNewline(text));
@@ -257,7 +258,9 @@ var DiffHunksRenderer = class {
 			const prevLine = canSyncDiffLine ? diff.additionLines[line] ?? "" : "";
 			const prevText = cleanLastNewline(prevLine);
 			if (pendingStructuralRows == null && canSyncDiffLine && changedDocumentLines?.has(line) !== true) {
-				diff.additionLines[line] = applyLineTextWithNewline(prevLine, lineText);
+				const nextLine = applyLineTextWithNewline(prevLine, lineText);
+				diff.additionLines[line] = nextLine;
+				diff.additionCharacterCount += nextLine.length - prevLine.length;
 				if (prevText !== lineText) {
 					changedAdditionLines.push(line);
 					previousAdditionLines.set(line, prevLine);
@@ -308,7 +311,7 @@ var DiffHunksRenderer = class {
 					this.applyRecomputePreservingSessionType(diff, recomputeEmptyDocumentDiff(diff, this.options.parseDiffOptions));
 					regionsChanged = true;
 				} else if (shouldTopAlignAdditionRecompute(diff, diff.additionLines)) {
-					this.applyRecomputePreservingSessionType(diff, recomputeTopAlignedAdditionDiff(diff, diff.additionLines, this.options.parseDiffOptions));
+					this.applyRecomputePreservingSessionType(diff, recomputeTopAlignedAdditionDiff(diff, diff.additionLines, diff.additionCharacterCount, this.options.parseDiffOptions));
 					regionsChanged = true;
 				} else {
 					const change = applySessionChangedLines(diff, changedAdditionLines, this.options.parseDiffOptions, previousAdditionLines);
@@ -332,7 +335,9 @@ var DiffHunksRenderer = class {
 		const result = renderCache?.result;
 		if (diff.isPartial) throw new Error("Could not apply document change for partial diff");
 		const { additionLines: previousAdditionLines } = diff;
-		diff.additionLines = getEditorDocumentLines(textDocument);
+		const { lines, characterCount } = getEditorDocumentLines(textDocument);
+		diff.additionLines = lines;
+		diff.additionCharacterCount = characterCount;
 		if (result != null) result.code.additionLines = realignAdditionHastLines(previousAdditionLines, diff.additionLines, result.code.additionLines, textDocument);
 		if (diff.additionLines.length <= 1 && diff.additionLines.join("") === "") {
 			this.applyRecomputePreservingSessionType(diff, recomputeEmptyDocumentDiff(diff, this.options.parseDiffOptions));
@@ -348,7 +353,7 @@ var DiffHunksRenderer = class {
 		const { parseDiffOptions } = this.options;
 		const rawLines = diff.additionLines;
 		if (shouldTopAlignAdditionRecompute(diff, rawLines)) {
-			this.applyRecomputePreservingSessionType(diff, recomputeTopAlignedAdditionDiff(diff, rawLines, parseDiffOptions));
+			this.applyRecomputePreservingSessionType(diff, recomputeTopAlignedAdditionDiff(diff, rawLines, diff.additionCharacterCount, parseDiffOptions));
 			return;
 		}
 		this.applyExpansionRemap(rebuildSessionHunks(diff, parseDiffOptions, (index) => previousAdditionLines[index]));
@@ -405,18 +410,16 @@ var DiffHunksRenderer = class {
 			useCSSClasses
 		};
 	}
-	async initializeHighlighter() {
-		this.highlighter = await getSharedHighlighter(getHighlighterOptions(this.computedLangs, {
+	initializeHighlighter() {
+		return getSharedHighlighter(getHighlighterOptions(this.computedLangs, {
 			theme: this.getLocalHighlightTheme(),
 			preferredHighlighter: resolvePreferredHighlighter(this.workerManager, this.options)
 		}));
-		return this.highlighter;
 	}
 	hydrate(diff) {
 		if (diff == null) return;
 		this.diff = diff;
 		const { options } = this.getRenderOptions(diff);
-		this.highlighter = getHighlighterIfLoaded({ theme: this.getLocalHighlightTheme() });
 		const massiveDiff = isDiffMassive(diff, this.getTokenizeMaxLength());
 		let cache = this.workerManager?.getDiffResultCache(diff);
 		if (cache != null && !areDiffRenderOptionsEqual(options, cache.options)) cache = void 0;
@@ -428,15 +431,24 @@ var DiffHunksRenderer = class {
 			result: massiveDiff ? void 0 : cache?.result,
 			renderRange: void 0
 		};
-		if (!this.editSessionActive && this.workerManager?.isWorkingPool() === true) {
-			if (this.renderCache.result == null && !massiveDiff) this.workerManager.highlightDiffAST(this, this.diff);
-		} else if (this.highlighter == null) {
+		const workerManager = this.getHighlightWorkerManager(diff);
+		if (workerManager != null) {
+			if (this.renderCache.result == null && !massiveDiff) workerManager.highlightDiffAST(this, this.diff);
+		} else if (getHighlighterIfLoaded({ theme: this.getLocalHighlightTheme() }) == null) {
 			this.computedLangs = getDiffLanguages(diff);
 			this.initializeHighlighter().catch((error) => {
 				if (!(error instanceof HighlighterDisposedError)) this.onHighlightError(error);
 			});
 		}
 	}
+	getHighlightWorkerManager(diff) {
+		const { editSessionActive, workerManager } = this;
+		return !editSessionActive && workerManager?.isWorkingPool() === true && !workerManager.shouldHighlightOnMainThread(diff) ? workerManager : void 0;
+	}
+	cacheHighlightResult(diff, renderResult) {
+		const { editSessionActive, workerManager } = this;
+		if (!editSessionActive && workerManager?.isWorkingPool() === true) workerManager.setDiffResultCache(diff.cacheKey, renderResult);
+	}
 	getLocalHighlightTheme() {
 		return this.workerManager?.getDiffRenderOptions().theme ?? this.options.theme ?? DEFAULT_THEMES;
 	}
@@ -497,10 +509,10 @@ var DiffHunksRenderer = class {
 	canRenderDiff(diff, options, forcePlainText) {
 		const { renderCache } = this;
 		if (renderCache == null || areDiffTargetsEqual(renderCache.diff, diff)) return true;
-		if (forcePlainText) return renderCache.result == null && renderCache.hydrated !== true || this.workerManager?.isWorkingPool() === true || this.highlighter != null && areThemesAttached(options.theme, this.highlighter);
+		if (forcePlainText) return renderCache.result == null && renderCache.hydrated !== true || this.workerManager?.isWorkingPool() === true && !this.workerManager.shouldHighlightOnMainThread(diff) || getHighlighterIfLoaded({ theme: options.theme }) != null;
 		if (renderCache.result == null && renderCache.hydrated !== true) return true;
-		if (!this.editSessionActive && this.workerManager?.isWorkingPool() === true) return !renderCache.highlighted;
-		return this.highlighter != null && areThemesAttached(options.theme, this.highlighter);
+		if (this.getHighlightWorkerManager(diff) != null) return !renderCache.highlighted;
+		return getHighlighterIfLoaded({ theme: options.theme }) != null;
 	}
 	renderDiff(diff = this.diff, renderRange = DEFAULT_RENDER_RANGE) {
 		this.diff = diff;
@@ -529,28 +541,29 @@ var DiffHunksRenderer = class {
 		};
 		const hasContent = diff.additionLines.length > 0 || diff.deletionLines.length > 0;
 		const forcePlainText = !hasContent || isDiffPlainText(diff) || isDiffMassive(diff, this.getTokenizeMaxLength());
-		this.highlighter = getHighlighterIfLoaded();
 		const canRenderDiff = this.canRenderDiff(diff, options, forcePlainText);
 		const newContent = !areDiffTargetsEqual(diff, this.renderCache.diff);
 		const newRenderRange = !areRenderRangesEqual(this.renderCache.renderRange, renderRange);
-		if (!this.editSessionActive && this.workerManager?.isWorkingPool() === true) {
+		const workerManager = this.getHighlightWorkerManager(diff);
+		if (workerManager != null) {
 			const preserveHydratedContent = this.renderCache.result == null && this.renderCache.highlighted && !forcePlainText && !newContent && isDefaultRenderRange(renderRange);
 			if (canRenderDiff && !preserveHydratedContent && (forcePlainText || this.renderCache.result == null || !this.renderCache.highlighted && (newContent || newRenderRange))) {
 				this.renderCache.diff = diff;
 				this.renderCache.options = options;
 				this.renderCache.highlighted = false;
-				if (this.renderCache.result == null || newContent || newRenderRange || forceHighlight) this.renderCache.result = this.workerManager.getPlainDiffAST(diff, renderRange.startingLine, renderRange.totalLines, isDefaultRenderRange(renderRange) ? true : expandUnchanged ? true : this.expandedHunks, collapsedContextThreshold);
+				if (this.renderCache.result == null || newContent || newRenderRange || forceHighlight) this.renderCache.result = workerManager.getPlainDiffAST(diff, renderRange.startingLine, renderRange.totalLines, isDefaultRenderRange(renderRange) ? true : expandUnchanged ? true : this.expandedHunks, collapsedContextThreshold);
 				this.renderCache.renderRange = renderRange;
 			}
-			if (!forcePlainText && hasContent && (!this.renderCache.highlighted || forceHighlight)) this.workerManager.highlightDiffAST(this, diff);
+			if (!forcePlainText && hasContent && (!this.renderCache.highlighted || forceHighlight)) workerManager.highlightDiffAST(this, diff);
 		} else {
 			this.computedLangs = getDiffLanguages(diff);
-			const hasThemes = this.highlighter != null && areThemesAttached(options.theme, this.highlighter);
-			const hasLangs = this.highlighter != null && areLanguagesAttached(this.computedLangs, this.highlighter);
+			const highlighter = getHighlighterIfLoaded();
+			const hasThemes = highlighter != null && areThemesAttached(options.theme, highlighter);
+			const hasLangs = highlighter != null && areLanguagesAttached(this.computedLangs, highlighter);
 			const canHighlight = !forcePlainText && hasLangs;
 			const lazyLineAST = Number.isFinite(renderRange.totalLines);
-			if (canRenderDiff && this.highlighter != null && hasThemes && (forceHighlight || forcePlainText || !this.renderCache.highlighted && canHighlight || this.renderCache.result == null)) {
-				const { result, options } = this.renderDiffWithHighlighter(diff, this.highlighter, forcePlainText || !hasLangs, lazyLineAST);
+			if (canRenderDiff && highlighter != null && hasThemes && (forceHighlight || forcePlainText || !this.renderCache.highlighted && canHighlight || this.renderCache.result == null)) {
+				const { result, options } = this.renderDiffWithHighlighter(diff, highlighter, forcePlainText || !hasLangs, lazyLineAST);
 				this.renderCache = {
 					diff,
 					options,
@@ -558,8 +571,16 @@ var DiffHunksRenderer = class {
 					result,
 					renderRange: void 0
 				};
+				if (canHighlight) this.cacheHighlightResult(diff, {
+					result,
+					options
+				});
 			}
 			if (!hasThemes || !forcePlainText && !hasLangs) this.asyncHighlight(diff, lazyLineAST).then(({ result, options }) => {
+				if (!forcePlainText) this.cacheHighlightResult(diff, {
+					result,
+					options
+				});
 				this.applyHighlightResult(diff, result, options, !forcePlainText);
 			}).catch((error) => {
 				if (!(error instanceof HighlighterDisposedError)) this.onHighlightError(error);
@@ -588,10 +609,11 @@ var DiffHunksRenderer = class {
 	async asyncHighlight(diff, lazyLineAST = false) {
 		const forcePlainText = isDiffMassive(diff, this.getTokenizeMaxLength());
 		this.computedLangs = forcePlainText ? ["text"] : getDiffLanguages(diff);
-		const hasThemes = this.highlighter != null && areThemesAttached(this.getLocalHighlightTheme(), this.highlighter);
-		const hasLangs = forcePlainText || this.highlighter != null && areLanguagesAttached(this.computedLangs, this.highlighter);
-		if (this.highlighter == null || !hasThemes || !hasLangs) this.highlighter = await this.initializeHighlighter();
-		return this.renderDiffWithHighlighter(diff, this.highlighter, forcePlainText, lazyLineAST);
+		let highlighter = getHighlighterIfLoaded();
+		const hasThemes = highlighter != null && areThemesAttached(this.getLocalHighlightTheme(), highlighter);
+		const hasLangs = forcePlainText || highlighter != null && areLanguagesAttached(this.computedLangs, highlighter);
+		if (highlighter == null || !hasThemes || !hasLangs) highlighter = await this.initializeHighlighter();
+		return this.renderDiffWithHighlighter(diff, highlighter, forcePlainText, lazyLineAST);
 	}
 	renderDiffWithHighlighter(diff, highlighter, forcePlainText = false, lazyLineAST = false) {
 		const { options } = this.getRenderOptions(diff);
@@ -1281,8 +1303,16 @@ function createPlainAdditionLineElement(lineIndex, lineText, unifiedLineIndex =
 }
 function getEditorDocumentLines(textDocument) {
 	const lines = [];
-	for (let line = 0; line < textDocument.lineCount; line++) lines.push(textDocument.getLineText(line, true));
-	return lines;
+	let characterCount = 0;
+	for (let line = 0; line < textDocument.lineCount; line++) {
+		const text = textDocument.getLineText(line, true);
+		lines.push(text);
+		characterCount += text.length;
+	}
+	return {
+		lines,
+		characterCount
+	};
 }
 function getDiffLanguages(diff) {
 	if (diff.lang != null) return [diff.lang];