@pierre/diffs 1.2.12 → 1.3.0-beta.10

package/dist/utils/updateDiffHunks.js

@@ -0,0 +1,235 @@
+import { cleanLastNewline } from "./cleanLastNewline.js";
+import { parseDiffFromFile } from "./parseDiffFromFile.js";
+import { hasTrailingContextMismatch } from "./virtualDiffLayout.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
+	};
+}
+function buildTopAlignedAdditionSentinel(lineCount, deletionContents) {
+	const count = Math.max(lineCount, 1);
+	let sentinel = Array.from({ length: count }, (_, index) => `${" ".repeat(index + 1)}\n`).join("");
+	if (sentinel === deletionContents) sentinel = Array.from({ length: count }, (_, index) => `\u0000${" ".repeat(index)}\n`).join("");
+	return sentinel;
+}
+function hasOnlyBlankAdditionContents(additionLines) {
+	for (const line of additionLines) if (line.trim().length > 0) return false;
+	return true;
+}
+function shouldTopAlignAdditionRecompute(diff, additionLines) {
+	return additionLines.length > 0 && additionLines.length < diff.deletionLines.length && hasOnlyBlankAdditionContents(additionLines);
+}
+function recomputeTopAlignedAdditionDiff(diff, additionLines, parseDiffOptions) {
+	const deletionContents = diff.deletionLines.join("");
+	const additionSentinel = buildTopAlignedAdditionSentinel(additionLines.length, deletionContents);
+	const recomputed = parseDiffFromFile({
+		name: diff.prevName ?? diff.name,
+		contents: deletionContents
+	}, {
+		name: diff.name,
+		contents: additionSentinel,
+		lang: diff.lang
+	}, parseDiffOptions);
+	return {
+		hunks: recomputed.hunks,
+		splitLineCount: recomputed.splitLineCount,
+		unifiedLineCount: recomputed.unifiedLineCount,
+		additionLines,
+		deletionLines: recomputed.deletionLines,
+		type: recomputed.type
+	};
+}
+function recomputeEmptyDocumentDiff(diff, parseDiffOptions) {
+	return recomputeTopAlignedAdditionDiff(diff, [""], parseDiffOptions);
+}
+/** Rebuilds diff hunks after an edit, top-aligning sparse addition sides when needed. */
+function recomputeDiffHunksForEdit(diff, parseDiffOptions) {
+	if (diff.additionLines.length === 0) return recomputeEmptyDocumentDiff(diff, parseDiffOptions);
+	if (shouldTopAlignAdditionRecompute(diff, diff.additionLines)) return recomputeTopAlignedAdditionDiff(diff, diff.additionLines, parseDiffOptions);
+	const additionLines = diff.additionLines;
+	const recomputed = recomputeDiffHunks(diff, parseDiffOptions);
+	preserveTrailingEditorBlankLine(recomputed, additionLines);
+	return recomputed;
+}
+function hasTrailingEditorBlankLine(additionLines) {
+	return additionLines.length > 1 && additionLines.at(-1) === "";
+}
+function preserveTrailingEditorBlankLine(recomputed, additionLines) {
+	if (!hasTrailingEditorBlankLine(additionLines)) return;
+	const extraLineCount = additionLines.length - recomputed.additionLines.length;
+	if (extraLineCount <= 0) return;
+	const extraAdditionLineIndex = recomputed.additionLines.length;
+	const lastHunk = recomputed.hunks.at(-1);
+	if (lastHunk == null) return;
+	if (lastHunk.additionLineIndex + lastHunk.additionCount !== extraAdditionLineIndex) return;
+	for (const content of lastHunk.hunkContent) if (content.type === "change" && content.additions < content.deletions && content.additionLineIndex + content.additions === extraAdditionLineIndex) {
+		recomputed.additionLines = additionLines;
+		content.additions += extraLineCount;
+		lastHunk.additionCount += extraLineCount;
+		lastHunk.additionLines += extraLineCount;
+		recomputeDiffRenderLineCounts(recomputed);
+		return;
+	}
+}
+/** 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 { offsetHunkContent, preserveTrailingEditorBlankLine, recomputeDiffHunks, recomputeDiffHunksForEdit, recomputeDiffRenderLineCounts, recomputeEmptyDocumentDiff, recomputeHunkRenderLineCounts, recomputeTopAlignedAdditionDiff, shouldTopAlignAdditionRecompute, syncHunkNoEOFCRFromFullFile, 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// Builds placeholder addition contents that diff as one top-aligned change row per\n// line. Bare `\\\\n` sentinels align as context against the first deletion lines,\n// which pushes the real addition rows down in split view.\nfunction buildTopAlignedAdditionSentinel(\n  lineCount: number,\n  deletionContents: string\n): string {\n  const count = Math.max(lineCount, 1);\n  let sentinel = Array.from(\n    { length: count },\n    (_, index) => `${' '.repeat(index + 1)}\\n`\n  ).join('');\n  if (sentinel === deletionContents) {\n    sentinel = Array.from(\n      { length: count },\n      (_, index) => `\\u0000${' '.repeat(index)}\\n`\n    ).join('');\n  }\n  return sentinel;\n}\n\nfunction hasOnlyBlankAdditionContents(additionLines: string[]): boolean {\n  for (const line of additionLines) {\n    if (line.trim().length > 0) {\n      return false;\n    }\n  }\n  return true;\n}\n\n// After delete-all the editable side is blank and much shorter than the deletion\n// side. A normal recompute can still treat newline-only additions as context and\n// render the first editable row deep in split view instead of at the top.\nexport function shouldTopAlignAdditionRecompute(\n  diff: FileDiffMetadata,\n  additionLines: string[]\n): boolean {\n  return (\n    additionLines.length > 0 &&\n    additionLines.length < diff.deletionLines.length &&\n    hasOnlyBlankAdditionContents(additionLines)\n  );\n}\n\n// Rebuilds hunk metadata while keeping the editable addition rows top-aligned in\n// split view. The sentinel only shapes hunks; the caller's addition lines are\n// preserved so the editor document stays the source of truth.\nexport function recomputeTopAlignedAdditionDiff(\n  diff: FileDiffMetadata,\n  additionLines: string[],\n  parseDiffOptions?: CreatePatchOptionsNonabortable\n): FullDiffHunkUpdate {\n  const deletionContents = diff.deletionLines.join('');\n  const additionSentinel = buildTopAlignedAdditionSentinel(\n    additionLines.length,\n    deletionContents\n  );\n  const recomputed = parseDiffFromFile(\n    {\n      name: diff.prevName ?? diff.name,\n      contents: deletionContents,\n    },\n    {\n      name: diff.name,\n      contents: additionSentinel,\n      lang: diff.lang,\n    },\n    parseDiffOptions\n  );\n  return {\n    hunks: recomputed.hunks,\n    splitLineCount: recomputed.splitLineCount,\n    unifiedLineCount: recomputed.unifiedLineCount,\n    additionLines,\n    deletionLines: recomputed.deletionLines,\n    type: recomputed.type,\n  };\n}\n\n// Rebuilds hunk metadata when the editable side has been emptied of all text.\n//\n// The editor always keeps one (empty) line for an empty document, but an empty\n// string splits into zero addition lines, so a normal recompute produces a diff\n// with no addition rows at all. Rendering that leaves the attached editor with\n// no line element to host its caret.\nexport function recomputeEmptyDocumentDiff(\n  diff: FileDiffMetadata,\n  parseDiffOptions?: CreatePatchOptionsNonabortable\n): FullDiffHunkUpdate {\n  return recomputeTopAlignedAdditionDiff(diff, [''], parseDiffOptions);\n}\n\n/** Rebuilds diff hunks after an edit, top-aligning sparse addition sides when needed. */\nexport function recomputeDiffHunksForEdit(\n  diff: FileDiffMetadata,\n  parseDiffOptions?: CreatePatchOptionsNonabortable\n): FullDiffHunkUpdate {\n  if (diff.additionLines.length === 0) {\n    return recomputeEmptyDocumentDiff(diff, parseDiffOptions);\n  }\n  if (shouldTopAlignAdditionRecompute(diff, diff.additionLines)) {\n    return recomputeTopAlignedAdditionDiff(\n      diff,\n      diff.additionLines,\n      parseDiffOptions\n    );\n  }\n  const additionLines = diff.additionLines;\n  const recomputed = recomputeDiffHunks(diff, parseDiffOptions);\n  preserveTrailingEditorBlankLine(recomputed, additionLines);\n  return recomputed;\n}\n\nfunction hasTrailingEditorBlankLine(additionLines: string[]): boolean {\n  return additionLines.length > 1 && additionLines.at(-1) === '';\n}\n\n// Re-adds the editor's phantom trailing empty line (a document ending in a\n// newline exposes one extra empty line) as an addition row when the last\n// hunk's final change block can absorb it, so the caret keeps a rendered row.\nexport function preserveTrailingEditorBlankLine(\n  recomputed: Pick<\n    FullDiffHunkUpdate,\n    'hunks' | 'additionLines' | 'splitLineCount' | 'unifiedLineCount'\n  >,\n  additionLines: string[]\n): void {\n  if (!hasTrailingEditorBlankLine(additionLines)) {\n    return;\n  }\n  const extraLineCount = additionLines.length - recomputed.additionLines.length;\n  if (extraLineCount <= 0) {\n    return;\n  }\n  const extraAdditionLineIndex = recomputed.additionLines.length;\n\n  const lastHunk = recomputed.hunks.at(-1);\n  if (lastHunk == null) {\n    return;\n  }\n\n  const lastHunkAdditionEnd =\n    lastHunk.additionLineIndex + lastHunk.additionCount;\n  if (lastHunkAdditionEnd !== extraAdditionLineIndex) {\n    return;\n  }\n\n  for (const content of lastHunk.hunkContent) {\n    if (\n      content.type === 'change' &&\n      content.additions < content.deletions &&\n      content.additionLineIndex + content.additions === extraAdditionLineIndex\n    ) {\n      recomputed.additionLines = additionLines;\n      content.additions += extraLineCount;\n      lastHunk.additionCount += extraLineCount;\n      lastHunk.additionLines += extraLineCount;\n      recomputeDiffRenderLineCounts(recomputed);\n      return;\n    }\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\nexport function 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\nexport function 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\nexport function 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\nexport function recomputeDiffRenderLineCounts(\n  diff: Pick<\n    FileDiffMetadata,\n    'hunks' | 'splitLineCount' | 'unifiedLineCount' | 'additionLines'\n  >\n): 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":"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"}

