@pierre/diffs 1.3.0-beta.9 → 1.3.0-rc.2

package/dist/utils/editSessionHunks.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"editSessionHunks.js","names":[],"sources":["../../src/utils/editSessionHunks.ts"],"sourcesContent":["import type { CreatePatchOptionsNonabortable } from 'diff';\n\nimport type {\n  ChangeContent,\n  ContextContent,\n  FileDiffMetadata,\n  Hunk,\n  HunkExpansionRegion,\n} from '../types';\nimport { getHunkSideStartBoundary } from './getHunkSideBoundaries';\nimport { parseDiffFromFile } from './parseDiffFromFile';\nimport {\n  offsetHunkContent,\n  preserveTrailingEditorBlankLine,\n  recomputeDiffHunksForEdit,\n  recomputeDiffRenderLineCounts,\n  recomputeHunkRenderLineCounts,\n  syncHunkNoEOFCRFromFullFile,\n} from './updateDiffHunks';\nimport {\n  getExpandedRegion,\n  getTrailingExpandedRegion,\n} from './virtualDiffLayout';\n\n// While an editor is attached to a FileDiff, each hunk is a persistent region\n// identified by its old-side range. Structural passes rebuild those regions\n// from one canonical old/current diff; a reverted region remains as context so\n// its rows keep rendering until the genuine session-exit recompute.\n\nexport interface DivergenceCore {\n  start: number;\n  deletionEnd: number;\n  additionEnd: number;\n}\n\ninterface PreviousRegionSpan {\n  firstIndex: number;\n  lastIndex: number;\n}\n\n/** Maps rebuilt regions back to the previous skeleton for expansion remapping. */\nexport interface SessionRegionChange {\n  regions: Array<PreviousRegionSpan | undefined>;\n}\n\ninterface RegionBounds {\n  additionStart: number;\n  additionEnd: number;\n  deletionStart: number;\n  deletionEnd: number;\n}\n\ninterface RegionPlan {\n  deletionStart: number;\n  deletionEnd: number;\n  blocks: ChangeContent[];\n  previousSpan: PreviousRegionSpan | undefined;\n}\n\nconst deletionLineSetCache = new WeakMap<\n  FileDiffMetadata,\n  { lines: string[]; set: Set<string> }\n>();\n\n/**\n * Drops the editor document's phantom trailing empty line (a document ending\n * in a newline exposes one extra empty line the parsed diff never contains)\n * so session line arrays compare like parse-derived ones.\n */\nexport function normalizeEditorLines(lines: string[]): string[] {\n  if (lines.length > 1 && lines[lines.length - 1] === '') {\n    return lines.slice(0, -1);\n  }\n  return lines;\n}\n\n/**\n * Find the complete old/current divergence core. The old side is immutable\n * during an edit session, so this result needs no prior-pass snapshot.\n */\nexport function findDivergenceCore(\n  deletionLines: string[],\n  additionLines: string[]\n): DivergenceCore | undefined {\n  const maxStart = Math.min(deletionLines.length, additionLines.length);\n  let start = 0;\n  while (start < maxStart && deletionLines[start] === additionLines[start]) {\n    start++;\n  }\n  let deletionEnd = deletionLines.length;\n  let additionEnd = additionLines.length;\n  while (\n    deletionEnd > start &&\n    additionEnd > start &&\n    deletionLines[deletionEnd - 1] === additionLines[additionEnd - 1]\n  ) {\n    deletionEnd--;\n    additionEnd--;\n  }\n  if (start === deletionEnd && start === additionEnd) {\n    return undefined;\n  }\n  return { start, deletionEnd, additionEnd };\n}\n\n/**\n * Rebuild the session skeleton as a pure function of the immutable old lines,\n * current new lines, and old-side ranges of the previous regions. One\n * canonical parse supplies the same change blocks that session exit will use.\n */\nexport function rebuildSessionHunks(\n  diff: FileDiffMetadata,\n  parseDiffOptions?: CreatePatchOptionsNonabortable\n): SessionRegionChange | undefined {\n  const previousHunks = diff.hunks;\n  const editorAdditionLines = diff.additionLines;\n  const canonicalAdditionLines = normalizeEditorLines(editorAdditionLines);\n  const canonicalDiff =\n    canonicalAdditionLines === editorAdditionLines\n      ? diff\n      : { ...diff, additionLines: canonicalAdditionLines };\n  const blocks = parseCanonicalChangeBlocks(canonicalDiff, parseDiffOptions);\n  const plans = buildRegionPlans(\n    previousHunks,\n    blocks,\n    diff.deletionLines.length\n  );\n\n  const nextHunks = buildRegionHunks(canonicalDiff, plans);\n  diff.additionLines = canonicalAdditionLines;\n  diff.hunks = nextHunks;\n  diff.editSessionDirty = true;\n  finalizeSessionHunks(diff);\n  preserveTrailingEditorBlankLine(diff, editorAdditionLines);\n  const layoutChanged = hasRegionOrSplitLayoutChanged(\n    previousHunks,\n    diff.hunks\n  );\n  if (!layoutChanged) {\n    return undefined;\n  }\n  return { regions: plans.map((plan) => plan.previousSpan) };\n}\n\n/**\n * Keep a cheap content-only path when a same-line-count pass cannot alter the\n * canonical blocks. Gap, ambiguous, or multi-region edits rebuild statelessly.\n */\nexport function applySessionChangedLines(\n  diff: FileDiffMetadata,\n  changedAdditionLineIndexes: Iterable<number>,\n  parseDiffOptions?: CreatePatchOptionsNonabortable,\n  previousAdditionLines?: ReadonlyMap<number, string>\n): SessionRegionChange | undefined {\n  const lines = Array.from(new Set(changedAdditionLineIndexes))\n    .filter((line) => line >= 0 && line < diff.additionLines.length)\n    .sort((a, b) => a - b);\n  if (lines.length === 0) {\n    return undefined;\n  }\n\n  const { hunks } = diff;\n  let regionIndex: number | undefined;\n  let hunkIndex = 0;\n  for (const line of lines) {\n    while (hunkIndex < hunks.length) {\n      const hunk = hunks[hunkIndex];\n      const start = getHunkAdditionStart(hunk);\n      if (line < start + hunk.additionCount) break;\n      hunkIndex++;\n    }\n    const hunk = hunks[hunkIndex];\n    const start = hunk == null ? undefined : getHunkAdditionStart(hunk);\n    if (\n      start == null ||\n      line < start ||\n      (regionIndex != null && regionIndex !== hunkIndex)\n    ) {\n      return rebuildSessionHunks(diff, parseDiffOptions);\n    }\n    regionIndex = hunkIndex;\n  }\n\n  if (regionIndex == null) {\n    return undefined;\n  }\n  if (\n    canRetainCanonicalBlocks(\n      diff,\n      lines,\n      regionIndex,\n      previousAdditionLines,\n      parseDiffOptions\n    )\n  ) {\n    diff.editSessionDirty = true;\n    return undefined;\n  }\n  return rebuildSessionHunks(diff, parseDiffOptions);\n}\n\n// Existing balanced change blocks remain canonical when every edited line was\n// unmatched before and stays unmatched now: the old/new equality matrix is\n// unchanged, and similarity realignment never reorders a balanced block.\nfunction canRetainCanonicalBlocks(\n  diff: FileDiffMetadata,\n  changedLines: number[],\n  regionIndex: number,\n  previousAdditionLines: ReadonlyMap<number, string> | undefined,\n  parseDiffOptions: CreatePatchOptionsNonabortable | undefined\n): boolean {\n  if (\n    previousAdditionLines == null ||\n    parseDiffOptions?.ignoreWhitespace === true ||\n    parseDiffOptions?.stripTrailingCr === true\n  ) {\n    return false;\n  }\n  const deletionLineSet = getDeletionLineSet(diff);\n  const hunk = diff.hunks[regionIndex];\n  if (hunk.hunkContent.some(isPureChange)) {\n    return false;\n  }\n  for (const line of changedLines) {\n    const previousLine = previousAdditionLines.get(line);\n    const additionLine = diff.additionLines[line];\n    if (\n      previousLine == null ||\n      additionLine == null ||\n      deletionLineSet.has(previousLine) ||\n      deletionLineSet.has(additionLine)\n    ) {\n      return false;\n    }\n    let insideBalancedChange = false;\n    for (const content of hunk.hunkContent) {\n      if (\n        content.type === 'change' &&\n        content.additions === content.deletions &&\n        line >= content.additionLineIndex &&\n        line < content.additionLineIndex + content.additions\n      ) {\n        insideBalancedChange = true;\n        break;\n      }\n    }\n    if (!insideBalancedChange) {\n      return false;\n    }\n  }\n  return true;\n}\n\nfunction getDeletionLineSet(diff: FileDiffMetadata): Set<string> {\n  const cached = deletionLineSetCache.get(diff);\n  if (cached?.lines === diff.deletionLines) {\n    return cached.set;\n  }\n  const set = new Set(diff.deletionLines);\n  deletionLineSetCache.set(diff, { lines: diff.deletionLines, set });\n  return set;\n}\n\nfunction isPureChange(\n  content: ContextContent | ChangeContent | undefined\n): boolean {\n  return (\n    content?.type === 'change' &&\n    (content.additions === 0 || content.deletions === 0)\n  );\n}\n\n/** Preserve expansion at the surviving outer edges of rebuilt old-side gaps. */\nexport function remapExpandedHunksForRegionChange(\n  expandedHunks: Map<number, HunkExpansionRegion>,\n  change: SessionRegionChange\n): Map<number, HunkExpansionRegion> {\n  const remapped = new Map<number, HunkExpansionRegion>();\n  const { regions } = change;\n  for (let key = 0; key <= regions.length; key++) {\n    const previous = regions[key - 1];\n    const next = regions[key];\n    const fromStartSource =\n      key === 0\n        ? expandedHunks.get(0)\n        : previous == null\n          ? undefined\n          : expandedHunks.get(previous.lastIndex + 1);\n    const fromEndSource =\n      next == null ? undefined : expandedHunks.get(next.firstIndex);\n    const fromStart = fromStartSource?.fromStart ?? 0;\n    const fromEnd = fromEndSource?.fromEnd ?? 0;\n    if (fromStart > 0 || fromEnd > 0) {\n      remapped.set(key, { fromStart, fromEnd });\n    }\n  }\n  return remapped;\n}\n\n/**\n * An expanded gap-edge slice in old-side (deletion-line) coordinates as a\n * `[start, end)` range. Old-side coordinates survive the exit recompute\n * unchanged — edits only touch the new side — so these anchor best-effort\n * expansion preservation across the recompute.\n */\nexport type ExpansionAnchorRange = [start: number, end: number];\n\n/** Snapshot the expanded gap-edge slices before the exit recompute. */\nexport function captureExpansionAnchors(\n  diff: FileDiffMetadata,\n  expandedHunks: Map<number, HunkExpansionRegion>,\n  collapsedContextThreshold: number\n): ExpansionAnchorRange[] {\n  const anchors: ExpansionAnchorRange[] = [];\n  if (diff.isPartial) {\n    return anchors;\n  }\n  for (const [hunkIndex, hunk] of diff.hunks.entries()) {\n    const region = getExpandedRegion({\n      isPartial: diff.isPartial,\n      rangeSize: hunk.collapsedBefore,\n      expandedHunks,\n      hunkIndex,\n      collapsedContextThreshold,\n    });\n    // Gaps at or below the threshold render on their own; only explicit\n    // expansion state needs preserving.\n    if (region.rangeSize <= collapsedContextThreshold) {\n      continue;\n    }\n    const gapEnd = getHunkDeletionStart(hunk);\n    const gapStart = gapEnd - region.rangeSize;\n    if (region.fromStart > 0) {\n      anchors.push([gapStart, gapStart + region.fromStart]);\n    }\n    if (region.fromEnd > 0) {\n      anchors.push([gapEnd - region.fromEnd, gapEnd]);\n    }\n  }\n  const trailingRegion = getTrailingExpandedRegion({\n    fileDiff: diff,\n    hunkIndex: diff.hunks.length - 1,\n    expandedHunks,\n    collapsedContextThreshold,\n    errorPrefix: 'captureExpansionAnchors',\n  });\n  if (\n    trailingRegion != null &&\n    trailingRegion.fromStart > 0 &&\n    trailingRegion.rangeSize > collapsedContextThreshold\n  ) {\n    const lastHunk = diff.hunks[diff.hunks.length - 1];\n    const gapStart = getHunkDeletionStart(lastHunk) + lastHunk.deletionCount;\n    anchors.push([gapStart, gapStart + trailingRegion.fromStart]);\n  }\n  return anchors;\n}\n\n/**\n * Rebuild gap expansion state against the recomputed hunks: for each new\n * gap, an anchor touching the gap's start edge restores `fromStart`, one\n * touching its end edge restores `fromEnd`, and anchors for gaps that no\n * longer exist drop.\n */\nexport function rebuildExpansionFromAnchors(\n  diff: FileDiffMetadata,\n  anchors: ExpansionAnchorRange[]\n): Map<number, HunkExpansionRegion> {\n  const rebuilt = new Map<number, HunkExpansionRegion>();\n  if (anchors.length === 0) {\n    return rebuilt;\n  }\n  const applyGap = (key: number, gapStart: number, gapEnd: number) => {\n    if (gapEnd <= gapStart) {\n      return;\n    }\n    let fromStart = 0;\n    let fromEnd = 0;\n    for (const [start, end] of anchors) {\n      if (end <= gapStart || start >= gapEnd) {\n        continue;\n      }\n      if (start <= gapStart) {\n        fromStart = Math.max(fromStart, Math.min(end, gapEnd) - gapStart);\n      }\n      if (end >= gapEnd) {\n        fromEnd = Math.max(fromEnd, gapEnd - Math.max(start, gapStart));\n      }\n    }\n    if (fromStart > 0 || fromEnd > 0) {\n      rebuilt.set(key, { fromStart, fromEnd });\n    }\n  };\n  for (const [hunkIndex, hunk] of diff.hunks.entries()) {\n    const gapEnd = getHunkDeletionStart(hunk);\n    applyGap(hunkIndex, gapEnd - Math.max(hunk.collapsedBefore, 0), gapEnd);\n  }\n  const lastHunk = diff.hunks[diff.hunks.length - 1];\n  if (lastHunk != null && !diff.isPartial && diff.deletionLines.length > 0) {\n    applyGap(\n      diff.hunks.length,\n      getHunkDeletionStart(lastHunk) + lastHunk.deletionCount,\n      diff.deletionLines.length\n    );\n  }\n  return rebuilt;\n}\n\n/**\n * Genuine session exit: when session passes reshaped the hunks, run the real\n * full recompute so exit state matches a non-session edit pipeline, and clear\n * the marker. Returns true when a recompute ran.\n */\nexport function finishEditSessionForDiff(\n  diff: FileDiffMetadata,\n  parseDiffOptions?: CreatePatchOptionsNonabortable\n): boolean {\n  if (diff.editSessionDirty !== true) {\n    return false;\n  }\n  diff.editSessionDirty = undefined;\n  Object.assign(diff, recomputeDiffHunksForEdit(diff, parseDiffOptions));\n  return true;\n}\n\n// Parse the complete old/current files once with the same context policy as\n// session exit. Equal boundary lines affect Myers tie-breaking, while parsed\n// context is required for the blank-run alignment post-pass; only canonical\n// change blocks are retained. Running cursors normalize unified N,0 indexes.\nfunction parseCanonicalChangeBlocks(\n  diff: FileDiffMetadata,\n  parseDiffOptions?: CreatePatchOptionsNonabortable\n): ChangeContent[] {\n  if (findDivergenceCore(diff.deletionLines, diff.additionLines) == null) {\n    return [];\n  }\n  const parsed = 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\n  const blocks: ChangeContent[] = [];\n  let coveredAdditions = 0;\n  let coveredDeletions = 0;\n  for (const hunk of parsed.hunks) {\n    const contextLines =\n      hunk.additionCount > 0\n        ? hunk.additionLineIndex - coveredAdditions\n        : hunk.deletionLineIndex - coveredDeletions;\n    coveredAdditions += contextLines;\n    coveredDeletions += contextLines;\n    for (const content of hunk.hunkContent) {\n      if (content.type === 'context') {\n        coveredAdditions += content.lines;\n        coveredDeletions += content.lines;\n        continue;\n      }\n      const block = offsetHunkContent(content, 0, 0) as ChangeContent;\n      if (block.additions === 0) {\n        block.additionLineIndex = coveredAdditions;\n      }\n      if (block.deletions === 0) {\n        block.deletionLineIndex = coveredDeletions;\n      }\n      blocks.push(block);\n      coveredAdditions += block.additions;\n      coveredDeletions += block.deletions;\n    }\n  }\n  return blocks;\n}\n\n// Co-walk canonical blocks and previous old-side regions. A block touching a\n// region grows it; touching several merges them; a block wholly in a gap gets\n// its own region. Pure insertions/deletions absorb one adjacent context line\n// when available so the region stays renderable on both sides and after undo.\nfunction buildRegionPlans(\n  previousHunks: Hunk[],\n  blocks: ChangeContent[],\n  deletionLineCount: number\n): RegionPlan[] {\n  const previousPlans = previousHunks.map((hunk, index): RegionPlan => {\n    const deletionStart = getHunkDeletionStart(hunk);\n    return {\n      deletionStart,\n      deletionEnd: deletionStart + hunk.deletionCount,\n      blocks: [],\n      previousSpan: { firstIndex: index, lastIndex: index },\n    };\n  });\n  const plans: RegionPlan[] = [];\n  let previousIndex = 0;\n\n  for (const block of blocks) {\n    const blockStart = block.deletionLineIndex;\n    const blockEnd = blockStart + block.deletions;\n    while (\n      previousIndex < previousPlans.length &&\n      previousPlans[previousIndex].deletionEnd < blockStart\n    ) {\n      plans.push(previousPlans[previousIndex]);\n      previousIndex++;\n    }\n\n    let plan =\n      plans.length > 0 &&\n      blockTouchesRegion(blockStart, blockEnd, plans[plans.length - 1])\n        ? plans.pop()\n        : undefined;\n    while (\n      previousIndex < previousPlans.length &&\n      previousPlans[previousIndex].deletionStart <= blockEnd\n    ) {\n      plan = mergeRegionPlans(plan, previousPlans[previousIndex]);\n      previousIndex++;\n    }\n\n    if (plan == null) {\n      let deletionStart = blockStart;\n      let deletionEnd = blockEnd;\n      if (\n        (block.deletions === 0 || block.additions === 0) &&\n        deletionLineCount > block.deletions\n      ) {\n        const previousEnd = plans[plans.length - 1]?.deletionEnd ?? 0;\n        const nextStart =\n          previousPlans[previousIndex]?.deletionStart ?? deletionLineCount;\n        if (blockStart > previousEnd) {\n          deletionStart--;\n        } else if (blockEnd < nextStart) {\n          deletionEnd++;\n        }\n      }\n      plan = {\n        deletionStart,\n        deletionEnd,\n        blocks: [],\n        previousSpan: undefined,\n      };\n    }\n    plan.deletionStart = Math.min(plan.deletionStart, blockStart);\n    plan.deletionEnd = Math.max(plan.deletionEnd, blockEnd);\n    plan.blocks.push(block);\n    plans.push(plan);\n  }\n\n  while (previousIndex < previousPlans.length) {\n    plans.push(previousPlans[previousIndex]);\n    previousIndex++;\n  }\n  return plans;\n}\n\nfunction blockTouchesRegion(\n  blockStart: number,\n  blockEnd: number,\n  region: RegionPlan\n): boolean {\n  return blockStart <= region.deletionEnd && blockEnd >= region.deletionStart;\n}\n\nfunction mergeRegionPlans(\n  target: RegionPlan | undefined,\n  source: RegionPlan\n): RegionPlan {\n  if (target == null) {\n    return source;\n  }\n  target.deletionStart = Math.min(target.deletionStart, source.deletionStart);\n  target.deletionEnd = Math.max(target.deletionEnd, source.deletionEnd);\n  target.blocks.push(...source.blocks);\n  if (source.previousSpan != null) {\n    target.previousSpan ??= { ...source.previousSpan };\n    target.previousSpan.firstIndex = Math.min(\n      target.previousSpan.firstIndex,\n      source.previousSpan.firstIndex\n    );\n    target.previousSpan.lastIndex = Math.max(\n      target.previousSpan.lastIndex,\n      source.previousSpan.lastIndex\n    );\n  }\n  return target;\n}\n\n// One paired-context walk constructs every region's new-side range. There is\n// no downstream coordinate shifting: each boundary is derived from the\n// canonical blocks that precede it.\nfunction buildRegionHunks(diff: FileDiffMetadata, plans: RegionPlan[]): Hunk[] {\n  const hunks: Hunk[] = [];\n  let deletionCursor = 0;\n  let additionCursor = 0;\n  for (const plan of plans) {\n    const contextBefore = plan.deletionStart - deletionCursor;\n    if (contextBefore < 0) {\n      throw new Error('buildRegionHunks: overlapping old-side regions');\n    }\n    deletionCursor += contextBefore;\n    additionCursor += contextBefore;\n    const additionStart = additionCursor;\n    const hunkContent: Array<ContextContent | ChangeContent> = [];\n\n    for (const canonicalBlock of plan.blocks) {\n      const deletionContext = canonicalBlock.deletionLineIndex - deletionCursor;\n      const additionContext = canonicalBlock.additionLineIndex - additionCursor;\n      if (deletionContext < 0 || deletionContext !== additionContext) {\n        throw new Error('buildRegionHunks: canonical block context mismatch');\n      }\n      pushContext(hunkContent, deletionContext, additionCursor, deletionCursor);\n      deletionCursor += deletionContext;\n      additionCursor += additionContext;\n      hunkContent.push({ ...canonicalBlock });\n      deletionCursor += canonicalBlock.deletions;\n      additionCursor += canonicalBlock.additions;\n    }\n\n    const trailingContext = plan.deletionEnd - deletionCursor;\n    if (trailingContext < 0) {\n      throw new Error('buildRegionHunks: block exceeds its old-side region');\n    }\n    pushContext(hunkContent, trailingContext, additionCursor, deletionCursor);\n    deletionCursor += trailingContext;\n    additionCursor += trailingContext;\n    hunks.push(\n      createRegionHunk(\n        diff,\n        {\n          additionStart,\n          additionEnd: additionCursor,\n          deletionStart: plan.deletionStart,\n          deletionEnd: plan.deletionEnd,\n        },\n        hunkContent\n      )\n    );\n  }\n\n  if (\n    diff.deletionLines.length - deletionCursor !==\n    diff.additionLines.length - additionCursor\n  ) {\n    throw new Error('buildRegionHunks: trailing context mismatch');\n  }\n  return hunks;\n}\n\nfunction createRegionHunk(\n  diff: FileDiffMetadata,\n  bounds: RegionBounds,\n  hunkContent: Array<ContextContent | ChangeContent>\n): Hunk {\n  const additionCount = bounds.additionEnd - bounds.additionStart;\n  const deletionCount = bounds.deletionEnd - bounds.deletionStart;\n  let additionLines = 0;\n  let deletionLines = 0;\n  for (const content of hunkContent) {\n    if (content.type === 'change') {\n      additionLines += content.additions;\n      deletionLines += content.deletions;\n    }\n  }\n  const hunk: Hunk = {\n    collapsedBefore: 0,\n    additionStart: getUnifiedStart(bounds.additionStart, additionCount),\n    additionCount,\n    additionLines,\n    additionLineIndex: getUnifiedLineIndex(bounds.additionStart, additionCount),\n    deletionStart: getUnifiedStart(bounds.deletionStart, deletionCount),\n    deletionCount,\n    deletionLines,\n    deletionLineIndex: getUnifiedLineIndex(bounds.deletionStart, deletionCount),\n    hunkContent,\n    hunkSpecs: `@@ -${getUnifiedStart(bounds.deletionStart, deletionCount)},${deletionCount} +${getUnifiedStart(bounds.additionStart, additionCount)},${additionCount} @@`,\n    splitLineStart: 0,\n    splitLineCount: 0,\n    unifiedLineStart: 0,\n    unifiedLineCount: 0,\n    noEOFCRAdditions: false,\n    noEOFCRDeletions: false,\n  };\n  recomputeHunkRenderLineCounts(hunk);\n  return hunk;\n}\n\nfunction pushContext(\n  hunkContent: Array<ContextContent | ChangeContent>,\n  lines: number,\n  additionLineIndex: number,\n  deletionLineIndex: number\n): void {\n  if (lines > 0) {\n    hunkContent.push({\n      type: 'context',\n      lines,\n      additionLineIndex,\n      deletionLineIndex,\n    });\n  }\n}\n\nfunction hasRegionOrSplitLayoutChanged(\n  previous: Hunk[],\n  next: Hunk[]\n): boolean {\n  if (previous.length !== next.length) {\n    return true;\n  }\n  for (let index = 0; index < previous.length; index++) {\n    const previousHunk = previous[index];\n    const nextHunk = next[index];\n    if (\n      getHunkDeletionStart(previousHunk) !== getHunkDeletionStart(nextHunk) ||\n      previousHunk.deletionCount !== nextHunk.deletionCount ||\n      getHunkAdditionStart(previousHunk) !== getHunkAdditionStart(nextHunk) ||\n      previousHunk.additionCount !== nextHunk.additionCount ||\n      previousHunk.splitLineCount !== nextHunk.splitLineCount ||\n      !haveSameSplitRowMapping(previousHunk, nextHunk)\n    ) {\n      return true;\n    }\n  }\n  return false;\n}\n\nfunction haveSameSplitRowMapping(previous: Hunk, next: Hunk): boolean {\n  const previousRows = iterateSplitRowMapping(previous);\n  const nextRows = iterateSplitRowMapping(next);\n  while (true) {\n    const previousRow = previousRows.next();\n    const nextRow = nextRows.next();\n    if (previousRow.done === true || nextRow.done === true) {\n      return previousRow.done === nextRow.done;\n    }\n    if (\n      previousRow.value[0] !== nextRow.value[0] ||\n      previousRow.value[1] !== nextRow.value[1]\n    ) {\n      return false;\n    }\n  }\n}\n\nfunction* iterateSplitRowMapping(\n  hunk: Hunk\n): Generator<\n  [deletionLine: number | undefined, additionLine: number | undefined]\n> {\n  for (const content of hunk.hunkContent) {\n    if (content.type === 'context') {\n      for (let offset = 0; offset < content.lines; offset++) {\n        yield [\n          content.deletionLineIndex + offset,\n          content.additionLineIndex + offset,\n        ];\n      }\n      continue;\n    }\n    const rowCount = Math.max(content.deletions, content.additions);\n    for (let offset = 0; offset < rowCount; offset++) {\n      yield [\n        offset < content.deletions\n          ? content.deletionLineIndex + offset\n          : undefined,\n        offset < content.additions\n          ? content.additionLineIndex + offset\n          : undefined,\n      ];\n    }\n  }\n}\n\nfunction getHunkAdditionStart(hunk: Hunk): number {\n  return getHunkSideStartBoundary(hunk.additionStart, hunk.additionCount);\n}\n\nfunction getHunkDeletionStart(hunk: Hunk): number {\n  return getHunkSideStartBoundary(hunk.deletionStart, hunk.deletionCount);\n}\n\nfunction getUnifiedStart(lineIndex: number, count: number): number {\n  return count === 0 ? lineIndex : lineIndex + 1;\n}\n\nfunction getUnifiedLineIndex(lineIndex: number, count: number): number {\n  return count === 0 ? lineIndex - 1 : lineIndex;\n}\n\nfunction finalizeSessionHunks(diff: FileDiffMetadata): void {\n  recomputeDiffRenderLineCounts(diff);\n  for (let index = 0; index < diff.hunks.length; index++) {\n    syncHunkNoEOFCRFromFullFile(diff, index);\n  }\n}\n"],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"getDiffHunksRendererOptions.d.ts","names":[],"sources":["../../src/utils/getDiffHunksRendererOptions.ts"],"mappings":";;;;iBAKgB,2BAAA,cACd,OAAA,EAAS,eAAA,CAAgB,WAAA,gBACxB,wBAAA"}
+{"version":3,"file":"getDiffHunksRendererOptions.d.ts","names":[],"sources":["../../src/utils/getDiffHunksRendererOptions.ts"],"mappings":";;;;iBAMgB,2BAAA,cACd,OAAA,EAAS,eAAA,CAAgB,WAAA,gBACxB,wBAAA"}

