@pierre/diffs 1.3.0-beta.2 → 1.3.0-beta.4

package/dist/components/FileDiff.js

@@ -72,7 +72,6 @@ var FileDiff = class {
 	mounted = false;
 	enabled = true;
 	editor;
-	rerenderTimeout;
 	constructor(options = { theme: DEFAULT_THEMES }, workerManager, isContainerManaged = false) {
 		this.options = options;
 		this.workerManager = workerManager;
@@ -94,11 +93,12 @@ var FileDiff = class {
 		return new DiffHunksRenderer(this.getHunksRendererOptions(options), this.handleHighlightRender, this.workerManager);
 	}
 	getLineIndex = (lineNumber, side = "additions") => {
-		if (this.fileDiff == null) return;
-		const lastHunk = this.fileDiff.hunks.at(-1);
+		const fileDiff = this.hunksRenderer.getRenderDiff() ?? this.fileDiff;
+		if (fileDiff == null) return;
+		const lastHunk = fileDiff.hunks.at(-1);
 		let targetUnifiedIndex;
 		let targetSplitIndex;
-		hunkIterator: for (const hunk of this.fileDiff.hunks) {
+		hunkIterator: for (const hunk of fileDiff.hunks) {
 			let currentLineNumber = side === "deletions" ? hunk.deletionStart : hunk.additionStart;
 			const hunkCount = side === "deletions" ? hunk.deletionCount : hunk.additionCount;
 			let splitIndex = hunk.splitLineStart;
@@ -183,7 +183,8 @@ var FileDiff = class {
 	setLineAnnotations(lineAnnotations) {
 		this.lineAnnotations = lineAnnotations;
 	}
-	canPartiallyRender(forceRender, annotationsChanged, didContentChange) {
+	canPartiallyRender(forceRender, annotationsChanged, didContentChange, didEdit) {
+		if (didEdit) return true;
 		if (forceRender || annotationsChanged || didContentChange || typeof this.options.hunkSeparators === "function") return false;
 		return true;
 	}
@@ -249,8 +250,6 @@ var FileDiff = class {
 		this.enabled = false;
 		this.editor?.cleanUp();
 		this.editor = void 0;
-		if (this.rerenderTimeout !== void 0) clearTimeout(this.rerenderTimeout);
-		this.rerenderTimeout = void 0;
 	}
 	virtualizedSetup() {
 		this.enabled = true;
@@ -351,15 +350,16 @@ var FileDiff = class {
 		this.hunksRenderer.expandHunk(hunkIndex, direction, expansionLineCountOverride);
 		this.rerender();
 	};
-	render({ oldFile, newFile, fileDiff, deferManagers = false, forceRender = false, preventEmit = false, lineAnnotations, fileContainer, containerWrapper, renderRange }) {
+	render({ oldFile, newFile, fileDiff, deferManagers = false, didEdit = false, forceRender = false, preventEmit = false, lineAnnotations, fileContainer, containerWrapper, renderRange }) {
 		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;
 		const nextRenderRange = collapsed ? void 0 : renderRange;
 		const themeChanged = this.hasThemeChanged();
 		const filesDidChange = oldFile != null && newFile != null && (!areFilesEqual(oldFile, this.deletionFile) || !areFilesEqual(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);
+		if (!collapsed && areRenderRangesEqual(nextRenderRange, this.renderRange) && !didEdit && !forceRender && !annotationsChanged && !themeChanged && (fileDiff != null && fileDiff === this.fileDiff || fileDiff == null && !filesDidChange)) return this.applyCachedThemeState(themeType);
 		const { renderRange: previousRenderRange } = this;
 		this.renderRange = nextRenderRange;
 		this.deletionFile = oldFile;
@@ -405,7 +405,7 @@ var FileDiff = class {
 		}
 		try {
 			const pre = this.getOrCreatePreNode(fileContainer);
-			if (!(this.canPartiallyRender(forceRender, annotationsChanged, filesDidChange || diffDidChange || themeChanged) && this.applyPartialRender({
+			if (!(this.canPartiallyRender(forceRender, annotationsChanged, filesDidChange || diffDidChange || themeChanged, didEdit) && this.applyPartialRender({
 				previousRenderRange,
 				renderRange: nextRenderRange
 			}))) {
@@ -422,7 +422,7 @@ var FileDiff = class {
 					this.pre = void 0;
 				}
 				this.renderSeparators(hunksResult.hunkData);
-			}
+			} else if (didEdit && nextRenderRange != null) this.updateLineType(nextRenderRange);
 			this.applyBuffers(pre, nextRenderRange);
 			this.injectUnsafeCSS();
 			this.renderAnnotations();
@@ -432,7 +432,7 @@ var FileDiff = class {
 			const editor = this.editor;
 			const file = this.getAdditionFile();
 			if (editor != null && file != null) this.hunksRenderer.initializeHighlighter().then((highlighter) => {
-				editor.syncWithRender(highlighter, fileContainer, file, this.lineAnnotations, this.renderRange, "advanced");
+				editor.syncToRenderedView(highlighter, fileContainer, file, diffDidChange, this.lineAnnotations, this.renderRange);
 			});
 		} catch (error) {
 			if (disableErrorHandling) throw error;
@@ -456,53 +456,37 @@ var FileDiff = class {
 		this.mounted = true;
 		onPostRender?.(fileContainer, this, phase);
 	}
-	applyLayoutChange(textDocument, newLineAnnotations) {
-		if (newLineAnnotations !== void 0 && newLineAnnotations !== this.lineAnnotations) {
-			this.setLineAnnotations(newLineAnnotations);
-			this.hunksRenderer.setLineAnnotations(this.lineAnnotations);
-		}
-		const deletionFile = this.getDeletionFile();
-		if (deletionFile != null) {
-			const { name, lang } = deletionFile;
-			const newFile = {
-				name,
-				lang,
-				cacheKey: name + "-" + Date.now()
-			};
-			Object.defineProperty(newFile, "contents", { get: () => textDocument.getText() });
-			if (this.rerenderTimeout !== void 0) clearTimeout(this.rerenderTimeout);
-			this.rerenderTimeout = setTimeout(() => {
-				this.fileDiff = parseDiffFromFile(deletionFile, newFile, this.options.parseDiffOptions);
-				this.hunksRenderer.renderDiff(this.fileDiff, this.renderRange);
-			}, 500);
-		}
-	}
 	attachEditor(editor) {
 		this.editor?.cleanUp();
 		const fileContainer = this.fileContainer;
 		const file = this.getAdditionFile();
 		if (fileContainer != null && file != null) this.hunksRenderer.initializeHighlighter().then((highlighter) => {
-			editor.syncWithRender(highlighter, fileContainer, file, this.lineAnnotations, this.renderRange, "advanced");
+			editor.syncToRenderedView(highlighter, fileContainer, file, false, this.lineAnnotations, this.renderRange);
 		});
 		this.editor = editor;
 		return () => {
 			this.editor = void 0;
 		};
 	}
-	getDeletionFile() {
-		if (this.deletionFile != null) return this.deletionFile;
-		const fileDiff = this.fileDiff;
-		if (fileDiff != null && !fileDiff.isPartial) {
-			const { name, lang, cacheKey } = fileDiff;
-			const file = {
-				name,
-				lang,
-				cacheKey
-			};
-			Object.defineProperty(file, "contents", { get: () => fileDiff.deletionLines.join("") });
-			return file;
+	applyDocumentChange(textDocument, newLineAnnotations) {
+		this.hunksRenderer.applyDocumentChange(textDocument);
+		const renderDiff = this.hunksRenderer.getRenderDiff();
+		if (renderDiff != null) this.fileDiff = renderDiff;
+		this.rerender();
+		this.interactionManager.setSelectionDirty();
+		if (newLineAnnotations !== void 0 && newLineAnnotations !== this.lineAnnotations) {
+			this.setLineAnnotations(newLineAnnotations);
+			this.hunksRenderer.setLineAnnotations(this.lineAnnotations);
+			this.renderAnnotations();
 		}
 	}
+	updateRenderCache(dirtyLines, themeType, shouldRerender) {
+		this.hunksRenderer.updateRenderCache(dirtyLines, themeType);
+		if (shouldRerender === true) this.render({
+			didEdit: true,
+			renderRange: this.renderRange
+		});
+	}
 	getAdditionFile() {
 		if (this.additionFile != null) return this.additionFile;
 		const fileDiff = this.fileDiff;
@@ -513,7 +497,10 @@ var FileDiff = class {
 				lang,
 				cacheKey
 			};
-			Object.defineProperty(file, "contents", { get: () => fileDiff.additionLines.join("") });
+			Object.defineProperty(file, "contents", {
+				enumerable: true,
+				get: () => fileDiff.additionLines.join("")
+			});
 			return file;
 		}
 	}
@@ -1006,6 +993,26 @@ var FileDiff = class {
 			this.renderPartialColumn(columns[1], additionsAST, insertPosition);
 		} else throw new Error("FileDiff.insertPartialHTML: Invalid argument composition");
 	}
+	updateLineType(renderRange) {
+		if (this.options.diffStyle === "unified") return;
+		const hunksResult = this.hunksRenderer.renderDiff(this.fileDiff, renderRange);
+		if (hunksResult == null) return;
+		const columns = this.getCodeColumns("split", this.codeUnified, this.codeDeletions, this.codeAdditions);
+		if (columns == null || !Array.isArray(columns)) return;
+		const applyLineType = (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.childElementCount === astChildren.length) for (let i = 0; i < astChildren.length; i++) {
+				const gutterElement = el.children[i];
+				const lineType = astChildren[i].properties["data-line-type"];
+				if (lineType != null && gutterElement.dataset.lineType !== lineType) gutterElement.dataset.lineType = lineType;
+			}
+		};
+		applyLineType("deletions", columns[0]);
+		applyLineType("additions", columns[1]);
+	}
 	renderPartialColumn(column, ast, insertPosition) {
 		if (column == null || ast == null) return;
 		const gutterChildren = getElementChildren(ast[0]);
@@ -1205,6 +1212,9 @@ var FileDiff = class {
 			return deletions != null || additions != null ? [deletions, additions] : void 0;
 		}
 	}
+	updateBuffers(renderRange) {
+		if (this.pre != null) this.applyBuffers(this.pre, renderRange);
+	}
 	applyBuffers(pre, renderRange) {
 		if (renderRange == null || this.shouldDisableVirtualizationBuffers()) {
 			if (this.bufferBefore != null) {