@pierre/diffs 1.2.6 → 1.3.0-beta.1

package/dist/utils/computeFileOffsets.d.ts

@@ -0,0 +1,13 @@
+//#region src/utils/computeFileOffsets.d.ts
+/**
+ * Computes line start offsets for a string.
+ */
+declare function computeLineOffsets(contents: string): number[];
+/**
+ * Splits file contents into lines aligned with {@link computeLineOffsets}.
+ * Unlike splitFileContents, a trailing newline produces a final empty line.
+ */
+declare function linesFromFileContents(contents: string): string[];
+//#endregion
+export { computeLineOffsets, linesFromFileContents };
+//# sourceMappingURL=computeFileOffsets.d.ts.map

package/dist/utils/computeFileOffsets.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"computeFileOffsets.d.ts","names":["computeLineOffsets","linesFromFileContents"],"sources":["../../src/utils/computeFileOffsets.d.ts"],"sourcesContent":["/**\n * Computes line start offsets for a string.\n */\nexport declare function computeLineOffsets(contents: string): number[];\n/**\n * Splits file contents into lines aligned with {@link computeLineOffsets}.\n * Unlike splitFileContents, a trailing newline produces a final empty line.\n */\nexport declare function linesFromFileContents(contents: string): string[];\n//# sourceMappingURL=computeFileOffsets.d.ts.map"],"mappings":";;AAGA;AAKA;iBALwBA,kBAAAA;;;;;iBAKAC,qBAAAA"}

package/dist/utils/computeFileOffsets.js

@@ -0,0 +1,33 @@
+//#region src/utils/computeFileOffsets.ts
+const LINE_FEED = 10;
+const CARRIAGE_RETURN = 13;
+/**
+* Computes line start offsets for a string.
+*/
+function computeLineOffsets(contents) {
+	const offsets = [0];
+	for (let i = 0; i < contents.length; i++) {
+		const char = contents.charCodeAt(i);
+		if (char === LINE_FEED || char === CARRIAGE_RETURN) {
+			if (char === CARRIAGE_RETURN && i + 1 < contents.length && contents.charCodeAt(i + 1) === LINE_FEED) i++;
+			offsets.push(i + 1);
+		}
+	}
+	return offsets;
+}
+/**
+* Splits file contents into lines aligned with {@link computeLineOffsets}.
+* Unlike splitFileContents, a trailing newline produces a final empty line.
+*/
+function linesFromFileContents(contents) {
+	const offsets = computeLineOffsets(contents);
+	return Array.from({ length: offsets.length }, (_, i) => {
+		const start = offsets[i];
+		const end = offsets[i + 1] ?? contents.length;
+		return contents.slice(start, end);
+	});
+}
+
+//#endregion
+export { computeLineOffsets, linesFromFileContents };
+//# sourceMappingURL=computeFileOffsets.js.map

package/dist/utils/computeFileOffsets.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"computeFileOffsets.js","names":["offsets: number[]"],"sources":["../../src/utils/computeFileOffsets.ts"],"sourcesContent":["const LINE_FEED = 10; // \\n\nconst CARRIAGE_RETURN = 13; // \\r\n\n/**\n * Computes line start offsets for a string.\n */\nexport function computeLineOffsets(contents: string): number[] {\n  const offsets: number[] = [0];\n  for (let i = 0; i < contents.length; i++) {\n    const char = contents.charCodeAt(i);\n    if (char === LINE_FEED || char === CARRIAGE_RETURN) {\n      if (\n        char === CARRIAGE_RETURN &&\n        i + 1 < contents.length &&\n        contents.charCodeAt(i + 1) === LINE_FEED\n      ) {\n        i++;\n      }\n      offsets.push(i + 1);\n    }\n  }\n  return offsets;\n}\n\n/**\n * Splits file contents into lines aligned with {@link computeLineOffsets}.\n * Unlike splitFileContents, a trailing newline produces a final empty line.\n */\nexport function linesFromFileContents(contents: string): string[] {\n  const offsets = computeLineOffsets(contents);\n  const lines = Array.from({ length: offsets.length }, (_, i) => {\n    const start = offsets[i];\n    const end = offsets[i + 1] ?? contents.length;\n    return contents.slice(start, end);\n  });\n  return lines;\n}\n"],"mappings":";AAAA,MAAM,YAAY;AAClB,MAAM,kBAAkB;;;;AAKxB,SAAgB,mBAAmB,UAA4B;CAC7D,MAAMA,UAAoB,CAAC,EAAE;AAC7B,MAAK,IAAI,IAAI,GAAG,IAAI,SAAS,QAAQ,KAAK;EACxC,MAAM,OAAO,SAAS,WAAW,EAAE;AACnC,MAAI,SAAS,aAAa,SAAS,iBAAiB;AAClD,OACE,SAAS,mBACT,IAAI,IAAI,SAAS,UACjB,SAAS,WAAW,IAAI,EAAE,KAAK,UAE/B;AAEF,WAAQ,KAAK,IAAI,EAAE;;;AAGvB,QAAO;;;;;;AAOT,SAAgB,sBAAsB,UAA4B;CAChE,MAAM,UAAU,mBAAmB,SAAS;AAM5C,QALc,MAAM,KAAK,EAAE,QAAQ,QAAQ,QAAQ,GAAG,GAAG,MAAM;EAC7D,MAAM,QAAQ,QAAQ;EACtB,MAAM,MAAM,QAAQ,IAAI,MAAM,SAAS;AACvC,SAAO,SAAS,MAAM,OAAO,IAAI;GACjC"}