package/dist/utils/getDiffHunksRendererOptions.js

@@ -1,3 +1,4 @@
+import { shouldUseTokenTransformer } from "./shouldUseTokenTransformer.js";
 //#region src/utils/getDiffHunksRendererOptions.ts
 function getDiffHunksRendererOptions(options) {
 	return {
@@ -10,7 +11,7 @@ function getDiffHunksRendererOptions(options) {
 		stickyHeader: options?.stickyHeader,
 		preferredHighlighter: options?.preferredHighlighter,
 		useCSSClasses: options?.useCSSClasses,
-		useTokenTransformer: options?.useTokenTransformer,
+		useTokenTransformer: shouldUseTokenTransformer(options),
 		tokenizeMaxLineLength: options?.tokenizeMaxLineLength,
 		tokenizeMaxLength: options?.tokenizeMaxLength,
 		diffStyle: options?.diffStyle,

package/dist/utils/getDiffHunksRendererOptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"getDiffHunksRendererOptions.js","names":[],"sources":["../../src/utils/getDiffHunksRendererOptions.ts"],"sourcesContent":["import type { FileDiffOptions } from '../components/FileDiff';\nimport type { DiffHunksRendererOptions } from '../renderers/DiffHunksRenderer';\n\n// Build the renderer option snapshot with direct property reads. CodeView item\n// options may inherit prototype getters, so object spread can miss values.\nexport function getDiffHunksRendererOptions<LAnnotation>(\n  options: FileDiffOptions<LAnnotation> | undefined\n): DiffHunksRendererOptions {\n  return {\n    theme: options?.theme,\n    disableLineNumbers: options?.disableLineNumbers,\n    overflow: options?.overflow,\n    collapsed: options?.collapsed,\n    disableFileHeader: options?.disableFileHeader,\n    disableVirtualizationBuffers: options?.disableVirtualizationBuffers,\n    stickyHeader: options?.stickyHeader,\n    preferredHighlighter: options?.preferredHighlighter,\n    useCSSClasses: options?.useCSSClasses,\n    useTokenTransformer: options?.useTokenTransformer,\n    tokenizeMaxLineLength: options?.tokenizeMaxLineLength,\n    tokenizeMaxLength: options?.tokenizeMaxLength,\n    diffStyle: options?.diffStyle,\n    diffIndicators: options?.diffIndicators,\n    disableBackground: options?.disableBackground,\n    hunkSeparators:\n      typeof options?.hunkSeparators === 'function'\n        ? 'custom'\n        : options?.hunkSeparators,\n    expandUnchanged: options?.expandUnchanged,\n    loadDiffFiles: options?.loadDiffFiles,\n    collapsedContextThreshold: options?.collapsedContextThreshold,\n    lineDiffType: options?.lineDiffType,\n    maxLineDiffLength: options?.maxLineDiffLength,\n    expansionLineCount: options?.expansionLineCount,\n    headerRenderMode:\n      options?.renderCustomHeader != null ? 'custom' : 'default',\n  };\n}\n"],"mappings":";AAKA,SAAgB,4BACd,SAC0B;CAC1B,OAAO;EACL,OAAO,SAAS;EAChB,oBAAoB,SAAS;EAC7B,UAAU,SAAS;EACnB,WAAW,SAAS;EACpB,mBAAmB,SAAS;EAC5B,8BAA8B,SAAS;EACvC,cAAc,SAAS;EACvB,sBAAsB,SAAS;EAC/B,eAAe,SAAS;EACxB,qBAAqB,SAAS;EAC9B,uBAAuB,SAAS;EAChC,mBAAmB,SAAS;EAC5B,WAAW,SAAS;EACpB,gBAAgB,SAAS;EACzB,mBAAmB,SAAS;EAC5B,gBACE,OAAO,SAAS,mBAAmB,aAC/B,WACA,SAAS;EACf,iBAAiB,SAAS;EAC1B,eAAe,SAAS;EACxB,2BAA2B,SAAS;EACpC,cAAc,SAAS;EACvB,mBAAmB,SAAS;EAC5B,oBAAoB,SAAS;EAC7B,kBACE,SAAS,sBAAsB,OAAO,WAAW;CACrD;AACF"}
+{"version":3,"file":"getDiffHunksRendererOptions.js","names":[],"sources":["../../src/utils/getDiffHunksRendererOptions.ts"],"sourcesContent":["import type { FileDiffOptions } from '../components/FileDiff';\nimport type { DiffHunksRendererOptions } from '../renderers/DiffHunksRenderer';\nimport { shouldUseTokenTransformer } from './shouldUseTokenTransformer';\n\n// Build the renderer option snapshot with direct property reads. CodeView item\n// options may inherit prototype getters, so object spread can miss values.\nexport function getDiffHunksRendererOptions<LAnnotation>(\n  options: FileDiffOptions<LAnnotation> | undefined\n): DiffHunksRendererOptions {\n  return {\n    theme: options?.theme,\n    disableLineNumbers: options?.disableLineNumbers,\n    overflow: options?.overflow,\n    collapsed: options?.collapsed,\n    disableFileHeader: options?.disableFileHeader,\n    disableVirtualizationBuffers: options?.disableVirtualizationBuffers,\n    stickyHeader: options?.stickyHeader,\n    preferredHighlighter: options?.preferredHighlighter,\n    useCSSClasses: options?.useCSSClasses,\n    useTokenTransformer: shouldUseTokenTransformer<'diff'>(options),\n    tokenizeMaxLineLength: options?.tokenizeMaxLineLength,\n    tokenizeMaxLength: options?.tokenizeMaxLength,\n    diffStyle: options?.diffStyle,\n    diffIndicators: options?.diffIndicators,\n    disableBackground: options?.disableBackground,\n    hunkSeparators:\n      typeof options?.hunkSeparators === 'function'\n        ? 'custom'\n        : options?.hunkSeparators,\n    expandUnchanged: options?.expandUnchanged,\n    loadDiffFiles: options?.loadDiffFiles,\n    collapsedContextThreshold: options?.collapsedContextThreshold,\n    lineDiffType: options?.lineDiffType,\n    maxLineDiffLength: options?.maxLineDiffLength,\n    expansionLineCount: options?.expansionLineCount,\n    headerRenderMode:\n      options?.renderCustomHeader != null ? 'custom' : 'default',\n  };\n}\n"],"mappings":";;AAMA,SAAgB,4BACd,SAC0B;CAC1B,OAAO;EACL,OAAO,SAAS;EAChB,oBAAoB,SAAS;EAC7B,UAAU,SAAS;EACnB,WAAW,SAAS;EACpB,mBAAmB,SAAS;EAC5B,8BAA8B,SAAS;EACvC,cAAc,SAAS;EACvB,sBAAsB,SAAS;EAC/B,eAAe,SAAS;EACxB,qBAAqB,0BAAkC,OAAO;EAC9D,uBAAuB,SAAS;EAChC,mBAAmB,SAAS;EAC5B,WAAW,SAAS;EACpB,gBAAgB,SAAS;EACzB,mBAAmB,SAAS;EAC5B,gBACE,OAAO,SAAS,mBAAmB,aAC/B,WACA,SAAS;EACf,iBAAiB,SAAS;EAC1B,eAAe,SAAS;EACxB,2BAA2B,SAAS;EACpC,cAAc,SAAS;EACvB,mBAAmB,SAAS;EAC5B,oBAAoB,SAAS;EAC7B,kBACE,SAAS,sBAAsB,OAAO,WAAW;CACrD;AACF"}

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

@@ -1 +1 @@
-{"version":3,"file":"getFileRendererOptions.d.ts","names":[],"sources":["../../src/utils/getFileRendererOptions.ts"],"mappings":";;;;iBAKgB,sBAAA,cACd,OAAA,EAAS,WAAA,CAAY,WAAA,gBACpB,mBAAA"}
+{"version":3,"file":"getFileRendererOptions.d.ts","names":[],"sources":["../../src/utils/getFileRendererOptions.ts"],"mappings":";;;;iBAMgB,sBAAA,cACd,OAAA,EAAS,WAAA,CAAY,WAAA,gBACpB,mBAAA"}

package/dist/utils/getFileRendererOptions.js

@@ -1,3 +1,4 @@
+import { shouldUseTokenTransformer } from "./shouldUseTokenTransformer.js";
 //#region src/utils/getFileRendererOptions.ts
 function getFileRendererOptions(options) {
 	return {
@@ -11,7 +12,7 @@ function getFileRendererOptions(options) {
 		stickyHeader: options?.stickyHeader,
 		preferredHighlighter: options?.preferredHighlighter,
 		useCSSClasses: options?.useCSSClasses,
-		useTokenTransformer: options?.useTokenTransformer,
+		useTokenTransformer: shouldUseTokenTransformer(options),
 		tokenizeMaxLineLength: options?.tokenizeMaxLineLength,
 		tokenizeMaxLength: options?.tokenizeMaxLength,
 		unsafeCSS: options?.unsafeCSS,

package/dist/utils/getFileRendererOptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"getFileRendererOptions.js","names":[],"sources":["../../src/utils/getFileRendererOptions.ts"],"sourcesContent":["import type { FileOptions } from '../components/File';\nimport type { FileRendererOptions } from '../renderers/FileRenderer';\n\n// Build the renderer option snapshot with direct property reads. CodeView item\n// options may inherit prototype getters, so object spread can miss values.\nexport function getFileRendererOptions<LAnnotation>(\n  options: FileOptions<LAnnotation> | undefined\n): FileRendererOptions {\n  return {\n    theme: options?.theme,\n    disableLineNumbers: options?.disableLineNumbers,\n    overflow: options?.overflow,\n    themeType: options?.themeType,\n    collapsed: options?.collapsed,\n    disableFileHeader: options?.disableFileHeader,\n    disableVirtualizationBuffers: options?.disableVirtualizationBuffers,\n    stickyHeader: options?.stickyHeader,\n    preferredHighlighter: options?.preferredHighlighter,\n    useCSSClasses: options?.useCSSClasses,\n    useTokenTransformer: options?.useTokenTransformer,\n    tokenizeMaxLineLength: options?.tokenizeMaxLineLength,\n    tokenizeMaxLength: options?.tokenizeMaxLength,\n    unsafeCSS: options?.unsafeCSS,\n    headerRenderMode:\n      options?.renderCustomHeader != null ? 'custom' : 'default',\n  };\n}\n"],"mappings":";AAKA,SAAgB,uBACd,SACqB;CACrB,OAAO;EACL,OAAO,SAAS;EAChB,oBAAoB,SAAS;EAC7B,UAAU,SAAS;EACnB,WAAW,SAAS;EACpB,WAAW,SAAS;EACpB,mBAAmB,SAAS;EAC5B,8BAA8B,SAAS;EACvC,cAAc,SAAS;EACvB,sBAAsB,SAAS;EAC/B,eAAe,SAAS;EACxB,qBAAqB,SAAS;EAC9B,uBAAuB,SAAS;EAChC,mBAAmB,SAAS;EAC5B,WAAW,SAAS;EACpB,kBACE,SAAS,sBAAsB,OAAO,WAAW;CACrD;AACF"}
+{"version":3,"file":"getFileRendererOptions.js","names":[],"sources":["../../src/utils/getFileRendererOptions.ts"],"sourcesContent":["import type { FileOptions } from '../components/File';\nimport type { FileRendererOptions } from '../renderers/FileRenderer';\nimport { shouldUseTokenTransformer } from './shouldUseTokenTransformer';\n\n// Build the renderer option snapshot with direct property reads. CodeView item\n// options may inherit prototype getters, so object spread can miss values.\nexport function getFileRendererOptions<LAnnotation>(\n  options: FileOptions<LAnnotation> | undefined\n): FileRendererOptions {\n  return {\n    theme: options?.theme,\n    disableLineNumbers: options?.disableLineNumbers,\n    overflow: options?.overflow,\n    themeType: options?.themeType,\n    collapsed: options?.collapsed,\n    disableFileHeader: options?.disableFileHeader,\n    disableVirtualizationBuffers: options?.disableVirtualizationBuffers,\n    stickyHeader: options?.stickyHeader,\n    preferredHighlighter: options?.preferredHighlighter,\n    useCSSClasses: options?.useCSSClasses,\n    useTokenTransformer: shouldUseTokenTransformer(options),\n    tokenizeMaxLineLength: options?.tokenizeMaxLineLength,\n    tokenizeMaxLength: options?.tokenizeMaxLength,\n    unsafeCSS: options?.unsafeCSS,\n    headerRenderMode:\n      options?.renderCustomHeader != null ? 'custom' : 'default',\n  };\n}\n"],"mappings":";;AAMA,SAAgB,uBACd,SACqB;CACrB,OAAO;EACL,OAAO,SAAS;EAChB,oBAAoB,SAAS;EAC7B,UAAU,SAAS;EACnB,WAAW,SAAS;EACpB,WAAW,SAAS;EACpB,mBAAmB,SAAS;EAC5B,8BAA8B,SAAS;EACvC,cAAc,SAAS;EACvB,sBAAsB,SAAS;EAC/B,eAAe,SAAS;EACxB,qBAAqB,0BAA0B,OAAO;EACtD,uBAAuB,SAAS;EAChC,mBAAmB,SAAS;EAC5B,WAAW,SAAS;EACpB,kBACE,SAAS,sBAAsB,OAAO,WAAW;CACrD;AACF"}

package/dist/utils/getHunkSideBoundaries.d.ts

@@ -0,0 +1,7 @@
+//#region src/utils/getHunkSideBoundaries.d.ts
+/** Converts a unified hunk side's start/count into its consumed-file range. */
+declare function getHunkSideStartBoundary(start: number, count: number): number;
+declare function getHunkSideEndBoundary(start: number, count: number): number;
+//#endregion
+export { getHunkSideEndBoundary, getHunkSideStartBoundary };
+//# sourceMappingURL=getHunkSideBoundaries.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"getHunkSideBoundaries.d.ts","names":[],"sources":["../../src/utils/getHunkSideBoundaries.ts"],"mappings":";;iBACgB,wBAAA,CAAyB,KAAA,UAAe,KAAa;AAAA,iBAIrD,sBAAA,CAAuB,KAAA,UAAe,KAAa"}

package/dist/utils/getHunkSideBoundaries.js

@@ -0,0 +1,12 @@
+//#region src/utils/getHunkSideBoundaries.ts
+/** Converts a unified hunk side's start/count into its consumed-file range. */
+function getHunkSideStartBoundary(start, count) {
+	return start - (count === 0 ? 0 : 1);
+}
+function getHunkSideEndBoundary(start, count) {
+	return getHunkSideStartBoundary(start, count) + count;
+}
+//#endregion
+export { getHunkSideEndBoundary, getHunkSideStartBoundary };
+
+//# sourceMappingURL=getHunkSideBoundaries.js.map

package/dist/utils/getHunkSideBoundaries.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getHunkSideBoundaries.js","names":[],"sources":["../../src/utils/getHunkSideBoundaries.ts"],"sourcesContent":["/** Converts a unified hunk side's start/count into its consumed-file range. */\nexport function getHunkSideStartBoundary(start: number, count: number): number {\n  return start - (count === 0 ? 0 : 1);\n}\n\nexport function getHunkSideEndBoundary(start: number, count: number): number {\n  return getHunkSideStartBoundary(start, count) + count;\n}\n"],"mappings":";;AACA,SAAgB,yBAAyB,OAAe,OAAuB;CAC7E,OAAO,SAAS,UAAU,IAAI,IAAI;AACpC;AAEA,SAAgB,uBAAuB,OAAe,OAAuB;CAC3E,OAAO,yBAAyB,OAAO,KAAK,IAAI;AAClD"}

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

@@ -1 +1 @@
-{"version":3,"file":"getTotalLineCountFromHunks.d.ts","names":[],"sources":["../../src/utils/getTotalLineCountFromHunks.ts"],"mappings":";;;iBAEgB,0BAAA,CAA2B,KAAa,EAAN,IAAI"}
+{"version":3,"file":"getTotalLineCountFromHunks.d.ts","names":[],"sources":["../../src/utils/getTotalLineCountFromHunks.ts"],"mappings":";;;iBAGgB,0BAAA,CAA2B,KAAa,EAAN,IAAI"}

package/dist/utils/getTotalLineCountFromHunks.js

@@ -1,8 +1,9 @@
+import { getHunkSideEndBoundary } from "./getHunkSideBoundaries.js";
 //#region src/utils/getTotalLineCountFromHunks.ts
 function getTotalLineCountFromHunks(hunks) {
 	const lastHunk = hunks.at(-1);
 	if (lastHunk == null) return 0;
-	return Math.max(lastHunk.additionStart + lastHunk.additionCount, lastHunk.deletionStart + lastHunk.deletionCount);
+	return Math.max(getHunkSideEndBoundary(lastHunk.additionStart, lastHunk.additionCount), getHunkSideEndBoundary(lastHunk.deletionStart, lastHunk.deletionCount));
 }
 //#endregion
 export { getTotalLineCountFromHunks };

package/dist/utils/getTotalLineCountFromHunks.js.map

@@ -1 +1 @@
-{"version":3,"file":"getTotalLineCountFromHunks.js","names":[],"sources":["../../src/utils/getTotalLineCountFromHunks.ts"],"sourcesContent":["import type { Hunk } from '../types';\n\nexport function getTotalLineCountFromHunks(hunks: Hunk[]): number {\n  const lastHunk = hunks.at(-1);\n  if (lastHunk == null) {\n    return 0;\n  }\n  return Math.max(\n    lastHunk.additionStart + lastHunk.additionCount,\n    lastHunk.deletionStart + lastHunk.deletionCount\n  );\n}\n"],"mappings":";AAEA,SAAgB,2BAA2B,OAAuB;CAChE,MAAM,WAAW,MAAM,GAAG,EAAE;CAC5B,IAAI,YAAY,MACd,OAAO;CAET,OAAO,KAAK,IACV,SAAS,gBAAgB,SAAS,eAClC,SAAS,gBAAgB,SAAS,aACpC;AACF"}
+{"version":3,"file":"getTotalLineCountFromHunks.js","names":[],"sources":["../../src/utils/getTotalLineCountFromHunks.ts"],"sourcesContent":["import type { Hunk } from '../types';\nimport { getHunkSideEndBoundary } from './getHunkSideBoundaries';\n\nexport function getTotalLineCountFromHunks(hunks: Hunk[]): number {\n  const lastHunk = hunks.at(-1);\n  if (lastHunk == null) {\n    return 0;\n  }\n  return Math.max(\n    getHunkSideEndBoundary(lastHunk.additionStart, lastHunk.additionCount),\n    getHunkSideEndBoundary(lastHunk.deletionStart, lastHunk.deletionCount)\n  );\n}\n"],"mappings":";;AAGA,SAAgB,2BAA2B,OAAuB;CAChE,MAAM,WAAW,MAAM,GAAG,EAAE;CAC5B,IAAI,YAAY,MACd,OAAO;CAET,OAAO,KAAK,IACV,uBAAuB,SAAS,eAAe,SAAS,aAAa,GACrE,uBAAuB,SAAS,eAAe,SAAS,aAAa,CACvE;AACF"}

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

@@ -1 +1 @@
-{"version":3,"file":"hydratePartialDiff.d.ts","names":[],"sources":["../../src/utils/hydratePartialDiff.ts"],"mappings":";;;;;AAkBA;iBAAgB,kBAAA,CACd,IAAA,qBACA,QAAA,EAAU,gBAAA,EACV,KAAA,EAAO,mBAAA,GACN,gBAAA"}
+{"version":3,"file":"hydratePartialDiff.d.ts","names":[],"sources":["../../src/utils/hydratePartialDiff.ts"],"mappings":";;;;;AAsBA;iBAAgB,kBAAA,CACd,IAAA,qBACA,QAAA,EAAU,gBAAA,EACV,KAAA,EAAO,mBAAA,GACN,gBAAA"}

package/dist/utils/hydratePartialDiff.js

@@ -1,3 +1,4 @@
+import { getHunkSideEndBoundary, getHunkSideStartBoundary } from "./getHunkSideBoundaries.js";
 import { cloneFileDiffMetadata } from "./cloneFileDiffMetadata.js";
 import { splitFileContents } from "./splitFileContents.js";
 //#region src/utils/hydratePartialDiff.ts
@@ -76,7 +77,7 @@ function hydrateHunks(hunks, totalAdditionLines) {
 			hunkSplitLineCount += Math.max(content.additions, content.deletions);
 			hunkUnifiedLineCount += content.additions + content.deletions;
 		}
-		const collapsedBefore = Math.max(hunk.additionStart - 1 - lastHunkAdditionEnd, 0);
+		const collapsedBefore = Math.max(getHunkSideStartBoundary(hunk.additionStart, hunk.additionCount) - lastHunkAdditionEnd, 0);
 		hydratedHunks.push({
 			...hunk,
 			collapsedBefore,
@@ -92,11 +93,11 @@ function hydrateHunks(hunks, totalAdditionLines) {
 		});
 		splitLineCount += collapsedBefore + hunkSplitLineCount;
 		unifiedLineCount += collapsedBefore + hunkUnifiedLineCount;
-		lastHunkAdditionEnd = hunk.additionStart + hunk.additionCount - 1;
+		lastHunkAdditionEnd = getHunkSideEndBoundary(hunk.additionStart, hunk.additionCount);
 	}
 	if (hydratedHunks.length > 0) {
 		const lastHunk = hydratedHunks[hydratedHunks.length - 1];
-		const lastHunkEnd = Math.max(lastHunk.additionStart + lastHunk.additionCount - 1, 0);
+		const lastHunkEnd = getHunkSideEndBoundary(lastHunk.additionStart, lastHunk.additionCount);
 		const collapsedAfter = Math.max(totalAdditionLines - lastHunkEnd, 0);
 		splitLineCount += collapsedAfter;
 		unifiedLineCount += collapsedAfter;

package/dist/utils/hydratePartialDiff.js.map

@@ -1 +1 @@
-{"version":3,"file":"hydratePartialDiff.js","names":[],"sources":["../../src/utils/hydratePartialDiff.ts"],"sourcesContent":["import type {\n  FileContents,\n  FileDiffLoadedFiles,\n  FileDiffMetadata,\n  Hunk,\n} from '../types';\nimport { cloneFileDiffMetadata } from './cloneFileDiffMetadata';\nimport { splitFileContents } from './splitFileContents';\n\ninterface HydratedHunksResult {\n  hunks: Hunk[];\n  splitLineCount: number;\n  unifiedLineCount: number;\n}\n\n/**\n * Hydrates a partial diff in place with full file line arrays.\n */\nexport function hydratePartialDiff(\n  type: 'clone' | 'merge',\n  fileDiff: FileDiffMetadata,\n  files: FileDiffLoadedFiles\n): FileDiffMetadata {\n  const targetFileDiff =\n    type === 'clone' ? cloneFileDiffMetadata(fileDiff) : fileDiff;\n\n  if (!targetFileDiff.isPartial) {\n    throw new Error('hydratePartialDiff: fileDiff must be partial');\n  }\n\n  switch (targetFileDiff.type) {\n    case 'change':\n    case 'rename-changed': {\n      const oldFile = requireOldFile(targetFileDiff, files);\n      const newFile = requireNewFile(targetFileDiff, files);\n      return hydrateTwoSidedFileDiff(targetFileDiff, oldFile, newFile);\n    }\n    case 'rename-pure': {\n      const newFile = requireNewFile(targetFileDiff, files);\n      requireMissingOldFile(targetFileDiff, files);\n      const lines = splitFileContents(newFile.contents);\n      targetFileDiff.isPartial = false;\n      targetFileDiff.deletionLines = lines;\n      targetFileDiff.additionLines = lines;\n      setHydratedCacheKey(targetFileDiff, null, newFile);\n      return targetFileDiff;\n    }\n  }\n  throw new Error(\n    `hydratePartialDiff: ${targetFileDiff.type} diffs cannot be hydrated from loaded files`\n  );\n}\n\nfunction hydrateTwoSidedFileDiff(\n  fileDiff: FileDiffMetadata,\n  oldFile: FileContents,\n  newFile: FileContents\n): FileDiffMetadata {\n  const deletionLines = splitFileContents(oldFile.contents);\n  const additionLines = splitFileContents(newFile.contents);\n  const { hunks, splitLineCount, unifiedLineCount } = hydrateHunks(\n    fileDiff.hunks,\n    additionLines.length\n  );\n\n  fileDiff.hunks = hunks;\n  fileDiff.splitLineCount = splitLineCount;\n  fileDiff.unifiedLineCount = unifiedLineCount;\n  fileDiff.isPartial = false;\n  fileDiff.deletionLines = deletionLines;\n  fileDiff.additionLines = additionLines;\n  setHydratedCacheKey(fileDiff, oldFile, newFile);\n  return fileDiff;\n}\n\nfunction hydrateHunks(\n  hunks: Hunk[],\n  totalAdditionLines: number\n): HydratedHunksResult {\n  let splitLineCount = 0;\n  let unifiedLineCount = 0;\n  let lastHunkAdditionEnd = 0;\n\n  const hydratedHunks: Hunk[] = [];\n\n  for (const hunk of hunks) {\n    const additionLineIndex = Math.max(hunk.additionStart - 1, 0);\n    const deletionLineIndex = Math.max(hunk.deletionStart - 1, 0);\n    let contentAdditionLineIndex = additionLineIndex;\n    let contentDeletionLineIndex = deletionLineIndex;\n    let hunkAdditionLines = 0;\n    let hunkDeletionLines = 0;\n    let hunkSplitLineCount = 0;\n    let hunkUnifiedLineCount = 0;\n    const hunkContent: Hunk['hunkContent'] = [];\n\n    for (const content of hunk.hunkContent) {\n      if (content.type === 'context') {\n        hunkContent.push({\n          ...content,\n          additionLineIndex: contentAdditionLineIndex,\n          deletionLineIndex: contentDeletionLineIndex,\n        });\n        contentAdditionLineIndex += content.lines;\n        contentDeletionLineIndex += content.lines;\n        hunkSplitLineCount += content.lines;\n        hunkUnifiedLineCount += content.lines;\n        continue;\n      }\n\n      hunkContent.push({\n        ...content,\n        additionLineIndex: contentAdditionLineIndex,\n        deletionLineIndex: contentDeletionLineIndex,\n      });\n      contentAdditionLineIndex += content.additions;\n      contentDeletionLineIndex += content.deletions;\n      hunkAdditionLines += content.additions;\n      hunkDeletionLines += content.deletions;\n      hunkSplitLineCount += Math.max(content.additions, content.deletions);\n      hunkUnifiedLineCount += content.additions + content.deletions;\n    }\n\n    const collapsedBefore = Math.max(\n      hunk.additionStart - 1 - lastHunkAdditionEnd,\n      0\n    );\n    hydratedHunks.push({\n      ...hunk,\n      collapsedBefore,\n      additionLineIndex,\n      deletionLineIndex,\n      additionLines: hunkAdditionLines,\n      deletionLines: hunkDeletionLines,\n      hunkContent,\n      splitLineStart: splitLineCount + collapsedBefore,\n      unifiedLineStart: unifiedLineCount + collapsedBefore,\n      splitLineCount: hunkSplitLineCount,\n      unifiedLineCount: hunkUnifiedLineCount,\n    });\n\n    splitLineCount += collapsedBefore + hunkSplitLineCount;\n    unifiedLineCount += collapsedBefore + hunkUnifiedLineCount;\n    lastHunkAdditionEnd = hunk.additionStart + hunk.additionCount - 1;\n  }\n\n  if (hydratedHunks.length > 0) {\n    const lastHunk = hydratedHunks[hydratedHunks.length - 1];\n    const lastHunkEnd = Math.max(\n      lastHunk.additionStart + lastHunk.additionCount - 1,\n      0\n    );\n    const collapsedAfter = Math.max(totalAdditionLines - lastHunkEnd, 0);\n    splitLineCount += collapsedAfter;\n    unifiedLineCount += collapsedAfter;\n  }\n\n  return { hunks: hydratedHunks, splitLineCount, unifiedLineCount };\n}\n\nfunction requireOldFile(\n  fileDiff: FileDiffMetadata,\n  files: FileDiffLoadedFiles\n): FileContents {\n  if (files.oldFile == null) {\n    throw new Error(\n      `hydratePartialDiff: ${fileDiff.type} diff for ${fileDiff.name} requires oldFile`\n    );\n  }\n  return files.oldFile;\n}\n\nfunction requireNewFile(\n  fileDiff: FileDiffMetadata,\n  files: FileDiffLoadedFiles\n): FileContents {\n  if (files.newFile == null) {\n    throw new Error(\n      `hydratePartialDiff: ${fileDiff.type} diff for ${fileDiff.name} requires newFile`\n    );\n  }\n  return files.newFile;\n}\n\nfunction requireMissingOldFile(\n  fileDiff: FileDiffMetadata,\n  files: FileDiffLoadedFiles\n): void {\n  if (files.oldFile !== null) {\n    throw new Error(\n      `hydratePartialDiff: ${fileDiff.type} diff for ${fileDiff.name} requires oldFile to be null`\n    );\n  }\n}\n\nfunction getHydratedCacheKey(\n  fileDiff: FileDiffMetadata,\n  oldFile: FileContents | null,\n  newFile: FileContents | null\n): string | undefined {\n  if (fileDiff.cacheKey != null) {\n    return `${fileDiff.cacheKey}:hydrated`;\n  }\n  return getLoadedFileCacheKey(oldFile, newFile);\n}\n\nfunction setHydratedCacheKey(\n  fileDiff: FileDiffMetadata,\n  oldFile: FileContents | null,\n  newFile: FileContents | null\n): void {\n  const cacheKey = getHydratedCacheKey(fileDiff, oldFile, newFile);\n  if (cacheKey == null) {\n    delete fileDiff.cacheKey;\n    return;\n  }\n  fileDiff.cacheKey = cacheKey;\n}\n\nfunction getLoadedFileCacheKey(\n  oldFile: FileContents | null,\n  newFile: FileContents | null\n): string | undefined {\n  if (oldFile != null && newFile != null) {\n    return oldFile.cacheKey != null && newFile.cacheKey != null\n      ? `${oldFile.cacheKey}:${newFile.cacheKey}`\n      : undefined;\n  }\n  return oldFile?.cacheKey ?? newFile?.cacheKey;\n}\n"],"mappings":"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"}
+{"version":3,"file":"hydratePartialDiff.js","names":[],"sources":["../../src/utils/hydratePartialDiff.ts"],"sourcesContent":["import type {\n  FileContents,\n  FileDiffLoadedFiles,\n  FileDiffMetadata,\n  Hunk,\n} from '../types';\nimport { cloneFileDiffMetadata } from './cloneFileDiffMetadata';\nimport {\n  getHunkSideEndBoundary,\n  getHunkSideStartBoundary,\n} from './getHunkSideBoundaries';\nimport { splitFileContents } from './splitFileContents';\n\ninterface HydratedHunksResult {\n  hunks: Hunk[];\n  splitLineCount: number;\n  unifiedLineCount: number;\n}\n\n/**\n * Hydrates a partial diff in place with full file line arrays.\n */\nexport function hydratePartialDiff(\n  type: 'clone' | 'merge',\n  fileDiff: FileDiffMetadata,\n  files: FileDiffLoadedFiles\n): FileDiffMetadata {\n  const targetFileDiff =\n    type === 'clone' ? cloneFileDiffMetadata(fileDiff) : fileDiff;\n\n  if (!targetFileDiff.isPartial) {\n    throw new Error('hydratePartialDiff: fileDiff must be partial');\n  }\n\n  switch (targetFileDiff.type) {\n    case 'change':\n    case 'rename-changed': {\n      const oldFile = requireOldFile(targetFileDiff, files);\n      const newFile = requireNewFile(targetFileDiff, files);\n      return hydrateTwoSidedFileDiff(targetFileDiff, oldFile, newFile);\n    }\n    case 'rename-pure': {\n      const newFile = requireNewFile(targetFileDiff, files);\n      requireMissingOldFile(targetFileDiff, files);\n      const lines = splitFileContents(newFile.contents);\n      targetFileDiff.isPartial = false;\n      targetFileDiff.deletionLines = lines;\n      targetFileDiff.additionLines = lines;\n      setHydratedCacheKey(targetFileDiff, null, newFile);\n      return targetFileDiff;\n    }\n  }\n  throw new Error(\n    `hydratePartialDiff: ${targetFileDiff.type} diffs cannot be hydrated from loaded files`\n  );\n}\n\nfunction hydrateTwoSidedFileDiff(\n  fileDiff: FileDiffMetadata,\n  oldFile: FileContents,\n  newFile: FileContents\n): FileDiffMetadata {\n  const deletionLines = splitFileContents(oldFile.contents);\n  const additionLines = splitFileContents(newFile.contents);\n  const { hunks, splitLineCount, unifiedLineCount } = hydrateHunks(\n    fileDiff.hunks,\n    additionLines.length\n  );\n\n  fileDiff.hunks = hunks;\n  fileDiff.splitLineCount = splitLineCount;\n  fileDiff.unifiedLineCount = unifiedLineCount;\n  fileDiff.isPartial = false;\n  fileDiff.deletionLines = deletionLines;\n  fileDiff.additionLines = additionLines;\n  setHydratedCacheKey(fileDiff, oldFile, newFile);\n  return fileDiff;\n}\n\nfunction hydrateHunks(\n  hunks: Hunk[],\n  totalAdditionLines: number\n): HydratedHunksResult {\n  let splitLineCount = 0;\n  let unifiedLineCount = 0;\n  let lastHunkAdditionEnd = 0;\n\n  const hydratedHunks: Hunk[] = [];\n\n  for (const hunk of hunks) {\n    const additionLineIndex = Math.max(hunk.additionStart - 1, 0);\n    const deletionLineIndex = Math.max(hunk.deletionStart - 1, 0);\n    let contentAdditionLineIndex = additionLineIndex;\n    let contentDeletionLineIndex = deletionLineIndex;\n    let hunkAdditionLines = 0;\n    let hunkDeletionLines = 0;\n    let hunkSplitLineCount = 0;\n    let hunkUnifiedLineCount = 0;\n    const hunkContent: Hunk['hunkContent'] = [];\n\n    for (const content of hunk.hunkContent) {\n      if (content.type === 'context') {\n        hunkContent.push({\n          ...content,\n          additionLineIndex: contentAdditionLineIndex,\n          deletionLineIndex: contentDeletionLineIndex,\n        });\n        contentAdditionLineIndex += content.lines;\n        contentDeletionLineIndex += content.lines;\n        hunkSplitLineCount += content.lines;\n        hunkUnifiedLineCount += content.lines;\n        continue;\n      }\n\n      hunkContent.push({\n        ...content,\n        additionLineIndex: contentAdditionLineIndex,\n        deletionLineIndex: contentDeletionLineIndex,\n      });\n      contentAdditionLineIndex += content.additions;\n      contentDeletionLineIndex += content.deletions;\n      hunkAdditionLines += content.additions;\n      hunkDeletionLines += content.deletions;\n      hunkSplitLineCount += Math.max(content.additions, content.deletions);\n      hunkUnifiedLineCount += content.additions + content.deletions;\n    }\n\n    const collapsedBefore = Math.max(\n      getHunkSideStartBoundary(hunk.additionStart, hunk.additionCount) -\n        lastHunkAdditionEnd,\n      0\n    );\n    hydratedHunks.push({\n      ...hunk,\n      collapsedBefore,\n      additionLineIndex,\n      deletionLineIndex,\n      additionLines: hunkAdditionLines,\n      deletionLines: hunkDeletionLines,\n      hunkContent,\n      splitLineStart: splitLineCount + collapsedBefore,\n      unifiedLineStart: unifiedLineCount + collapsedBefore,\n      splitLineCount: hunkSplitLineCount,\n      unifiedLineCount: hunkUnifiedLineCount,\n    });\n\n    splitLineCount += collapsedBefore + hunkSplitLineCount;\n    unifiedLineCount += collapsedBefore + hunkUnifiedLineCount;\n    lastHunkAdditionEnd = getHunkSideEndBoundary(\n      hunk.additionStart,\n      hunk.additionCount\n    );\n  }\n\n  if (hydratedHunks.length > 0) {\n    const lastHunk = hydratedHunks[hydratedHunks.length - 1];\n    const lastHunkEnd = getHunkSideEndBoundary(\n      lastHunk.additionStart,\n      lastHunk.additionCount\n    );\n    const collapsedAfter = Math.max(totalAdditionLines - lastHunkEnd, 0);\n    splitLineCount += collapsedAfter;\n    unifiedLineCount += collapsedAfter;\n  }\n\n  return { hunks: hydratedHunks, splitLineCount, unifiedLineCount };\n}\n\nfunction requireOldFile(\n  fileDiff: FileDiffMetadata,\n  files: FileDiffLoadedFiles\n): FileContents {\n  if (files.oldFile == null) {\n    throw new Error(\n      `hydratePartialDiff: ${fileDiff.type} diff for ${fileDiff.name} requires oldFile`\n    );\n  }\n  return files.oldFile;\n}\n\nfunction requireNewFile(\n  fileDiff: FileDiffMetadata,\n  files: FileDiffLoadedFiles\n): FileContents {\n  if (files.newFile == null) {\n    throw new Error(\n      `hydratePartialDiff: ${fileDiff.type} diff for ${fileDiff.name} requires newFile`\n    );\n  }\n  return files.newFile;\n}\n\nfunction requireMissingOldFile(\n  fileDiff: FileDiffMetadata,\n  files: FileDiffLoadedFiles\n): void {\n  if (files.oldFile !== null) {\n    throw new Error(\n      `hydratePartialDiff: ${fileDiff.type} diff for ${fileDiff.name} requires oldFile to be null`\n    );\n  }\n}\n\nfunction getHydratedCacheKey(\n  fileDiff: FileDiffMetadata,\n  oldFile: FileContents | null,\n  newFile: FileContents | null\n): string | undefined {\n  if (fileDiff.cacheKey != null) {\n    return `${fileDiff.cacheKey}:hydrated`;\n  }\n  return getLoadedFileCacheKey(oldFile, newFile);\n}\n\nfunction setHydratedCacheKey(\n  fileDiff: FileDiffMetadata,\n  oldFile: FileContents | null,\n  newFile: FileContents | null\n): void {\n  const cacheKey = getHydratedCacheKey(fileDiff, oldFile, newFile);\n  if (cacheKey == null) {\n    delete fileDiff.cacheKey;\n    return;\n  }\n  fileDiff.cacheKey = cacheKey;\n}\n\nfunction getLoadedFileCacheKey(\n  oldFile: FileContents | null,\n  newFile: FileContents | null\n): string | undefined {\n  if (oldFile != null && newFile != null) {\n    return oldFile.cacheKey != null && newFile.cacheKey != null\n      ? `${oldFile.cacheKey}:${newFile.cacheKey}`\n      : undefined;\n  }\n  return oldFile?.cacheKey ?? newFile?.cacheKey;\n}\n"],"mappings":"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"}

package/dist/utils/isGutterUtilityPath.d.ts

@@ -0,0 +1,5 @@
+//#region src/utils/isGutterUtilityPath.d.ts
+declare function isGutterUtilityPath(path: readonly (EventTarget | undefined)[]): boolean;
+//#endregion
+export { isGutterUtilityPath };
+//# sourceMappingURL=isGutterUtilityPath.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"isGutterUtilityPath.d.ts","names":[],"sources":["../../src/utils/isGutterUtilityPath.ts"],"mappings":";iBAEgB,mBAAA,CACd,IAA0C,YAA1B,WAAW"}

package/dist/utils/isGutterUtilityPath.js

@@ -0,0 +1,12 @@
+//#region src/utils/isGutterUtilityPath.ts
+function isGutterUtilityPath(path) {
+	for (const element of path) {
+		if (!(element instanceof HTMLElement)) continue;
+		if (element.hasAttribute("data-utility-button") || element.hasAttribute("data-gutter-utility-slot") || element.getAttribute("slot") === "gutter-utility-slot" || element.getAttribute("name") === "gutter-utility-slot") return true;
+	}
+	return false;
+}
+//#endregion
+export { isGutterUtilityPath };
+
+//# sourceMappingURL=isGutterUtilityPath.js.map

package/dist/utils/isGutterUtilityPath.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"isGutterUtilityPath.js","names":[],"sources":["../../src/utils/isGutterUtilityPath.ts"],"sourcesContent":["// Recognize both the built-in utility button and custom content assigned to the\n// gutter utility slot so other pointer handlers leave the gesture untouched.\nexport function isGutterUtilityPath(\n  path: readonly (EventTarget | undefined)[]\n): boolean {\n  for (const element of path) {\n    if (!(element instanceof HTMLElement)) {\n      continue;\n    }\n    if (\n      element.hasAttribute('data-utility-button') ||\n      element.hasAttribute('data-gutter-utility-slot') ||\n      element.getAttribute('slot') === 'gutter-utility-slot' ||\n      element.getAttribute('name') === 'gutter-utility-slot'\n    ) {\n      return true;\n    }\n  }\n  return false;\n}\n"],"mappings":";AAEA,SAAgB,oBACd,MACS;CACT,KAAK,MAAM,WAAW,MAAM;EAC1B,IAAI,EAAE,mBAAmB,cACvB;EAEF,IACE,QAAQ,aAAa,qBAAqB,KAC1C,QAAQ,aAAa,0BAA0B,KAC/C,QAAQ,aAAa,MAAM,MAAM,yBACjC,QAAQ,aAAa,MAAM,MAAM,uBAEjC,OAAO;CAEX;CACA,OAAO;AACT"}

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

@@ -1 +1 @@
-{"version":3,"file":"iterateOverDiff.d.ts","names":[],"sources":["../../src/utils/iterateOverDiff.ts"],"mappings":";;;UAYiB,gBAAA;EACf,gBAAA;EACA,cAAA;EACA,SAAA;EACA,UAAA;EACA,OAAA;AAAA;AAAA,UAGe,oBAAA;EACf,SAAA;EACA,IAAA,EAAM,IAAI;EACV,eAAA;EACA,cAAA;AAAA;AAAA,UAGQ,6BAAA,SAAsC,oBAAA;EAC9C,IAAA;EACA,YAAA,EAAc,gBAAA;EACd,YAAA,EAAc,gBAAA;AAAA;AAAA,UAGN,8BAAA,SAAuC,oBAAoB;EACnE,IAAA;EACA,YAAA,EAAc,gBAAA;EACd,YAAA;AAAA;AAAA,UAGQ,8BAAA,SAAuC,oBAAoB;EACnE,IAAA;EACA,YAAA;EACA,YAAA,EAAc,gBAAA;AAAA;AAAA,KAGJ,qBAAA,GACR,6BAAA,GACA,8BAAA,GACA,8BAAA;AAAA,KAEC,SAAA;AAAA,KAgDO,gBAAA,IAAoB,KAA4B,EAArB,qBAAqB;AAAA,UAE3C,oBAAA;EACf,IAAA,EAAM,gBAAA;EACN,SAAA,EAAW,SAAA;EACX,YAAA;EACA,UAAA;EACA,aAAA,GAAgB,GAAA,SAAY,mBAAA;EAC5B,yBAAA;EACA,QAAA,EAAU,gBAAA;AAAA;AAAA,iBAGI,eAAA;EACd,IAAA;EACA,SAAA;EACA,YAAA;EACA,UAAA;EACA,aAAA;EACA,yBAAA;EACA;AAAA,GACC,oBAAA"}
+{"version":3,"file":"iterateOverDiff.d.ts","names":[],"sources":["../../src/utils/iterateOverDiff.ts"],"mappings":";;;UAaiB,gBAAA;EACf,gBAAA;EACA,cAAA;EACA,SAAA;EACA,UAAA;EACA,OAAA;AAAA;AAAA,UAGe,oBAAA;EACf,SAAA;EACA,IAAA,EAAM,IAAI;EACV,eAAA;EACA,cAAA;AAAA;AAAA,UAGQ,6BAAA,SAAsC,oBAAA;EAC9C,IAAA;EACA,YAAA,EAAc,gBAAA;EACd,YAAA,EAAc,gBAAA;AAAA;AAAA,UAGN,8BAAA,SAAuC,oBAAoB;EACnE,IAAA;EACA,YAAA,EAAc,gBAAA;EACd,YAAA;AAAA;AAAA,UAGQ,8BAAA,SAAuC,oBAAoB;EACnE,IAAA;EACA,YAAA;EACA,YAAA,EAAc,gBAAA;AAAA;AAAA,KAGJ,qBAAA,GACR,6BAAA,GACA,8BAAA,GACA,8BAAA;AAAA,KAEC,SAAA;AAAA,KAgDO,gBAAA,IAAoB,KAA4B,EAArB,qBAAqB;AAAA,UAE3C,oBAAA;EACf,IAAA,EAAM,gBAAA;EACN,SAAA,EAAW,SAAA;EACX,YAAA;EACA,UAAA;EACA,aAAA,GAAgB,GAAA,SAAY,mBAAA;EAC5B,yBAAA;EACA,QAAA,EAAU,gBAAA;AAAA;AAAA,iBAGI,eAAA;EACd,IAAA;EACA,SAAA;EACA,YAAA;EACA,UAAA;EACA,aAAA;EACA,yBAAA;EACA;AAAA,GACC,oBAAA"}

package/dist/utils/iterateOverDiff.js

@@ -1,4 +1,5 @@
 import "../constants.js";
+import { getHunkSideStartBoundary } from "./getHunkSideBoundaries.js";
 import { getExpandedRegion, getTrailingExpandedRegion } from "./virtualDiffLayout.js";
 //#region src/utils/iterateOverDiff.ts
 function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infinity, expandedHunks, collapsedContextThreshold = 1, callback }) {
@@ -61,6 +62,10 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 		const hunk = diff.hunks[hunkIndex];
 		if (hunk == null) throw new Error("iterateOverDiff: invalid hunk index");
 		if (state.shouldBreak()) break;
+		const deletionBoundary = getHunkSideStartBoundary(hunk.deletionStart, hunk.deletionCount);
+		const additionBoundary = getHunkSideStartBoundary(hunk.additionStart, hunk.additionCount);
+		const deletionStartIndex = !diff.isPartial && hunk.deletionCount === 0 ? deletionBoundary : hunk.deletionLineIndex;
+		const additionStartIndex = !diff.isPartial && hunk.additionCount === 0 ? additionBoundary : hunk.additionLineIndex;
 		const leadingRegion = getExpandedRegion({
 			isPartial: diff.isPartial,
 			rangeSize: hunk.collapsedBefore,
@@ -90,10 +95,10 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 		if (!state.shouldSkip(expandedLineCount, expandedLineCount)) {
 			let unifiedLineIndex = hunk.unifiedLineStart - leadingRegion.rangeSize;
 			let splitLineIndex = hunk.splitLineStart - leadingRegion.rangeSize;
-			let deletionLineIndex = hunk.deletionLineIndex - leadingRegion.rangeSize;
-			let additionLineIndex = hunk.additionLineIndex - leadingRegion.rangeSize;
-			let deletionLineNumber = hunk.deletionStart - leadingRegion.rangeSize;
-			let additionLineNumber = hunk.additionStart - leadingRegion.rangeSize;
+			let deletionLineIndex = deletionStartIndex - leadingRegion.rangeSize;
+			let additionLineIndex = additionStartIndex - leadingRegion.rangeSize;
+			let deletionLineNumber = deletionBoundary + 1 - leadingRegion.rangeSize;
+			let additionLineNumber = additionBoundary + 1 - leadingRegion.rangeSize;
 			if (walkContextLines(state, leadingRegion.fromStart, diffStyle, (index) => {
 				return state.emit({
 					hunkIndex,
@@ -119,10 +124,10 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 			})) break hunkIterator;
 			unifiedLineIndex = hunk.unifiedLineStart - leadingRegion.fromEnd;
 			splitLineIndex = hunk.splitLineStart - leadingRegion.fromEnd;
-			deletionLineIndex = hunk.deletionLineIndex - leadingRegion.fromEnd;
-			additionLineIndex = hunk.additionLineIndex - leadingRegion.fromEnd;
-			deletionLineNumber = hunk.deletionStart - leadingRegion.fromEnd;
-			additionLineNumber = hunk.additionStart - leadingRegion.fromEnd;
+			deletionLineIndex = deletionStartIndex - leadingRegion.fromEnd;
+			additionLineIndex = additionStartIndex - leadingRegion.fromEnd;
+			deletionLineNumber = deletionBoundary + 1 - leadingRegion.fromEnd;
+			additionLineNumber = additionBoundary + 1 - leadingRegion.fromEnd;
 			if (walkContextLines(state, leadingRegion.fromEnd, diffStyle, (index) => {
 				return state.emit({
 					hunkIndex,
@@ -154,10 +159,10 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
 		}
 		let unifiedLineIndex = hunk.unifiedLineStart;
 		let splitLineIndex = hunk.splitLineStart;
-		let deletionLineIndex = hunk.deletionLineIndex;
-		let additionLineIndex = hunk.additionLineIndex;
-		let deletionLineNumber = hunk.deletionStart;
-		let additionLineNumber = hunk.additionStart;
+		let deletionLineIndex = deletionStartIndex;
+		let additionLineIndex = additionStartIndex;
+		let deletionLineNumber = deletionBoundary + 1;
+		let additionLineNumber = additionBoundary + 1;
 		const lastContent = hunk.hunkContent.at(-1);
 		for (const content of hunk.hunkContent) {
 			if (state.shouldBreak()) break hunkIterator;