@pierre/diffs 1.0.7 → 1.1.0-beta.1

package/dist/renderers/DiffHunksRenderer.js

@@ -1,29 +1,36 @@
-import { DEFAULT_THEMES } from "../constants.js";
+import { DEFAULT_EXPANDED_REGION, DEFAULT_THEMES } from "../constants.js";
 import { areLanguagesAttached } from "../highlighter/languages/areLanguagesAttached.js";
 import { getHighlighterIfLoaded, getSharedHighlighter } from "../highlighter/shared_highlighter.js";
 import { areThemesAttached } from "../highlighter/themes/areThemesAttached.js";
 import { areThemesEqual } from "../utils/areThemesEqual.js";
-import { createHastElement } from "../utils/hast_utils.js";
+import { createBufferElement, createHastElement } from "../utils/hast_utils.js";
 import { createAnnotationElement } from "../utils/createAnnotationElement.js";
 import { createFileHeaderElement } from "../utils/createFileHeaderElement.js";
 import { createPreElement } from "../utils/createPreElement.js";
 import { getFiletypeFromFileName } from "../utils/getFiletypeFromFileName.js";
 import { getHighlighterOptions } from "../utils/getHighlighterOptions.js";
 import { getLineAnnotationName } from "../utils/getLineAnnotationName.js";
+import { areRenderRangesEqual } from "../utils/areRenderRangesEqual.js";
 import { createEmptyRowBuffer } from "../utils/createEmptyRowBuffer.js";
 import { createNoNewlineElement } from "../utils/createNoNewlineElement.js";
 import { createSeparator } from "../utils/createSeparator.js";
 import { getHunkSeparatorSlotName } from "../utils/getHunkSeparatorSlotName.js";
 import { getTotalLineCountFromHunks } from "../utils/getTotalLineCountFromHunks.js";
+import { isDefaultRenderRange } from "../utils/isDefaultRenderRange.js";
+import { iterateOverDiff } from "../utils/iterateOverDiff.js";
 import { renderDiffWithHighlighter } from "../utils/renderDiffWithHighlighter.js";
 import { toHtml } from "hast-util-to-html";
 
 //#region src/renderers/DiffHunksRenderer.ts