package/dist/utils/createTransformerWithState.js

@@ -51,6 +51,15 @@ function createTransformerWithState(useTokenTransformer = false, useCSSClasses =
 		} : null
 	}];
 	if (useCSSClasses) transformers.push(tokenStyleNormalizer, toClass);
+	if (useTokenTransformer) transformers.push({ line: (node) => {
+		if (node.type === "element" && node.children.length === 0) node.children.push({
+			type: "element",
+			tagName: "br",
+			properties: {},
+			children: []
+		});
+		return node;
+	} });
 	return {
 		state,
 		transformers,

package/dist/utils/createTransformerWithState.js.map

@@ -1 +1 @@
-{"version":3,"file":"createTransformerWithState.js","names":["state: SharedRenderState","transformers: ShikiTransformer[]","children: ElementContent[]","tokenStyleNormalizer: ShikiTransformer","style: Record<string, string>"],"sources":["../../src/utils/createTransformerWithState.ts"],"sourcesContent":["import {\n  type ShikiTransformerStyleToClass,\n  transformerStyleToClass,\n} from '@shikijs/transformers';\nimport type { ElementContent } from 'hast';\nimport type { ThemedToken } from 'shiki';\n\nimport type { SharedRenderState, ShikiTransformer } from '../types';\nimport { findCodeElement } from './hast_utils';\nimport { processLine } from './processLine';\nimport { wrapTokenFragments } from './wrapTokenFragments';\n\ninterface CreateTransformerWithStateReturn {\n  state: SharedRenderState;\n  transformers: ShikiTransformer[];\n  toClass: ShikiTransformerStyleToClass;\n}\n\ntype TokenWithLineChar = ThemedToken & {\n  __lineChar?: number;\n};\n\nexport function createTransformerWithState(\n  useTokenTransformer = false,\n  useCSSClasses = false\n): CreateTransformerWithStateReturn {\n  const state: SharedRenderState = { lineInfo: [] };\n  const transformers: ShikiTransformer[] = [\n    {\n      line(node) {\n        // Remove the default class\n        delete node.properties.class;\n        return node;\n      },\n      pre(pre) {\n        const code = findCodeElement(pre);\n        const children: ElementContent[] = [];\n        if (code != null) {\n          let index = 1;\n          for (const node of code.children) {\n            if (node.type !== 'element') continue;\n            if (useTokenTransformer) {\n              wrapTokenFragments(node);\n            }\n            children.push(processLine(node, index, state));\n            index++;\n          }\n          code.children = children;\n        }\n        return pre;\n      },\n      ...(useTokenTransformer\n        ? {\n            tokens(lines) {\n              for (const line of lines) {\n                let col = 0;\n                for (const token of line) {\n                  const tokenWithOriginalRange = token as TokenWithLineChar;\n                  tokenWithOriginalRange.__lineChar ??= col;\n                  col += token.content.length;\n                }\n              }\n            },\n            preprocess(_code, options) {\n              options.mergeWhitespaces = 'never';\n            },\n            span(hast, _line, _char, _lineElement, token) {\n              if (token?.offset != null && token.content != null) {\n                const tokenWithOriginalRange = token as TokenWithLineChar;\n                const tokenChar = tokenWithOriginalRange.__lineChar;\n                if (tokenChar != null) {\n                  hast.properties['data-char'] = tokenChar;\n                }\n                return hast;\n              }\n              return hast;\n            },\n          }\n        : null),\n    },\n  ];\n  if (useCSSClasses) {\n    transformers.push(tokenStyleNormalizer, toClass);\n  }\n  return { state, transformers, toClass };\n}\n\nconst toClass = transformerStyleToClass({ classPrefix: 'hl-' });\n\n// Create a transformer that converts token color/fontStyle to htmlStyle\n// This needs to run BEFORE transformerStyleToClass\nconst tokenStyleNormalizer: ShikiTransformer = {\n  name: 'token-style-normalizer',\n  tokens(lines) {\n    for (const line of lines) {\n      for (const token of line) {\n        // Skip if htmlStyle is already set\n        if (token.htmlStyle != null) continue;\n\n        const style: Record<string, string> = {};\n\n        if (token.color != null) {\n          style.color = token.color;\n        }\n        if (token.bgColor != null) {\n          style['background-color'] = token.bgColor;\n        }\n        if (token.fontStyle != null && token.fontStyle !== 0) {\n          // FontStyle is a bitmask: 1 = italic, 2 = bold, 4 = underline\n          if ((token.fontStyle & 1) !== 0) {\n            style['font-style'] = 'italic';\n          }\n          if ((token.fontStyle & 2) !== 0) {\n            style['font-weight'] = 'bold';\n          }\n          if ((token.fontStyle & 4) !== 0) {\n            style['text-decoration'] = 'underline';\n          }\n        }\n\n        // Only set htmlStyle if we have any styles\n        if (Object.keys(style).length > 0) {\n          token.htmlStyle = style;\n        }\n      }\n    }\n  },\n};\n"],"mappings":";;;;;;AAsBA,SAAgB,2BACd,sBAAsB,OACtB,gBAAgB,OACkB;CAClC,MAAMA,QAA2B,EAAE,UAAU,EAAE,EAAE;CACjD,MAAMC,eAAmC,CACvC;EACE,KAAK,MAAM;AAET,UAAO,KAAK,WAAW;AACvB,UAAO;;EAET,IAAI,KAAK;GACP,MAAM,OAAO,gBAAgB,IAAI;GACjC,MAAMC,WAA6B,EAAE;AACrC,OAAI,QAAQ,MAAM;IAChB,IAAI,QAAQ;AACZ,SAAK,MAAM,QAAQ,KAAK,UAAU;AAChC,SAAI,KAAK,SAAS,UAAW;AAC7B,SAAI,oBACF,oBAAmB,KAAK;AAE1B,cAAS,KAAK,YAAY,MAAM,OAAO,MAAM,CAAC;AAC9C;;AAEF,SAAK,WAAW;;AAElB,UAAO;;EAET,GAAI,sBACA;GACE,OAAO,OAAO;AACZ,SAAK,MAAM,QAAQ,OAAO;KACxB,IAAI,MAAM;AACV,UAAK,MAAM,SAAS,MAAM;MACxB,MAAM,yBAAyB;AAC/B,6BAAuB,eAAe;AACtC,aAAO,MAAM,QAAQ;;;;GAI3B,WAAW,OAAO,SAAS;AACzB,YAAQ,mBAAmB;;GAE7B,KAAK,MAAM,OAAO,OAAO,cAAc,OAAO;AAC5C,QAAI,OAAO,UAAU,QAAQ,MAAM,WAAW,MAAM;KAElD,MAAM,YADyB,MACU;AACzC,SAAI,aAAa,KACf,MAAK,WAAW,eAAe;AAEjC,YAAO;;AAET,WAAO;;GAEV,GACD;EACL,CACF;AACD,KAAI,cACF,cAAa,KAAK,sBAAsB,QAAQ;AAElD,QAAO;EAAE;EAAO;EAAc;EAAS;;AAGzC,MAAM,UAAU,wBAAwB,EAAE,aAAa,OAAO,CAAC;AAI/D,MAAMC,uBAAyC;CAC7C,MAAM;CACN,OAAO,OAAO;AACZ,OAAK,MAAM,QAAQ,MACjB,MAAK,MAAM,SAAS,MAAM;AAExB,OAAI,MAAM,aAAa,KAAM;GAE7B,MAAMC,QAAgC,EAAE;AAExC,OAAI,MAAM,SAAS,KACjB,OAAM,QAAQ,MAAM;AAEtB,OAAI,MAAM,WAAW,KACnB,OAAM,sBAAsB,MAAM;AAEpC,OAAI,MAAM,aAAa,QAAQ,MAAM,cAAc,GAAG;AAEpD,SAAK,MAAM,YAAY,OAAO,EAC5B,OAAM,gBAAgB;AAExB,SAAK,MAAM,YAAY,OAAO,EAC5B,OAAM,iBAAiB;AAEzB,SAAK,MAAM,YAAY,OAAO,EAC5B,OAAM,qBAAqB;;AAK/B,OAAI,OAAO,KAAK,MAAM,CAAC,SAAS,EAC9B,OAAM,YAAY;;;CAK3B"}
+{"version":3,"file":"createTransformerWithState.js","names":["state: SharedRenderState","transformers: ShikiTransformer[]","children: ElementContent[]","tokenStyleNormalizer: ShikiTransformer","style: Record<string, string>"],"sources":["../../src/utils/createTransformerWithState.ts"],"sourcesContent":["import {\n  type ShikiTransformerStyleToClass,\n  transformerStyleToClass,\n} from '@shikijs/transformers';\nimport type { ElementContent } from 'hast';\nimport type { ThemedToken } from 'shiki';\n\nimport type { SharedRenderState, ShikiTransformer } from '../types';\nimport { findCodeElement } from './hast_utils';\nimport { processLine } from './processLine';\nimport { wrapTokenFragments } from './wrapTokenFragments';\n\ninterface CreateTransformerWithStateReturn {\n  state: SharedRenderState;\n  transformers: ShikiTransformer[];\n  toClass: ShikiTransformerStyleToClass;\n}\n\ntype TokenWithLineChar = ThemedToken & {\n  __lineChar?: number;\n};\n\nexport function createTransformerWithState(\n  useTokenTransformer = false,\n  useCSSClasses = false\n): CreateTransformerWithStateReturn {\n  const state: SharedRenderState = { lineInfo: [] };\n  const transformers: ShikiTransformer[] = [\n    {\n      line(node) {\n        // Remove the default class\n        delete node.properties.class;\n        return node;\n      },\n      pre(pre) {\n        const code = findCodeElement(pre);\n        const children: ElementContent[] = [];\n        if (code != null) {\n          let index = 1;\n          for (const node of code.children) {\n            if (node.type !== 'element') continue;\n            if (useTokenTransformer) {\n              wrapTokenFragments(node);\n            }\n            children.push(processLine(node, index, state));\n            index++;\n          }\n          code.children = children;\n        }\n        return pre;\n      },\n      ...(useTokenTransformer\n        ? {\n            tokens(lines) {\n              for (const line of lines) {\n                let col = 0;\n                for (const token of line) {\n                  const tokenWithOriginalRange = token as TokenWithLineChar;\n                  tokenWithOriginalRange.__lineChar ??= col;\n                  col += token.content.length;\n                }\n              }\n            },\n            preprocess(_code, options) {\n              options.mergeWhitespaces = 'never';\n            },\n            span(hast, _line, _char, _lineElement, token) {\n              if (token?.offset != null && token.content != null) {\n                const tokenWithOriginalRange = token as TokenWithLineChar;\n                const tokenChar = tokenWithOriginalRange.__lineChar;\n                if (tokenChar != null) {\n                  hast.properties['data-char'] = tokenChar;\n                }\n                return hast;\n              }\n              return hast;\n            },\n          }\n        : null),\n    },\n  ];\n  if (useCSSClasses) {\n    transformers.push(tokenStyleNormalizer, toClass);\n  }\n  if (useTokenTransformer) {\n    // shiki renders empty lines as \" \" that breaks the editor selection.\n    // We replace them with <br> tags.\n    transformers.push({\n      line: (node) => {\n        if (node.type === 'element' && node.children.length === 0) {\n          node.children.push({\n            type: 'element',\n            tagName: 'br',\n            properties: {},\n            children: [],\n          });\n        }\n        return node;\n      },\n    });\n  }\n  return { state, transformers, toClass };\n}\n\nconst toClass = transformerStyleToClass({ classPrefix: 'hl-' });\n\n// Create a transformer that converts token color/fontStyle to htmlStyle\n// This needs to run BEFORE transformerStyleToClass\nconst tokenStyleNormalizer: ShikiTransformer = {\n  name: 'token-style-normalizer',\n  tokens(lines) {\n    for (const line of lines) {\n      for (const token of line) {\n        // Skip if htmlStyle is already set\n        if (token.htmlStyle != null) continue;\n\n        const style: Record<string, string> = {};\n\n        if (token.color != null) {\n          style.color = token.color;\n        }\n        if (token.bgColor != null) {\n          style['background-color'] = token.bgColor;\n        }\n        if (token.fontStyle != null && token.fontStyle !== 0) {\n          // FontStyle is a bitmask: 1 = italic, 2 = bold, 4 = underline\n          if ((token.fontStyle & 1) !== 0) {\n            style['font-style'] = 'italic';\n          }\n          if ((token.fontStyle & 2) !== 0) {\n            style['font-weight'] = 'bold';\n          }\n          if ((token.fontStyle & 4) !== 0) {\n            style['text-decoration'] = 'underline';\n          }\n        }\n\n        // Only set htmlStyle if we have any styles\n        if (Object.keys(style).length > 0) {\n          token.htmlStyle = style;\n        }\n      }\n    }\n  },\n};\n"],"mappings":";;;;;;AAsBA,SAAgB,2BACd,sBAAsB,OACtB,gBAAgB,OACkB;CAClC,MAAMA,QAA2B,EAAE,UAAU,EAAE,EAAE;CACjD,MAAMC,eAAmC,CACvC;EACE,KAAK,MAAM;AAET,UAAO,KAAK,WAAW;AACvB,UAAO;;EAET,IAAI,KAAK;GACP,MAAM,OAAO,gBAAgB,IAAI;GACjC,MAAMC,WAA6B,EAAE;AACrC,OAAI,QAAQ,MAAM;IAChB,IAAI,QAAQ;AACZ,SAAK,MAAM,QAAQ,KAAK,UAAU;AAChC,SAAI,KAAK,SAAS,UAAW;AAC7B,SAAI,oBACF,oBAAmB,KAAK;AAE1B,cAAS,KAAK,YAAY,MAAM,OAAO,MAAM,CAAC;AAC9C;;AAEF,SAAK,WAAW;;AAElB,UAAO;;EAET,GAAI,sBACA;GACE,OAAO,OAAO;AACZ,SAAK,MAAM,QAAQ,OAAO;KACxB,IAAI,MAAM;AACV,UAAK,MAAM,SAAS,MAAM;MACxB,MAAM,yBAAyB;AAC/B,6BAAuB,eAAe;AACtC,aAAO,MAAM,QAAQ;;;;GAI3B,WAAW,OAAO,SAAS;AACzB,YAAQ,mBAAmB;;GAE7B,KAAK,MAAM,OAAO,OAAO,cAAc,OAAO;AAC5C,QAAI,OAAO,UAAU,QAAQ,MAAM,WAAW,MAAM;KAElD,MAAM,YADyB,MACU;AACzC,SAAI,aAAa,KACf,MAAK,WAAW,eAAe;AAEjC,YAAO;;AAET,WAAO;;GAEV,GACD;EACL,CACF;AACD,KAAI,cACF,cAAa,KAAK,sBAAsB,QAAQ;AAElD,KAAI,oBAGF,cAAa,KAAK,EAChB,OAAO,SAAS;AACd,MAAI,KAAK,SAAS,aAAa,KAAK,SAAS,WAAW,EACtD,MAAK,SAAS,KAAK;GACjB,MAAM;GACN,SAAS;GACT,YAAY,EAAE;GACd,UAAU,EAAE;GACb,CAAC;AAEJ,SAAO;IAEV,CAAC;AAEJ,QAAO;EAAE;EAAO;EAAc;EAAS;;AAGzC,MAAM,UAAU,wBAAwB,EAAE,aAAa,OAAO,CAAC;AAI/D,MAAMC,uBAAyC;CAC7C,MAAM;CACN,OAAO,OAAO;AACZ,OAAK,MAAM,QAAQ,MACjB,MAAK,MAAM,SAAS,MAAM;AAExB,OAAI,MAAM,aAAa,KAAM;GAE7B,MAAMC,QAAgC,EAAE;AAExC,OAAI,MAAM,SAAS,KACjB,OAAM,QAAQ,MAAM;AAEtB,OAAI,MAAM,WAAW,KACnB,OAAM,sBAAsB,MAAM;AAEpC,OAAI,MAAM,aAAa,QAAQ,MAAM,cAAc,GAAG;AAEpD,SAAK,MAAM,YAAY,OAAO,EAC5B,OAAM,gBAAgB;AAExB,SAAK,MAAM,YAAY,OAAO,EAC5B,OAAM,iBAAiB;AAEzB,SAAK,MAAM,YAAY,OAAO,EAC5B,OAAM,qBAAqB;;AAK/B,OAAI,OAAO,KAAK,MAAM,CAAC,SAAS,EAC9B,OAAM,YAAY;;;CAK3B"}

package/dist/utils/iterateOverDiff.js

@@ -1,5 +1,5 @@
 import { DEFAULT_COLLAPSED_CONTEXT_THRESHOLD } from "../constants.js";
-import { getExpandedRegion, getTrailingExpandedRegion } from "./virtualDiffLayout.js";
+import { getExpandedRegion } from "./virtualDiffLayout.js";
 
 //#region src/utils/iterateOverDiff.ts
 function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infinity, expandedHunks, collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, callback }) {
@@ -11,12 +11,12 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 		collapsedContextThreshold
 	});
 	const state = {
+		finalHunk: diff.hunks.at(-1),
 		viewportStart: startingLine,
 		viewportEnd: startingLine + totalLines,
 		isWindowedHighlight: startingLine > 0 || totalLines < Infinity,
 		splitCount: iterationStart.splitCount,
 		unifiedCount: iterationStart.unifiedCount,
-		finalHunkIndex: diff.hunks.length - 1,
 		shouldBreak() {
 			if (!state.isWindowedHighlight) return false;
 			const breakUnified = state.unifiedCount >= startingLine + totalLines;
@@ -69,24 +69,31 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 			hunkIndex,
 			collapsedContextThreshold
 		});
