@pierre/diffs 1.1.0-beta.1 → 1.1.0-beta.10

package/dist/renderers/DiffHunksRenderer.js

@@ -1,16 +1,17 @@
-import { DEFAULT_EXPANDED_REGION, DEFAULT_THEMES } from "../constants.js";
+import { DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, DEFAULT_EXPANDED_REGION, DEFAULT_RENDER_RANGE, 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 { areRenderRangesEqual } from "../utils/areRenderRangesEqual.js";
 import { areThemesEqual } from "../utils/areThemesEqual.js";
-import { createBufferElement, createHastElement } from "../utils/hast_utils.js";
+import { createGutterGap, createGutterItem, createGutterWrapper, createHastElement } from "../utils/hast_utils.js";
 import { createAnnotationElement } from "../utils/createAnnotationElement.js";
+import { createContentColumn } from "../utils/createContentColumn.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";
@@ -22,12 +23,6 @@ import { renderDiffWithHighlighter } from "../utils/renderDiffWithHighlighter.js
 import { toHtml } from "hast-util-to-html";
 
 //#region src/renderers/DiffHunksRenderer.ts
-const DEFAULT_RENDER_RANGE = {
-	startingLine: 0,
-	totalLines: Infinity,
-	bufferBefore: 0,
-	bufferAfter: 0
-};
 let instanceId = -1;
 var DiffHunksRenderer = class {
 	__id = `diff-hunks-renderer:${++instanceId}`;
@@ -79,6 +74,7 @@ var DiffHunksRenderer = class {
 		} };
 		if (direction === "up" || direction === "both") region.fromStart += expansionLineCount;
 		if (direction === "down" || direction === "both") region.fromEnd += expansionLineCount;
+		if (this.renderCache?.highlighted !== true) this.renderCache = void 0;
 		this.expandedHunks.set(index, region);
 	}
 	getExpandedHunk(hunkIndex) {
@@ -103,7 +99,7 @@ var DiffHunksRenderer = class {
 		}
 	}
 	getOptionsWithDefaults() {
-		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;
+		const { diffIndicators = "bars", diffStyle = "split", disableBackground = false, disableFileHeader = false, disableLineNumbers = false, disableVirtualizationBuffers = false, expandUnchanged = false, collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, 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,
@@ -112,6 +108,7 @@ var DiffHunksRenderer = class {
 			disableLineNumbers,
 			disableVirtualizationBuffers,
 			expandUnchanged,
+			collapsedContextThreshold,
 			expansionLineCount,
 			hunkSeparators,
 			lineDiffType,
@@ -172,7 +169,7 @@ var DiffHunksRenderer = class {
 	}
 	renderDiff(diff = this.renderCache?.diff, renderRange = DEFAULT_RENDER_RANGE) {
 		if (diff == null) return;
-		const { expandUnchanged = false } = this.options;
+		const { expandUnchanged = false, collapsedContextThreshold } = this.getOptionsWithDefaults();
 		const cache = this.workerManager?.getDiffResultCache(diff);
 		if (cache != null && this.renderCache == null) this.renderCache = {
 			diff,
@@ -190,7 +187,7 @@ var DiffHunksRenderer = class {
 		};
 		if (this.workerManager?.isWorkingPool() === true) {
 			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.result = this.workerManager.getPlainDiffAST(diff, renderRange.startingLine, renderRange.totalLines, isDefaultRenderRange(renderRange) ? true : expandUnchanged ? true : this.expandedHunks, collapsedContextThreshold);
 				this.renderCache.renderRange = renderRange;
 			}
 			if (renderRange.totalLines > 0 && (!this.renderCache.highlighted || forceRender)) this.workerManager.highlightDiffAST(this, diff);
@@ -221,6 +218,7 @@ var DiffHunksRenderer = class {
 	createPreElement(split, totalLines, themeStyles, baseThemeType) {
 		const { diffIndicators, disableBackground, disableLineNumbers, overflow, themeType } = this.getOptionsWithDefaults();
 		return createPreElement({
+			type: "diff",
 			diffIndicators,
 			disableBackground,
 			disableLineNumbers,
@@ -240,10 +238,12 @@ var DiffHunksRenderer = class {
 	}
 	renderDiffWithHighlighter(diff, highlighter, forcePlainText = false) {
 		const { options } = this.getRenderOptions(diff);
+		const { collapsedContextThreshold } = this.getOptionsWithDefaults();
 		return {
 			result: renderDiffWithHighlighter(diff, highlighter, options, {
 				forcePlainText,
-				expandedHunks: forcePlainText ? true : void 0
+				expandedHunks: forcePlainText ? true : void 0,
+				collapsedContextThreshold
 			}),
 			options
 		};
@@ -264,50 +264,71 @@ var DiffHunksRenderer = class {
 		console.error(error);
 	}
 	processDiffResult(fileDiff, renderRange, { code, themeStyles, baseThemeType }) {
-		const { diffStyle, disableFileHeader, disableVirtualizationBuffers, expandUnchanged, expansionLineCount, hunkSeparators } = this.getOptionsWithDefaults();
+		const { diffStyle, disableFileHeader, expandUnchanged, expansionLineCount, collapsedContextThreshold, hunkSeparators } = this.getOptionsWithDefaults();
 		this.diff = fileDiff;
 		const unified = diffStyle === "unified";
-		let additionsAST = [];
-		let deletionsAST = [];
-		let unifiedAST = [];
+		let additionsContentAST = [];
+		let deletionsContentAST = [];
+		let unifiedContentAST = [];
 		const hunkData = [];
 		const { additionLines, deletionLines } = code;
-		const separatorContext = {
+		const context = {
+			rowCount: 0,
 			hunkSeparators,
-			additionsAST,
-			deletionsAST,
-			unifiedAST,
+			additionsContentAST,
+			deletionsContentAST,
+			unifiedContentAST,
+			unifiedGutterAST: createGutterWrapper(),
+			deletionsGutterAST: createGutterWrapper(),
+			additionsGutterAST: createGutterWrapper(),
 			expansionLineCount,
-			hunkData
+			hunkData,
+			incrementRowCount(count = 1) {
+				context.rowCount += count;
+			},
+			pushToGutter(type, element) {
+				switch (type) {
+					case "unified":
+						context.unifiedGutterAST.children.push(element);
+						break;
+					case "deletions":
+						context.deletionsGutterAST.children.push(element);
+						break;
+					case "additions":
+						context.additionsGutterAST.children.push(element);
+						break;
+				}
+			}
 		};
-		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);
-		})();
+		const trailingRangeSize = calculateTrailingRangeSize(fileDiff);
 		let pendingSplitSpanSize = 0;
 		let pendingSplitMissing;
-		let lastHunkIndex;
+		function pushGutterLineNumber(type, lineType, lineNumber, lineIndex) {
+			context.pushToGutter(type, createGutterItem(lineType, lineNumber, lineIndex));
+		}
 		function flushSplitSpan() {
+			if (diffStyle === "unified") return;
 			if (pendingSplitSpanSize <= 0 || pendingSplitMissing == null) {
 				pendingSplitSpanSize = 0;
 				pendingSplitMissing = void 0;
 				return;
 			}
-			if (pendingSplitMissing === "additions") additionsAST?.push(createEmptyRowBuffer(pendingSplitSpanSize));
-			else deletionsAST?.push(createEmptyRowBuffer(pendingSplitSpanSize));
+			if (pendingSplitMissing === "additions") {
+				context.pushToGutter("additions", createGutterGap(void 0, "buffer", pendingSplitSpanSize));
+				additionsContentAST?.push(createEmptyRowBuffer(pendingSplitSpanSize));
+			} else {
+				context.pushToGutter("deletions", createGutterGap(void 0, "buffer", pendingSplitSpanSize));
+				deletionsContentAST?.push(createEmptyRowBuffer(pendingSplitSpanSize));
+			}
 			pendingSplitSpanSize = 0;
 			pendingSplitMissing = void 0;
 		}
 		function pushSeparators(props) {
 			flushSplitSpan();
-			if (diffStyle === "unified") pushSeparator("unified", props, separatorContext);
+			if (diffStyle === "unified") pushSeparator("unified", props, context);
 			else {
-				pushSeparator("deletions", props, separatorContext);
-				pushSeparator("additions", props, separatorContext);
+				pushSeparator("deletions", props, context);
+				pushSeparator("additions", props, context);
 			}
 		}
 		iterateOverDiff({
@@ -316,12 +337,11 @@ var DiffHunksRenderer = class {
 			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;
+			collapsedContextThreshold,
+			callback: ({ hunkIndex, hunk, collapsedBefore, collapsedAfter, additionLine, deletionLine, type }) => {
+				const splitLineIndex = deletionLine != null ? deletionLine.splitLineIndex : additionLine.splitLineIndex;
+				const unifiedLineIndex = additionLine != null ? additionLine.unifiedLineIndex : deletionLine.unifiedLineIndex;
+				if (diffStyle === "split" && type !== "change") flushSplitSpan();
 				if (collapsedBefore > 0) pushSeparators({
 					hunkIndex,
 					collapsedLines: collapsedBefore,
@@ -331,64 +351,90 @@ var DiffHunksRenderer = class {
 					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);
-				}
+				const lineIndex = diffStyle === "unified" ? unifiedLineIndex : splitLineIndex;
 				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 deletionLineContent = deletionLine != null ? deletionLines[deletionLine.lineIndex] : void 0;
+					const additionLineContent = additionLine != null ? additionLines[additionLine.lineIndex] : void 0;
+					if (deletionLineContent == null && additionLineContent == null) {
 						const errorMessage = "DiffHunksRenderer.processDiffResult: deletionLine and additionLine are null, something is wrong";
 						console.error(errorMessage, { file: fileDiff.name });
 						throw new Error(errorMessage);
 					}
+					pushGutterLineNumber("unified", type === "change" ? additionLine != null ? "change-addition" : "change-deletion" : type, additionLine != null ? additionLine.lineNumber : deletionLine.lineNumber, `${unifiedLineIndex},${splitLineIndex}`);
 					pushLineWithAnnotation({
-						deletionLine,
-						additionLine,
-						unifiedAST,
-						unifiedSpan: this.getAnnotations("unified", deletionLineNumber, additionLineNumber, hunkIndex, lineIndex)
+						diffStyle: "unified",
+						type,
+						deletionLine: deletionLineContent,
+						additionLine: additionLineContent,
+						unifiedSpan: this.getAnnotations("unified", deletionLine?.lineNumber, additionLine?.lineNumber, hunkIndex, lineIndex),
+						context
 					});
 				} else {
-					const deletionLine = deletionLineIndex != null ? deletionLines[deletionLineIndex] : void 0;
-					const additionLine = additionLineIndex != null ? additionLines[additionLineIndex] : void 0;
-					if (deletionLine == null && additionLine == null) {
+					const deletionLineContent = deletionLine != null ? deletionLines[deletionLine.lineIndex] : void 0;
+					const additionLineContent = additionLine != null ? additionLines[additionLine.lineIndex] : void 0;
+					if (deletionLineContent == null && additionLineContent == 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;
+					const missingSide = (() => {
+						if (type === "change") {
+							if (additionLineContent == null) return "additions";
+							else if (deletionLineContent == null) return "deletions";
+						}
+					})();
 					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);
+					const annotationSpans = this.getAnnotations("split", deletionLine?.lineNumber, additionLine?.lineNumber, hunkIndex, lineIndex);
 					if (annotationSpans != null && pendingSplitSpanSize > 0) flushSplitSpan();
+					if (deletionLine != null) pushGutterLineNumber("deletions", type === "change" ? "change-deletion" : type, deletionLine.lineNumber, `${deletionLine.unifiedLineIndex},${splitLineIndex}`);
+					if (additionLine != null) pushGutterLineNumber("additions", type === "change" ? "change-addition" : type, additionLine.lineNumber, `${additionLine.unifiedLineIndex},${splitLineIndex}`);
 					pushLineWithAnnotation({
-						additionLine,
-						deletionLine,
-						deletionsAST,
-						additionsAST,
-						...annotationSpans
+						diffStyle: "split",
+						type,
+						additionLine: additionLineContent,
+						deletionLine: deletionLineContent,
+						...annotationSpans,
+						context
 					});
 				}
-				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));
+				const noEOFCRDeletion = deletionLine?.noEOFCR ?? false;
+				const noEOFCRAddition = additionLine?.noEOFCR ?? false;
+				if (noEOFCRAddition || noEOFCRDeletion) {
+					if (noEOFCRDeletion) {
+						const noEOFType = type === "context" || type === "context-expanded" ? type : "change-deletion";
+						if (diffStyle === "unified") {
+							context.unifiedContentAST.push(createNoNewlineElement(noEOFType));
+							context.pushToGutter("unified", createGutterGap(noEOFType, "metadata", 1));
+						} else {
+							context.deletionsContentAST.push(createNoNewlineElement(noEOFType));
+							context.pushToGutter("deletions", createGutterGap(noEOFType, "metadata", 1));
+							if (!noEOFCRAddition) {
+								context.pushToGutter("additions", createGutterGap(void 0, "buffer", 1));
+								context.additionsContentAST.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 (noEOFCRAddition) {
+						const noEOFType = type === "context" || type === "context-expanded" ? type : "change-addition";
+						if (diffStyle === "unified") {
+							context.unifiedContentAST.push(createNoNewlineElement(noEOFType));
+							context.pushToGutter("unified", createGutterGap(noEOFType, "metadata", 1));
+						} else {
+							context.additionsContentAST.push(createNoNewlineElement(noEOFType));
+							context.pushToGutter("additions", createGutterGap(noEOFType, "metadata", 1));
+							if (!noEOFCRDeletion) {
+								context.pushToGutter("deletions", createGutterGap(void 0, "buffer", 1));
+								context.deletionsContentAST.push(createEmptyRowBuffer(1));
+							}
+						}
 					}
+					context.incrementRowCount(1);
 				}
-				if (collapsedAfter > 0) pushSeparators({
+				if (collapsedAfter > 0 && hunkSeparators !== "simple") pushSeparators({
 					hunkIndex: type === "context-expanded" ? hunkIndex : hunkIndex + 1,
 					collapsedLines: collapsedAfter,
 					rangeSize: trailingRangeSize,
@@ -397,64 +443,75 @@ var DiffHunksRenderer = class {
 					isLastHunk: true,
 					isExpandable: !fileDiff.isPartial
 				});
+				context.incrementRowCount(1);
 			}
 		});
 		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);
-			}
-		}
-		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);
+		const hasBuffer = renderRange.bufferBefore > 0 || renderRange.bufferAfter > 0;
+		const shouldIncludeAdditions = !unified && fileDiff.type !== "deleted";
+		const shouldIncludeDeletions = !unified && fileDiff.type !== "new";
+		const hasContent = context.rowCount > 0 || hasBuffer;
+		additionsContentAST = shouldIncludeAdditions && hasContent ? additionsContentAST : void 0;
+		deletionsContentAST = shouldIncludeDeletions && hasContent ? deletionsContentAST : void 0;
+		unifiedContentAST = unified && hasContent ? unifiedContentAST : void 0;
+		const preNode = this.createPreElement(deletionsContentAST != null && additionsContentAST != null, totalLines, themeStyles, baseThemeType);
 		return {
-			additionsAST,
-			deletionsAST,
-			unifiedAST,
+			unifiedGutterAST: unified && hasContent ? context.unifiedGutterAST.children : void 0,
+			unifiedContentAST,
+			deletionsGutterAST: shouldIncludeDeletions && hasContent ? context.deletionsGutterAST.children : void 0,
+			deletionsContentAST,
+			additionsGutterAST: shouldIncludeAdditions && hasContent ? context.additionsGutterAST.children : void 0,
+			additionsContentAST,
 			hunkData,
 			preNode,
 			themeStyles,
 			baseThemeType,
 			headerElement: !disableFileHeader ? this.renderHeader(this.diff, themeStyles, baseThemeType) : void 0,
 			totalLines,
+			rowCount: context.rowCount,
+			bufferBefore: renderRange.bufferBefore,
+			bufferAfter: renderRange.bufferAfter,
 			css: ""
 		};
 	}
+	renderCodeAST(type, result) {
+		const gutterAST = type === "unified" ? result.unifiedGutterAST : type === "deletions" ? result.deletionsGutterAST : result.additionsGutterAST;
+		const contentAST = type === "unified" ? result.unifiedContentAST : type === "deletions" ? result.deletionsContentAST : result.additionsContentAST;
+		if (gutterAST == null || contentAST == null) return;
+		const gutter = createGutterWrapper(gutterAST);
+		gutter.properties.style = `grid-row: span ${result.rowCount}`;
+		return [gutter, createContentColumn(contentAST, result.rowCount)];
+	}
 	renderFullAST(result, children = []) {
-		if (result.unifiedAST != null) children.push(createHastElement({
-			tagName: "code",
-			children: result.unifiedAST,
-			properties: {
-				"data-code": "",
-				"data-unified": ""
-			}
-		}));
-		if (result.deletionsAST != null) children.push(createHastElement({
+		const unifiedAST = this.renderCodeAST("unified", result);
+		if (unifiedAST != null) {
+			children.push(createHastElement({
+				tagName: "code",
+				children: unifiedAST,
+				properties: {
+					"data-code": "",
+					"data-unified": ""
+				}
+			}));
+			return {
+				...result.preNode,
+				children
+			};
+		}
+		const deletionsAST = this.renderCodeAST("deletions", result);
+		if (deletionsAST != null) children.push(createHastElement({
 			tagName: "code",
-			children: result.deletionsAST,
+			children: deletionsAST,
 			properties: {
 				"data-code": "",
 				"data-deletions": ""
 			}
 		}));
-		if (result.additionsAST != null) children.push(createHastElement({
+		const additionsAST = this.renderCodeAST("additions", result);
+		if (additionsAST != null) children.push(createHastElement({
 			tagName: "code",
-			children: result.additionsAST,
+			children: additionsAST,
 			properties: {
 				"data-code": "",
 				"data-additions": ""
@@ -519,43 +576,86 @@ 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 pushLineWithAnnotation({ diffStyle, type, deletionLine, additionLine, unifiedSpan, deletionSpan, additionSpan, context }) {
+	let hasAnnotationRow = false;
+	if (diffStyle === "unified") {
+		if (additionLine != null) context.unifiedContentAST.push(additionLine);
+		else if (deletionLine != null) context.unifiedContentAST.push(deletionLine);
+		if (unifiedSpan != null) {
+			const lineType = type === "change" ? deletionLine != null ? "change-deletion" : "change-addition" : type;
+			context.unifiedContentAST.push(createAnnotationElement(unifiedSpan));
+			context.pushToGutter("unified", createGutterGap(lineType, "annotation", 1));
+			hasAnnotationRow = true;
+		}
+	} else if (diffStyle === "split") {
+		if (deletionLine != null) context.deletionsContentAST.push(deletionLine);
+		if (additionLine != null) context.additionsContentAST.push(additionLine);
+		if (deletionSpan != null) {
+			const lineType = type === "change" ? deletionLine != null ? "change-deletion" : "context" : type;
+			context.deletionsContentAST.push(createAnnotationElement(deletionSpan));
+			context.pushToGutter("deletions", createGutterGap(lineType, "annotation", 1));
+			hasAnnotationRow = true;
+		}
+		if (additionSpan != null) {
+			const lineType = type === "change" ? additionLine != null ? "change-addition" : "context" : type;
+			context.additionsContentAST.push(createAnnotationElement(additionSpan));
+			context.pushToGutter("additions", createGutterGap(lineType, "annotation", 1));
+			hasAnnotationRow = true;
+		}
 	}
+	if (hasAnnotationRow) context.incrementRowCount(1);
 }
-function pushSeparator(type, { hunkIndex, collapsedLines, rangeSize, hunkSpecs, isFirstHunk, isLastHunk, isExpandable }, { expansionLineCount, hunkSeparators, unifiedAST, deletionsAST, additionsAST, hunkData }) {
+function pushSeparator(type, { hunkIndex, collapsedLines, rangeSize, hunkSpecs, isFirstHunk, isLastHunk, isExpandable }, context) {
 	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
-		}));
+	const linesAST = type === "unified" ? context.unifiedContentAST : type === "deletions" ? context.deletionsContentAST : context.additionsContentAST;
+	if (context.hunkSeparators === "metadata") {
+		if (hunkSpecs != null) {
+			context.pushToGutter(type, createSeparator({
+				type: "metadata",
+				content: hunkSpecs,
+				isFirstHunk,
+				isLastHunk
+			}));
+			linesAST.push(createSeparator({
+				type: "metadata",
+				content: hunkSpecs,
+				isFirstHunk,
+				isLastHunk
+			}));
+			if (type !== "additions") context.incrementRowCount(1);
+		}
 		return;
 	}
-	if (hunkSeparators === "simple") {
-		if (hunkIndex > 0) linesAST.push(createSeparator({
-			type: "simple",
-			isFirstHunk,
-			isLastHunk: false
-		}));
+	if (context.hunkSeparators === "simple") {
+		if (hunkIndex > 0) {
+			context.pushToGutter(type, createSeparator({
+				type: "simple",
+				isFirstHunk,
+				isLastHunk: false
+			}));
+			linesAST.push(createSeparator({
+				type: "simple",
+				isFirstHunk,
+				isLastHunk: false
+			}));
+			if (type !== "additions") context.incrementRowCount(1);
+		}
 		return;
 	}
 	const slotName = getHunkSeparatorSlotName(type, hunkIndex);
-	const chunked = rangeSize > expansionLineCount;
+	const chunked = rangeSize > context.expansionLineCount;
 	const expandIndex = isExpandable ? hunkIndex : void 0;
+	context.pushToGutter(type, createSeparator({
+		type: context.hunkSeparators,
+		content: getModifiedLinesString(collapsedLines),
+		expandIndex,
+		chunked,
+		slotName,
+		isFirstHunk,
+		isLastHunk
+	}));
 	linesAST.push(createSeparator({
-		type: hunkSeparators,
+		type: context.hunkSeparators,
 		content: getModifiedLinesString(collapsedLines),
 		expandIndex,
 		chunked,
@@ -563,7 +663,8 @@ function pushSeparator(type, { hunkIndex, collapsedLines, rangeSize, hunkSpecs,
 		isFirstHunk,
 		isLastHunk
 	}));
-	hunkData.push({
+	if (type !== "additions") context.incrementRowCount(1);
+	context.hunkData.push({
 		slotName,
 		hunkIndex,
 		lines: collapsedLines,
@@ -575,6 +676,14 @@ function pushSeparator(type, { hunkIndex, collapsedLines, rangeSize, hunkSpecs,
 		} : void 0
 	});
 }
+function calculateTrailingRangeSize(fileDiff) {
+	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);
+}
 
 //#endregion
 export { DiffHunksRenderer };