-const EXPANDED_REGION = {
-	fromStart: 0,
-	fromEnd: 0
+const DEFAULT_RENDER_RANGE = {
+	startingLine: 0,
+	totalLines: Infinity,
+	bufferBefore: 0,
+	bufferAfter: 0
 };
+let instanceId = -1;
 var DiffHunksRenderer = class {
+	__id = `diff-hunks-renderer:${++instanceId}`;
 	highlighter;
 	diff;
 	expandedHunks = /* @__PURE__ */ new Map();
@@ -41,9 +48,16 @@ var DiffHunksRenderer = class {
 		this.highlighter = void 0;
 		this.diff = void 0;
 		this.renderCache = void 0;
+		this.workerManager?.cleanUpPendingTasks(this);
 		this.workerManager = void 0;
 		this.onRenderUpdate = void 0;
 	}
+	recycle() {
+		this.highlighter = void 0;
+		this.diff = void 0;
+		this.renderCache = void 0;
+		this.workerManager?.cleanUpPendingTasks(this);
+	}
 	setOptions(options) {
 		this.options = options;
 	}
@@ -59,14 +73,20 @@ var DiffHunksRenderer = class {
 	}
 	expandHunk(index, direction) {
 		const { expansionLineCount } = this.getOptionsWithDefaults();
-		const region = this.expandedHunks.get(index) ?? {
+		const region = { ...this.expandedHunks.get(index) ?? {
 			fromStart: 0,
 			fromEnd: 0
-		};
+		} };
 		if (direction === "up" || direction === "both") region.fromStart += expansionLineCount;
 		if (direction === "down" || direction === "both") region.fromEnd += expansionLineCount;
 		this.expandedHunks.set(index, region);
 	}
+	getExpandedHunk(hunkIndex) {
+		return this.expandedHunks.get(hunkIndex) ?? DEFAULT_EXPANDED_REGION;
+	}
+	getExpandedHunksMap() {
+		return this.expandedHunks;
+	}
 	setLineAnnotations(lineAnnotations) {
 		this.additionAnnotations = {};
 		this.deletionAnnotations = {};
@@ -83,13 +103,14 @@ var DiffHunksRenderer = class {
 		}
 	}
 	getOptionsWithDefaults() {
-		const { diffIndicators = "bars", diffStyle = "split", disableBackground = false, disableFileHeader = false, disableLineNumbers = false, expandUnchanged = false, expansionLineCount = 100, hunkSeparators = "line-info", lineDiffType = "word-alt", maxLineDiffLength = 1e3, overflow = "scroll", theme = DEFAULT_THEMES, themeType = "system", tokenizeMaxLineLength = 1e3, useCSSClasses = false } = this.options;
+		const { diffIndicators = "bars", diffStyle = "split", disableBackground = false, disableFileHeader = false, disableLineNumbers = false, disableVirtualizationBuffers = false, expandUnchanged = false, expansionLineCount = 100, hunkSeparators = "line-info", lineDiffType = "word-alt", maxLineDiffLength = 1e3, overflow = "scroll", theme = DEFAULT_THEMES, themeType = "system", tokenizeMaxLineLength = 1e3, useCSSClasses = false } = this.options;
 		return {
 			diffIndicators,
 			diffStyle,
 			disableBackground,
 			disableFileHeader,
 			disableLineNumbers,
+			disableVirtualizationBuffers,
 			expandUnchanged,
 			expansionLineCount,
 			hunkSeparators,
@@ -116,7 +137,8 @@ var DiffHunksRenderer = class {
 			diff,
 			highlighted: true,
 			options,
-			result: cache?.result
+			result: cache?.result,
+			renderRange: void 0
 		};
 		if (this.workerManager?.isWorkingPool() === true && this.renderCache.result == null) this.workerManager.highlightDiffAST(this, this.diff);
 		else this.asyncHighlight(diff).then(({ result, options: options$1 }) => {
@@ -148,12 +170,14 @@ var DiffHunksRenderer = class {
 			forceRender: false
 		};
 	}
-	renderDiff(diff = this.renderCache?.diff) {
+	renderDiff(diff = this.renderCache?.diff, renderRange = DEFAULT_RENDER_RANGE) {
 		if (diff == null) return;
+		const { expandUnchanged = false } = this.options;
 		const cache = this.workerManager?.getDiffResultCache(diff);
 		if (cache != null && this.renderCache == null) this.renderCache = {
 			diff,
 			highlighted: true,
+			renderRange: void 0,
 			...cache
 		};
 		const { options, forceRender } = this.getRenderOptions(diff);
@@ -161,11 +185,15 @@ var DiffHunksRenderer = class {
 			diff,
 			highlighted: false,
 			options,
-			result: void 0
+			result: void 0,
+			renderRange: void 0
 		};
 		if (this.workerManager?.isWorkingPool() === true) {
-			this.renderCache.result ??= this.workerManager.getPlainDiffAST(diff);
-			if (!this.renderCache.highlighted || forceRender) this.workerManager.highlightDiffAST(this, diff);
+			if (this.renderCache.result == null || !this.renderCache.highlighted && !areRenderRangesEqual(this.renderCache.renderRange, renderRange)) {
+				this.renderCache.result = this.workerManager.getPlainDiffAST(diff, renderRange.startingLine, renderRange.totalLines, isDefaultRenderRange(renderRange) ? true : expandUnchanged ? true : this.expandedHunks);
+				this.renderCache.renderRange = renderRange;
+			}
+			if (renderRange.totalLines > 0 && (!this.renderCache.highlighted || forceRender)) this.workerManager.highlightDiffAST(this, diff);
 		} else {
 			this.computedLang = diff.lang ?? getFiletypeFromFileName(diff.name);
 			const hasThemes = this.highlighter != null && areThemesAttached(options.theme);
@@ -176,18 +204,19 @@ var DiffHunksRenderer = class {
 					diff,
 					options: options$1,
 					highlighted: hasLangs,
-					result
+					result,
+					renderRange: void 0
 				};
 			}
 			if (!hasThemes || !hasLangs) this.asyncHighlight(diff).then(({ result, options: options$1 }) => {
 				this.onHighlightSuccess(diff, result, options$1);
 			});
 		}
-		return this.renderCache.result != null ? this.processDiffResult(this.renderCache.diff, this.renderCache.result) : void 0;
+		return this.renderCache.result != null ? this.processDiffResult(this.renderCache.diff, renderRange, this.renderCache.result) : void 0;
 	}
-	async asyncRender(diff) {
+	async asyncRender(diff, renderRange = DEFAULT_RENDER_RANGE) {
 		const { result } = await this.asyncHighlight(diff);
-		return this.processDiffResult(diff, result);
+		return this.processDiffResult(diff, renderRange, result);
 	}
 	createPreElement(split, totalLines, themeStyles, baseThemeType) {
 		const { diffIndicators, disableBackground, disableLineNumbers, overflow, themeType } = this.getOptionsWithDefaults();
@@ -209,10 +238,13 @@ var DiffHunksRenderer = class {
 		if (this.highlighter == null || !hasThemes || !hasLangs) this.highlighter = await this.initializeHighlighter();
 		return this.renderDiffWithHighlighter(diff, this.highlighter);
 	}
-	renderDiffWithHighlighter(diff, highlighter, plainText = false) {
+	renderDiffWithHighlighter(diff, highlighter, forcePlainText = false) {
 		const { options } = this.getRenderOptions(diff);
 		return {
-			result: renderDiffWithHighlighter(diff, highlighter, options, plainText),
+			result: renderDiffWithHighlighter(diff, highlighter, options, {
+				forcePlainText,
+				expandedHunks: forcePlainText ? true : void 0
+			}),
 			options
 		};
 	}
@@ -223,45 +255,172 @@ var DiffHunksRenderer = class {
 			diff,
 			options,
 			highlighted: true,
-			result
+			result,
+			renderRange: void 0
 		};
 		if (triggerRenderUpdate) this.onRenderUpdate?.();
 	}
 	onHighlightError(error) {
 		console.error(error);
 	}
-	processDiffResult(fileDiff, { code, themeStyles, baseThemeType }) {
-		const { diffStyle, disableFileHeader } = this.getOptionsWithDefaults();
+	processDiffResult(fileDiff, renderRange, { code, themeStyles, baseThemeType }) {
+		const { diffStyle, disableFileHeader, disableVirtualizationBuffers, expandUnchanged, expansionLineCount, hunkSeparators } = this.getOptionsWithDefaults();
 		this.diff = fileDiff;
 		const unified = diffStyle === "unified";
 		let additionsAST = [];
 		let deletionsAST = [];
 		let unifiedAST = [];
-		let hunkIndex = 0;
 		const hunkData = [];
-		let prevHunk;
-		let lineIndex = 0;
-		for (const hunk of fileDiff.hunks) {
-			lineIndex += hunk.collapsedBefore;
-			lineIndex = this.renderHunks({
-				ast: code,
-				hunk,
-				prevHunk,
-				hunkIndex,
-				isLastHunk: hunkIndex === fileDiff.hunks.length - 1,
-				additionsAST,
-				deletionsAST,
-				unifiedAST,
-				hunkData,
-				lineIndex
-			});
-			hunkIndex++;
-			prevHunk = hunk;
+		const { additionLines, deletionLines } = code;
+		const separatorContext = {
+			hunkSeparators,
+			additionsAST,
+			deletionsAST,
+			unifiedAST,
+			expansionLineCount,
+			hunkData
+		};
+		const trailingRangeSize = (() => {
+			const lastHunk = fileDiff.hunks.at(-1);
+			if (lastHunk == null || fileDiff.isPartial || fileDiff.additionLines.length === 0 || fileDiff.deletionLines.length === 0) return 0;
+			const additionRemaining = fileDiff.additionLines.length - (lastHunk.additionLineIndex + lastHunk.additionCount);
+			const deletionRemaining = fileDiff.deletionLines.length - (lastHunk.deletionLineIndex + lastHunk.deletionCount);
+			if (additionRemaining !== deletionRemaining) throw new Error(`DiffHunksRenderer.processDiffResult: trailing context mismatch (additions=${additionRemaining}, deletions=${deletionRemaining}) for ${fileDiff.name}`);
+			return Math.min(additionRemaining, deletionRemaining);
+		})();
+		let pendingSplitSpanSize = 0;
+		let pendingSplitMissing;
+		let lastHunkIndex;
+		function flushSplitSpan() {
+			if (pendingSplitSpanSize <= 0 || pendingSplitMissing == null) {
+				pendingSplitSpanSize = 0;
+				pendingSplitMissing = void 0;
+				return;
+			}
+			if (pendingSplitMissing === "additions") additionsAST?.push(createEmptyRowBuffer(pendingSplitSpanSize));
+			else deletionsAST?.push(createEmptyRowBuffer(pendingSplitSpanSize));
+			pendingSplitSpanSize = 0;
+			pendingSplitMissing = void 0;
+		}
+		function pushSeparators(props) {
+			flushSplitSpan();
+			if (diffStyle === "unified") pushSeparator("unified", props, separatorContext);
+			else {
+				pushSeparator("deletions", props, separatorContext);
+				pushSeparator("additions", props, separatorContext);
+			}
+		}
+		iterateOverDiff({
+			diff: fileDiff,
+			diffStyle,
+			startingLine: renderRange.startingLine,
+			totalLines: renderRange.totalLines,
+			expandedHunks: expandUnchanged ? true : this.expandedHunks,
+			callback: ({ hunkIndex, hunk, collapsedBefore, collapsedAfter, unifiedDeletionLineIndex, unifiedAdditionLineIndex, splitLineIndex, additionLineIndex, deletionLineIndex, additionLineNumber, deletionLineNumber, type, noEOFCRAddition, noEOFCRDeletion }) => {
+				if (diffStyle === "split") {
+					if (lastHunkIndex != null && lastHunkIndex !== hunkIndex) flushSplitSpan();
+					if (type !== "change") flushSplitSpan();
+				}
+				lastHunkIndex = hunkIndex;
+				if (collapsedBefore > 0) pushSeparators({
+					hunkIndex,
+					collapsedLines: collapsedBefore,
+					rangeSize: Math.max(hunk?.collapsedBefore ?? 0, 0),
+					hunkSpecs: hunk?.hunkSpecs,
+					isFirstHunk: hunkIndex === 0,
+					isLastHunk: false,
+					isExpandable: !fileDiff.isPartial
+				});
+				const lineIndex = diffStyle === "unified" ? unifiedDeletionLineIndex ?? unifiedAdditionLineIndex : splitLineIndex;
+				if (lineIndex == null) {
+					const errorMessage = "DiffHunksRenderer.processDiffResult: iterateOverDiff, no valid line index";
+					console.error(errorMessage, { file: fileDiff.name });
+					throw new Error(errorMessage);
+				}
+				if (diffStyle === "unified") {
+					const deletionLine = additionLineIndex != null ? void 0 : deletionLineIndex != null ? deletionLines[deletionLineIndex] : void 0;
+					const additionLine = additionLineIndex != null ? additionLines[additionLineIndex] : void 0;
+					if (deletionLine == null && additionLine == null) {
+						const errorMessage = "DiffHunksRenderer.processDiffResult: deletionLine and additionLine are null, something is wrong";
+						console.error(errorMessage, { file: fileDiff.name });
+						throw new Error(errorMessage);
+					}
+					pushLineWithAnnotation({
+						deletionLine,
+						additionLine,
+						unifiedAST,
+						unifiedSpan: this.getAnnotations("unified", deletionLineNumber, additionLineNumber, hunkIndex, lineIndex)
+					});
+				} else {
+					const deletionLine = deletionLineIndex != null ? deletionLines[deletionLineIndex] : void 0;
+					const additionLine = additionLineIndex != null ? additionLines[additionLineIndex] : void 0;
+					if (deletionLine == null && additionLine == null) {
+						const errorMessage = "DiffHunksRenderer.processDiffResult: deletionLine and additionLine are null, something is wrong";
+						console.error(errorMessage, { file: fileDiff.name });
+						throw new Error(errorMessage);
+					}
+					const missingSide = deletionLine == null ? "deletions" : additionLine == null ? "additions" : void 0;
+					if (missingSide != null) {
+						if (pendingSplitMissing != null && pendingSplitMissing !== missingSide) throw new Error("DiffHunksRenderer.processDiffResult: iterateOverDiff, invalid pending splits");
+						pendingSplitMissing = missingSide;
+						pendingSplitSpanSize++;
+					}
+					const annotationSpans = this.getAnnotations("split", deletionLineNumber, additionLineNumber, hunkIndex, lineIndex);
+					if (annotationSpans != null && pendingSplitSpanSize > 0) flushSplitSpan();
+					pushLineWithAnnotation({
+						additionLine,
+						deletionLine,
+						deletionsAST,
+						additionsAST,
+						...annotationSpans
+					});
+				}
+				if (noEOFCRDeletion || noEOFCRAddition) {
+					const noEOFType = type === "context" || type === "context-expanded" ? "context" : deletionLineIndex != null ? "change-deletion" : "change-addition";
+					if (noEOFCRDeletion) if (diffStyle === "unified") unifiedAST?.push(createNoNewlineElement(noEOFType));
+					else {
+						deletionsAST?.push(createNoNewlineElement("change-deletion"));
+						if (!noEOFCRAddition) additionsAST?.push(createEmptyRowBuffer(1));
+					}
+					if (noEOFCRAddition) if (diffStyle === "unified") unifiedAST?.push(createNoNewlineElement("change-addition"));
+					else {
+						additionsAST?.push(createNoNewlineElement("change-addition"));
+						if (!noEOFCRDeletion) deletionsAST?.push(createEmptyRowBuffer(1));
+					}
+				}
+				if (collapsedAfter > 0) pushSeparators({
+					hunkIndex: type === "context-expanded" ? hunkIndex : hunkIndex + 1,
+					collapsedLines: collapsedAfter,
+					rangeSize: trailingRangeSize,
+					hunkSpecs: void 0,
+					isFirstHunk: false,
+					isLastHunk: true,
+					isExpandable: !fileDiff.isPartial
+				});
+			}
+		});
+		if (diffStyle === "split") flushSplitSpan();
+		const totalLines = Math.max(getTotalLineCountFromHunks(fileDiff.hunks), fileDiff.additionLines.length ?? 0, fileDiff.deletionLines.length ?? 0);
+		additionsAST = !unified && fileDiff.type !== "deleted" ? additionsAST : void 0;
+		deletionsAST = !unified && fileDiff.type !== "new" ? deletionsAST : void 0;
+		unifiedAST = unified ? unifiedAST : void 0;
+		if (!disableVirtualizationBuffers) {
+			if (renderRange.bufferBefore > 0) {
+				const element = createBufferElement("before", renderRange.bufferBefore);
+				unifiedAST?.unshift(element);
+				deletionsAST?.unshift(element);
+				additionsAST?.unshift(element);
+			}
+			if (renderRange.bufferAfter > 0) {
+				const element = createBufferElement("after", renderRange.bufferAfter);
+				unifiedAST?.push(element);
+				deletionsAST?.push(element);
+				additionsAST?.push(element);
+			}
 		}
-		const totalLines = Math.max(getTotalLineCountFromHunks(fileDiff.hunks), fileDiff.newLines?.length ?? 0, fileDiff.oldLines?.length ?? 0);
-		additionsAST = !unified && (code.hunks != null || code.newLines.length > 0) ? additionsAST : void 0;
-		deletionsAST = !unified && (code.hunks != null || code.oldLines.length > 0) ? deletionsAST : void 0;
-		unifiedAST = unifiedAST.length > 0 ? unifiedAST : void 0;
+		if (unifiedAST?.length === 0) unifiedAST = void 0;
+		if (deletionsAST?.length === 0) deletionsAST = void 0;
+		if (additionsAST?.length === 0) additionsAST = void 0;
 		const preNode = this.createPreElement(deletionsAST != null && additionsAST != null, totalLines, themeStyles, baseThemeType);
 		return {
 			additionsAST,
@@ -320,310 +479,21 @@ var DiffHunksRenderer = class {
 			}
 		}));
 	}
-	renderCollapsedHunks({ ast, hunkData, hunkIndex, hunkSpecs, isFirstHunk, isLastHunk, rangeSize, lineIndex, additionLineNumber, deletionLineNumber, unifiedAST, deletionsAST, additionsAST }) {
-		if (rangeSize <= 0) return;
-		const { hunkSeparators, expandUnchanged, diffStyle, expansionLineCount } = this.getOptionsWithDefaults();
-		const expandable = ast.hunks == null && ast.newLines.length > 0 && ast.oldLines.length > 0;
-		const expandedRegion = this.expandedHunks.get(hunkIndex) ?? EXPANDED_REGION;
-		const chunked = rangeSize > expansionLineCount;
-		const collapsedLines = Math.max(!expandUnchanged ? rangeSize - (expandedRegion.fromEnd + expandedRegion.fromStart) : 0, 0);
-		const pushHunkSeparator = ({ type, linesAST }) => {
-			if (hunkSeparators === "line-info" || hunkSeparators === "custom") {
-				const slotName = getHunkSeparatorSlotName(type, hunkIndex);
-				linesAST.push(createSeparator({
-					type: hunkSeparators,
-					content: getModifiedLinesString(collapsedLines),
-					expandIndex: expandable ? hunkIndex : void 0,
-					chunked,
-					slotName,
-					isFirstHunk,
-					isLastHunk
-				}));
-				hunkData.push({
-					slotName,
-					hunkIndex,
-					lines: collapsedLines,
-					type,
-					expandable: expandable ? {
-						up: expandable && !isFirstHunk,
-						down: expandable,
-						chunked
-					} : void 0
-				});
-			} else if (hunkSeparators === "metadata" && hunkSpecs != null) linesAST.push(createSeparator({
-				type: "metadata",
-				content: hunkSpecs,
-				isFirstHunk,
-				isLastHunk
-			}));
-			else if (hunkSeparators === "simple" && hunkIndex > 0) linesAST.push(createSeparator({
-				type: "simple",
-				isFirstHunk,
-				isLastHunk: false
-			}));
-		};
-		const renderRange = ({ rangeLen, fromStart }) => {
-			if (ast.newLines == null || ast.oldLines == null) return;
-			const offset = isLastHunk ? 0 : fromStart ? rangeSize : rangeLen;
-			let dLineNumber = deletionLineNumber - offset;
-			let aLineNumber = additionLineNumber - offset;
-			let lIndex = lineIndex - offset;
-			for (let i = 0; i < rangeLen; i++) {
-				const oldLine = ast.oldLines[dLineNumber];
-				const newLine = ast.newLines[aLineNumber];
-				if (oldLine == null || newLine == null) {
-					console.error({
-						aLineNumber,
-						dLineNumber,
-						ast
-					});
-					throw new Error("DiffHunksRenderer.renderHunks prefill context invalid. Must include data for old and new lines");
-				}
-				dLineNumber++;
-				aLineNumber++;
-				if (diffStyle === "unified") this.pushLineWithAnnotation({
-					newLine,
-					unifiedAST,
-					unifiedSpan: this.getAnnotations("unified", dLineNumber, aLineNumber, hunkIndex, lIndex)
-				});
-				else this.pushLineWithAnnotation({
-					newLine,
-					oldLine,
-					additionsAST,
-					deletionsAST,
-					...this.getAnnotations("split", dLineNumber, aLineNumber, hunkIndex, lIndex)
-				});
-				lIndex++;
-			}
-		};
-		if (expandable) renderRange({
-			rangeLen: Math.min(collapsedLines === 0 || expandUnchanged ? rangeSize : expandedRegion.fromStart, rangeSize),
-			fromStart: true
-		});
-		if (collapsedLines > 0) if (diffStyle === "unified") pushHunkSeparator({
-			type: "unified",
-			linesAST: unifiedAST
-		});
-		else {
-			pushHunkSeparator({
-				type: "deletions",
-				linesAST: deletionsAST
-			});
-			pushHunkSeparator({
-				type: "additions",
-				linesAST: additionsAST
-			});
-		}
-		if (collapsedLines > 0 && expandedRegion.fromEnd > 0 && !isLastHunk) renderRange({
-			rangeLen: Math.min(expandedRegion.fromEnd, rangeSize),
-			fromStart: false
-		});
-	}
-	renderHunks({ hunk, hunkData, hunkIndex, lineIndex, isLastHunk, prevHunk, ast, deletionsAST, additionsAST, unifiedAST }) {
-		const { diffStyle } = this.getOptionsWithDefaults();
-		const unified = diffStyle === "unified";
-		let additionLineNumber = hunk.additionStart - 1;
-		let deletionLineNumber = hunk.deletionStart - 1;
-		this.renderCollapsedHunks({
-			additionLineNumber,
-			additionsAST,
-			ast,
-			deletionLineNumber,
-			deletionsAST,
-			hunkData,
-			hunkIndex,
-			hunkSpecs: hunk.hunkSpecs,
-			isFirstHunk: prevHunk == null,
-			isLastHunk: false,
-			lineIndex,
-			rangeSize: Math.max(hunk.collapsedBefore, 0),
-			unifiedAST
-		});
-		let { oldLines, newLines, oldIndex, newIndex } = (() => {
-			if (ast.hunks != null) {
-				const lineHunk = ast.hunks[hunkIndex];
-				if (lineHunk == null) {
-					console.error({
-						ast,
-						hunkIndex
-					});
-					throw new Error(`DiffHunksRenderer.renderHunks: lineHunk doesn't exist`);
-				}
-				return {
-					oldLines: lineHunk.oldLines,
-					newLines: lineHunk.newLines,
-					oldIndex: 0,
-					newIndex: 0
-				};
-			}
-			return {
-				oldLines: ast.oldLines,
-				newLines: ast.newLines,
-				oldIndex: deletionLineNumber,
-				newIndex: additionLineNumber
-			};
-		})();
-		for (const hunkContent of hunk.hunkContent) if (hunkContent.type === "context") {
-			const { length: len } = hunkContent.lines;
-			for (let i = 0; i < len; i++) {
-				const oldLine = oldLines[oldIndex];
-				const newLine = newLines[newIndex];
-				oldIndex++;
-				newIndex++;
-				additionLineNumber++;
-				deletionLineNumber++;
-				if (unified) {
-					if (newLine == null) throw new Error("DiffHunksRenderer.renderHunks: newLine doesnt exist for context...");
-					this.pushLineWithAnnotation({
-						newLine,
-						unifiedAST,
-						unifiedSpan: this.getAnnotations("unified", deletionLineNumber, additionLineNumber, hunkIndex, lineIndex)
-					});
-				} else {
-					if (newLine == null || oldLine == null) throw new Error("DiffHunksRenderer.renderHunks: newLine or oldLine doesnt exist for context...");
-					this.pushLineWithAnnotation({
-						oldLine,
-						newLine,
-						deletionsAST,
-						additionsAST,
-						...this.getAnnotations("split", deletionLineNumber, additionLineNumber, hunkIndex, lineIndex)
-					});
-				}
-				lineIndex++;
-			}
-			if (hunkContent.noEOFCR) {
-				const node = createNoNewlineElement("context");
-				if (unified) unifiedAST.push(node);
-				else {
-					deletionsAST.push(node);
-					additionsAST.push(node);
-				}
-			}
-		} else {
-			const { length: dLen } = hunkContent.deletions;
-			const { length: aLen } = hunkContent.additions;
-			const len = unified ? dLen + aLen : Math.max(dLen, aLen);
-			let spanSize = 0;
-			for (let i = 0; i < len; i++) {
-				const { oldLine, newLine } = (() => {
-					let oldLine$1 = oldLines[oldIndex];
-					let newLine$1 = newLines[newIndex];
-					if (unified) if (i < dLen) newLine$1 = void 0;
-					else oldLine$1 = void 0;
-					else {
-						if (i >= dLen) oldLine$1 = void 0;
-						if (i >= aLen) newLine$1 = void 0;
-					}
-					if (oldLine$1 == null && newLine$1 == null) {
-						console.error({
-							i,
-							len,
-							ast,
-							hunkContent
-						});
-						throw new Error("renderHunks: oldLine and newLine are null, something is wrong");
-					}
-					return {
-						oldLine: oldLine$1,
-						newLine: newLine$1
-					};
-				})();
-				if (oldLine != null) {
-					oldIndex++;
-					deletionLineNumber++;
-				}
-				if (newLine != null) {
-					newIndex++;
-					additionLineNumber++;
-				}
-				if (unified) {
-					this.pushLineWithAnnotation({
-						oldLine,
-						newLine,
-						unifiedAST,
-						unifiedSpan: this.getAnnotations("unified", oldLine != null ? deletionLineNumber : void 0, newLine != null ? additionLineNumber : void 0, hunkIndex, lineIndex)
-					});
-					lineIndex++;
-				} else {
-					if (oldLine == null || newLine == null) spanSize++;
-					const annotationSpans = this.getAnnotations("split", oldLine != null ? deletionLineNumber : void 0, newLine != null ? additionLineNumber : void 0, hunkIndex, lineIndex);
-					if (annotationSpans != null) {
-						if (spanSize > 0) {
-							if (aLen > dLen) deletionsAST.push(createEmptyRowBuffer(spanSize));
-							else additionsAST.push(createEmptyRowBuffer(spanSize));
-							spanSize = 0;
-						}
-					}
-					this.pushLineWithAnnotation({
-						newLine,
-						oldLine,
-						deletionsAST,
-						additionsAST,
-						...annotationSpans
-					});
-					lineIndex++;
-				}
-			}
-			if (!unified) {
-				if (spanSize > 0) {
-					if (aLen > dLen) deletionsAST.push(createEmptyRowBuffer(spanSize));
-					else additionsAST.push(createEmptyRowBuffer(spanSize));
-					spanSize = 0;
-				}
-				if (hunkContent.noEOFCRDeletions) {
-					deletionsAST.push(createNoNewlineElement("change-deletion"));
-					if (!hunkContent.noEOFCRAdditions) additionsAST.push(createEmptyRowBuffer(1));
-				}
-				if (hunkContent.noEOFCRAdditions) {
-					additionsAST.push(createNoNewlineElement("change-addition"));
-					if (!hunkContent.noEOFCRDeletions) deletionsAST.push(createEmptyRowBuffer(1));
-				}
-			}
-		}
-		if (isLastHunk && ast.newLines != null && ast.newLines.length > 0) this.renderCollapsedHunks({
-			additionLineNumber,
-			additionsAST,
-			ast,
-			deletionLineNumber,
-			deletionsAST,
-			hunkData,
-			hunkIndex: hunkIndex + 1,
-			hunkSpecs: void 0,
-			isFirstHunk: false,
-			isLastHunk: true,
-			lineIndex,
-			rangeSize: Math.max(ast.newLines.length - Math.max(hunk.additionStart + hunk.additionCount - 1, 0), 0),
-			unifiedAST
-		});
-		return lineIndex;
-	}
-	pushLineWithAnnotation({ newLine, oldLine, unifiedAST, additionsAST, deletionsAST, unifiedSpan, deletionSpan, additionSpan }) {
-		if (unifiedAST != null) {
-			if (oldLine != null) unifiedAST.push(oldLine);
-			else if (newLine != null) unifiedAST.push(newLine);
-			if (unifiedSpan != null) unifiedAST.push(createAnnotationElement(unifiedSpan));
-		} else if (deletionsAST != null && additionsAST != null) {
-			if (oldLine != null) deletionsAST.push(oldLine);
-			if (newLine != null) additionsAST.push(newLine);
-			if (deletionSpan != null) deletionsAST.push(createAnnotationElement(deletionSpan));
-			if (additionSpan != null) additionsAST.push(createAnnotationElement(additionSpan));
-		}
-	}
-	getAnnotations(type, oldLineNumber, newLineNumber, hunkIndex, lineIndex) {
+	getAnnotations(type, deletionLineNumber, additionLineNumber, hunkIndex, lineIndex) {
 		const deletionSpan = {
 			type: "annotation",
 			hunkIndex,
 			lineIndex,
 			annotations: []
 		};
-		if (oldLineNumber != null) for (const anno of this.deletionAnnotations[oldLineNumber] ?? []) deletionSpan.annotations.push(getLineAnnotationName(anno));
+		if (deletionLineNumber != null) for (const anno of this.deletionAnnotations[deletionLineNumber] ?? []) deletionSpan.annotations.push(getLineAnnotationName(anno));
 		const additionSpan = {
 			type: "annotation",
 			hunkIndex,
 			lineIndex,
 			annotations: []
 		};
-		if (newLineNumber != null) for (const anno of this.additionAnnotations[newLineNumber] ?? []) (type === "unified" ? deletionSpan : additionSpan).annotations.push(getLineAnnotationName(anno));
+		if (additionLineNumber != null) for (const anno of this.additionAnnotations[additionLineNumber] ?? []) (type === "unified" ? deletionSpan : additionSpan).annotations.push(getLineAnnotationName(anno));
 		if (type === "unified") {
 			if (deletionSpan.annotations.length > 0) return deletionSpan;
 			return;
@@ -649,6 +519,62 @@ function areRenderOptionsEqual(optionsA, optionsB) {
 function getModifiedLinesString(lines) {
 	return `${lines} unmodified line${lines > 1 ? "s" : ""}`;
 }
+function pushLineWithAnnotation({ deletionLine, additionLine, unifiedAST, additionsAST, deletionsAST, unifiedSpan, deletionSpan, additionSpan }) {
+	if (unifiedAST != null) {
+		if (deletionLine != null) unifiedAST.push(deletionLine);
+		else if (additionLine != null) unifiedAST.push(additionLine);
+		if (unifiedSpan != null) unifiedAST.push(createAnnotationElement(unifiedSpan));
+	} else if (deletionsAST != null && additionsAST != null) {
+		if (deletionLine != null) deletionsAST.push(deletionLine);
+		if (additionLine != null) additionsAST.push(additionLine);
+		if (deletionSpan != null) deletionsAST.push(createAnnotationElement(deletionSpan));
+		if (additionSpan != null) additionsAST.push(createAnnotationElement(additionSpan));
+	}
+}
+function pushSeparator(type, { hunkIndex, collapsedLines, rangeSize, hunkSpecs, isFirstHunk, isLastHunk, isExpandable }, { expansionLineCount, hunkSeparators, unifiedAST, deletionsAST, additionsAST, hunkData }) {
+	if (collapsedLines <= 0) return;
+	const linesAST = type === "unified" ? unifiedAST : type === "deletions" ? deletionsAST : additionsAST;
+	if (hunkSeparators === "metadata") {
+		if (hunkSpecs != null) linesAST.push(createSeparator({
+			type: "metadata",
+			content: hunkSpecs,
+			isFirstHunk,
+			isLastHunk
+		}));
+		return;
+	}
+	if (hunkSeparators === "simple") {
+		if (hunkIndex > 0) linesAST.push(createSeparator({
+			type: "simple",
+			isFirstHunk,
+			isLastHunk: false
+		}));
+		return;
+	}
+	const slotName = getHunkSeparatorSlotName(type, hunkIndex);
+	const chunked = rangeSize > expansionLineCount;
+	const expandIndex = isExpandable ? hunkIndex : void 0;
+	linesAST.push(createSeparator({
+		type: hunkSeparators,
+		content: getModifiedLinesString(collapsedLines),
+		expandIndex,
+		chunked,
+		slotName,
+		isFirstHunk,
+		isLastHunk
+	}));
+	hunkData.push({
+		slotName,
+		hunkIndex,
+		lines: collapsedLines,
+		type,
+		expandable: isExpandable ? {
+			up: !isFirstHunk,
+			down: !isLastHunk,
+			chunked
+		} : void 0
+	});
+}
 
 //#endregion
 export { DiffHunksRenderer };