-		const trailingRegion = hunkIndex === state.finalHunkIndex ? getTrailingExpandedRegion({
-			fileDiff: diff,
-			hunkIndex,
-			expandedHunks,
-			collapsedContextThreshold,
-			errorPrefix: "iterateOverDiff"
-		}) : void 0;
+		const trailingRegion = (() => {
+			if (hunk !== state.finalHunk || !hasFinalCollapsedHunk(diff)) return;
+			const additionRemaining = diff.additionLines.length - (hunk.additionLineIndex + hunk.additionCount);
+			const deletionRemaining = diff.deletionLines.length - (hunk.deletionLineIndex + hunk.deletionCount);
+			if (additionRemaining !== deletionRemaining) throw new Error(`iterateOverDiff: trailing context mismatch (additions=${additionRemaining}, deletions=${deletionRemaining}) for ${diff.name}`);
+			const trailingRangeSize = Math.min(additionRemaining, deletionRemaining);
+			return getExpandedRegion({
+				isPartial: diff.isPartial,
+				rangeSize: trailingRangeSize,
+				expandedHunks,
+				hunkIndex: diff.hunks.length,
+				collapsedContextThreshold
+			});
+		})();
 		const expandedLineCount = leadingRegion.fromStart + leadingRegion.fromEnd;
 		function getTrailingCollapsedAfter(unifiedLineIndex$1, splitLineIndex$1) {
 			if (trailingRegion == null || trailingRegion.collapsedLines <= 0 || trailingRegion.fromStart + trailingRegion.fromEnd > 0) return 0;
 			if (diffStyle === "unified") return unifiedLineIndex$1 === hunk.unifiedLineStart + hunk.unifiedLineCount - 1 ? trailingRegion.collapsedLines : 0;
 			return splitLineIndex$1 === hunk.splitLineStart + hunk.splitLineCount - 1 ? trailingRegion.collapsedLines : 0;
 		}
