@pierre/diffs 1.4.2 → 1.5.0

package/dist/renderers/DiffHunksRenderer.js

@@ -55,6 +55,7 @@ var DiffHunksRenderer = class {
 		if (workerManager?.isWorkingPool() !== true) this.highlighter = areThemesAttached(options.theme ?? DEFAULT_THEMES) ? getHighlighterIfLoaded() : void 0;
 	}
 	cleanUp() {
+		this.endEditSession();
 		this.recycle();
 		this.expandedHunks.clear();
 		this.workerManager = void 0;
@@ -63,11 +64,14 @@ var DiffHunksRenderer = class {
 	recycle() {
 		this.highlighter = void 0;
 		this.diff = void 0;
-		this.clearRenderCache();
+		if (this.editSessionActive) {
+			if (this.renderCache != null) this.renderCache.renderRange = void 0;
+			this.pendingHighlightResult = void 0;
+			this.pendingStructuralRows = void 0;
+		} else this.clearRenderCache();
 		this.additionAnnotations = {};
 		this.deletionAnnotations = {};
 		this.workerManager?.cleanUpTasks(this);
-		this.endEditSession();
 	}
 	/**
 	* Enter edit-session mode: hunk updates preserve the current region
@@ -79,10 +83,12 @@ var DiffHunksRenderer = class {
 	* empty additions document gets one row for the editor's caret.
 	*/
 	beginEditSession(diff, externalDiff) {
-		const { editSessionActive: wasAlreadyActive, renderCache } = this;
+		const { editSessionActive: wasAlreadyActive } = this;
 		this.editSessionActive = true;
 		if (!wasAlreadyActive) this.pendingHighlightResult = void 0;
 		this.diff = diff;
+		if (wasAlreadyActive && this.renderCache != null && this.renderCache.diff !== diff) this.clearRenderCache();
+		const { renderCache } = this;
 		if (!diff.isPartial && diff.additionLines.length === 0) {
 			Object.assign(diff, recomputeEmptyDocumentDiff(diff, this.options.parseDiffOptions));
 			this.markEditSessionPass(diff);
@@ -118,6 +124,7 @@ var DiffHunksRenderer = class {
 	endEditSession() {
 		this.editSessionActive = false;
 		this.pendingHighlightResult = void 0;
+		if (this.diff == null) this.clearRenderCache();
 	}
 	/**
 	* Ensures that the DOM is compatible with editor render updates
@@ -304,31 +311,31 @@ var DiffHunksRenderer = class {
 	applyDocumentChange(textDocument) {
 		const { pendingStructuralRows, renderCache } = this;
 		this.pendingStructuralRows = void 0;
-		if (renderCache == null) return;
-		const { diff, result } = renderCache;
-		if (result == null) return;
+		const diff = this.diff ?? renderCache?.diff;
+		if (diff == null) return;
+		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);
-		result.code.additionLines = realignAdditionHastLines(previousAdditionLines, diff.additionLines, result.code.additionLines, textDocument);
+		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));
-			result.code.additionLines[0] = createPlainAdditionLineElement(0, textDocument.getLineText(0));
-		} else if (this.editSessionActive) this.applySessionDocumentChange(diff);
+			if (result != null) result.code.additionLines[0] = createPlainAdditionLineElement(0, textDocument.getLineText(0));
+		} else if (this.editSessionActive) this.applySessionDocumentChange(diff, previousAdditionLines);
 		else Object.assign(diff, recomputeDiffHunksForEdit(diff, this.options.parseDiffOptions));
-		if (pendingStructuralRows != null) {
+		if (pendingStructuralRows != null && result != null) {
 			for (const [line, row] of pendingStructuralRows) if (line < result.code.additionLines.length) result.code.additionLines[line] = row;
 		}
-		renderCache.isDirty = true;
+		if (renderCache != null) renderCache.isDirty = true;
 	}
-	applySessionDocumentChange(diff) {
+	applySessionDocumentChange(diff, previousAdditionLines) {
 		const { parseDiffOptions } = this.options;
 		const rawLines = diff.additionLines;
 		if (shouldTopAlignAdditionRecompute(diff, rawLines)) {
 			this.applyRecomputePreservingSessionType(diff, recomputeTopAlignedAdditionDiff(diff, rawLines, parseDiffOptions));
 			return;
 		}
-		this.applyExpansionRemap(rebuildSessionHunks(diff, parseDiffOptions));
+		this.applyExpansionRemap(rebuildSessionHunks(diff, parseDiffOptions, (index) => previousAdditionLines[index]));
 	}
 	applyRecomputePreservingSessionType(diff, update) {
 		const sessionType = this.editSessionActive ? diff.type : void 0;