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

package/dist/utils/updateDiffHunks.js

@@ -0,0 +1,171 @@
+import { hasTrailingContextMismatch } from "./virtualDiffLayout.js";
+import { cleanLastNewline } from "./cleanLastNewline.js";
+import { parseDiffFromFile } from "./parseDiffFromFile.js";
+
+//#region src/utils/updateDiffHunks.ts
+/** Rebuilds all hunk metadata from the current deletion/addition line arrays. */
+function recomputeDiffHunks(diff, parseDiffOptions) {
+	const recomputed = parseDiffFromFile({
+		name: diff.prevName ?? diff.name,
+		contents: diff.deletionLines.join("")
+	}, {
+		name: diff.name,
+		contents: diff.additionLines.join(""),
+		lang: diff.lang
+	}, parseDiffOptions);
+	return {
+		hunks: recomputed.hunks,
+		splitLineCount: recomputed.splitLineCount,
+		unifiedLineCount: recomputed.unifiedLineCount,
+		additionLines: recomputed.additionLines,
+		deletionLines: recomputed.deletionLines,
+		type: recomputed.type
+	};
+}
+/** Updates hunk metadata after addition lines change; re-parses affected hunks only. */
+function updateDiffHunks(diff, changedAdditionLineIndexes, parseDiffOptions) {
+	if (diff.isPartial) return applyHunkUpdateResult(diff, recomputeDiffHunks(diff, parseDiffOptions));
+	if (diff.deletionLines.length !== diff.additionLines.length) return applyHunkUpdateResult(diff, recomputeDiffHunks(diff, parseDiffOptions));
+	const changedLines = Array.from(changedAdditionLineIndexes);
+	if (changedLines.length === 0) return applyHunkUpdateResult(diff, {
+		hunks: diff.hunks,
+		splitLineCount: diff.splitLineCount,
+		unifiedLineCount: diff.unifiedLineCount,
+		type: diff.type
+	});
+	for (const line of changedLines) {
+		const additionLine = diff.additionLines[line];
+		const deletionLine = diff.deletionLines[line];
+		if (additionLine == null || deletionLine == null) return applyHunkUpdateResult(diff, recomputeDiffHunks(diff, parseDiffOptions));
+		if (cleanLastNewline(additionLine) === cleanLastNewline(deletionLine)) return applyHunkUpdateResult(diff, recomputeDiffHunks(diff, parseDiffOptions));
+	}
+	const affectedHunkIndexes = getAffectedHunkIndexes(diff, changedLines);
+	if (affectedHunkIndexes.size === 0) return applyHunkUpdateResult(diff, recomputeDiffHunks(diff, parseDiffOptions));
+	for (const hunkIndex of affectedHunkIndexes) if (!reparseHunkRegion(diff, hunkIndex, parseDiffOptions)) return applyHunkUpdateResult(diff, recomputeDiffHunks(diff, parseDiffOptions));
+	recomputeDiffRenderLineCounts(diff);
+	if (hasTrailingContextMismatch(diff)) return applyHunkUpdateResult(diff, recomputeDiffHunks(diff, parseDiffOptions));
+	return applyHunkUpdateResult(diff, {
+		hunks: diff.hunks,
+		splitLineCount: diff.splitLineCount,
+		unifiedLineCount: diff.unifiedLineCount,
+		type: diff.type
+	});
+}
+function applyHunkUpdateResult(diff, result) {
+	Object.assign(diff, result);
+	return result;
+}
+function getAffectedHunkIndexes(diff, changedAdditionLineIndexes) {
+	const indexes = /* @__PURE__ */ new Set();
+	for (const line of changedAdditionLineIndexes) {
+		const hunkIndex = findHunkIndexForAdditionLine(diff, line);
+		if (hunkIndex == null) return /* @__PURE__ */ new Set();
+		indexes.add(hunkIndex);
+	}
+	return indexes;
+}
+function findHunkIndexForAdditionLine(diff, line) {
+	for (const [hunkIndex, hunk] of diff.hunks.entries()) {
+		const end = hunk.additionLineIndex + hunk.additionCount;
+		if (line >= hunk.additionLineIndex && line < end) return hunkIndex;
+	}
+}
+function reparseHunkRegion(diff, hunkIndex, parseDiffOptions) {
+	const hunk = diff.hunks[hunkIndex];
+	if (hunk == null) return false;
+	const deletionSlice = diff.deletionLines.slice(hunk.deletionLineIndex, hunk.deletionLineIndex + hunk.deletionCount);
+	const additionSlice = diff.additionLines.slice(hunk.additionLineIndex, hunk.additionLineIndex + hunk.additionCount);
+	const reparsed = parseDiffFromFile({
+		name: diff.prevName ?? diff.name,
+		contents: deletionSlice.join("")
+	}, {
+		name: diff.name,
+		contents: additionSlice.join(""),
+		lang: diff.lang
+	}, {
+		...parseDiffOptions,
+		context: 0
+	});
+	const reparsedHunk = reparsed.hunks[0];
+	if (reparsedHunk == null || reparsed.hunks.length !== 1) return false;
+	applyReparsedHunk(hunk, reparsedHunk);
+	syncHunkNoEOFCRFromFullFile(diff, hunkIndex);
+	return true;
+}
+function syncHunkNoEOFCRFromFullFile(diff, hunkIndex) {
+	const hunk = diff.hunks[hunkIndex];
+	if (hunk == null) return;
+	if (!(hunkIndex === diff.hunks.length - 1)) {
+		hunk.noEOFCRAdditions = false;
+		hunk.noEOFCRDeletions = false;
+		return;
+	}
+	const lastAdditionLine = diff.additionLines.at(-1);
+	const lastDeletionLine = diff.deletionLines.at(-1);
+	hunk.noEOFCRAdditions = lastAdditionLine != null && lastAdditionLine !== "" && !lastAdditionLine.endsWith("\n");
+	hunk.noEOFCRDeletions = lastDeletionLine != null && lastDeletionLine !== "" && !lastDeletionLine.endsWith("\n");
+}
+function applyReparsedHunk(target, parsed) {
+	const additionOffset = target.additionLineIndex;
+	const deletionOffset = target.deletionLineIndex;
+	target.hunkContent = parsed.hunkContent.map((content) => offsetHunkContent(content, additionOffset, deletionOffset));
+	target.additionLineIndex = additionOffset + parsed.additionLineIndex;
+	target.additionStart = target.additionStart + parsed.additionLineIndex;
+	target.additionCount = parsed.additionCount;
+	target.additionLines = parsed.additionLines;
+	if (parsed.deletionLineIndex >= 0) {
+		target.deletionLineIndex = deletionOffset + parsed.deletionLineIndex;
+		target.deletionStart = target.deletionStart + parsed.deletionLineIndex;
+	}
+	target.deletionCount = parsed.deletionCount;
+	target.deletionLines = parsed.deletionLines;
+	target.noEOFCRAdditions = parsed.noEOFCRAdditions;
+	target.noEOFCRDeletions = parsed.noEOFCRDeletions;
+	recomputeHunkRenderLineCounts(target);
+}
+function offsetHunkContent(content, additionOffset, deletionOffset) {
+	return {
+		...content,
+		additionLineIndex: content.additionLineIndex + additionOffset,
+		deletionLineIndex: content.deletionLineIndex + deletionOffset
+	};
+}
+function recomputeHunkRenderLineCounts(hunk) {
+	let splitLineCount = 0;
+	let unifiedLineCount = 0;
+	for (const content of hunk.hunkContent) if (content.type === "context") {
+		splitLineCount += content.lines;
+		unifiedLineCount += content.lines;
+	} else {
+		splitLineCount += Math.max(content.additions, content.deletions);
+		unifiedLineCount += content.additions + content.deletions;
+	}
+	hunk.splitLineCount = splitLineCount;
+	hunk.unifiedLineCount = unifiedLineCount;
+}
+function recomputeDiffRenderLineCounts(diff) {
+	let splitTotal = 0;
+	let unifiedTotal = 0;
+	let lastHunkAdditionEnd = 0;
+	for (const hunk of diff.hunks) {
+		hunk.collapsedBefore = Math.max(hunk.additionStart - 1 - lastHunkAdditionEnd, 0);
+		hunk.splitLineStart = splitTotal + hunk.collapsedBefore;
+		hunk.unifiedLineStart = unifiedTotal + hunk.collapsedBefore;
+		recomputeHunkRenderLineCounts(hunk);
+		splitTotal += hunk.collapsedBefore + hunk.splitLineCount;
+		unifiedTotal += hunk.collapsedBefore + hunk.unifiedLineCount;
+		lastHunkAdditionEnd = hunk.additionStart + hunk.additionCount - 1;
+	}
+	if (diff.hunks.length > 0) {
+		const lastHunk = diff.hunks[diff.hunks.length - 1];
+		const collapsedAfter = Math.max(diff.additionLines.length - (lastHunk.additionLineIndex + lastHunk.additionCount), 0);
+		splitTotal += collapsedAfter;
+		unifiedTotal += collapsedAfter;
+	}
+	diff.splitLineCount = splitTotal;
+	diff.unifiedLineCount = unifiedTotal;
+}
+
+//#endregion
+export { recomputeDiffHunks, updateDiffHunks };
+//# sourceMappingURL=updateDiffHunks.js.map