-		let consumedCollapsed = leadingRegion.collapsedLines === 0;
-		function consumePendingCollapsed() {
-			if (consumedCollapsed) return 0;
-			consumedCollapsed = true;
-			return leadingRegion.collapsedLines;
+		function getPendingCollapsed() {
+			if (leadingRegion.collapsedLines === 0) return 0;
+			const value = leadingRegion.collapsedLines;
+			leadingRegion.collapsedLines = 0;
+			return value;
 		}
 		if (!state.shouldSkip(expandedLineCount, expandedLineCount)) {
 			let unifiedLineIndex$1 = hunk.unifiedLineStart - leadingRegion.rangeSize;
@@ -95,63 +102,81 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 			let additionLineIndex$1 = hunk.additionLineIndex - leadingRegion.rangeSize;
 			let deletionLineNumber$1 = hunk.deletionStart - leadingRegion.rangeSize;
 			let additionLineNumber$1 = hunk.additionStart - leadingRegion.rangeSize;
-			if (walkContextLines(state, leadingRegion.fromStart, diffStyle, (index) => {
-				return state.emit({
-					hunkIndex,
-					hunk,
-					collapsedBefore: 0,
-					collapsedAfter: 0,
-					type: "context-expanded",
-					deletionLine: {
-						lineNumber: deletionLineNumber$1 + index,
-						lineIndex: deletionLineIndex$1 + index,
-						noEOFCR: false,
-						unifiedLineIndex: unifiedLineIndex$1 + index,
-						splitLineIndex: splitLineIndex$1 + index
-					},
-					additionLine: {
-						unifiedLineIndex: unifiedLineIndex$1 + index,
-						splitLineIndex: splitLineIndex$1 + index,
-						lineIndex: additionLineIndex$1 + index,
-						lineNumber: additionLineNumber$1 + index,
-						noEOFCR: false
-					}
-				});
-			})) break hunkIterator;
+			const [startIndex, endIndex] = getEqualLineIterationRange(state, leadingRegion.fromStart, diffStyle);
+			if (startIndex > 0) state.incrementCounts(startIndex, startIndex);
+			let index = startIndex;
+			while (index < leadingRegion.fromStart) {
+				if (index >= endIndex) {
+					state.incrementCounts(leadingRegion.fromStart - index, leadingRegion.fromStart - index);
+					break;
+				}
+				if (state.isInWindow(0, 0)) {
+					if (state.emit({
+						hunkIndex,
+						hunk,
+						collapsedBefore: 0,
+						collapsedAfter: 0,
+						type: "context-expanded",
+						deletionLine: {
+							lineNumber: deletionLineNumber$1 + index,
+							lineIndex: deletionLineIndex$1 + index,
+							noEOFCR: false,
+							unifiedLineIndex: unifiedLineIndex$1 + index,
+							splitLineIndex: splitLineIndex$1 + index
+						},
+						additionLine: {
+							unifiedLineIndex: unifiedLineIndex$1 + index,
+							splitLineIndex: splitLineIndex$1 + index,
+							lineIndex: additionLineIndex$1 + index,
+							lineNumber: additionLineNumber$1 + index,
+							noEOFCR: false
+						}
+					})) break hunkIterator;
+				} else state.incrementCounts(1, 1);
+				index++;
+			}
 			unifiedLineIndex$1 = hunk.unifiedLineStart - leadingRegion.fromEnd;
 			splitLineIndex$1 = hunk.splitLineStart - leadingRegion.fromEnd;
 			deletionLineIndex$1 = hunk.deletionLineIndex - leadingRegion.fromEnd;
 			additionLineIndex$1 = hunk.additionLineIndex - leadingRegion.fromEnd;
 			deletionLineNumber$1 = hunk.deletionStart - leadingRegion.fromEnd;
 			additionLineNumber$1 = hunk.additionStart - leadingRegion.fromEnd;
-			if (walkContextLines(state, leadingRegion.fromEnd, diffStyle, (index) => {
-				return state.emit({
-					hunkIndex,
-					hunk,
-					collapsedBefore: consumePendingCollapsed(),
-					collapsedAfter: 0,
-					type: "context-expanded",
-					deletionLine: {
-						lineNumber: deletionLineNumber$1 + index,
-						lineIndex: deletionLineIndex$1 + index,
-						noEOFCR: false,
-						unifiedLineIndex: unifiedLineIndex$1 + index,
-						splitLineIndex: splitLineIndex$1 + index
-					},
-					additionLine: {
-						unifiedLineIndex: unifiedLineIndex$1 + index,
-						splitLineIndex: splitLineIndex$1 + index,
-						lineIndex: additionLineIndex$1 + index,
-						lineNumber: additionLineNumber$1 + index,
-						noEOFCR: false
-					}
-				});
-			}, () => {
-				consumePendingCollapsed();
-			})) break hunkIterator;
+			const [fromEndStartIndex, fromEndEndIndex] = getEqualLineIterationRange(state, leadingRegion.fromEnd, diffStyle);
+			if (fromEndStartIndex > 0) state.incrementCounts(fromEndStartIndex, fromEndStartIndex);
+			index = fromEndStartIndex;
+			while (index < leadingRegion.fromEnd) {
+				if (index >= fromEndEndIndex) {
+					state.incrementCounts(leadingRegion.fromEnd - index, leadingRegion.fromEnd - index);
+					break;
+				}
+				if (state.isInWindow(0, 0)) {
+					if (state.emit({
+						hunkIndex,
+						hunk,
+						collapsedBefore: getPendingCollapsed(),
+						collapsedAfter: 0,
+						type: "context-expanded",
+						deletionLine: {
+							lineNumber: deletionLineNumber$1 + index,
+							lineIndex: deletionLineIndex$1 + index,
+							noEOFCR: false,
+							unifiedLineIndex: unifiedLineIndex$1 + index,
+							splitLineIndex: splitLineIndex$1 + index
+						},
+						additionLine: {
+							unifiedLineIndex: unifiedLineIndex$1 + index,
+							splitLineIndex: splitLineIndex$1 + index,
+							lineIndex: additionLineIndex$1 + index,
+							lineNumber: additionLineNumber$1 + index,
+							noEOFCR: false
+						}
+					})) break hunkIterator;
+				} else state.incrementCounts(1, 1);
+				index++;
+			}
 		} else {
 			state.incrementCounts(expandedLineCount, expandedLineCount);
-			consumePendingCollapsed();
+			getPendingCollapsed();
 		}
 		let unifiedLineIndex = hunk.unifiedLineStart;
 		let splitLineIndex = hunk.splitLineStart;
@@ -165,37 +190,45 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 			const isLastContent = content === lastContent;
 			if (content.type === "context") {
 				if (!state.shouldSkip(content.lines, content.lines)) {
-					if (walkContextLines(state, content.lines, diffStyle, (index) => {
-						const isLastLine = isLastContent && index === content.lines - 1;
-						const unifiedRowIndex = unifiedLineIndex + index;
-						const splitRowIndex = splitLineIndex + index;
-						return state.emit({
-							hunkIndex,
-							hunk,
-							collapsedBefore: consumePendingCollapsed(),
-							collapsedAfter: getTrailingCollapsedAfter(unifiedRowIndex, splitRowIndex),
-							type: "context",
-							deletionLine: {
-								lineNumber: deletionLineNumber + index,
-								lineIndex: deletionLineIndex + index,
-								noEOFCR: isLastLine && hunk.noEOFCRDeletions,
-								unifiedLineIndex: unifiedRowIndex,
-								splitLineIndex: splitRowIndex
-							},
-							additionLine: {
-								unifiedLineIndex: unifiedRowIndex,
-								splitLineIndex: splitRowIndex,
-								lineIndex: additionLineIndex + index,
-								lineNumber: additionLineNumber + index,
-								noEOFCR: isLastLine && hunk.noEOFCRAdditions
-							}
-						});
-					}, () => {
-						consumePendingCollapsed();
-					})) break hunkIterator;
+					const [startIndex, endIndex] = getEqualLineIterationRange(state, content.lines, diffStyle);
+					if (startIndex > 0) state.incrementCounts(startIndex, startIndex);
+					let index = startIndex;
+					while (index < content.lines) {
+						if (index >= endIndex) {
+							state.incrementCounts(content.lines - index, content.lines - index);
+							break;
+						}
+						if (state.isInWindow(0, 0)) {
+							const isLastLine = isLastContent && index === content.lines - 1;
+							const unifiedRowIndex = unifiedLineIndex + index;
+							const splitRowIndex = splitLineIndex + index;
+							if (state.emit({
+								hunkIndex,
+								hunk,
+								collapsedBefore: getPendingCollapsed(),
+								collapsedAfter: getTrailingCollapsedAfter(unifiedRowIndex, splitRowIndex),
+								type: "context",
+								deletionLine: {
+									lineNumber: deletionLineNumber + index,
+									lineIndex: deletionLineIndex + index,
+									noEOFCR: isLastLine && hunk.noEOFCRDeletions,
+									unifiedLineIndex: unifiedRowIndex,
+									splitLineIndex: splitRowIndex
+								},
+								additionLine: {
+									unifiedLineIndex: unifiedRowIndex,
+									splitLineIndex: splitRowIndex,
+									lineIndex: additionLineIndex + index,
+									lineNumber: additionLineNumber + index,
+									noEOFCR: isLastLine && hunk.noEOFCRAdditions
+								}
+							})) break hunkIterator;
+						} else state.incrementCounts(1, 1);
+						index++;
+					}
 				} else {
 					state.incrementCounts(content.lines, content.lines);
-					consumePendingCollapsed();
+					getPendingCollapsed();
 				}
 				unifiedLineIndex += content.lines;
 				splitLineIndex += content.lines;
@@ -208,13 +241,12 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 				const unifiedCount = content.deletions + content.additions;
 				if (!state.shouldSkip(unifiedCount, splitCount)) {
 					const iterationRanges = getChangeIterationRanges(state, content, diffStyle);
-					if ((iterationRanges[0]?.[0] ?? 0) > 0) consumePendingCollapsed();
 					for (const [rangeStart, rangeEnd] of iterationRanges) for (let index = rangeStart; index < rangeEnd; index++) {
 						const collapsedAfter = getTrailingCollapsedAfter(unifiedLineIndex + index, diffStyle === "unified" ? splitLineIndex + (index < content.deletions ? index : index - content.deletions) : splitLineIndex + index);
 						if (state.emit(getChangeLineData({
 							hunkIndex,
 							hunk,
-							collapsedBefore: consumePendingCollapsed(),
+							collapsedBefore: getPendingCollapsed(),
 							collapsedAfter,
 							diffStyle,
 							index,
@@ -231,7 +263,7 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 						}), true)) break hunkIterator;
 					}
 				}
-				consumePendingCollapsed();
+				getPendingCollapsed();
 				state.incrementCounts(unifiedCount, splitCount);
 				unifiedLineIndex += unifiedCount;
 				splitLineIndex += splitCount;
@@ -244,30 +276,41 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 		if (trailingRegion != null) {
 			const { collapsedLines, fromStart, fromEnd } = trailingRegion;
 			const len = fromStart + fromEnd;
-			if (walkContextLines(state, len, diffStyle, (index) => {
-				const isLastLine = index === len - 1;
-				return state.emit({
-					hunkIndex: diff.hunks.length,
-					hunk: void 0,
-					collapsedBefore: 0,
-					collapsedAfter: isLastLine ? collapsedLines : 0,
-					type: "context-expanded",
-					deletionLine: {
-						lineNumber: deletionLineNumber + index,
-						lineIndex: deletionLineIndex + index,
-						noEOFCR: false,
-						unifiedLineIndex: unifiedLineIndex + index,
-						splitLineIndex: splitLineIndex + index
-					},
-					additionLine: {
-						unifiedLineIndex: unifiedLineIndex + index,
-						splitLineIndex: splitLineIndex + index,
-						lineIndex: additionLineIndex + index,
-						lineNumber: additionLineNumber + index,
-						noEOFCR: false
-					}
-				});
-			}, void 0, () => state.shouldBreak())) break hunkIterator;
+			const [startIndex, endIndex] = getEqualLineIterationRange(state, len, diffStyle);
+			if (startIndex > 0) state.incrementCounts(startIndex, startIndex);
+			let index = startIndex;
+			while (index < len) {
+				if (state.shouldBreak()) break hunkIterator;
+				if (index >= endIndex) {
+					state.incrementCounts(len - index, len - index);
+					break;
+				}
+				if (state.isInWindow(0, 0)) {
+					const isLastLine = index === len - 1;
+					if (state.emit({
+						hunkIndex: diff.hunks.length,
+						hunk: void 0,
+						collapsedBefore: 0,
+						collapsedAfter: isLastLine ? collapsedLines : 0,
+						type: "context-expanded",
+						deletionLine: {
+							lineNumber: deletionLineNumber + index,
+							lineIndex: deletionLineIndex + index,
+							noEOFCR: false,
+							unifiedLineIndex: unifiedLineIndex + index,
+							splitLineIndex: splitLineIndex + index
+						},
+						additionLine: {
+							unifiedLineIndex: unifiedLineIndex + index,
+							splitLineIndex: splitLineIndex + index,
+							lineIndex: additionLineIndex + index,
+							lineNumber: additionLineNumber + index,
+							noEOFCR: false
+						}
+					})) break hunkIterator;
+				} else state.incrementCounts(1, 1);
+				index++;
+			}
 		}
 	}
 }