package/dist/utils/virtualDiffLayout.d.ts

@@ -46,6 +46,7 @@ declare function getExpandedRegion({
   collapsedContextThreshold
 }: GetExpandedRegionProps): ExpandedRegionResult;
 declare function hasTrailingContext(fileDiff: FileDiffMetadata): boolean;
+declare function hasTrailingContextMismatch(fileDiff: FileDiffMetadata): boolean;
 declare function getTrailingContextRangeSize({
   fileDiff,
   errorPrefix
@@ -57,6 +58,44 @@ declare function getTrailingExpandedRegion({
   collapsedContextThreshold,
   errorPrefix
 }: GetTrailingExpandedRegionProps): ExpandedRegionResult | undefined;
+interface IsAdditionLineRenderableProps {
+  fileDiff: FileDiffMetadata;
+  /** One-based line number in the new file. */
+  lineNumber: number;
+  expandedHunks: Map<number, HunkExpansionRegion> | true | undefined;
+  collapsedContextThreshold: number;
+}
+/**
+ * Whether a one-based new-file line currently has (or will have on scroll) a
+ * rendered row under the given expansion state — the editor-facing
+ * visibility oracle. False only for lines hidden inside a collapsed
+ * unchanged region; lines outside the diff's modeled range report true so
+ * callers keep their existing missing-row handling. Computed from the same
+ * inputs as `iterateOverDiff` so layout math and the oracle cannot diverge.
+ */
+declare function isAdditionLineRenderable({
+  fileDiff,
+  lineNumber,
+  expandedHunks,
+  collapsedContextThreshold
+}: IsAdditionLineRenderableProps): boolean;
+interface GetNearestRenderableAdditionLineProps extends IsAdditionLineRenderableProps {
+  direction: 'up' | 'down';
+}
+/**
+ * The nearest renderable new-file line at or beyond `lineNumber` in the
+ * given direction (one-based), or undefined when every line that way is
+ * hidden inside collapsed regions. Sequential caret motion uses this to skip
+ * over collapsed regions like code folds; it walks the hunk metadata once
+ * instead of probing line by line across a gap.
+ */
+declare function getNearestRenderableAdditionLine({
+  fileDiff,
+  lineNumber,
+  direction,
+  expandedHunks,
+  collapsedContextThreshold
+}: GetNearestRenderableAdditionLineProps): number | undefined;
 declare function getHunkSeparatorHeight({
   type,
   metrics
@@ -82,5 +121,5 @@ declare function getTrailingHunkSeparatorLayout({
   metrics
 }: HunkSeparatorBaseProps): HunkSeparatorLayout | undefined;
 //#endregion
-export { ExpandedRegionResult, GetExpandedRegionProps, GetTrailingContextRangeSizeProps, GetTrailingExpandedRegionProps, HunkSeparatorLayout, getExpandedRegion, getHunkSeparatorGap, getHunkSeparatorHeight, getLeadingHunkSeparatorLayout, getTrailingContextRangeSize, getTrailingExpandedRegion, getTrailingHunkSeparatorLayout, hasLeadingHunkSeparator, hasTrailingContext, hasTrailingHunkSeparator };
+export { ExpandedRegionResult, GetExpandedRegionProps, GetNearestRenderableAdditionLineProps, GetTrailingContextRangeSizeProps, GetTrailingExpandedRegionProps, HunkSeparatorLayout, IsAdditionLineRenderableProps, getExpandedRegion, getHunkSeparatorGap, getHunkSeparatorHeight, getLeadingHunkSeparatorLayout, getNearestRenderableAdditionLine, getTrailingContextRangeSize, getTrailingExpandedRegion, getTrailingHunkSeparatorLayout, hasLeadingHunkSeparator, hasTrailingContext, hasTrailingContextMismatch, hasTrailingHunkSeparator, isAdditionLineRenderable };
 //# sourceMappingURL=virtualDiffLayout.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"virtualDiffLayout.d.ts","names":[],"sources":["../../src/utils/virtualDiffLayout.ts"],"mappings":";;;UAQiB,oBAAA;EACf,SAAA;EACA,OAAA;EACA,SAAA;EACA,cAAA;EACA,SAAA;AAAA;AAAA,UAGe,sBAAA;EACf,SAAA;EACA,SAAA;EACA,aAAA,EAAe,GAAG,SAAS,mBAAA;EAC3B,SAAA;EACA,yBAAA;AAAA;AAAA,UAGe,gCAAA;EACf,QAAA,EAAU,gBAAgB;EAC1B,WAAA;AAAA;AAAA,UAGe,8BAAA,SAAuC,gCAAgC;EACtF,SAAA;EACA,aAAA,EAAe,sBAAA;EACf,yBAAA;AAAA;AAAA,UAGe,mBAAA;EACf,MAAA;EACA,SAAA;EACA,QAAA;EACA,WAAA;AAAA;AAAA,UAGQ,sBAAA;EACR,IAAA,EAAM,cAAA;EACN,OAAA,EAAS,kBAAkB;AAAA;AAAA,UAGnB,+BAAA,SAAwC,sBAAsB;EACtE,SAAA;EACA,SAAA;AAAA;AAAA,iBAKc,iBAAA;EACd,SAAA;EACA,SAAA;EACA,aAAA;EACA,SAAA;EACA;AAAA,GACC,sBAAA,GAAyB,oBAAA;AAAA,iBA6CZ,kBAAA,CAAmB,QAA0B,EAAhB,gBAAgB;AAAA,iBAuB7C,2BAAA;EACd,QAAA;EACA;AAAA,GACC,gCAAA;AAAA,iBA8Ba,yBAAA;EACd,QAAA;EACA,SAAA;EACA,aAAA;EACA,yBAAA;EACA;AAAA,GACC,8BAAA,GAAiC,oBAAA;AAAA,iBA0CpB,sBAAA;EACd,IAAA;EACA;AAAA,GACC,sBAAA;AAAA,iBAIa,mBAAA;EACd,IAAA;EACA;AAAA,GACC,sBAAA;AAAA,iBAMa,uBAAA;EACd,IAAA;EACA,SAAA;EACA;AAAA,GACC,IAAA,CAAK,+BAAA;AAAA,iBAaQ,wBAAA,CAAyB,IAAoB,EAAd,cAAc;AAAA,iBAK7C,6BAAA;EACd,IAAA;EACA,OAAA;EACA,SAAA;EACA;AAAA,GACC,+BAAA,GAAkC,mBAAA;AAAA,iBAmBrB,8BAAA;EACd,IAAA;EACA;AAAA,GACC,sBAAA,GAAyB,mBAAA"}
+{"version":3,"file":"virtualDiffLayout.d.ts","names":[],"sources":["../../src/utils/virtualDiffLayout.ts"],"mappings":";;;UAQiB,oBAAA;EACf,SAAA;EACA,OAAA;EACA,SAAA;EACA,cAAA;EACA,SAAA;AAAA;AAAA,UAGe,sBAAA;EACf,SAAA;EACA,SAAA;EACA,aAAA,EAAe,GAAG,SAAS,mBAAA;EAC3B,SAAA;EACA,yBAAA;AAAA;AAAA,UAGe,gCAAA;EACf,QAAA,EAAU,gBAAgB;EAC1B,WAAA;AAAA;AAAA,UAGe,8BAAA,SAAuC,gCAAgC;EACtF,SAAA;EACA,aAAA,EAAe,sBAAA;EACf,yBAAA;AAAA;AAAA,UAGe,mBAAA;EACf,MAAA;EACA,SAAA;EACA,QAAA;EACA,WAAA;AAAA;AAAA,UAGQ,sBAAA;EACR,IAAA,EAAM,cAAA;EACN,OAAA,EAAS,kBAAkB;AAAA;AAAA,UAGnB,+BAAA,SAAwC,sBAAsB;EACtE,SAAA;EACA,SAAA;AAAA;AAAA,iBAKc,iBAAA;EACd,SAAA;EACA,SAAA;EACA,aAAA;EACA,SAAA;EACA;AAAA,GACC,sBAAA,GAAyB,oBAAA;AAAA,iBA6CZ,kBAAA,CAAmB,QAA0B,EAAhB,gBAAgB;AAAA,iBAsB7C,0BAAA,CACd,QAA0B,EAAhB,gBAAgB;AAAA,iBA4BZ,2BAAA;EACd,QAAA;EACA;AAAA,GACC,gCAAA;AAAA,iBA8Ba,yBAAA;EACd,QAAA;EACA,SAAA;EACA,aAAA;EACA,yBAAA;EACA;AAAA,GACC,8BAAA,GAAiC,oBAAA;AAAA,UA0CnB,6BAAA;EACf,QAAA,EAAU,gBAAA;EA9Me;EAgNzB,UAAA;EACA,aAAA,EAAe,GAAA,SAAY,mBAAA;EAC3B,yBAAA;AAAA;;;;;;;AA3MW;AACZ;iBAqNe,wBAAA;EACd,QAAA;EACA,UAAA;EACA,aAAA;EACA;AAAA,GACC,6BAAA;AAAA,UA8Cc,qCAAA,SAA8C,6BAA6B;EAC1F,SAAS;AAAA;;;;;AArQkB;AAAA;;iBA+Qb,gCAAA;EACd,QAAA;EACA,UAAA;EACA,SAAA;EACA,aAAA;EACA;AAAA,GACC,qCAAA;AAAA,iBAqEa,sBAAA;EACd,IAAA;EACA;AAAA,GACC,sBAAA;AAAA,iBAIa,mBAAA;EACd,IAAA;EACA;AAAA,GACC,sBAAA;AAAA,iBAMa,uBAAA;EACd,IAAA;EACA,SAAA;EACA;AAAA,GACC,IAAA,CAAK,+BAAA;AAAA,iBAaQ,wBAAA,CAAyB,IAAoB,EAAd,cAAc;AAAA,iBAK7C,6BAAA;EACd,IAAA;EACA,OAAA;EACA,SAAA;EACA;AAAA,GACC,+BAAA,GAAkC,mBAAA;AAAA,iBAmBrB,8BAAA;EACd,IAAA;EACA;AAAA,GACC,sBAAA,GAAyB,mBAAA"}

package/dist/utils/virtualDiffLayout.js

@@ -36,6 +36,14 @@ function hasTrailingContext(fileDiff) {
 	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;
@@ -69,6 +77,93 @@ function getTrailingExpandedRegion({ fileDiff, hunkIndex, expandedHunks, collaps
 		renderAll: fromStart >= trailingRangeSize
 	};
 }
+/**
+* Whether a one-based new-file line currently has (or will have on scroll) a
+* rendered row under the given expansion state — the editor-facing
+* visibility oracle. False only for lines hidden inside a collapsed
+* unchanged region; lines outside the diff's modeled range report true so
+* callers keep their existing missing-row handling. Computed from the same
+* inputs as `iterateOverDiff` so layout math and the oracle cannot diverge.
+*/
+function isAdditionLineRenderable({ fileDiff, lineNumber, expandedHunks, collapsedContextThreshold }) {
+	if (expandedHunks === true || fileDiff.isPartial) return true;
+	for (const [hunkIndex, hunk] of fileDiff.hunks.entries()) {
+		if (lineNumber < hunk.additionStart) {
+			const region = getExpandedRegion({
+				isPartial: fileDiff.isPartial,
+				rangeSize: hunk.collapsedBefore,
+				expandedHunks,
+				hunkIndex,
+				collapsedContextThreshold
+			});
+			const gapStart = hunk.additionStart - region.rangeSize;
+			return region.renderAll || lineNumber < gapStart + region.fromStart || lineNumber >= hunk.additionStart - region.fromEnd;
+		}
+		if (lineNumber < hunk.additionStart + hunk.additionCount) return true;
+	}
+	const trailingRegion = getTrailingExpandedRegion({
+		fileDiff,
+		hunkIndex: fileDiff.hunks.length - 1,
+		expandedHunks,
+		collapsedContextThreshold,
+		errorPrefix: "isAdditionLineRenderable"
+	});
+	if (trailingRegion == null || trailingRegion.renderAll) return true;
+	const lastHunk = fileDiff.hunks[fileDiff.hunks.length - 1];
+	const trailingStart = lastHunk.additionStart + lastHunk.additionCount;
+	return lineNumber < trailingStart + trailingRegion.fromStart || lineNumber >= trailingStart + trailingRegion.rangeSize;
+}
+/**
+* The nearest renderable new-file line at or beyond `lineNumber` in the
+* given direction (one-based), or undefined when every line that way is
+* hidden inside collapsed regions. Sequential caret motion uses this to skip
+* over collapsed regions like code folds; it walks the hunk metadata once
+* instead of probing line by line across a gap.
+*/
+function getNearestRenderableAdditionLine({ fileDiff, lineNumber, direction, expandedHunks, collapsedContextThreshold }) {
+	if (expandedHunks === true || fileDiff.isPartial) return lineNumber;
+	const ranges = [];
+	let modeledEnd = 1;
+	for (const [hunkIndex, hunk] of fileDiff.hunks.entries()) {
+		const region = getExpandedRegion({
+			isPartial: fileDiff.isPartial,
+			rangeSize: hunk.collapsedBefore,
+			expandedHunks,
+			hunkIndex,
+			collapsedContextThreshold
+		});
+		const gapStart = hunk.additionStart - region.rangeSize;
+		if (region.renderAll) ranges.push([gapStart, hunk.additionStart]);
+		else {
+			if (region.fromStart > 0) ranges.push([gapStart, gapStart + region.fromStart]);
+			if (region.fromEnd > 0) ranges.push([hunk.additionStart - region.fromEnd, hunk.additionStart]);
+		}
+		ranges.push([hunk.additionStart, hunk.additionStart + hunk.additionCount]);
+		modeledEnd = hunk.additionStart + hunk.additionCount;
+	}
+	const trailingRegion = getTrailingExpandedRegion({
+		fileDiff,
+		hunkIndex: fileDiff.hunks.length - 1,
+		expandedHunks,
+		collapsedContextThreshold,
+		errorPrefix: "getNearestRenderableAdditionLine"
+	});
+	if (trailingRegion != null) {
+		const trailingStart = modeledEnd;
+		modeledEnd = trailingStart + trailingRegion.rangeSize;
+		if (trailingRegion.renderAll) ranges.push([trailingStart, modeledEnd]);
+		else if (trailingRegion.fromStart > 0) ranges.push([trailingStart, trailingStart + trailingRegion.fromStart]);
+	}
+	if (lineNumber >= modeledEnd) return lineNumber;
+	if (direction === "down") {
+		for (const [start, end] of ranges) if (end > lineNumber) return Math.max(start, lineNumber);
+		return;
+	}
+	for (let index = ranges.length - 1; index >= 0; index--) {
+		const [start, end] = ranges[index];
+		if (start <= lineNumber) return Math.min(end - 1, lineNumber);
+	}
+}
 function getHunkSeparatorHeight({ type, metrics }) {
 	return metrics.hunkSeparatorHeight ?? getDefaultHunkSeparatorHeight(type);
 }
@@ -128,6 +223,6 @@ function getTrailingHunkSeparatorLayout({ type, metrics }) {
 	};
 }
 //#endregion
-export { getExpandedRegion, getHunkSeparatorGap, getHunkSeparatorHeight, getLeadingHunkSeparatorLayout, getTrailingContextRangeSize, getTrailingExpandedRegion, getTrailingHunkSeparatorLayout, hasLeadingHunkSeparator, hasTrailingContext, hasTrailingHunkSeparator };
+export { getExpandedRegion, getHunkSeparatorGap, getHunkSeparatorHeight, getLeadingHunkSeparatorLayout, getNearestRenderableAdditionLine, getTrailingContextRangeSize, getTrailingExpandedRegion, getTrailingHunkSeparatorLayout, hasLeadingHunkSeparator, hasTrailingContext, hasTrailingContextMismatch, hasTrailingHunkSeparator, isAdditionLineRenderable };
 
 //# 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  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// 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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"}
+{"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 interface IsAdditionLineRenderableProps {\n  fileDiff: FileDiffMetadata;\n  /** One-based line number in the new file. */\n  lineNumber: number;\n  expandedHunks: Map<number, HunkExpansionRegion> | true | undefined;\n  collapsedContextThreshold: number;\n}\n\n/**\n * Whether a one-based new-file line currently has (or will have on scroll) a\n * rendered row under the given expansion state — the editor-facing\n * visibility oracle. False only for lines hidden inside a collapsed\n * unchanged region; lines outside the diff's modeled range report true so\n * callers keep their existing missing-row handling. Computed from the same\n * inputs as `iterateOverDiff` so layout math and the oracle cannot diverge.\n */\nexport function isAdditionLineRenderable({\n  fileDiff,\n  lineNumber,\n  expandedHunks,\n  collapsedContextThreshold,\n}: IsAdditionLineRenderableProps): boolean {\n  if (expandedHunks === true || fileDiff.isPartial) {\n    return true;\n  }\n\n  for (const [hunkIndex, hunk] of fileDiff.hunks.entries()) {\n    if (lineNumber < hunk.additionStart) {\n      // Inside the collapsed gap before this hunk: renderable only within\n      // the expanded slices at the gap's edges.\n      const region = getExpandedRegion({\n        isPartial: fileDiff.isPartial,\n        rangeSize: hunk.collapsedBefore,\n        expandedHunks,\n        hunkIndex,\n        collapsedContextThreshold,\n      });\n      const gapStart = hunk.additionStart - region.rangeSize;\n      return (\n        region.renderAll ||\n        lineNumber < gapStart + region.fromStart ||\n        lineNumber >= hunk.additionStart - region.fromEnd\n      );\n    }\n    if (lineNumber < hunk.additionStart + hunk.additionCount) {\n      return true;\n    }\n  }\n\n  const trailingRegion = getTrailingExpandedRegion({\n    fileDiff,\n    hunkIndex: fileDiff.hunks.length - 1,\n    expandedHunks,\n    collapsedContextThreshold,\n    errorPrefix: 'isAdditionLineRenderable',\n  });\n  if (trailingRegion == null || trailingRegion.renderAll) {\n    return true;\n  }\n  const lastHunk = fileDiff.hunks[fileDiff.hunks.length - 1];\n  const trailingStart = lastHunk.additionStart + lastHunk.additionCount;\n  return (\n    lineNumber < trailingStart + trailingRegion.fromStart ||\n    lineNumber >= trailingStart + trailingRegion.rangeSize\n  );\n}\n\nexport interface GetNearestRenderableAdditionLineProps extends IsAdditionLineRenderableProps {\n  direction: 'up' | 'down';\n}\n\n/**\n * The nearest renderable new-file line at or beyond `lineNumber` in the\n * given direction (one-based), or undefined when every line that way is\n * hidden inside collapsed regions. Sequential caret motion uses this to skip\n * over collapsed regions like code folds; it walks the hunk metadata once\n * instead of probing line by line across a gap.\n */\nexport function getNearestRenderableAdditionLine({\n  fileDiff,\n  lineNumber,\n  direction,\n  expandedHunks,\n  collapsedContextThreshold,\n}: GetNearestRenderableAdditionLineProps): number | undefined {\n  if (expandedHunks === true || fileDiff.isPartial) {\n    return lineNumber;\n  }\n\n  // Renderable [start, end) line ranges in ascending order, plus the\n  // exclusive end of the modeled range — anything past it (the editor's\n  // phantom document-end line) counts as renderable.\n  const ranges: Array<[start: number, end: number]> = [];\n  let modeledEnd = 1;\n  for (const [hunkIndex, hunk] of fileDiff.hunks.entries()) {\n    const region = getExpandedRegion({\n      isPartial: fileDiff.isPartial,\n      rangeSize: hunk.collapsedBefore,\n      expandedHunks,\n      hunkIndex,\n      collapsedContextThreshold,\n    });\n    const gapStart = hunk.additionStart - region.rangeSize;\n    if (region.renderAll) {\n      ranges.push([gapStart, hunk.additionStart]);\n    } else {\n      if (region.fromStart > 0) {\n        ranges.push([gapStart, gapStart + region.fromStart]);\n      }\n      if (region.fromEnd > 0) {\n        ranges.push([hunk.additionStart - region.fromEnd, hunk.additionStart]);\n      }\n    }\n    ranges.push([hunk.additionStart, hunk.additionStart + hunk.additionCount]);\n    modeledEnd = hunk.additionStart + hunk.additionCount;\n  }\n  const trailingRegion = getTrailingExpandedRegion({\n    fileDiff,\n    hunkIndex: fileDiff.hunks.length - 1,\n    expandedHunks,\n    collapsedContextThreshold,\n    errorPrefix: 'getNearestRenderableAdditionLine',\n  });\n  if (trailingRegion != null) {\n    const trailingStart = modeledEnd;\n    modeledEnd = trailingStart + trailingRegion.rangeSize;\n    if (trailingRegion.renderAll) {\n      ranges.push([trailingStart, modeledEnd]);\n    } else if (trailingRegion.fromStart > 0) {\n      ranges.push([trailingStart, trailingStart + trailingRegion.fromStart]);\n    }\n  }\n\n  if (lineNumber >= modeledEnd) {\n    return lineNumber;\n  }\n  if (direction === 'down') {\n    for (const [start, end] of ranges) {\n      if (end > lineNumber) {\n        return Math.max(start, lineNumber);\n      }\n    }\n    return undefined;\n  }\n  for (let index = ranges.length - 1; index >= 0; index--) {\n    const [start, end] = ranges[index];\n    if (start <= lineNumber) {\n      return Math.min(end - 1, lineNumber);\n    }\n  }\n  return undefined;\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.d.ts

@@ -69,10 +69,12 @@ declare class WorkerPoolManager {
   private initializeWorkers;
   private drainQueue;
   highlightFileAST(instance: FileRendererInstance, file: FileContents): void;
-  primeFileHighlightCache(file: FileContents): void;
+  primeFileHighlightCache(file: FileContents): Promise<void>;
+  private getOrCreateFileHighlightCacheTask;
   getPlainFileAST(file: FileContents, startingLine: number, totalLines: number, lines?: string[]): ThemedFileResult | undefined;
   highlightDiffAST(instance: DiffRendererInstance, diff: FileDiffMetadata): void;
-  primeDiffHighlightCache(diff: FileDiffMetadata): void;
+  primeDiffHighlightCache(diff: FileDiffMetadata): Promise<void>;
+  private getOrCreateDiffHighlightCacheTask;
   getPlainDiffAST(diff: FileDiffMetadata, startingLine: number, totalLines: number, expandedHunks?: Map<number, HunkExpansionRegion> | true, collapsedContextThreshold?: number): ThemedDiffResult | undefined;
   terminate(): void;
   private isCurrentLifecycle;
@@ -102,6 +104,9 @@ declare class WorkerPoolManager {
   private detachInstanceFromRenderTask;
   private removeQueuedTask;
   private removeActiveTask;
+  private createRenderTaskCallbacks;
+  private resolveRenderTaskCallbacks;
+  private rejectRenderTaskCallbacks;
   private invalidateRenderTasks;
   private clearQueuedInstanceRequests;
   private clearHighlightKey;

package/dist/worker/WorkerPoolManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WorkerPoolManager.d.ts","names":[],"sources":["../../src/worker/WorkerPoolManager.ts"],"mappings":"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"}
+{"version":3,"file":"WorkerPoolManager.d.ts","names":[],"sources":["../../src/worker/WorkerPoolManager.ts"],"mappings":"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"}