package/dist/utils/updateDiffHunks.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"updateDiffHunks.js","names":[],"sources":["../../src/utils/updateDiffHunks.ts"],"sourcesContent":["import type { CreatePatchOptionsNonabortable } from 'diff';\n\nimport type {\n  ChangeContent,\n  ContextContent,\n  FileDiffMetadata,\n  Hunk,\n} from '../types';\nimport { cleanLastNewline } from './cleanLastNewline';\nimport { parseDiffFromFile } from './parseDiffFromFile';\nimport { hasTrailingContextMismatch } from './virtualDiffLayout';\n\ntype HunkContent = ContextContent | ChangeContent;\n\ntype HunkMetadataUpdate = Pick<\n  FileDiffMetadata,\n  'hunks' | 'splitLineCount' | 'unifiedLineCount' | 'type'\n>;\n\ntype FullDiffHunkUpdate = HunkMetadataUpdate &\n  Pick<FileDiffMetadata, 'additionLines' | 'deletionLines'>;\n\n/** Rebuilds all hunk metadata from the current deletion/addition line arrays. */\nexport function recomputeDiffHunks(\n  diff: FileDiffMetadata,\n  parseDiffOptions?: CreatePatchOptionsNonabortable\n): FullDiffHunkUpdate {\n  const recomputed = parseDiffFromFile(\n    {\n      name: diff.prevName ?? diff.name,\n      contents: diff.deletionLines.join(''),\n    },\n    {\n      name: diff.name,\n      contents: diff.additionLines.join(''),\n      lang: diff.lang,\n    },\n    parseDiffOptions\n  );\n  return {\n    hunks: recomputed.hunks,\n    splitLineCount: recomputed.splitLineCount,\n    unifiedLineCount: recomputed.unifiedLineCount,\n    additionLines: recomputed.additionLines,\n    deletionLines: recomputed.deletionLines,\n    type: recomputed.type,\n  };\n}\n\n/** Updates hunk metadata after addition lines change; re-parses affected hunks only. */\nexport function updateDiffHunks(\n  diff: FileDiffMetadata,\n  changedAdditionLineIndexes: Iterable<number>,\n  parseDiffOptions?: CreatePatchOptionsNonabortable\n): HunkMetadataUpdate {\n  if (diff.isPartial) {\n    return applyHunkUpdateResult(\n      diff,\n      recomputeDiffHunks(diff, parseDiffOptions)\n    );\n  }\n\n  if (diff.deletionLines.length !== diff.additionLines.length) {\n    return applyHunkUpdateResult(\n      diff,\n      recomputeDiffHunks(diff, parseDiffOptions)\n    );\n  }\n\n  const changedLines = Array.from(changedAdditionLineIndexes);\n  if (changedLines.length === 0) {\n    return applyHunkUpdateResult(diff, {\n      hunks: diff.hunks,\n      splitLineCount: diff.splitLineCount,\n      unifiedLineCount: diff.unifiedLineCount,\n      type: diff.type,\n    });\n  }\n  for (const line of changedLines) {\n    const additionLine = diff.additionLines[line];\n    const deletionLine = diff.deletionLines[line];\n    if (additionLine == null || deletionLine == null) {\n      return applyHunkUpdateResult(\n        diff,\n        recomputeDiffHunks(diff, parseDiffOptions)\n      );\n    }\n    // Restoring a line to the old side can merge/split hunks across context windows.\n    if (cleanLastNewline(additionLine) === cleanLastNewline(deletionLine)) {\n      return applyHunkUpdateResult(\n        diff,\n        recomputeDiffHunks(diff, parseDiffOptions)\n      );\n    }\n  }\n\n  const affectedHunkIndexes = getAffectedHunkIndexes(diff, changedLines);\n  if (affectedHunkIndexes.size === 0) {\n    return applyHunkUpdateResult(\n      diff,\n      recomputeDiffHunks(diff, parseDiffOptions)\n    );\n  }\n\n  for (const hunkIndex of affectedHunkIndexes) {\n    const updated = reparseHunkRegion(diff, hunkIndex, parseDiffOptions);\n    if (!updated) {\n      return applyHunkUpdateResult(\n        diff,\n        recomputeDiffHunks(diff, parseDiffOptions)\n      );\n    }\n  }\n\n  recomputeDiffRenderLineCounts(diff);\n\n  if (hasTrailingContextMismatch(diff)) {\n    return applyHunkUpdateResult(\n      diff,\n      recomputeDiffHunks(diff, parseDiffOptions)\n    );\n  }\n\n  return applyHunkUpdateResult(diff, {\n    hunks: diff.hunks,\n    splitLineCount: diff.splitLineCount,\n    unifiedLineCount: diff.unifiedLineCount,\n    type: diff.type,\n  });\n}\n\nfunction applyHunkUpdateResult<T extends HunkMetadataUpdate>(\n  diff: FileDiffMetadata,\n  result: T\n): T {\n  Object.assign(diff, result);\n  return result;\n}\n\nfunction getAffectedHunkIndexes(\n  diff: FileDiffMetadata,\n  changedAdditionLineIndexes: Iterable<number>\n): Set<number> {\n  const indexes = new Set<number>();\n  for (const line of changedAdditionLineIndexes) {\n    const hunkIndex = findHunkIndexForAdditionLine(diff, line);\n    if (hunkIndex == null) {\n      return new Set();\n    }\n    indexes.add(hunkIndex);\n  }\n  return indexes;\n}\n\nfunction findHunkIndexForAdditionLine(\n  diff: FileDiffMetadata,\n  line: number\n): number | undefined {\n  for (const [hunkIndex, hunk] of diff.hunks.entries()) {\n    const end = hunk.additionLineIndex + hunk.additionCount;\n    if (line >= hunk.additionLineIndex && line < end) {\n      return hunkIndex;\n    }\n  }\n  return undefined;\n}\n\nfunction reparseHunkRegion(\n  diff: FileDiffMetadata,\n  hunkIndex: number,\n  parseDiffOptions?: CreatePatchOptionsNonabortable\n): boolean {\n  const hunk = diff.hunks[hunkIndex];\n  if (hunk == null) {\n    return false;\n  }\n\n  const deletionSlice = diff.deletionLines.slice(\n    hunk.deletionLineIndex,\n    hunk.deletionLineIndex + hunk.deletionCount\n  );\n  const additionSlice = diff.additionLines.slice(\n    hunk.additionLineIndex,\n    hunk.additionLineIndex + hunk.additionCount\n  );\n\n  const reparsed = parseDiffFromFile(\n    {\n      name: diff.prevName ?? diff.name,\n      contents: deletionSlice.join(''),\n    },\n    {\n      name: diff.name,\n      contents: additionSlice.join(''),\n      lang: diff.lang,\n    },\n    { ...parseDiffOptions, context: 0 }\n  );\n\n  const reparsedHunk = reparsed.hunks[0];\n  if (reparsedHunk == null || reparsed.hunks.length !== 1) {\n    return false;\n  }\n\n  applyReparsedHunk(hunk, reparsedHunk);\n  syncHunkNoEOFCRFromFullFile(diff, hunkIndex);\n  return true;\n}\n\nfunction syncHunkNoEOFCRFromFullFile(\n  diff: FileDiffMetadata,\n  hunkIndex: number\n): void {\n  const hunk = diff.hunks[hunkIndex];\n  if (hunk == null) {\n    return;\n  }\n\n  const isLastHunk = hunkIndex === diff.hunks.length - 1;\n  if (!isLastHunk) {\n    hunk.noEOFCRAdditions = false;\n    hunk.noEOFCRDeletions = false;\n    return;\n  }\n\n  const lastAdditionLine = diff.additionLines.at(-1);\n  const lastDeletionLine = diff.deletionLines.at(-1);\n  hunk.noEOFCRAdditions =\n    lastAdditionLine != null &&\n    lastAdditionLine !== '' &&\n    !lastAdditionLine.endsWith('\\n');\n  hunk.noEOFCRDeletions =\n    lastDeletionLine != null &&\n    lastDeletionLine !== '' &&\n    !lastDeletionLine.endsWith('\\n');\n}\n\nfunction applyReparsedHunk(target: Hunk, parsed: Hunk): void {\n  const additionOffset = target.additionLineIndex;\n  const deletionOffset = target.deletionLineIndex;\n\n  target.hunkContent = parsed.hunkContent.map((content) =>\n    offsetHunkContent(content, additionOffset, deletionOffset)\n  );\n  target.additionLineIndex = additionOffset + parsed.additionLineIndex;\n  target.additionStart = target.additionStart + parsed.additionLineIndex;\n  target.additionCount = parsed.additionCount;\n  target.additionLines = parsed.additionLines;\n  if (parsed.deletionLineIndex >= 0) {\n    target.deletionLineIndex = deletionOffset + parsed.deletionLineIndex;\n    target.deletionStart = target.deletionStart + parsed.deletionLineIndex;\n  }\n  target.deletionCount = parsed.deletionCount;\n  target.deletionLines = parsed.deletionLines;\n  target.noEOFCRAdditions = parsed.noEOFCRAdditions;\n  target.noEOFCRDeletions = parsed.noEOFCRDeletions;\n\n  recomputeHunkRenderLineCounts(target);\n}\n\nfunction offsetHunkContent(\n  content: HunkContent,\n  additionOffset: number,\n  deletionOffset: number\n): HunkContent {\n  return {\n    ...content,\n    additionLineIndex: content.additionLineIndex + additionOffset,\n    deletionLineIndex: content.deletionLineIndex + deletionOffset,\n  };\n}\n\nfunction recomputeHunkRenderLineCounts(hunk: Hunk): void {\n  let splitLineCount = 0;\n  let unifiedLineCount = 0;\n\n  for (const content of hunk.hunkContent) {\n    if (content.type === 'context') {\n      splitLineCount += content.lines;\n      unifiedLineCount += content.lines;\n    } else {\n      splitLineCount += Math.max(content.additions, content.deletions);\n      unifiedLineCount += content.additions + content.deletions;\n    }\n  }\n\n  hunk.splitLineCount = splitLineCount;\n  hunk.unifiedLineCount = unifiedLineCount;\n}\n\nfunction recomputeDiffRenderLineCounts(diff: FileDiffMetadata): void {\n  let splitTotal = 0;\n  let unifiedTotal = 0;\n  let lastHunkAdditionEnd = 0;\n\n  for (const hunk of diff.hunks) {\n    hunk.collapsedBefore = Math.max(\n      hunk.additionStart - 1 - lastHunkAdditionEnd,\n      0\n    );\n    hunk.splitLineStart = splitTotal + hunk.collapsedBefore;\n    hunk.unifiedLineStart = unifiedTotal + hunk.collapsedBefore;\n\n    recomputeHunkRenderLineCounts(hunk);\n\n    splitTotal += hunk.collapsedBefore + hunk.splitLineCount;\n    unifiedTotal += hunk.collapsedBefore + hunk.unifiedLineCount;\n    lastHunkAdditionEnd = hunk.additionStart + hunk.additionCount - 1;\n  }\n\n  if (diff.hunks.length > 0) {\n    const lastHunk = diff.hunks[diff.hunks.length - 1];\n    const collapsedAfter = Math.max(\n      diff.additionLines.length -\n        (lastHunk.additionLineIndex + lastHunk.additionCount),\n      0\n    );\n    splitTotal += collapsedAfter;\n    unifiedTotal += collapsedAfter;\n  }\n\n  diff.splitLineCount = splitTotal;\n  diff.unifiedLineCount = unifiedTotal;\n}\n"],"mappings":";;;;;;AAuBA,SAAgB,mBACd,MACA,kBACoB;CACpB,MAAM,aAAa,kBACjB;EACE,MAAM,KAAK,YAAY,KAAK;EAC5B,UAAU,KAAK,cAAc,KAAK,GAAG;EACtC,EACD;EACE,MAAM,KAAK;EACX,UAAU,KAAK,cAAc,KAAK,GAAG;EACrC,MAAM,KAAK;EACZ,EACD,iBACD;AACD,QAAO;EACL,OAAO,WAAW;EAClB,gBAAgB,WAAW;EAC3B,kBAAkB,WAAW;EAC7B,eAAe,WAAW;EAC1B,eAAe,WAAW;EAC1B,MAAM,WAAW;EAClB;;;AAIH,SAAgB,gBACd,MACA,4BACA,kBACoB;AACpB,KAAI,KAAK,UACP,QAAO,sBACL,MACA,mBAAmB,MAAM,iBAAiB,CAC3C;AAGH,KAAI,KAAK,cAAc,WAAW,KAAK,cAAc,OACnD,QAAO,sBACL,MACA,mBAAmB,MAAM,iBAAiB,CAC3C;CAGH,MAAM,eAAe,MAAM,KAAK,2BAA2B;AAC3D,KAAI,aAAa,WAAW,EAC1B,QAAO,sBAAsB,MAAM;EACjC,OAAO,KAAK;EACZ,gBAAgB,KAAK;EACrB,kBAAkB,KAAK;EACvB,MAAM,KAAK;EACZ,CAAC;AAEJ,MAAK,MAAM,QAAQ,cAAc;EAC/B,MAAM,eAAe,KAAK,cAAc;EACxC,MAAM,eAAe,KAAK,cAAc;AACxC,MAAI,gBAAgB,QAAQ,gBAAgB,KAC1C,QAAO,sBACL,MACA,mBAAmB,MAAM,iBAAiB,CAC3C;AAGH,MAAI,iBAAiB,aAAa,KAAK,iBAAiB,aAAa,CACnE,QAAO,sBACL,MACA,mBAAmB,MAAM,iBAAiB,CAC3C;;CAIL,MAAM,sBAAsB,uBAAuB,MAAM,aAAa;AACtE,KAAI,oBAAoB,SAAS,EAC/B,QAAO,sBACL,MACA,mBAAmB,MAAM,iBAAiB,CAC3C;AAGH,MAAK,MAAM,aAAa,oBAEtB,KAAI,CADY,kBAAkB,MAAM,WAAW,iBAAiB,CAElE,QAAO,sBACL,MACA,mBAAmB,MAAM,iBAAiB,CAC3C;AAIL,+BAA8B,KAAK;AAEnC,KAAI,2BAA2B,KAAK,CAClC,QAAO,sBACL,MACA,mBAAmB,MAAM,iBAAiB,CAC3C;AAGH,QAAO,sBAAsB,MAAM;EACjC,OAAO,KAAK;EACZ,gBAAgB,KAAK;EACrB,kBAAkB,KAAK;EACvB,MAAM,KAAK;EACZ,CAAC;;AAGJ,SAAS,sBACP,MACA,QACG;AACH,QAAO,OAAO,MAAM,OAAO;AAC3B,QAAO;;AAGT,SAAS,uBACP,MACA,4BACa;CACb,MAAM,0BAAU,IAAI,KAAa;AACjC,MAAK,MAAM,QAAQ,4BAA4B;EAC7C,MAAM,YAAY,6BAA6B,MAAM,KAAK;AAC1D,MAAI,aAAa,KACf,wBAAO,IAAI,KAAK;AAElB,UAAQ,IAAI,UAAU;;AAExB,QAAO;;AAGT,SAAS,6BACP,MACA,MACoB;AACpB,MAAK,MAAM,CAAC,WAAW,SAAS,KAAK,MAAM,SAAS,EAAE;EACpD,MAAM,MAAM,KAAK,oBAAoB,KAAK;AAC1C,MAAI,QAAQ,KAAK,qBAAqB,OAAO,IAC3C,QAAO;;;AAMb,SAAS,kBACP,MACA,WACA,kBACS;CACT,MAAM,OAAO,KAAK,MAAM;AACxB,KAAI,QAAQ,KACV,QAAO;CAGT,MAAM,gBAAgB,KAAK,cAAc,MACvC,KAAK,mBACL,KAAK,oBAAoB,KAAK,cAC/B;CACD,MAAM,gBAAgB,KAAK,cAAc,MACvC,KAAK,mBACL,KAAK,oBAAoB,KAAK,cAC/B;CAED,MAAM,WAAW,kBACf;EACE,MAAM,KAAK,YAAY,KAAK;EAC5B,UAAU,cAAc,KAAK,GAAG;EACjC,EACD;EACE,MAAM,KAAK;EACX,UAAU,cAAc,KAAK,GAAG;EAChC,MAAM,KAAK;EACZ,EACD;EAAE,GAAG;EAAkB,SAAS;EAAG,CACpC;CAED,MAAM,eAAe,SAAS,MAAM;AACpC,KAAI,gBAAgB,QAAQ,SAAS,MAAM,WAAW,EACpD,QAAO;AAGT,mBAAkB,MAAM,aAAa;AACrC,6BAA4B,MAAM,UAAU;AAC5C,QAAO;;AAGT,SAAS,4BACP,MACA,WACM;CACN,MAAM,OAAO,KAAK,MAAM;AACxB,KAAI,QAAQ,KACV;AAIF,KAAI,EADe,cAAc,KAAK,MAAM,SAAS,IACpC;AACf,OAAK,mBAAmB;AACxB,OAAK,mBAAmB;AACxB;;CAGF,MAAM,mBAAmB,KAAK,cAAc,GAAG,GAAG;CAClD,MAAM,mBAAmB,KAAK,cAAc,GAAG,GAAG;AAClD,MAAK,mBACH,oBAAoB,QACpB,qBAAqB,MACrB,CAAC,iBAAiB,SAAS,KAAK;AAClC,MAAK,mBACH,oBAAoB,QACpB,qBAAqB,MACrB,CAAC,iBAAiB,SAAS,KAAK;;AAGpC,SAAS,kBAAkB,QAAc,QAAoB;CAC3D,MAAM,iBAAiB,OAAO;CAC9B,MAAM,iBAAiB,OAAO;AAE9B,QAAO,cAAc,OAAO,YAAY,KAAK,YAC3C,kBAAkB,SAAS,gBAAgB,eAAe,CAC3D;AACD,QAAO,oBAAoB,iBAAiB,OAAO;AACnD,QAAO,gBAAgB,OAAO,gBAAgB,OAAO;AACrD,QAAO,gBAAgB,OAAO;AAC9B,QAAO,gBAAgB,OAAO;AAC9B,KAAI,OAAO,qBAAqB,GAAG;AACjC,SAAO,oBAAoB,iBAAiB,OAAO;AACnD,SAAO,gBAAgB,OAAO,gBAAgB,OAAO;;AAEvD,QAAO,gBAAgB,OAAO;AAC9B,QAAO,gBAAgB,OAAO;AAC9B,QAAO,mBAAmB,OAAO;AACjC,QAAO,mBAAmB,OAAO;AAEjC,+BAA8B,OAAO;;AAGvC,SAAS,kBACP,SACA,gBACA,gBACa;AACb,QAAO;EACL,GAAG;EACH,mBAAmB,QAAQ,oBAAoB;EAC/C,mBAAmB,QAAQ,oBAAoB;EAChD;;AAGH,SAAS,8BAA8B,MAAkB;CACvD,IAAI,iBAAiB;CACrB,IAAI,mBAAmB;AAEvB,MAAK,MAAM,WAAW,KAAK,YACzB,KAAI,QAAQ,SAAS,WAAW;AAC9B,oBAAkB,QAAQ;AAC1B,sBAAoB,QAAQ;QACvB;AACL,oBAAkB,KAAK,IAAI,QAAQ,WAAW,QAAQ,UAAU;AAChE,sBAAoB,QAAQ,YAAY,QAAQ;;AAIpD,MAAK,iBAAiB;AACtB,MAAK,mBAAmB;;AAG1B,SAAS,8BAA8B,MAA8B;CACnE,IAAI,aAAa;CACjB,IAAI,eAAe;CACnB,IAAI,sBAAsB;AAE1B,MAAK,MAAM,QAAQ,KAAK,OAAO;AAC7B,OAAK,kBAAkB,KAAK,IAC1B,KAAK,gBAAgB,IAAI,qBACzB,EACD;AACD,OAAK,iBAAiB,aAAa,KAAK;AACxC,OAAK,mBAAmB,eAAe,KAAK;AAE5C,gCAA8B,KAAK;AAEnC,gBAAc,KAAK,kBAAkB,KAAK;AAC1C,kBAAgB,KAAK,kBAAkB,KAAK;AAC5C,wBAAsB,KAAK,gBAAgB,KAAK,gBAAgB;;AAGlE,KAAI,KAAK,MAAM,SAAS,GAAG;EACzB,MAAM,WAAW,KAAK,MAAM,KAAK,MAAM,SAAS;EAChD,MAAM,iBAAiB,KAAK,IAC1B,KAAK,cAAc,UAChB,SAAS,oBAAoB,SAAS,gBACzC,EACD;AACD,gBAAc;AACd,kBAAgB;;AAGlB,MAAK,iBAAiB;AACtB,MAAK,mBAAmB"}