@@ -332,14 +375,15 @@ function getHunkPrefixCounts({ diff, expandedHunks, collapsedContextThreshold })
 		const leadingCount = leadingRegion.fromStart + leadingRegion.fromEnd;
 		splitCount += leadingCount + hunk.splitLineCount;
 		unifiedCount += leadingCount + hunk.unifiedLineCount;
-		const trailingRegion = index === finalHunkIndex ? getTrailingExpandedRegion({
-			fileDiff: diff,
-			hunkIndex: index,
-			expandedHunks,
-			collapsedContextThreshold,
-			errorPrefix: "iterateOverDiff"
-		}) : void 0;
-		if (trailingRegion != null) {
+		if (index === finalHunkIndex && hasFinalCollapsedHunk(diff)) {
+			const trailingRangeSize = getTrailingRangeSize(diff, hunk);
+			const trailingRegion = getExpandedRegion({
+				isPartial: diff.isPartial,
+				rangeSize: trailingRangeSize,
+				expandedHunks,
+				hunkIndex: diff.hunks.length,
+				collapsedContextThreshold
+			});
 			const trailingCount = trailingRegion.fromStart + trailingRegion.fromEnd;
 			splitCount += trailingCount;
 			unifiedCount += trailingCount;
@@ -351,7 +395,7 @@ function getHunkPrefixCounts({ diff, expandedHunks, collapsedContextThreshold })
 	}
 	return prefixCounts;
 }
-function getContextLineIterationBounds(state, count, diffStyle) {
+function getEqualLineIterationRange(state, count, diffStyle) {
 	if (!state.isWindowedHighlight || count <= 0) return [0, count];
 	const ranges = [];
 	function pushRange(currentCount) {
@@ -371,25 +415,16 @@ function getContextLineIterationBounds(state, count, diffStyle) {
 	}
 	return [start, end];
 }
-function walkContextLines(state, count, diffStyle, callback, onSkippedStart, shouldBreak) {
-	const [startIndex, endIndex] = getContextLineIterationBounds(state, count, diffStyle);
-	if (startIndex > 0) {
-		state.incrementCounts(startIndex, startIndex);
-		onSkippedStart?.();
-	}
-	let index = startIndex;
-	while (index < count) {
-		if (shouldBreak?.() === true) return true;
-		if (index >= endIndex) {
-			state.incrementCounts(count - index, count - index);
-			break;
-		}
-		if (state.isInWindow(0, 0)) {
-			if (callback(index) === true) return true;
-		} else state.incrementCounts(1, 1);
-		index++;
-	}
-	return false;
+function getTrailingRangeSize(diff, hunk) {
+	const additionRemaining = diff.additionLines.length - (hunk.additionLineIndex + hunk.additionCount);
+	const deletionRemaining = diff.deletionLines.length - (hunk.deletionLineIndex + hunk.deletionCount);
+	if (additionRemaining !== deletionRemaining) throw new Error(`iterateOverDiff: trailing context mismatch (additions=${additionRemaining}, deletions=${deletionRemaining}) for ${diff.name}`);
+	return Math.min(additionRemaining, deletionRemaining);
+}
+function hasFinalCollapsedHunk(diff) {
+	const lastHunk = diff.hunks.at(-1);
+	if (lastHunk == null || diff.isPartial || diff.additionLines.length === 0 || diff.deletionLines.length === 0) return false;
+	return lastHunk.additionLineIndex + lastHunk.additionCount < diff.additionLines.length || lastHunk.deletionLineIndex + lastHunk.deletionCount < diff.deletionLines.length;
 }
 function getChangeIterationRanges(state, content, diffStyle) {
 	if (!state.isWindowedHighlight) return [[0, diffStyle === "unified" ? content.deletions + content.additions : Math.max(content.deletions, content.additions)]];