package/dist/utils/virtualDiffLayout.d.ts

@@ -1,4 +1,4 @@
-import { HunkExpansionRegion, HunkSeparators, VirtualFileMetrics } from "../types.js";
+import { FileDiffMetadata, HunkExpansionRegion, HunkSeparators, VirtualFileMetrics } from "../types.js";
 
 //#region src/utils/virtualDiffLayout.d.ts
 interface ExpandedRegionResult {
@@ -15,6 +15,15 @@ interface GetExpandedRegionProps {
   hunkIndex: number;
   collapsedContextThreshold: number;
 }
+interface GetTrailingContextRangeSizeProps {
+  fileDiff: FileDiffMetadata;
+  errorPrefix: string;
+}
+interface GetTrailingExpandedRegionProps extends GetTrailingContextRangeSizeProps {
+  hunkIndex: number;
+  expandedHunks: GetExpandedRegionProps['expandedHunks'];
+  collapsedContextThreshold: number;
+}
 interface HunkSeparatorLayout {
   height: number;
   gapBefore: number;
@@ -36,6 +45,19 @@ declare function getExpandedRegion({
   hunkIndex,
   collapsedContextThreshold
 }: GetExpandedRegionProps): ExpandedRegionResult;
+declare function hasTrailingContext(fileDiff: FileDiffMetadata): boolean;
+declare function hasTrailingContextMismatch(fileDiff: FileDiffMetadata): boolean;
+declare function getTrailingContextRangeSize({
+  fileDiff,
+  errorPrefix
+}: GetTrailingContextRangeSizeProps): number;
+declare function getTrailingExpandedRegion({
+  fileDiff,
+  hunkIndex,
+  expandedHunks,
+  collapsedContextThreshold,
+  errorPrefix
+}: GetTrailingExpandedRegionProps): ExpandedRegionResult | undefined;
 declare function getHunkSeparatorHeight({
   type,
   metrics
@@ -61,5 +83,5 @@ declare function getTrailingHunkSeparatorLayout({
   metrics
 }: HunkSeparatorBaseProps): HunkSeparatorLayout | undefined;
 //#endregion
-export { ExpandedRegionResult, GetExpandedRegionProps, HunkSeparatorLayout, getExpandedRegion, getHunkSeparatorGap, getHunkSeparatorHeight, getLeadingHunkSeparatorLayout, getTrailingHunkSeparatorLayout, hasLeadingHunkSeparator, hasTrailingHunkSeparator };
+export { ExpandedRegionResult, GetExpandedRegionProps, GetTrailingContextRangeSizeProps, GetTrailingExpandedRegionProps, HunkSeparatorLayout, getExpandedRegion, getHunkSeparatorGap, getHunkSeparatorHeight, getLeadingHunkSeparatorLayout, getTrailingContextRangeSize, getTrailingExpandedRegion, getTrailingHunkSeparatorLayout, hasLeadingHunkSeparator, hasTrailingContext, hasTrailingContextMismatch, hasTrailingHunkSeparator };
 //# sourceMappingURL=virtualDiffLayout.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"virtualDiffLayout.d.ts","names":["HunkExpansionRegion","HunkSeparators","VirtualFileMetrics","ExpandedRegionResult","GetExpandedRegionProps","Map","HunkSeparatorLayout","HunkSeparatorBaseProps","LeadingHunkSeparatorLayoutProps","getExpandedRegion","isPartial","rangeSize","expandedHunks","hunkIndex","collapsedContextThreshold","getHunkSeparatorHeight","type","metrics","getHunkSeparatorGap","hasLeadingHunkSeparator","hunkSpecs","Omit","hasTrailingHunkSeparator","getLeadingHunkSeparatorLayout","getTrailingHunkSeparatorLayout"],"sources":["../../src/utils/virtualDiffLayout.d.ts"],"sourcesContent":["import type { HunkExpansionRegion, HunkSeparators, VirtualFileMetrics } from '../types';\nexport interface ExpandedRegionResult {\n    fromStart: number;\n    fromEnd: number;\n    rangeSize: number;\n    collapsedLines: number;\n    renderAll: boolean;\n}\nexport interface GetExpandedRegionProps {\n    isPartial: boolean;\n    rangeSize: number;\n    expandedHunks: Map<number, HunkExpansionRegion> | true | undefined;\n    hunkIndex: number;\n    collapsedContextThreshold: number;\n}\nexport interface HunkSeparatorLayout {\n    height: number;\n    gapBefore: number;\n    gapAfter: number;\n    totalHeight: number;\n}\ninterface HunkSeparatorBaseProps {\n    type: HunkSeparators;\n    metrics: VirtualFileMetrics;\n}\ninterface LeadingHunkSeparatorLayoutProps extends HunkSeparatorBaseProps {\n    hunkIndex: number;\n    hunkSpecs: string | undefined;\n}\nexport declare function getExpandedRegion({ isPartial, rangeSize, expandedHunks, hunkIndex, collapsedContextThreshold }: GetExpandedRegionProps): ExpandedRegionResult;\nexport declare function getHunkSeparatorHeight({ type, metrics }: HunkSeparatorBaseProps): number;\nexport declare function getHunkSeparatorGap({ type, metrics }: HunkSeparatorBaseProps): number;\nexport declare function hasLeadingHunkSeparator({ type, hunkIndex, hunkSpecs }: Omit<LeadingHunkSeparatorLayoutProps, 'metrics'>): boolean;\nexport declare function hasTrailingHunkSeparator(type: HunkSeparators): boolean;\nexport declare function getLeadingHunkSeparatorLayout({ type, metrics, hunkIndex, hunkSpecs }: LeadingHunkSeparatorLayoutProps): HunkSeparatorLayout | undefined;\nexport declare function getTrailingHunkSeparatorLayout({ type, metrics }: HunkSeparatorBaseProps): HunkSeparatorLayout | undefined;\nexport {};\n//# sourceMappingURL=virtualDiffLayout.d.ts.map"],"mappings":";;;UACiBG,oBAAAA;;EAAAA,OAAAA,EAAAA,MAAAA;EAOAC,SAAAA,EAAAA,MAAAA;EAOAE,cAAAA,EAAAA,MAAmB;EAM1BC,SAAAA,EAAAA,OAAAA;AAEqB;AAMPE,UArBPL,sBAAAA,CAqBwB;EAAGM,SAAAA,EAAAA,OAAAA;EAAWC,SAAAA,EAAAA,MAAAA;EAAWC,aAAAA,EAlB/CP,GAkB+CO,CAAAA,MAAAA,EAlBnCZ,mBAkBmCY,CAAAA,GAAAA,IAAAA,GAAAA,SAAAA;EAAeC,SAAAA,EAAAA,MAAAA;EAAWC,yBAAAA,EAAAA,MAAAA;;AAAsDX,UAdjIG,mBAAAA,CAciIH;EAAoB,MAAA,EAAA,MAAA;EAC9IY,SAAAA,EAAAA,MAAAA;EAAyBC,QAAAA,EAAAA,MAAAA;EAAMC,WAAAA,EAAAA,MAAAA;;UAT7CV,sBAAAA,CAS8E;EAChEW,IAAAA,EATdjB,cASciB;EAAsBF,OAAAA,EARjCd,kBAQiCc;;UANpCR,+BAAAA,SAAwCD,sBAMaA,CAAAA;EAAsB,SAAA,EAAA,MAAA;EAC7DY,SAAAA,EAAAA,MAAAA,GAAAA,SAAuB;;AAASN,iBAHhCJ,iBAAAA,CAGgCI;EAAAA,SAAAA;EAAAA,SAAAA;EAAAA,aAAAA;EAAAA,SAAAA;EAAAA;AAAAA,CAAAA,EAHiET,sBAGjES,CAAAA,EAH0FV,oBAG1FU;AAAWO,iBAF3CL,sBAAAA,CAE2CK;EAAAA,IAAAA;EAAAA;AAAAA,CAAAA,EAFDb,sBAECa,CAAAA,EAAAA,MAAAA;AAAkBZ,iBAD7DU,mBAAAA,CAC6DV;EAAAA,IAAAA;EAAAA;AAAAA,CAAAA,EADtBD,sBACsBC,CAAAA,EAAAA,MAAAA;AAALa,iBAAxDF,uBAAAA,CAAwDE;EAAAA,IAAAA;EAAAA,SAAAA;EAAAA;AAAAA,CAAAA,EAAAA,IAAAA,CAAKb,+BAALa,EAAAA,SAAAA,CAAAA,CAAAA,EAAAA,OAAAA;AAAI,iBAC5DC,wBAAAA,CAD4D,IAAA,EAC7BrB,cAD6B,CAAA,EAAA,OAAA;AAC5DqB,iBACAC,6BAAAA,CAD+BtB;EAAAA,IAAc;EAAA,OAAA;EAAA,SAAA;EAAA;AAAA,CAAA,EAC0BO,+BAD1B,CAAA,EAC4DF,mBAD5D,GAAA,SAAA;AAC7CiB,iBACAC,8BAAAA,CAD6B;EAAA,IAAA;EAAA;AAAA,CAAA,EACqBjB,sBADrB,CAAA,EAC8CD,mBAD9C,GAAA,SAAA"}
+{"version":3,"file":"virtualDiffLayout.d.ts","names":["FileDiffMetadata","HunkExpansionRegion","HunkSeparators","VirtualFileMetrics","ExpandedRegionResult","GetExpandedRegionProps","Map","GetTrailingContextRangeSizeProps","GetTrailingExpandedRegionProps","HunkSeparatorLayout","HunkSeparatorBaseProps","LeadingHunkSeparatorLayoutProps","getExpandedRegion","isPartial","rangeSize","expandedHunks","hunkIndex","collapsedContextThreshold","hasTrailingContext","hasTrailingContextMismatch","getTrailingContextRangeSize","fileDiff","errorPrefix","getTrailingExpandedRegion","getHunkSeparatorHeight","type","metrics","getHunkSeparatorGap","hasLeadingHunkSeparator","hunkSpecs","Omit","hasTrailingHunkSeparator","getLeadingHunkSeparatorLayout","getTrailingHunkSeparatorLayout"],"sources":["../../src/utils/virtualDiffLayout.d.ts"],"sourcesContent":["import type { FileDiffMetadata, HunkExpansionRegion, HunkSeparators, VirtualFileMetrics } from '../types';\nexport interface ExpandedRegionResult {\n    fromStart: number;\n    fromEnd: number;\n    rangeSize: number;\n    collapsedLines: number;\n    renderAll: boolean;\n}\nexport interface GetExpandedRegionProps {\n    isPartial: boolean;\n    rangeSize: number;\n    expandedHunks: Map<number, HunkExpansionRegion> | true | undefined;\n    hunkIndex: number;\n    collapsedContextThreshold: number;\n}\nexport interface GetTrailingContextRangeSizeProps {\n    fileDiff: FileDiffMetadata;\n    errorPrefix: string;\n}\nexport interface GetTrailingExpandedRegionProps extends GetTrailingContextRangeSizeProps {\n    hunkIndex: number;\n    expandedHunks: GetExpandedRegionProps['expandedHunks'];\n    collapsedContextThreshold: number;\n}\nexport interface HunkSeparatorLayout {\n    height: number;\n    gapBefore: number;\n    gapAfter: number;\n    totalHeight: number;\n}\ninterface HunkSeparatorBaseProps {\n    type: HunkSeparators;\n    metrics: VirtualFileMetrics;\n}\ninterface LeadingHunkSeparatorLayoutProps extends HunkSeparatorBaseProps {\n    hunkIndex: number;\n    hunkSpecs: string | undefined;\n}\nexport declare function getExpandedRegion({ isPartial, rangeSize, expandedHunks, hunkIndex, collapsedContextThreshold }: GetExpandedRegionProps): ExpandedRegionResult;\nexport declare function hasTrailingContext(fileDiff: FileDiffMetadata): boolean;\nexport declare function hasTrailingContextMismatch(fileDiff: FileDiffMetadata): boolean;\nexport declare function getTrailingContextRangeSize({ fileDiff, errorPrefix }: GetTrailingContextRangeSizeProps): number;\nexport declare function getTrailingExpandedRegion({ fileDiff, hunkIndex, expandedHunks, collapsedContextThreshold, errorPrefix }: GetTrailingExpandedRegionProps): ExpandedRegionResult | undefined;\nexport declare function getHunkSeparatorHeight({ type, metrics }: HunkSeparatorBaseProps): number;\nexport declare function getHunkSeparatorGap({ type, metrics }: HunkSeparatorBaseProps): number;\nexport declare function hasLeadingHunkSeparator({ type, hunkIndex, hunkSpecs }: Omit<LeadingHunkSeparatorLayoutProps, 'metrics'>): boolean;\nexport declare function hasTrailingHunkSeparator(type: HunkSeparators): boolean;\nexport declare function getLeadingHunkSeparatorLayout({ type, metrics, hunkIndex, hunkSpecs }: LeadingHunkSeparatorLayoutProps): HunkSeparatorLayout | undefined;\nexport declare function getTrailingHunkSeparatorLayout({ type, metrics }: HunkSeparatorBaseProps): HunkSeparatorLayout | undefined;\nexport {};\n//# sourceMappingURL=virtualDiffLayout.d.ts.map"],"mappings":";;;UACiBI,oBAAAA;;EAAAA,OAAAA,EAAAA,MAAAA;EAOAC,SAAAA,EAAAA,MAAAA;EAOAE,cAAAA,EAAAA,MAAAA;EAIAC,SAAAA,EAAAA,OAAAA;AAKjB;AAMUE,UAtBOL,sBAAAA,CAsBe;EAItBM,SAAAA,EAAAA,OAAAA;EAIcC,SAAAA,EAAAA,MAAAA;EAAoBC,aAAAA,EA3BzBP,GA2ByBO,CAAAA,MAAAA,EA3BbZ,mBA2BaY,CAAAA,GAAAA,IAAAA,GAAAA,SAAAA;EAAWC,SAAAA,EAAAA,MAAAA;EAAWC,yBAAAA,EAAAA,MAAAA;;AAA0BE,UAvB3EV,gCAAAA,CAuB2EU;EAA6BZ,QAAAA,EAtB3GL,gBAsB2GK;EAAyBD,WAAAA,EAAAA,MAAAA;;AAC1Hc,UApBPV,8BAAAA,SAAuCD,gCAoBa,CAAA;EAC7CY,SAAAA,EAAAA,MAAAA;EACAC,aAAAA,EApBLf,sBAoBgC,CAAA,eAAA,CAAA;EAAGgB,yBAAAA,EAAAA,MAAAA;;AAAyBd,UAjB9DE,mBAAAA,CAiB8DF;EAAgC,MAAA,EAAA,MAAA;EACvFgB,SAAAA,EAAAA,MAAAA;EAA4BF,QAAAA,EAAAA,MAAAA;EAAUL,WAAAA,EAAAA,MAAAA;;UAZpDN,sBAAAA,CAY8EO;EAA2BK,IAAAA,EAXzGpB,cAWyGoB;EAAed,OAAAA,EAVrHL,kBAUqHK;;UARxHG,+BAAAA,SAAwCD,sBAQqI,CAAA;EAC/Jc,SAAAA,EAAAA,MAAAA;EAAyBC,SAAAA,EAAAA,MAAAA,GAAAA,SAAAA;;AAAiBf,iBAL1CE,iBAAAA,CAK0CF;EAAAA,SAAAA;EAAAA,SAAAA;EAAAA,aAAAA;EAAAA,SAAAA;EAAAA;AAAAA,CAAAA,EALuDL,sBAKvDK,CAAAA,EALgFN,oBAKhFM;AAAsB,iBAJhEQ,kBAAAA,CAIgE,QAAA,EAJnClB,gBAImC,CAAA,EAAA,OAAA;AAChE2B,iBAJAR,0BAAAA,CAImB,QAAA,EAJkBnB,gBAIlB,CAAA,EAAA,OAAA;AAAGyB,iBAHtBL,2BAAAA,CAGsBK;EAAAA,QAAAA;EAAAA;AAAAA,CAAAA,EAHiClB,gCAGjCkB,CAAAA,EAAAA,MAAAA;AAAMC,iBAF5BH,yBAAAA,CAE4BG;EAAAA,QAAAA;EAAAA,SAAAA;EAAAA,aAAAA;EAAAA,yBAAAA;EAAAA;AAAAA,CAAAA,EAF8ElB,8BAE9EkB,CAAAA,EAF+GtB,oBAE/GsB,GAAAA,SAAAA;AAAWhB,iBADvCc,sBAAAA,CACuCd;EAAAA,IAAAA;EAAAA;AAAAA,CAAAA,EADGA,sBACHA,CAAAA,EAAAA,MAAAA;AAAsB,iBAA7DiB,mBAAAA,CAA6D;EAAA,IAAA;EAAA;AAAA,CAAA,EAAtBjB,sBAAsB,CAAA,EAAA,MAAA;AAC7DkB,iBAAAA,uBAAAA,CAAuB;EAAA,IAAA;EAAA,SAAA;EAAA;AAAA,CAAA,EAAiCE,IAAjC,CAAsCnB,+BAAtC,EAAA,SAAA,CAAA,CAAA,EAAA,OAAA;AAAGc,iBAC1BM,wBAAAA,CAD0BN,IAAAA,EACKvB,cADLuB,CAAAA,EAAAA,OAAAA;AAAMT,iBAEhCgB,6BAAAA,CAFgChB;EAAAA,IAAAA;EAAAA,OAAAA;EAAAA,SAAAA;EAAAA;AAAAA,CAAAA,EAEuCL,+BAFvCK,CAAAA,EAEyEP,mBAFzEO,GAAAA,SAAAA;AAAWa,iBAG3CI,8BAAAA,CAH2CJ;EAAAA,IAAAA;EAAAA;AAAAA,CAAAA,EAGOnB,sBAHPmB,CAAAA,EAGgCpB,mBAHhCoB,GAAAA,SAAAA"}

package/dist/utils/virtualDiffLayout.js

@@ -30,6 +30,54 @@ function getExpandedRegion({ isPartial, rangeSize, expandedHunks, hunkIndex, col
 		renderAll
 	};
 }
+function hasTrailingContext(fileDiff) {
+	const lastHunk = fileDiff.hunks[fileDiff.hunks.length - 1];
+	if (lastHunk == null || fileDiff.isPartial || fileDiff.additionLines.length === 0 || fileDiff.deletionLines.length === 0) return false;
+	const additionRemaining = fileDiff.additionLines.length - (lastHunk.additionLineIndex + lastHunk.additionCount);
+	const deletionRemaining = fileDiff.deletionLines.length - (lastHunk.deletionLineIndex + lastHunk.deletionCount);
+	return additionRemaining > 0 || deletionRemaining > 0;
+}
+function hasTrailingContextMismatch(fileDiff) {
+	const lastHunk = fileDiff.hunks[fileDiff.hunks.length - 1];
+	if (lastHunk == null || fileDiff.isPartial || fileDiff.additionLines.length === 0 || fileDiff.deletionLines.length === 0) return false;
+	const additionRemaining = fileDiff.additionLines.length - (lastHunk.additionLineIndex + lastHunk.additionCount);
+	const deletionRemaining = fileDiff.deletionLines.length - (lastHunk.deletionLineIndex + lastHunk.deletionCount);
+	if (additionRemaining <= 0 && deletionRemaining <= 0) return false;
+	return additionRemaining !== deletionRemaining;
+}
+function getTrailingContextRangeSize({ fileDiff, errorPrefix }) {
+	const lastHunk = fileDiff.hunks[fileDiff.hunks.length - 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 <= 0 && deletionRemaining <= 0) return 0;
+	if (additionRemaining !== deletionRemaining) throw new Error(`${errorPrefix}: trailing context mismatch (additions=${additionRemaining}, deletions=${deletionRemaining}) for ${fileDiff.name}`);
+	return Math.min(additionRemaining, deletionRemaining);
+}
+function getTrailingExpandedRegion({ fileDiff, hunkIndex, expandedHunks, collapsedContextThreshold, errorPrefix }) {
+	if (hunkIndex !== fileDiff.hunks.length - 1) return;
+	const trailingRangeSize = getTrailingContextRangeSize({
+		fileDiff,
+		errorPrefix
+	});
+	if (trailingRangeSize <= 0) return;
+	if (expandedHunks === true || trailingRangeSize <= collapsedContextThreshold) return {
+		fromStart: trailingRangeSize,
+		fromEnd: 0,
+		rangeSize: trailingRangeSize,
+		collapsedLines: 0,
+		renderAll: true
+	};
+	const region = expandedHunks?.get(fileDiff.hunks.length);
+	const fromStart = Math.min(Math.max(region?.fromStart ?? 0, 0), trailingRangeSize);
+	return {
+		fromStart,
+		fromEnd: 0,
+		rangeSize: trailingRangeSize,
+		collapsedLines: trailingRangeSize - fromStart,
+		renderAll: fromStart >= trailingRangeSize
+	};
+}
 function getHunkSeparatorHeight({ type, metrics }) {
 	return metrics.hunkSeparatorHeight ?? getDefaultHunkSeparatorHeight(type);
 }
@@ -90,5 +138,5 @@ function getTrailingHunkSeparatorLayout({ type, metrics }) {
 }
 
 //#endregion
-export { getExpandedRegion, getHunkSeparatorGap, getHunkSeparatorHeight, getLeadingHunkSeparatorLayout, getTrailingHunkSeparatorLayout, hasLeadingHunkSeparator, hasTrailingHunkSeparator };
+export { getExpandedRegion, getHunkSeparatorGap, getHunkSeparatorHeight, getLeadingHunkSeparatorLayout, getTrailingContextRangeSize, getTrailingExpandedRegion, getTrailingHunkSeparatorLayout, hasLeadingHunkSeparator, hasTrailingContext, hasTrailingContextMismatch, hasTrailingHunkSeparator };
 //# sourceMappingURL=virtualDiffLayout.js.map

package/dist/utils/virtualDiffLayout.js.map

@@ -1 +1 @@
-{"version":3,"file":"virtualDiffLayout.js","names":[],"sources":["../../src/utils/virtualDiffLayout.ts"],"sourcesContent":["import type {\n  HunkExpansionRegion,\n  HunkSeparators,\n  VirtualFileMetrics,\n} from '../types';\nimport { getDefaultHunkSeparatorHeight } from './computeVirtualFileMetrics';\n\nexport interface ExpandedRegionResult {\n  fromStart: number;\n  fromEnd: number;\n  rangeSize: number;\n  collapsedLines: number;\n  renderAll: boolean;\n}\n\nexport interface GetExpandedRegionProps {\n  isPartial: boolean;\n  rangeSize: number;\n  expandedHunks: Map<number, HunkExpansionRegion> | true | undefined;\n  hunkIndex: number;\n  collapsedContextThreshold: number;\n}\n\nexport interface HunkSeparatorLayout {\n  height: number;\n  gapBefore: number;\n  gapAfter: number;\n  totalHeight: number;\n}\n\ninterface HunkSeparatorBaseProps {\n  type: HunkSeparators;\n  metrics: VirtualFileMetrics;\n}\n\ninterface LeadingHunkSeparatorLayoutProps extends HunkSeparatorBaseProps {\n  hunkIndex: number;\n  hunkSpecs: string | undefined;\n}\n\n// Converts a collapsed unchanged range into the slices that should render near\n// the start and end of that range for the active hunk expansion state.\nexport function getExpandedRegion({\n  isPartial,\n  rangeSize,\n  expandedHunks,\n  hunkIndex,\n  collapsedContextThreshold,\n}: GetExpandedRegionProps): ExpandedRegionResult {\n  const normalizedRangeSize = Math.max(rangeSize, 0);\n  if (normalizedRangeSize === 0 || isPartial) {\n    return {\n      fromStart: 0,\n      fromEnd: 0,\n      rangeSize: normalizedRangeSize,\n      collapsedLines: normalizedRangeSize,\n      renderAll: false,\n    };\n  }\n\n  if (\n    expandedHunks === true ||\n    normalizedRangeSize <= collapsedContextThreshold\n  ) {\n    return {\n      fromStart: normalizedRangeSize,\n      fromEnd: 0,\n      rangeSize: normalizedRangeSize,\n      collapsedLines: 0,\n      renderAll: true,\n    };\n  }\n\n  const region = expandedHunks?.get(hunkIndex);\n  const fromStart = Math.min(\n    Math.max(region?.fromStart ?? 0, 0),\n    normalizedRangeSize\n  );\n  const fromEnd = Math.min(\n    Math.max(region?.fromEnd ?? 0, 0),\n    normalizedRangeSize\n  );\n  const expandedCount = fromStart + fromEnd;\n  const renderAll = expandedCount >= normalizedRangeSize;\n  return {\n    fromStart: renderAll ? normalizedRangeSize : fromStart,\n    fromEnd: renderAll ? 0 : fromEnd,\n    rangeSize: normalizedRangeSize,\n    collapsedLines: Math.max(normalizedRangeSize - expandedCount, 0),\n    renderAll,\n  };\n}\n\nexport function getHunkSeparatorHeight({\n  type,\n  metrics,\n}: HunkSeparatorBaseProps): number {\n  return metrics.hunkSeparatorHeight ?? getDefaultHunkSeparatorHeight(type);\n}\n\nexport function getHunkSeparatorGap({\n  type,\n  metrics,\n}: HunkSeparatorBaseProps): number {\n  return type === 'simple' || type === 'metadata' || type === 'line-info-basic'\n    ? 0\n    : metrics.spacing;\n}\n\nexport function hasLeadingHunkSeparator({\n  type,\n  hunkIndex,\n  hunkSpecs,\n}: Omit<LeadingHunkSeparatorLayoutProps, 'metrics'>): boolean {\n  switch (type) {\n    case 'simple':\n      return hunkIndex > 0;\n    case 'metadata':\n      return hunkSpecs != null;\n    case 'line-info':\n    case 'line-info-basic':\n    case 'custom':\n      return true;\n  }\n}\n\nexport function hasTrailingHunkSeparator(type: HunkSeparators): boolean {\n  return type !== 'simple' && type !== 'metadata';\n}\n\n// Mirrors the renderer/CSS spacing rules for the separator shown before a hunk.\nexport function getLeadingHunkSeparatorLayout({\n  type,\n  metrics,\n  hunkIndex,\n  hunkSpecs,\n}: LeadingHunkSeparatorLayoutProps): HunkSeparatorLayout | undefined {\n  if (!hasLeadingHunkSeparator({ type, hunkIndex, hunkSpecs })) {\n    return undefined;\n  }\n\n  const height = getHunkSeparatorHeight({ type, metrics });\n  const gap = getHunkSeparatorGap({ type, metrics });\n  const gapBefore = hunkIndex > 0 ? gap : 0;\n  const gapAfter = gap;\n  return {\n    height,\n    gapBefore,\n    gapAfter,\n    totalHeight: gapBefore + height + gapAfter,\n  };\n}\n\n// Mirrors the renderer/CSS spacing rules for the separator shown after the last\n// hunk when trailing unchanged context is collapsed.\nexport function getTrailingHunkSeparatorLayout({\n  type,\n  metrics,\n}: HunkSeparatorBaseProps): HunkSeparatorLayout | undefined {\n  if (!hasTrailingHunkSeparator(type)) {\n    return undefined;\n  }\n\n  const height = getHunkSeparatorHeight({ type, metrics });\n  const gapBefore = getHunkSeparatorGap({ type, metrics });\n  return {\n    height,\n    gapBefore,\n    gapAfter: 0,\n    totalHeight: gapBefore + height,\n  };\n}\n"],"mappings":";;;AA0CA,SAAgB,kBAAkB,EAChC,WACA,WACA,eACA,WACA,6BAC+C;CAC/C,MAAM,sBAAsB,KAAK,IAAI,WAAW,EAAE;AAClD,KAAI,wBAAwB,KAAK,UAC/B,QAAO;EACL,WAAW;EACX,SAAS;EACT,WAAW;EACX,gBAAgB;EAChB,WAAW;EACZ;AAGH,KACE,kBAAkB,QAClB,uBAAuB,0BAEvB,QAAO;EACL,WAAW;EACX,SAAS;EACT,WAAW;EACX,gBAAgB;EAChB,WAAW;EACZ;CAGH,MAAM,SAAS,eAAe,IAAI,UAAU;CAC5C,MAAM,YAAY,KAAK,IACrB,KAAK,IAAI,QAAQ,aAAa,GAAG,EAAE,EACnC,oBACD;CACD,MAAM,UAAU,KAAK,IACnB,KAAK,IAAI,QAAQ,WAAW,GAAG,EAAE,EACjC,oBACD;CACD,MAAM,gBAAgB,YAAY;CAClC,MAAM,YAAY,iBAAiB;AACnC,QAAO;EACL,WAAW,YAAY,sBAAsB;EAC7C,SAAS,YAAY,IAAI;EACzB,WAAW;EACX,gBAAgB,KAAK,IAAI,sBAAsB,eAAe,EAAE;EAChE;EACD;;AAGH,SAAgB,uBAAuB,EACrC,MACA,WACiC;AACjC,QAAO,QAAQ,uBAAuB,8BAA8B,KAAK;;AAG3E,SAAgB,oBAAoB,EAClC,MACA,WACiC;AACjC,QAAO,SAAS,YAAY,SAAS,cAAc,SAAS,oBACxD,IACA,QAAQ;;AAGd,SAAgB,wBAAwB,EACtC,MACA,WACA,aAC4D;AAC5D,SAAQ,MAAR;EACE,KAAK,SACH,QAAO,YAAY;EACrB,KAAK,WACH,QAAO,aAAa;EACtB,KAAK;EACL,KAAK;EACL,KAAK,SACH,QAAO;;;AAIb,SAAgB,yBAAyB,MAA+B;AACtE,QAAO,SAAS,YAAY,SAAS;;AAIvC,SAAgB,8BAA8B,EAC5C,MACA,SACA,WACA,aACmE;AACnE,KAAI,CAAC,wBAAwB;EAAE;EAAM;EAAW;EAAW,CAAC,CAC1D;CAGF,MAAM,SAAS,uBAAuB;EAAE;EAAM;EAAS,CAAC;CACxD,MAAM,MAAM,oBAAoB;EAAE;EAAM;EAAS,CAAC;CAClD,MAAM,YAAY,YAAY,IAAI,MAAM;CACxC,MAAM,WAAW;AACjB,QAAO;EACL;EACA;EACA;EACA,aAAa,YAAY,SAAS;EACnC;;AAKH,SAAgB,+BAA+B,EAC7C,MACA,WAC0D;AAC1D,KAAI,CAAC,yBAAyB,KAAK,CACjC;CAGF,MAAM,SAAS,uBAAuB;EAAE;EAAM;EAAS,CAAC;CACxD,MAAM,YAAY,oBAAoB;EAAE;EAAM;EAAS,CAAC;AACxD,QAAO;EACL;EACA;EACA,UAAU;EACV,aAAa,YAAY;EAC1B"}
+{"version":3,"file":"virtualDiffLayout.js","names":[],"sources":["../../src/utils/virtualDiffLayout.ts"],"sourcesContent":["import type {\n  FileDiffMetadata,\n  HunkExpansionRegion,\n  HunkSeparators,\n  VirtualFileMetrics,\n} from '../types';\nimport { getDefaultHunkSeparatorHeight } from './computeVirtualFileMetrics';\n\nexport interface ExpandedRegionResult {\n  fromStart: number;\n  fromEnd: number;\n  rangeSize: number;\n  collapsedLines: number;\n  renderAll: boolean;\n}\n\nexport interface GetExpandedRegionProps {\n  isPartial: boolean;\n  rangeSize: number;\n  expandedHunks: Map<number, HunkExpansionRegion> | true | undefined;\n  hunkIndex: number;\n  collapsedContextThreshold: number;\n}\n\nexport interface GetTrailingContextRangeSizeProps {\n  fileDiff: FileDiffMetadata;\n  errorPrefix: string;\n}\n\nexport interface GetTrailingExpandedRegionProps extends GetTrailingContextRangeSizeProps {\n  hunkIndex: number;\n  expandedHunks: GetExpandedRegionProps['expandedHunks'];\n  collapsedContextThreshold: number;\n}\n\nexport interface HunkSeparatorLayout {\n  height: number;\n  gapBefore: number;\n  gapAfter: number;\n  totalHeight: number;\n}\n\ninterface HunkSeparatorBaseProps {\n  type: HunkSeparators;\n  metrics: VirtualFileMetrics;\n}\n\ninterface LeadingHunkSeparatorLayoutProps extends HunkSeparatorBaseProps {\n  hunkIndex: number;\n  hunkSpecs: string | undefined;\n}\n\n// Converts a collapsed unchanged range into the slices that should render near\n// the start and end of that range for the active hunk expansion state.\nexport function getExpandedRegion({\n  isPartial,\n  rangeSize,\n  expandedHunks,\n  hunkIndex,\n  collapsedContextThreshold,\n}: GetExpandedRegionProps): ExpandedRegionResult {\n  const normalizedRangeSize = Math.max(rangeSize, 0);\n  if (normalizedRangeSize === 0 || isPartial) {\n    return {\n      fromStart: 0,\n      fromEnd: 0,\n      rangeSize: normalizedRangeSize,\n      collapsedLines: normalizedRangeSize,\n      renderAll: false,\n    };\n  }\n\n  if (\n    expandedHunks === true ||\n    normalizedRangeSize <= collapsedContextThreshold\n  ) {\n    return {\n      fromStart: normalizedRangeSize,\n      fromEnd: 0,\n      rangeSize: normalizedRangeSize,\n      collapsedLines: 0,\n      renderAll: true,\n    };\n  }\n\n  const region = expandedHunks?.get(hunkIndex);\n  const fromStart = Math.min(\n    Math.max(region?.fromStart ?? 0, 0),\n    normalizedRangeSize\n  );\n  const fromEnd = Math.min(\n    Math.max(region?.fromEnd ?? 0, 0),\n    normalizedRangeSize\n  );\n  const expandedCount = fromStart + fromEnd;\n  const renderAll = expandedCount >= normalizedRangeSize;\n  return {\n    fromStart: renderAll ? normalizedRangeSize : fromStart,\n    fromEnd: renderAll ? 0 : fromEnd,\n    rangeSize: normalizedRangeSize,\n    collapsedLines: Math.max(normalizedRangeSize - expandedCount, 0),\n    renderAll,\n  };\n}\n\nexport function hasTrailingContext(fileDiff: FileDiffMetadata): boolean {\n  const lastHunk = fileDiff.hunks[fileDiff.hunks.length - 1];\n  if (\n    lastHunk == null ||\n    fileDiff.isPartial ||\n    fileDiff.additionLines.length === 0 ||\n    fileDiff.deletionLines.length === 0\n  ) {\n    return false;\n  }\n\n  const additionRemaining =\n    fileDiff.additionLines.length -\n    (lastHunk.additionLineIndex + lastHunk.additionCount);\n  const deletionRemaining =\n    fileDiff.deletionLines.length -\n    (lastHunk.deletionLineIndex + lastHunk.deletionCount);\n\n  return additionRemaining > 0 || deletionRemaining > 0;\n}\n\n// Returns true when trailing-context line counts disagree between sides.\nexport function hasTrailingContextMismatch(\n  fileDiff: FileDiffMetadata\n): boolean {\n  const lastHunk = fileDiff.hunks[fileDiff.hunks.length - 1];\n  if (\n    lastHunk == null ||\n    fileDiff.isPartial ||\n    fileDiff.additionLines.length === 0 ||\n    fileDiff.deletionLines.length === 0\n  ) {\n    return false;\n  }\n\n  const additionRemaining =\n    fileDiff.additionLines.length -\n    (lastHunk.additionLineIndex + lastHunk.additionCount);\n  const deletionRemaining =\n    fileDiff.deletionLines.length -\n    (lastHunk.deletionLineIndex + lastHunk.deletionCount);\n\n  if (additionRemaining <= 0 && deletionRemaining <= 0) {\n    return false;\n  }\n\n  return additionRemaining !== deletionRemaining;\n}\n\n// Measures the unchanged tail after the final hunk. Both sides must have the\n// same remaining length because trailing context represents paired lines.\nexport function getTrailingContextRangeSize({\n  fileDiff,\n  errorPrefix,\n}: GetTrailingContextRangeSizeProps): number {\n  const lastHunk = fileDiff.hunks[fileDiff.hunks.length - 1];\n  if (\n    lastHunk == null ||\n    fileDiff.isPartial ||\n    fileDiff.additionLines.length === 0 ||\n    fileDiff.deletionLines.length === 0\n  ) {\n    return 0;\n  }\n\n  const additionRemaining =\n    fileDiff.additionLines.length -\n    (lastHunk.additionLineIndex + lastHunk.additionCount);\n  const deletionRemaining =\n    fileDiff.deletionLines.length -\n    (lastHunk.deletionLineIndex + lastHunk.deletionCount);\n\n  if (additionRemaining <= 0 && deletionRemaining <= 0) {\n    return 0;\n  }\n\n  if (additionRemaining !== deletionRemaining) {\n    throw new Error(\n      `${errorPrefix}: trailing context mismatch (additions=${additionRemaining}, deletions=${deletionRemaining}) for ${fileDiff.name}`\n    );\n  }\n  return Math.min(additionRemaining, deletionRemaining);\n}\n\nexport function getTrailingExpandedRegion({\n  fileDiff,\n  hunkIndex,\n  expandedHunks,\n  collapsedContextThreshold,\n  errorPrefix,\n}: GetTrailingExpandedRegionProps): ExpandedRegionResult | undefined {\n  if (hunkIndex !== fileDiff.hunks.length - 1) {\n    return undefined;\n  }\n\n  const trailingRangeSize = getTrailingContextRangeSize({\n    fileDiff,\n    errorPrefix,\n  });\n  if (trailingRangeSize <= 0) {\n    return undefined;\n  }\n\n  if (\n    expandedHunks === true ||\n    trailingRangeSize <= collapsedContextThreshold\n  ) {\n    return {\n      fromStart: trailingRangeSize,\n      fromEnd: 0,\n      rangeSize: trailingRangeSize,\n      collapsedLines: 0,\n      renderAll: true,\n    };\n  }\n\n  // The final trailing separator only exposes upward partial expansion. Treat it\n  // as a bottom-only pseudo-hunk and ignore unsupported downward expansion.\n  const region = expandedHunks?.get(fileDiff.hunks.length);\n  const fromStart = Math.min(\n    Math.max(region?.fromStart ?? 0, 0),\n    trailingRangeSize\n  );\n  return {\n    fromStart,\n    fromEnd: 0,\n    rangeSize: trailingRangeSize,\n    collapsedLines: trailingRangeSize - fromStart,\n    renderAll: fromStart >= trailingRangeSize,\n  };\n}\n\nexport function getHunkSeparatorHeight({\n  type,\n  metrics,\n}: HunkSeparatorBaseProps): number {\n  return metrics.hunkSeparatorHeight ?? getDefaultHunkSeparatorHeight(type);\n}\n\nexport function getHunkSeparatorGap({\n  type,\n  metrics,\n}: HunkSeparatorBaseProps): number {\n  return type === 'simple' || type === 'metadata' || type === 'line-info-basic'\n    ? 0\n    : metrics.spacing;\n}\n\nexport function hasLeadingHunkSeparator({\n  type,\n  hunkIndex,\n  hunkSpecs,\n}: Omit<LeadingHunkSeparatorLayoutProps, 'metrics'>): boolean {\n  switch (type) {\n    case 'simple':\n      return hunkIndex > 0;\n    case 'metadata':\n      return hunkSpecs != null;\n    case 'line-info':\n    case 'line-info-basic':\n    case 'custom':\n      return true;\n  }\n}\n\nexport function hasTrailingHunkSeparator(type: HunkSeparators): boolean {\n  return type !== 'simple' && type !== 'metadata';\n}\n\n// Mirrors the renderer/CSS spacing rules for the separator shown before a hunk.\nexport function getLeadingHunkSeparatorLayout({\n  type,\n  metrics,\n  hunkIndex,\n  hunkSpecs,\n}: LeadingHunkSeparatorLayoutProps): HunkSeparatorLayout | undefined {\n  if (!hasLeadingHunkSeparator({ type, hunkIndex, hunkSpecs })) {\n    return undefined;\n  }\n\n  const height = getHunkSeparatorHeight({ type, metrics });\n  const gap = getHunkSeparatorGap({ type, metrics });\n  const gapBefore = hunkIndex > 0 ? gap : 0;\n  const gapAfter = gap;\n  return {\n    height,\n    gapBefore,\n    gapAfter,\n    totalHeight: gapBefore + height + gapAfter,\n  };\n}\n\n// Mirrors the renderer/CSS spacing rules for the separator shown after the last\n// hunk when trailing unchanged context is collapsed.\nexport function getTrailingHunkSeparatorLayout({\n  type,\n  metrics,\n}: HunkSeparatorBaseProps): HunkSeparatorLayout | undefined {\n  if (!hasTrailingHunkSeparator(type)) {\n    return undefined;\n  }\n\n  const height = getHunkSeparatorHeight({ type, metrics });\n  const gapBefore = getHunkSeparatorGap({ type, metrics });\n  return {\n    height,\n    gapBefore,\n    gapAfter: 0,\n    totalHeight: gapBefore + height,\n  };\n}\n"],"mappings":"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"}

package/dist/worker/WorkerPoolManager.js

@@ -92,7 +92,7 @@ var WorkerPoolManager = class {
 			this.queueBroadcastStateChanges();
 		}
 	}
-	async setRenderOptions({ theme = DEFAULT_THEMES, useTokenTransformer = false, lineDiffType = "word-alt", maxLineDiffLength = 1e3, tokenizeMaxLineLength = 1e3 }) {
+	async setRenderOptions({ theme = this.renderOptions.theme ?? DEFAULT_THEMES, useTokenTransformer = this.renderOptions.useTokenTransformer ?? false, lineDiffType = this.renderOptions.lineDiffType ?? "word-alt", maxLineDiffLength = this.renderOptions.maxLineDiffLength ?? 1e3, tokenizeMaxLineLength = this.renderOptions.tokenizeMaxLineLength ?? 1e3 }) {
 		const { lifecycleGeneration } = this;
 		const renderOptionsRequestVersion = ++this.renderOptionsRequestVersion;
 		const isCurrentRequest = () => this.isCurrentLifecycle(lifecycleGeneration) && this.renderOptionsRequestVersion === renderOptionsRequestVersion;