@pierre/diffs 1.6.0-beta.1 → 1.6.0

package/dist/utils/tokenStyle.d.ts

@@ -1,7 +1,11 @@
 import { ThemedToken } from "../highlighter/types.js";
 import "../types.js";
 //#region src/utils/tokenStyle.d.ts
-declare function tokenStyle(token: ThemedToken, cacheHtmlStyle: boolean): string;
+/**
+ * Returns CSS declarations for a highlighted token. Enable caching only when
+ * htmlStyle objects are immutable and reused across tokens.
+ */
+declare function tokenStyle(token: ThemedToken, cacheHtmlStyle?: boolean): string;
 //#endregion
 export { tokenStyle };
 //# sourceMappingURL=tokenStyle.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"tokenStyle.d.ts","names":[],"sources":["../../src/utils/tokenStyle.ts"],"mappings":";;;iBAMgB,WACd,OAAO,aACP"}
+{"version":3,"file":"tokenStyle.d.ts","names":[],"sources":["../../src/utils/tokenStyle.ts"],"mappings":";;;;;;;iBAUgB,WACd,OAAO,aACP"}

package/dist/utils/tokenStyle.js

@@ -1,6 +1,10 @@
 //#region src/utils/tokenStyle.ts
 const htmlStyleCache = /* @__PURE__ */ new WeakMap();
-function tokenStyle(token, cacheHtmlStyle) {
+/**
+* Returns CSS declarations for a highlighted token. Enable caching only when
+* htmlStyle objects are immutable and reused across tokens.
+*/
+function tokenStyle(token, cacheHtmlStyle = false) {
 	const { htmlStyle } = token;
 	if (htmlStyle != null) {
 		let style = cacheHtmlStyle ? htmlStyleCache.get(htmlStyle) : void 0;

package/dist/utils/tokenStyle.js.map

@@ -1 +1 @@
-{"version":3,"file":"tokenStyle.js","names":[],"sources":["../../src/utils/tokenStyle.ts"],"sourcesContent":["import type { ThemedToken } from '../types';\n\n// Warning: cache only tokens from Highlights, which reuses htmlStyle objects.\n// Shiki creates one per token, so caching them adds a WeakMap entry per token.\nconst htmlStyleCache = new WeakMap<Record<string, string>, string>();\n\nexport function tokenStyle(\n  token: ThemedToken,\n  cacheHtmlStyle: boolean\n): string {\n  const { htmlStyle } = token;\n  if (htmlStyle != null) {\n    let style = cacheHtmlStyle ? htmlStyleCache.get(htmlStyle) : undefined;\n    if (style == null) {\n      style = '';\n      for (const name in htmlStyle) {\n        style += `${style === '' ? '' : ';'}${name}:${htmlStyle[name]}`;\n      }\n      if (cacheHtmlStyle) htmlStyleCache.set(htmlStyle, style);\n    }\n    return style;\n  }\n  let style = token.color != null ? `color:${token.color}` : '';\n  if (token.bgColor != null) style += `;background-color:${token.bgColor}`;\n  if (token.fontStyle != null) {\n    if ((token.fontStyle & 1) !== 0) style += ';font-style:italic';\n    if ((token.fontStyle & 2) !== 0) style += ';font-weight:bold';\n    const underline = (token.fontStyle & 4) !== 0;\n    const strikethrough = (token.fontStyle & 8) !== 0;\n    if (underline || strikethrough)\n      style += `;text-decoration:${underline ? 'underline' : ''}${underline && strikethrough ? ' ' : ''}${strikethrough ? 'line-through' : ''}`;\n  }\n  return style.replace(/^;/, '');\n}\n"],"mappings":";AAIA,MAAM,iCAAiB,IAAI,QAAwC;AAEnE,SAAgB,WACd,OACA,gBACQ;CACR,MAAM,EAAE,cAAc;CACtB,IAAI,aAAa,MAAM;EACrB,IAAI,QAAQ,iBAAiB,eAAe,IAAI,SAAS,IAAI,KAAA;EAC7D,IAAI,SAAS,MAAM;GACjB,QAAQ;GACR,KAAK,MAAM,QAAQ,WACjB,SAAS,GAAG,UAAU,KAAK,KAAK,MAAM,KAAK,GAAG,UAAU;GAE1D,IAAI,gBAAgB,eAAe,IAAI,WAAW,KAAK;EACzD;EACA,OAAO;CACT;CACA,IAAI,QAAQ,MAAM,SAAS,OAAO,SAAS,MAAM,UAAU;CAC3D,IAAI,MAAM,WAAW,MAAM,SAAS,qBAAqB,MAAM;CAC/D,IAAI,MAAM,aAAa,MAAM;EAC3B,KAAK,MAAM,YAAY,OAAO,GAAG,SAAS;EAC1C,KAAK,MAAM,YAAY,OAAO,GAAG,SAAS;EAC1C,MAAM,aAAa,MAAM,YAAY,OAAO;EAC5C,MAAM,iBAAiB,MAAM,YAAY,OAAO;EAChD,IAAI,aAAa,eACf,SAAS,oBAAoB,YAAY,cAAc,KAAK,aAAa,gBAAgB,MAAM,KAAK,gBAAgB,iBAAiB;CACzI;CACA,OAAO,MAAM,QAAQ,MAAM,EAAE;AAC/B"}
+{"version":3,"file":"tokenStyle.js","names":[],"sources":["../../src/utils/tokenStyle.ts"],"sourcesContent":["import type { ThemedToken } from '../types';\n\n// Warning: cache only tokens from Highlights, which reuses htmlStyle objects.\n// Shiki creates one per token, so caching them adds a WeakMap entry per token.\nconst htmlStyleCache = new WeakMap<Record<string, string>, string>();\n\n/**\n * Returns CSS declarations for a highlighted token. Enable caching only when\n * htmlStyle objects are immutable and reused across tokens.\n */\nexport function tokenStyle(\n  token: ThemedToken,\n  cacheHtmlStyle: boolean = false\n): string {\n  const { htmlStyle } = token;\n  if (htmlStyle != null) {\n    let style = cacheHtmlStyle ? htmlStyleCache.get(htmlStyle) : undefined;\n    if (style == null) {\n      style = '';\n      for (const name in htmlStyle) {\n        style += `${style === '' ? '' : ';'}${name}:${htmlStyle[name]}`;\n      }\n      if (cacheHtmlStyle) htmlStyleCache.set(htmlStyle, style);\n    }\n    return style;\n  }\n  let style = token.color != null ? `color:${token.color}` : '';\n  if (token.bgColor != null) style += `;background-color:${token.bgColor}`;\n  if (token.fontStyle != null) {\n    if ((token.fontStyle & 1) !== 0) style += ';font-style:italic';\n    if ((token.fontStyle & 2) !== 0) style += ';font-weight:bold';\n    const underline = (token.fontStyle & 4) !== 0;\n    const strikethrough = (token.fontStyle & 8) !== 0;\n    if (underline || strikethrough)\n      style += `;text-decoration:${underline ? 'underline' : ''}${underline && strikethrough ? ' ' : ''}${strikethrough ? 'line-through' : ''}`;\n  }\n  return style.replace(/^;/, '');\n}\n"],"mappings":";AAIA,MAAM,iCAAiB,IAAI,QAAwC;;;;;AAMnE,SAAgB,WACd,OACA,iBAA0B,OAClB;CACR,MAAM,EAAE,cAAc;CACtB,IAAI,aAAa,MAAM;EACrB,IAAI,QAAQ,iBAAiB,eAAe,IAAI,SAAS,IAAI,KAAA;EAC7D,IAAI,SAAS,MAAM;GACjB,QAAQ;GACR,KAAK,MAAM,QAAQ,WACjB,SAAS,GAAG,UAAU,KAAK,KAAK,MAAM,KAAK,GAAG,UAAU;GAE1D,IAAI,gBAAgB,eAAe,IAAI,WAAW,KAAK;EACzD;EACA,OAAO;CACT;CACA,IAAI,QAAQ,MAAM,SAAS,OAAO,SAAS,MAAM,UAAU;CAC3D,IAAI,MAAM,WAAW,MAAM,SAAS,qBAAqB,MAAM;CAC/D,IAAI,MAAM,aAAa,MAAM;EAC3B,KAAK,MAAM,YAAY,OAAO,GAAG,SAAS;EAC1C,KAAK,MAAM,YAAY,OAAO,GAAG,SAAS;EAC1C,MAAM,aAAa,MAAM,YAAY,OAAO;EAC5C,MAAM,iBAAiB,MAAM,YAAY,OAAO;EAChD,IAAI,aAAa,eACf,SAAS,oBAAoB,YAAY,cAAc,KAAK,aAAa,gBAAgB,MAAM,KAAK,gBAAgB,iBAAiB;CACzI;CACA,OAAO,MAAM,QAAQ,MAAM,EAAE;AAC/B"}

package/dist/utils/tokensToHtml.d.ts

@@ -1,8 +1,11 @@
 import { CodeToHtmlOptions, TokensResult } from "../highlighter/types.js";
 import "../types.js";
 //#region src/utils/tokensToHtml.d.ts
-/** Serialize highlighted tokens without loading a backend's HTML renderer. */
-declare function tokensToHtml(source: string, result: TokensResult, options: CodeToHtmlOptions, cacheHtmlStyles: boolean): string;
+/**
+ * Renders existing tokens as a pre/code HTML block without highlighting again.
+ * Pass the original source to resolve numeric decoration offsets.
+ */
+declare function tokensToHtml(source: string, result: TokensResult, options: CodeToHtmlOptions, cacheHtmlStyles?: boolean): string;
 //#endregion
 export { tokensToHtml };
 //# sourceMappingURL=tokensToHtml.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"tokensToHtml.d.ts","names":[],"sources":["../../src/utils/tokensToHtml.ts"],"mappings":";;;;iBAOgB,aACd,gBACA,QAAQ,cACR,SAAS,mBACT"}
+{"version":3,"file":"tokensToHtml.d.ts","names":[],"sources":["../../src/utils/tokensToHtml.ts"],"mappings":";;;;;;;iBAUgB,aACd,gBACA,QAAQ,cACR,SAAS,mBACT"}

package/dist/utils/tokensToHtml.js

@@ -1,8 +1,11 @@
 import { hastToHtml } from "./hastToHtml.js";
 import { renderTokenLines } from "./renderTokenLines.js";
 //#region src/utils/tokensToHtml.ts
-/** Serialize highlighted tokens without loading a backend's HTML renderer. */
-function tokensToHtml(source, result, options, cacheHtmlStyles) {
+/**
+* Renders existing tokens as a pre/code HTML block without highlighting again.
+* Pass the original source to resolve numeric decoration offsets.
+*/
+function tokensToHtml(source, result, options, cacheHtmlStyles = false) {
 	const lineOffsets = [0];
 	if (options.decorations?.some((item) => typeof item.start === "number" || typeof item.end === "number") === true) for (let index = source.indexOf("\n"); index !== -1; index = source.indexOf("\n", index + 1)) lineOffsets.push(index + 1);
 	const code = {

package/dist/utils/tokensToHtml.js.map

@@ -1 +1 @@
-{"version":3,"file":"tokensToHtml.js","names":[],"sources":["../../src/utils/tokensToHtml.ts"],"sourcesContent":["import type { Element, Root } from 'hast';\n\nimport type { CodeToHtmlOptions, TokensResult } from '../types';\nimport { hastToHtml } from './hastToHtml';\nimport { renderTokenLines } from './renderTokenLines';\n\n/** Serialize highlighted tokens without loading a backend's HTML renderer. */\nexport function tokensToHtml(\n  source: string,\n  result: TokensResult,\n  options: CodeToHtmlOptions,\n  cacheHtmlStyles: boolean\n): string {\n  const lineOffsets = [0];\n  if (\n    options.decorations?.some(\n      (item) => typeof item.start === 'number' || typeof item.end === 'number'\n    ) === true\n  ) {\n    for (\n      let index = source.indexOf('\\n');\n      index !== -1;\n      index = source.indexOf('\\n', index + 1)\n    )\n      lineOffsets.push(index + 1);\n  }\n  const code: Element = {\n    type: 'element',\n    tagName: 'code',\n    properties: {},\n    children: [],\n  };\n  const lines = renderTokenLines(result.tokens, {\n    decorations: options.decorations,\n    mergeWhitespaces: options.mergeWhitespaces,\n    lineOffsets,\n    cacheHtmlStyles,\n  });\n  for (let i = 0; i < lines.length; i++) {\n    if (i > 0) code.children.push({ type: 'text', value: '\\n' });\n    code.children.push(lines[i]);\n  }\n  const root: Root = {\n    type: 'root',\n    children: [\n      {\n        type: 'element',\n        tagName: 'pre',\n        properties: {\n          class: 'diffs',\n          style:\n            result.rootStyle === false\n              ? undefined\n              : (result.rootStyle ??\n                [\n                  result.fg != null ? `color:${result.fg}` : '',\n                  result.bg != null ? `background-color:${result.bg}` : '',\n                ]\n                  .filter(Boolean)\n                  .join(';')),\n          tabIndex: 0,\n        },\n        children: [code],\n      },\n    ],\n  };\n  return hastToHtml(root);\n}\n"],"mappings":";;;;AAOA,SAAgB,aACd,QACA,QACA,SACA,iBACQ;CACR,MAAM,cAAc,CAAC,CAAC;CACtB,IACE,QAAQ,aAAa,MAClB,SAAS,OAAO,KAAK,UAAU,YAAY,OAAO,KAAK,QAAQ,QAClE,MAAM,MAEN,KACE,IAAI,QAAQ,OAAO,QAAQ,IAAI,GAC/B,UAAU,IACV,QAAQ,OAAO,QAAQ,MAAM,QAAQ,CAAC,GAEtC,YAAY,KAAK,QAAQ,CAAC;CAE9B,MAAM,OAAgB;EACpB,MAAM;EACN,SAAS;EACT,YAAY,CAAC;EACb,UAAU,CAAC;CACb;CACA,MAAM,QAAQ,iBAAiB,OAAO,QAAQ;EAC5C,aAAa,QAAQ;EACrB,kBAAkB,QAAQ;EAC1B;EACA;CACF,CAAC;CACD,KAAK,IAAI,IAAI,GAAG,IAAI,MAAM,QAAQ,KAAK;EACrC,IAAI,IAAI,GAAG,KAAK,SAAS,KAAK;GAAE,MAAM;GAAQ,OAAO;EAAK,CAAC;EAC3D,KAAK,SAAS,KAAK,MAAM,EAAE;CAC7B;CACA,MAAM,OAAa;EACjB,MAAM;EACN,UAAU,CACR;GACE,MAAM;GACN,SAAS;GACT,YAAY;IACV,OAAO;IACP,OACE,OAAO,cAAc,QACjB,KAAA,IACC,OAAO,aACR,CACE,OAAO,MAAM,OAAO,SAAS,OAAO,OAAO,IAC3C,OAAO,MAAM,OAAO,oBAAoB,OAAO,OAAO,EACxD,CAAC,CACE,OAAO,OAAO,CAAC,CACf,KAAK,GAAG;IACjB,UAAU;GACZ;GACA,UAAU,CAAC,IAAI;EACjB,CACF;CACF;CACA,OAAO,WAAW,IAAI;AACxB"}
+{"version":3,"file":"tokensToHtml.js","names":[],"sources":["../../src/utils/tokensToHtml.ts"],"sourcesContent":["import type { Element, Root } from 'hast';\n\nimport type { CodeToHtmlOptions, TokensResult } from '../types';\nimport { hastToHtml } from './hastToHtml';\nimport { renderTokenLines } from './renderTokenLines';\n\n/**\n * Renders existing tokens as a pre/code HTML block without highlighting again.\n * Pass the original source to resolve numeric decoration offsets.\n */\nexport function tokensToHtml(\n  source: string,\n  result: TokensResult,\n  options: CodeToHtmlOptions,\n  cacheHtmlStyles: boolean = false\n): string {\n  const lineOffsets = [0];\n  if (\n    options.decorations?.some(\n      (item) => typeof item.start === 'number' || typeof item.end === 'number'\n    ) === true\n  ) {\n    for (\n      let index = source.indexOf('\\n');\n      index !== -1;\n      index = source.indexOf('\\n', index + 1)\n    )\n      lineOffsets.push(index + 1);\n  }\n  const code: Element = {\n    type: 'element',\n    tagName: 'code',\n    properties: {},\n    children: [],\n  };\n  const lines = renderTokenLines(result.tokens, {\n    decorations: options.decorations,\n    mergeWhitespaces: options.mergeWhitespaces,\n    lineOffsets,\n    cacheHtmlStyles,\n  });\n  for (let i = 0; i < lines.length; i++) {\n    if (i > 0) code.children.push({ type: 'text', value: '\\n' });\n    code.children.push(lines[i]);\n  }\n  const root: Root = {\n    type: 'root',\n    children: [\n      {\n        type: 'element',\n        tagName: 'pre',\n        properties: {\n          class: 'diffs',\n          style:\n            result.rootStyle === false\n              ? undefined\n              : (result.rootStyle ??\n                [\n                  result.fg != null ? `color:${result.fg}` : '',\n                  result.bg != null ? `background-color:${result.bg}` : '',\n                ]\n                  .filter(Boolean)\n                  .join(';')),\n          tabIndex: 0,\n        },\n        children: [code],\n      },\n    ],\n  };\n  return hastToHtml(root);\n}\n"],"mappings":";;;;;;;AAUA,SAAgB,aACd,QACA,QACA,SACA,kBAA2B,OACnB;CACR,MAAM,cAAc,CAAC,CAAC;CACtB,IACE,QAAQ,aAAa,MAClB,SAAS,OAAO,KAAK,UAAU,YAAY,OAAO,KAAK,QAAQ,QAClE,MAAM,MAEN,KACE,IAAI,QAAQ,OAAO,QAAQ,IAAI,GAC/B,UAAU,IACV,QAAQ,OAAO,QAAQ,MAAM,QAAQ,CAAC,GAEtC,YAAY,KAAK,QAAQ,CAAC;CAE9B,MAAM,OAAgB;EACpB,MAAM;EACN,SAAS;EACT,YAAY,CAAC;EACb,UAAU,CAAC;CACb;CACA,MAAM,QAAQ,iBAAiB,OAAO,QAAQ;EAC5C,aAAa,QAAQ;EACrB,kBAAkB,QAAQ;EAC1B;EACA;CACF,CAAC;CACD,KAAK,IAAI,IAAI,GAAG,IAAI,MAAM,QAAQ,KAAK;EACrC,IAAI,IAAI,GAAG,KAAK,SAAS,KAAK;GAAE,MAAM;GAAQ,OAAO;EAAK,CAAC;EAC3D,KAAK,SAAS,KAAK,MAAM,EAAE;CAC7B;CACA,MAAM,OAAa;EACjB,MAAM;EACN,UAAU,CACR;GACE,MAAM;GACN,SAAS;GACT,YAAY;IACV,OAAO;IACP,OACE,OAAO,cAAc,QACjB,KAAA,IACC,OAAO,aACR,CACE,OAAO,MAAM,OAAO,SAAS,OAAO,OAAO,IAC3C,OAAO,MAAM,OAAO,oBAAoB,OAAO,OAAO,EACxD,CAAC,CACE,OAAO,OAAO,CAAC,CACf,KAAK,GAAG;IACjB,UAAU;GACZ;GACA,UAAU,CAAC,IAAI;EACjB,CACF;CACF;CACA,OAAO,WAAW,IAAI;AACxB"}

package/dist/utils/updateDiffHunks.d.ts

@@ -3,11 +3,11 @@ import { CreatePatchOptionsNonabortable } from "diff";
 //#region src/utils/updateDiffHunks.d.ts
 type HunkContent = ContextContent | ChangeContent;
 type HunkMetadataUpdate = Pick<FileDiffMetadata, 'hunks' | 'splitLineCount' | 'unifiedLineCount' | 'type'>;
-type FullDiffHunkUpdate = HunkMetadataUpdate & Pick<FileDiffMetadata, 'additionLines' | 'deletionLines'>;
+type FullDiffHunkUpdate = HunkMetadataUpdate & Pick<FileDiffMetadata, 'additionLines' | 'deletionLines' | 'additionCharacterCount' | 'deletionCharacterCount'>;
 /** Rebuilds all hunk metadata from the current deletion/addition line arrays. */
 declare function recomputeDiffHunks(diff: FileDiffMetadata, parseDiffOptions?: CreatePatchOptionsNonabortable): FullDiffHunkUpdate;
 declare function shouldTopAlignAdditionRecompute(diff: FileDiffMetadata, additionLines: string[]): boolean;
-declare function recomputeTopAlignedAdditionDiff(diff: FileDiffMetadata, additionLines: string[], parseDiffOptions?: CreatePatchOptionsNonabortable): FullDiffHunkUpdate;
+declare function recomputeTopAlignedAdditionDiff(diff: FileDiffMetadata, additionLines: string[], additionCharacterCount: number, parseDiffOptions?: CreatePatchOptionsNonabortable): FullDiffHunkUpdate;
 declare function recomputeEmptyDocumentDiff(diff: FileDiffMetadata, parseDiffOptions?: CreatePatchOptionsNonabortable): FullDiffHunkUpdate;
 /** Rebuilds diff hunks after an edit, top-aligning sparse addition sides when needed. */
 declare function recomputeDiffHunksForEdit(diff: FileDiffMetadata, parseDiffOptions?: CreatePatchOptionsNonabortable): FullDiffHunkUpdate;

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

@@ -1 +1 @@
-{"version":3,"file":"updateDiffHunks.d.ts","names":[],"sources":["../../src/utils/updateDiffHunks.ts"],"mappings":";;;KAgBK,cAAc,iBAAiB;KAE/B,qBAAqB,KACxB;KAIG,qBAAqB,qBACxB,KAAK;;iBAGS,mBACd,MAAM,kBACN,mBAAmB,iCAClB;iBAwDa,gCACd,MAAM,kBACN;iBAYc,gCACd,MAAM,kBACN,yBACA,mBAAmB,iCAClB;iBAkCa,2BACd,MAAM,kBACN,mBAAmB,iCAClB;;iBAKa,0BACd,MAAM,kBACN,mBAAmB,iCAClB;iBAwBa,gCACd,YAAY,KACV,wFAGF;;iBAyCc,gBACd,MAAM,kBACN,4BAA4B,kBAC5B,mBAAmB,iCAClB;iBA2Ja,4BACd,MAAM,kBACN;iBAiDc,kBACd,SAAS,aACT,wBACA,yBACC;iBAQa,8BAA8B,MAAM;iBAkBpC,8BACd,MAAM,KACJ"}
+{"version":3,"file":"updateDiffHunks.d.ts","names":[],"sources":["../../src/utils/updateDiffHunks.ts"],"mappings":";;;KAgBK,cAAc,iBAAiB;KAE/B,qBAAqB,KACxB;KAIG,qBAAqB,qBACxB,KACE;;iBAQY,mBACd,MAAM,kBACN,mBAAmB,iCAClB;iBA0Da,gCACd,MAAM,kBACN;iBAYc,gCACd,MAAM,kBACN,yBACA,gCACA,mBAAmB,iCAClB;iBAoCa,2BACd,MAAM,kBACN,mBAAmB,iCAClB;;iBAKa,0BACd,MAAM,kBACN,mBAAmB,iCAClB;iBAyBa,gCACd,YAAY,KACV,wFAGF;;iBAyCc,gBACd,MAAM,kBACN,4BAA4B,kBAC5B,mBAAmB,iCAClB;iBA2Ja,4BACd,MAAM,kBACN;iBAiDc,kBACd,SAAS,aACT,wBACA,yBACC;iBAQa,8BAA8B,MAAM;iBAkBpC,8BACd,MAAM,KACJ"}

package/dist/utils/updateDiffHunks.js

@@ -19,6 +19,8 @@ function recomputeDiffHunks(diff, parseDiffOptions) {
 		unifiedLineCount: recomputed.unifiedLineCount,
 		additionLines: recomputed.additionLines,
 		deletionLines: recomputed.deletionLines,
+		additionCharacterCount: recomputed.additionCharacterCount,
+		deletionCharacterCount: recomputed.deletionCharacterCount,
 		type: recomputed.type
 	};
 }
@@ -35,7 +37,7 @@ function hasOnlyBlankAdditionContents(additionLines) {
 function shouldTopAlignAdditionRecompute(diff, additionLines) {
 	return additionLines.length > 0 && additionLines.length < diff.deletionLines.length && hasOnlyBlankAdditionContents(additionLines);
 }
-function recomputeTopAlignedAdditionDiff(diff, additionLines, parseDiffOptions) {
+function recomputeTopAlignedAdditionDiff(diff, additionLines, additionCharacterCount, parseDiffOptions) {
 	const deletionContents = diff.deletionLines.join("");
 	const additionSentinel = buildTopAlignedAdditionSentinel(additionLines.length, deletionContents);
 	const recomputed = parseDiffFromFile({
@@ -52,16 +54,18 @@ function recomputeTopAlignedAdditionDiff(diff, additionLines, parseDiffOptions)
 		unifiedLineCount: recomputed.unifiedLineCount,
 		additionLines,
 		deletionLines: recomputed.deletionLines,
+		additionCharacterCount,
+		deletionCharacterCount: recomputed.deletionCharacterCount,
 		type: recomputed.type
 	};
 }
 function recomputeEmptyDocumentDiff(diff, parseDiffOptions) {
-	return recomputeTopAlignedAdditionDiff(diff, [""], parseDiffOptions);
+	return recomputeTopAlignedAdditionDiff(diff, [""], 0, 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);
+	if (shouldTopAlignAdditionRecompute(diff, diff.additionLines)) return recomputeTopAlignedAdditionDiff(diff, diff.additionLines, diff.additionCharacterCount, parseDiffOptions);
 	const additionLines = diff.additionLines;
 	const recomputed = recomputeDiffHunks(diff, parseDiffOptions);
 	preserveTrailingEditorBlankLine(recomputed, additionLines);

package/dist/utils/updateDiffHunks.js.map

@@ -1 +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 {\n  getHunkSideEndBoundary,\n  getHunkSideStartBoundary,\n} from './getHunkSideBoundaries';\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 = getHunkSideEndBoundary(\n    lastHunk.additionStart,\n    lastHunk.additionCount\n  );\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      getHunkSideStartBoundary(hunk.additionStart, hunk.additionCount) -\n        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 = getHunkSideEndBoundary(\n      hunk.additionStart,\n      hunk.additionCount\n    );\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        getHunkSideEndBoundary(lastHunk.additionStart, lastHunk.additionCount),\n      0\n    );\n    splitTotal += collapsedAfter;\n    unifiedTotal += collapsedAfter;\n  }\n\n  diff.splitLineCount = splitTotal;\n  diff.unifiedLineCount = unifiedTotal;\n}\n"],"mappings":";;;;;;AA2BA,SAAgB,mBACd,MACA,kBACoB;CACpB,MAAM,aAAa,kBACjB;EACE,MAAM,KAAK,YAAY,KAAK;EAC5B,UAAU,KAAK,cAAc,KAAK,EAAE;CACtC,GACA;EACE,MAAM,KAAK;EACX,UAAU,KAAK,cAAc,KAAK,EAAE;EACpC,MAAM,KAAK;CACb,GACA,gBACF;CACA,OAAO;EACL,OAAO,WAAW;EAClB,gBAAgB,WAAW;EAC3B,kBAAkB,WAAW;EAC7B,eAAe,WAAW;EAC1B,eAAe,WAAW;EAC1B,MAAM,WAAW;CACnB;AACF;AAKA,SAAS,gCACP,WACA,kBACQ;CACR,MAAM,QAAQ,KAAK,IAAI,WAAW,CAAC;CACnC,IAAI,WAAW,MAAM,KACnB,EAAE,QAAQ,MAAM,IACf,GAAG,UAAU,GAAG,IAAI,OAAO,QAAQ,CAAC,EAAE,GACzC,CAAC,CAAC,KAAK,EAAE;CACT,IAAI,aAAa,kBACf,WAAW,MAAM,KACf,EAAE,QAAQ,MAAM,IACf,GAAG,UAAU,SAAS,IAAI,OAAO,KAAK,EAAE,GAC3C,CAAC,CAAC,KAAK,EAAE;CAEX,OAAO;AACT;AAEA,SAAS,6BAA6B,eAAkC;CACtE,KAAK,MAAM,QAAQ,eACjB,IAAI,KAAK,KAAK,CAAC,CAAC,SAAS,GACvB,OAAO;CAGX,OAAO;AACT;AAKA,SAAgB,gCACd,MACA,eACS;CACT,OACE,cAAc,SAAS,KACvB,cAAc,SAAS,KAAK,cAAc,UAC1C,6BAA6B,aAAa;AAE9C;AAKA,SAAgB,gCACd,MACA,eACA,kBACoB;CACpB,MAAM,mBAAmB,KAAK,cAAc,KAAK,EAAE;CACnD,MAAM,mBAAmB,gCACvB,cAAc,QACd,gBACF;CACA,MAAM,aAAa,kBACjB;EACE,MAAM,KAAK,YAAY,KAAK;EAC5B,UAAU;CACZ,GACA;EACE,MAAM,KAAK;EACX,UAAU;EACV,MAAM,KAAK;CACb,GACA,gBACF;CACA,OAAO;EACL,OAAO,WAAW;EAClB,gBAAgB,WAAW;EAC3B,kBAAkB,WAAW;EAC7B;EACA,eAAe,WAAW;EAC1B,MAAM,WAAW;CACnB;AACF;AAQA,SAAgB,2BACd,MACA,kBACoB;CACpB,OAAO,gCAAgC,MAAM,CAAC,EAAE,GAAG,gBAAgB;AACrE;;AAGA,SAAgB,0BACd,MACA,kBACoB;CACpB,IAAI,KAAK,cAAc,WAAW,GAChC,OAAO,2BAA2B,MAAM,gBAAgB;CAE1D,IAAI,gCAAgC,MAAM,KAAK,aAAa,GAC1D,OAAO,gCACL,MACA,KAAK,eACL,gBACF;CAEF,MAAM,gBAAgB,KAAK;CAC3B,MAAM,aAAa,mBAAmB,MAAM,gBAAgB;CAC5D,gCAAgC,YAAY,aAAa;CACzD,OAAO;AACT;AAEA,SAAS,2BAA2B,eAAkC;CACpE,OAAO,cAAc,SAAS,KAAK,cAAc,GAAG,EAAE,MAAM;AAC9D;AAKA,SAAgB,gCACd,YAIA,eACM;CACN,IAAI,CAAC,2BAA2B,aAAa,GAC3C;CAEF,MAAM,iBAAiB,cAAc,SAAS,WAAW,cAAc;CACvE,IAAI,kBAAkB,GACpB;CAEF,MAAM,yBAAyB,WAAW,cAAc;CAExD,MAAM,WAAW,WAAW,MAAM,GAAG,EAAE;CACvC,IAAI,YAAY,MACd;CAOF,IAJ4B,uBAC1B,SAAS,eACT,SAAS,aAEW,MAAM,wBAC1B;CAGF,KAAK,MAAM,WAAW,SAAS,aAC7B,IACE,QAAQ,SAAS,YACjB,QAAQ,YAAY,QAAQ,aAC5B,QAAQ,oBAAoB,QAAQ,cAAc,wBAClD;EACA,WAAW,gBAAgB;EAC3B,QAAQ,aAAa;EACrB,SAAS,iBAAiB;EAC1B,SAAS,iBAAiB;EAC1B,8BAA8B,UAAU;EACxC;CACF;AAEJ;;AAGA,SAAgB,gBACd,MACA,4BACA,kBACoB;CACpB,IAAI,KAAK,WACP,OAAO,sBACL,MACA,mBAAmB,MAAM,gBAAgB,CAC3C;CAGF,IAAI,KAAK,cAAc,WAAW,KAAK,cAAc,QACnD,OAAO,sBACL,MACA,mBAAmB,MAAM,gBAAgB,CAC3C;CAGF,MAAM,eAAe,MAAM,KAAK,0BAA0B;CAC1D,IAAI,aAAa,WAAW,GAC1B,OAAO,sBAAsB,MAAM;EACjC,OAAO,KAAK;EACZ,gBAAgB,KAAK;EACrB,kBAAkB,KAAK;EACvB,MAAM,KAAK;CACb,CAAC;CAEH,KAAK,MAAM,QAAQ,cAAc;EAC/B,MAAM,eAAe,KAAK,cAAc;EACxC,MAAM,eAAe,KAAK,cAAc;EACxC,IAAI,gBAAgB,QAAQ,gBAAgB,MAC1C,OAAO,sBACL,MACA,mBAAmB,MAAM,gBAAgB,CAC3C;EAGF,IAAI,iBAAiB,YAAY,MAAM,iBAAiB,YAAY,GAClE,OAAO,sBACL,MACA,mBAAmB,MAAM,gBAAgB,CAC3C;CAEJ;CAEA,MAAM,sBAAsB,uBAAuB,MAAM,YAAY;CACrE,IAAI,oBAAoB,SAAS,GAC/B,OAAO,sBACL,MACA,mBAAmB,MAAM,gBAAgB,CAC3C;CAGF,KAAK,MAAM,aAAa,qBAEtB,IAAI,CADY,kBAAkB,MAAM,WAAW,gBACxC,GACT,OAAO,sBACL,MACA,mBAAmB,MAAM,gBAAgB,CAC3C;CAIJ,8BAA8B,IAAI;CAElC,IAAI,2BAA2B,IAAI,GACjC,OAAO,sBACL,MACA,mBAAmB,MAAM,gBAAgB,CAC3C;CAGF,OAAO,sBAAsB,MAAM;EACjC,OAAO,KAAK;EACZ,gBAAgB,KAAK;EACrB,kBAAkB,KAAK;EACvB,MAAM,KAAK;CACb,CAAC;AACH;AAEA,SAAS,sBACP,MACA,QACG;CACH,OAAO,OAAO,MAAM,MAAM;CAC1B,OAAO;AACT;AAEA,SAAS,uBACP,MACA,4BACa;CACb,MAAM,0BAAU,IAAI,IAAY;CAChC,KAAK,MAAM,QAAQ,4BAA4B;EAC7C,MAAM,YAAY,6BAA6B,MAAM,IAAI;EACzD,IAAI,aAAa,MACf,uBAAO,IAAI,IAAI;EAEjB,QAAQ,IAAI,SAAS;CACvB;CACA,OAAO;AACT;AAEA,SAAS,6BACP,MACA,MACoB;CACpB,KAAK,MAAM,CAAC,WAAW,SAAS,KAAK,MAAM,QAAQ,GAAG;EACpD,MAAM,MAAM,KAAK,oBAAoB,KAAK;EAC1C,IAAI,QAAQ,KAAK,qBAAqB,OAAO,KAC3C,OAAO;CAEX;AAEF;AAEA,SAAS,kBACP,MACA,WACA,kBACS;CACT,MAAM,OAAO,KAAK,MAAM;CACxB,IAAI,QAAQ,MACV,OAAO;CAGT,MAAM,gBAAgB,KAAK,cAAc,MACvC,KAAK,mBACL,KAAK,oBAAoB,KAAK,aAChC;CACA,MAAM,gBAAgB,KAAK,cAAc,MACvC,KAAK,mBACL,KAAK,oBAAoB,KAAK,aAChC;CAEA,MAAM,WAAW,kBACf;EACE,MAAM,KAAK,YAAY,KAAK;EAC5B,UAAU,cAAc,KAAK,EAAE;CACjC,GACA;EACE,MAAM,KAAK;EACX,UAAU,cAAc,KAAK,EAAE;EAC/B,MAAM,KAAK;CACb,GACA;EAAE,GAAG;EAAkB,SAAS;CAAE,CACpC;CAEA,MAAM,eAAe,SAAS,MAAM;CACpC,IAAI,gBAAgB,QAAQ,SAAS,MAAM,WAAW,GACpD,OAAO;CAGT,kBAAkB,MAAM,YAAY;CACpC,4BAA4B,MAAM,SAAS;CAC3C,OAAO;AACT;AAEA,SAAgB,4BACd,MACA,WACM;CACN,MAAM,OAAO,KAAK,MAAM;CACxB,IAAI,QAAQ,MACV;CAIF,IAAI,EADe,cAAc,KAAK,MAAM,SAAS,IACpC;EACf,KAAK,mBAAmB;EACxB,KAAK,mBAAmB;EACxB;CACF;CAEA,MAAM,mBAAmB,KAAK,cAAc,GAAG,EAAE;CACjD,MAAM,mBAAmB,KAAK,cAAc,GAAG,EAAE;CACjD,KAAK,mBACH,oBAAoB,QACpB,qBAAqB,MACrB,CAAC,iBAAiB,SAAS,IAAI;CACjC,KAAK,mBACH,oBAAoB,QACpB,qBAAqB,MACrB,CAAC,iBAAiB,SAAS,IAAI;AACnC;AAEA,SAAS,kBAAkB,QAAc,QAAoB;CAC3D,MAAM,iBAAiB,OAAO;CAC9B,MAAM,iBAAiB,OAAO;CAE9B,OAAO,cAAc,OAAO,YAAY,KAAK,YAC3C,kBAAkB,SAAS,gBAAgB,cAAc,CAC3D;CACA,OAAO,oBAAoB,iBAAiB,OAAO;CACnD,OAAO,gBAAgB,OAAO,gBAAgB,OAAO;CACrD,OAAO,gBAAgB,OAAO;CAC9B,OAAO,gBAAgB,OAAO;CAC9B,IAAI,OAAO,qBAAqB,GAAG;EACjC,OAAO,oBAAoB,iBAAiB,OAAO;EACnD,OAAO,gBAAgB,OAAO,gBAAgB,OAAO;CACvD;CACA,OAAO,gBAAgB,OAAO;CAC9B,OAAO,gBAAgB,OAAO;CAC9B,OAAO,mBAAmB,OAAO;CACjC,OAAO,mBAAmB,OAAO;CAEjC,8BAA8B,MAAM;AACtC;AAEA,SAAgB,kBACd,SACA,gBACA,gBACa;CACb,OAAO;EACL,GAAG;EACH,mBAAmB,QAAQ,oBAAoB;EAC/C,mBAAmB,QAAQ,oBAAoB;CACjD;AACF;AAEA,SAAgB,8BAA8B,MAAkB;CAC9D,IAAI,iBAAiB;CACrB,IAAI,mBAAmB;CAEvB,KAAK,MAAM,WAAW,KAAK,aACzB,IAAI,QAAQ,SAAS,WAAW;EAC9B,kBAAkB,QAAQ;EAC1B,oBAAoB,QAAQ;CAC9B,OAAO;EACL,kBAAkB,KAAK,IAAI,QAAQ,WAAW,QAAQ,SAAS;EAC/D,oBAAoB,QAAQ,YAAY,QAAQ;CAClD;CAGF,KAAK,iBAAiB;CACtB,KAAK,mBAAmB;AAC1B;AAEA,SAAgB,8BACd,MAIM;CACN,IAAI,aAAa;CACjB,IAAI,eAAe;CACnB,IAAI,sBAAsB;CAE1B,KAAK,MAAM,QAAQ,KAAK,OAAO;EAC7B,KAAK,kBAAkB,KAAK,IAC1B,yBAAyB,KAAK,eAAe,KAAK,aAAa,IAC7D,qBACF,CACF;EACA,KAAK,iBAAiB,aAAa,KAAK;EACxC,KAAK,mBAAmB,eAAe,KAAK;EAE5C,8BAA8B,IAAI;EAElC,cAAc,KAAK,kBAAkB,KAAK;EAC1C,gBAAgB,KAAK,kBAAkB,KAAK;EAC5C,sBAAsB,uBACpB,KAAK,eACL,KAAK,aACP;CACF;CAEA,IAAI,KAAK,MAAM,SAAS,GAAG;EACzB,MAAM,WAAW,KAAK,MAAM,KAAK,MAAM,SAAS;EAChD,MAAM,iBAAiB,KAAK,IAC1B,KAAK,cAAc,SACjB,uBAAuB,SAAS,eAAe,SAAS,aAAa,GACvE,CACF;EACA,cAAc;EACd,gBAAgB;CAClB;CAEA,KAAK,iBAAiB;CACtB,KAAK,mBAAmB;AAC1B"}
+{"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 {\n  getHunkSideEndBoundary,\n  getHunkSideStartBoundary,\n} from './getHunkSideBoundaries';\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<\n    FileDiffMetadata,\n    | 'additionLines'\n    | 'deletionLines'\n    | 'additionCharacterCount'\n    | 'deletionCharacterCount'\n  >;\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    additionCharacterCount: recomputed.additionCharacterCount,\n    deletionCharacterCount: recomputed.deletionCharacterCount,\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  additionCharacterCount: number,\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    additionCharacterCount,\n    deletionCharacterCount: recomputed.deletionCharacterCount,\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, [''], 0, 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      diff.additionCharacterCount,\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 = getHunkSideEndBoundary(\n    lastHunk.additionStart,\n    lastHunk.additionCount\n  );\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      getHunkSideStartBoundary(hunk.additionStart, hunk.additionCount) -\n        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 = getHunkSideEndBoundary(\n      hunk.additionStart,\n      hunk.additionCount\n    );\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        getHunkSideEndBoundary(lastHunk.additionStart, lastHunk.additionCount),\n      0\n    );\n    splitTotal += collapsedAfter;\n    unifiedTotal += collapsedAfter;\n  }\n\n  diff.splitLineCount = splitTotal;\n  diff.unifiedLineCount = unifiedTotal;\n}\n"],"mappings":";;;;;;AAiCA,SAAgB,mBACd,MACA,kBACoB;CACpB,MAAM,aAAa,kBACjB;EACE,MAAM,KAAK,YAAY,KAAK;EAC5B,UAAU,KAAK,cAAc,KAAK,EAAE;CACtC,GACA;EACE,MAAM,KAAK;EACX,UAAU,KAAK,cAAc,KAAK,EAAE;EACpC,MAAM,KAAK;CACb,GACA,gBACF;CACA,OAAO;EACL,OAAO,WAAW;EAClB,gBAAgB,WAAW;EAC3B,kBAAkB,WAAW;EAC7B,eAAe,WAAW;EAC1B,eAAe,WAAW;EAC1B,wBAAwB,WAAW;EACnC,wBAAwB,WAAW;EACnC,MAAM,WAAW;CACnB;AACF;AAKA,SAAS,gCACP,WACA,kBACQ;CACR,MAAM,QAAQ,KAAK,IAAI,WAAW,CAAC;CACnC,IAAI,WAAW,MAAM,KACnB,EAAE,QAAQ,MAAM,IACf,GAAG,UAAU,GAAG,IAAI,OAAO,QAAQ,CAAC,EAAE,GACzC,CAAC,CAAC,KAAK,EAAE;CACT,IAAI,aAAa,kBACf,WAAW,MAAM,KACf,EAAE,QAAQ,MAAM,IACf,GAAG,UAAU,SAAS,IAAI,OAAO,KAAK,EAAE,GAC3C,CAAC,CAAC,KAAK,EAAE;CAEX,OAAO;AACT;AAEA,SAAS,6BAA6B,eAAkC;CACtE,KAAK,MAAM,QAAQ,eACjB,IAAI,KAAK,KAAK,CAAC,CAAC,SAAS,GACvB,OAAO;CAGX,OAAO;AACT;AAKA,SAAgB,gCACd,MACA,eACS;CACT,OACE,cAAc,SAAS,KACvB,cAAc,SAAS,KAAK,cAAc,UAC1C,6BAA6B,aAAa;AAE9C;AAKA,SAAgB,gCACd,MACA,eACA,wBACA,kBACoB;CACpB,MAAM,mBAAmB,KAAK,cAAc,KAAK,EAAE;CACnD,MAAM,mBAAmB,gCACvB,cAAc,QACd,gBACF;CACA,MAAM,aAAa,kBACjB;EACE,MAAM,KAAK,YAAY,KAAK;EAC5B,UAAU;CACZ,GACA;EACE,MAAM,KAAK;EACX,UAAU;EACV,MAAM,KAAK;CACb,GACA,gBACF;CACA,OAAO;EACL,OAAO,WAAW;EAClB,gBAAgB,WAAW;EAC3B,kBAAkB,WAAW;EAC7B;EACA,eAAe,WAAW;EAC1B;EACA,wBAAwB,WAAW;EACnC,MAAM,WAAW;CACnB;AACF;AAQA,SAAgB,2BACd,MACA,kBACoB;CACpB,OAAO,gCAAgC,MAAM,CAAC,EAAE,GAAG,GAAG,gBAAgB;AACxE;;AAGA,SAAgB,0BACd,MACA,kBACoB;CACpB,IAAI,KAAK,cAAc,WAAW,GAChC,OAAO,2BAA2B,MAAM,gBAAgB;CAE1D,IAAI,gCAAgC,MAAM,KAAK,aAAa,GAC1D,OAAO,gCACL,MACA,KAAK,eACL,KAAK,wBACL,gBACF;CAEF,MAAM,gBAAgB,KAAK;CAC3B,MAAM,aAAa,mBAAmB,MAAM,gBAAgB;CAC5D,gCAAgC,YAAY,aAAa;CACzD,OAAO;AACT;AAEA,SAAS,2BAA2B,eAAkC;CACpE,OAAO,cAAc,SAAS,KAAK,cAAc,GAAG,EAAE,MAAM;AAC9D;AAKA,SAAgB,gCACd,YAIA,eACM;CACN,IAAI,CAAC,2BAA2B,aAAa,GAC3C;CAEF,MAAM,iBAAiB,cAAc,SAAS,WAAW,cAAc;CACvE,IAAI,kBAAkB,GACpB;CAEF,MAAM,yBAAyB,WAAW,cAAc;CAExD,MAAM,WAAW,WAAW,MAAM,GAAG,EAAE;CACvC,IAAI,YAAY,MACd;CAOF,IAJ4B,uBAC1B,SAAS,eACT,SAAS,aAEW,MAAM,wBAC1B;CAGF,KAAK,MAAM,WAAW,SAAS,aAC7B,IACE,QAAQ,SAAS,YACjB,QAAQ,YAAY,QAAQ,aAC5B,QAAQ,oBAAoB,QAAQ,cAAc,wBAClD;EACA,WAAW,gBAAgB;EAC3B,QAAQ,aAAa;EACrB,SAAS,iBAAiB;EAC1B,SAAS,iBAAiB;EAC1B,8BAA8B,UAAU;EACxC;CACF;AAEJ;;AAGA,SAAgB,gBACd,MACA,4BACA,kBACoB;CACpB,IAAI,KAAK,WACP,OAAO,sBACL,MACA,mBAAmB,MAAM,gBAAgB,CAC3C;CAGF,IAAI,KAAK,cAAc,WAAW,KAAK,cAAc,QACnD,OAAO,sBACL,MACA,mBAAmB,MAAM,gBAAgB,CAC3C;CAGF,MAAM,eAAe,MAAM,KAAK,0BAA0B;CAC1D,IAAI,aAAa,WAAW,GAC1B,OAAO,sBAAsB,MAAM;EACjC,OAAO,KAAK;EACZ,gBAAgB,KAAK;EACrB,kBAAkB,KAAK;EACvB,MAAM,KAAK;CACb,CAAC;CAEH,KAAK,MAAM,QAAQ,cAAc;EAC/B,MAAM,eAAe,KAAK,cAAc;EACxC,MAAM,eAAe,KAAK,cAAc;EACxC,IAAI,gBAAgB,QAAQ,gBAAgB,MAC1C,OAAO,sBACL,MACA,mBAAmB,MAAM,gBAAgB,CAC3C;EAGF,IAAI,iBAAiB,YAAY,MAAM,iBAAiB,YAAY,GAClE,OAAO,sBACL,MACA,mBAAmB,MAAM,gBAAgB,CAC3C;CAEJ;CAEA,MAAM,sBAAsB,uBAAuB,MAAM,YAAY;CACrE,IAAI,oBAAoB,SAAS,GAC/B,OAAO,sBACL,MACA,mBAAmB,MAAM,gBAAgB,CAC3C;CAGF,KAAK,MAAM,aAAa,qBAEtB,IAAI,CADY,kBAAkB,MAAM,WAAW,gBACxC,GACT,OAAO,sBACL,MACA,mBAAmB,MAAM,gBAAgB,CAC3C;CAIJ,8BAA8B,IAAI;CAElC,IAAI,2BAA2B,IAAI,GACjC,OAAO,sBACL,MACA,mBAAmB,MAAM,gBAAgB,CAC3C;CAGF,OAAO,sBAAsB,MAAM;EACjC,OAAO,KAAK;EACZ,gBAAgB,KAAK;EACrB,kBAAkB,KAAK;EACvB,MAAM,KAAK;CACb,CAAC;AACH;AAEA,SAAS,sBACP,MACA,QACG;CACH,OAAO,OAAO,MAAM,MAAM;CAC1B,OAAO;AACT;AAEA,SAAS,uBACP,MACA,4BACa;CACb,MAAM,0BAAU,IAAI,IAAY;CAChC,KAAK,MAAM,QAAQ,4BAA4B;EAC7C,MAAM,YAAY,6BAA6B,MAAM,IAAI;EACzD,IAAI,aAAa,MACf,uBAAO,IAAI,IAAI;EAEjB,QAAQ,IAAI,SAAS;CACvB;CACA,OAAO;AACT;AAEA,SAAS,6BACP,MACA,MACoB;CACpB,KAAK,MAAM,CAAC,WAAW,SAAS,KAAK,MAAM,QAAQ,GAAG;EACpD,MAAM,MAAM,KAAK,oBAAoB,KAAK;EAC1C,IAAI,QAAQ,KAAK,qBAAqB,OAAO,KAC3C,OAAO;CAEX;AAEF;AAEA,SAAS,kBACP,MACA,WACA,kBACS;CACT,MAAM,OAAO,KAAK,MAAM;CACxB,IAAI,QAAQ,MACV,OAAO;CAGT,MAAM,gBAAgB,KAAK,cAAc,MACvC,KAAK,mBACL,KAAK,oBAAoB,KAAK,aAChC;CACA,MAAM,gBAAgB,KAAK,cAAc,MACvC,KAAK,mBACL,KAAK,oBAAoB,KAAK,aAChC;CAEA,MAAM,WAAW,kBACf;EACE,MAAM,KAAK,YAAY,KAAK;EAC5B,UAAU,cAAc,KAAK,EAAE;CACjC,GACA;EACE,MAAM,KAAK;EACX,UAAU,cAAc,KAAK,EAAE;EAC/B,MAAM,KAAK;CACb,GACA;EAAE,GAAG;EAAkB,SAAS;CAAE,CACpC;CAEA,MAAM,eAAe,SAAS,MAAM;CACpC,IAAI,gBAAgB,QAAQ,SAAS,MAAM,WAAW,GACpD,OAAO;CAGT,kBAAkB,MAAM,YAAY;CACpC,4BAA4B,MAAM,SAAS;CAC3C,OAAO;AACT;AAEA,SAAgB,4BACd,MACA,WACM;CACN,MAAM,OAAO,KAAK,MAAM;CACxB,IAAI,QAAQ,MACV;CAIF,IAAI,EADe,cAAc,KAAK,MAAM,SAAS,IACpC;EACf,KAAK,mBAAmB;EACxB,KAAK,mBAAmB;EACxB;CACF;CAEA,MAAM,mBAAmB,KAAK,cAAc,GAAG,EAAE;CACjD,MAAM,mBAAmB,KAAK,cAAc,GAAG,EAAE;CACjD,KAAK,mBACH,oBAAoB,QACpB,qBAAqB,MACrB,CAAC,iBAAiB,SAAS,IAAI;CACjC,KAAK,mBACH,oBAAoB,QACpB,qBAAqB,MACrB,CAAC,iBAAiB,SAAS,IAAI;AACnC;AAEA,SAAS,kBAAkB,QAAc,QAAoB;CAC3D,MAAM,iBAAiB,OAAO;CAC9B,MAAM,iBAAiB,OAAO;CAE9B,OAAO,cAAc,OAAO,YAAY,KAAK,YAC3C,kBAAkB,SAAS,gBAAgB,cAAc,CAC3D;CACA,OAAO,oBAAoB,iBAAiB,OAAO;CACnD,OAAO,gBAAgB,OAAO,gBAAgB,OAAO;CACrD,OAAO,gBAAgB,OAAO;CAC9B,OAAO,gBAAgB,OAAO;CAC9B,IAAI,OAAO,qBAAqB,GAAG;EACjC,OAAO,oBAAoB,iBAAiB,OAAO;EACnD,OAAO,gBAAgB,OAAO,gBAAgB,OAAO;CACvD;CACA,OAAO,gBAAgB,OAAO;CAC9B,OAAO,gBAAgB,OAAO;CAC9B,OAAO,mBAAmB,OAAO;CACjC,OAAO,mBAAmB,OAAO;CAEjC,8BAA8B,MAAM;AACtC;AAEA,SAAgB,kBACd,SACA,gBACA,gBACa;CACb,OAAO;EACL,GAAG;EACH,mBAAmB,QAAQ,oBAAoB;EAC/C,mBAAmB,QAAQ,oBAAoB;CACjD;AACF;AAEA,SAAgB,8BAA8B,MAAkB;CAC9D,IAAI,iBAAiB;CACrB,IAAI,mBAAmB;CAEvB,KAAK,MAAM,WAAW,KAAK,aACzB,IAAI,QAAQ,SAAS,WAAW;EAC9B,kBAAkB,QAAQ;EAC1B,oBAAoB,QAAQ;CAC9B,OAAO;EACL,kBAAkB,KAAK,IAAI,QAAQ,WAAW,QAAQ,SAAS;EAC/D,oBAAoB,QAAQ,YAAY,QAAQ;CAClD;CAGF,KAAK,iBAAiB;CACtB,KAAK,mBAAmB;AAC1B;AAEA,SAAgB,8BACd,MAIM;CACN,IAAI,aAAa;CACjB,IAAI,eAAe;CACnB,IAAI,sBAAsB;CAE1B,KAAK,MAAM,QAAQ,KAAK,OAAO;EAC7B,KAAK,kBAAkB,KAAK,IAC1B,yBAAyB,KAAK,eAAe,KAAK,aAAa,IAC7D,qBACF,CACF;EACA,KAAK,iBAAiB,aAAa,KAAK;EACxC,KAAK,mBAAmB,eAAe,KAAK;EAE5C,8BAA8B,IAAI;EAElC,cAAc,KAAK,kBAAkB,KAAK;EAC1C,gBAAgB,KAAK,kBAAkB,KAAK;EAC5C,sBAAsB,uBACpB,KAAK,eACL,KAAK,aACP;CACF;CAEA,IAAI,KAAK,MAAM,SAAS,GAAG;EACzB,MAAM,WAAW,KAAK,MAAM,KAAK,MAAM,SAAS;EAChD,MAAM,iBAAiB,KAAK,IAC1B,KAAK,cAAc,SACjB,uBAAuB,SAAS,eAAe,SAAS,aAAa,GACvE,CACF;EACA,cAAc;EACd,gBAAgB;CAClB;CAEA,KAAK,iBAAiB;CACtB,KAAK,mBAAmB;AAC1B"}

package/dist/worker/WorkerPoolManager.d.ts

@@ -26,6 +26,7 @@ declare class WorkerPoolManager {
   private nextRequestId;
   private themeSubscribers;
   private workersFailed;
+  private terminated;
   private statSubscribers;
   private fileCache;
   private diffCache;
@@ -33,8 +34,16 @@ declare class WorkerPoolManager {
   private lifecycleGeneration;
   constructor(options: WorkerPoolOptions, { langs, theme, useTokenTransformer, lineDiffType, maxLineDiffLength, tokenizeMaxLineLength, preferredHighlighter }: WorkerInitializationRenderOptions);
   isWorkingPool(): boolean;
+  /**
+   * Whether a file or diff fits within `mainThreadMaxCharacters`, so it
+   * highlights on the main thread instead of a worker. Files count `contents`;
+   * diffs count both sides.
+   */
+  shouldHighlightOnMainThread(fileOrDiff: FileContents | FileDiffMetadata): boolean;
   getFileResultCache(file: FileContents): RenderFileResult | undefined;
   getDiffResultCache(diff: FileDiffMetadata): RenderDiffResult | undefined;
+  setFileResultCache(cacheKey: string | undefined, { result, options }: RenderFileResult): boolean;
+  setDiffResultCache(cacheKey: string | undefined, { result, options }: RenderDiffResult): boolean;
   inspectCaches(): GetCachesResult;
   evictFileFromCache(cacheKey: string): boolean;
   evictDiffFromCache(cacheKey: string): boolean;
@@ -65,10 +74,13 @@ declare class WorkerPoolManager {
   private drainQueue;
   highlightFileAST(instance: FileRendererInstance, file: FileContents): void;
   primeFileHighlightCache(file: FileContents): Promise<void>;
+  private shouldPrimeFileHighlightCache;
   private getOrCreateFileHighlightCacheTask;
   getPlainFileAST(file: FileContents, startingLine: number, totalLines: number, lines?: string[]): ThemedFileResult | undefined;
   highlightDiffAST(instance: DiffRendererInstance, diff: FileDiffMetadata): void;
   primeDiffHighlightCache(diff: FileDiffMetadata): Promise<void>;
+  private shouldPrimeDiffHighlightCache;
+  private primeHighlightCacheOnMainThread;
   private getOrCreateDiffHighlightCacheTask;
   getPlainDiffAST(diff: FileDiffMetadata, startingLine: number, totalLines: number, expandedHunks?: Map<number, HunkExpansionRegion> | true, collapsedContextThreshold?: number): ThemedDiffResult | undefined;
   terminate(): void;

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

@@ -1 +1 @@
-{"version":3,"file":"WorkerPoolManager.d.ts","names":[],"sources":["../../src/worker/WorkerPoolManager.ts"],"mappings":";;;;UAkFU;EACR,WAAW,eAAe;EAC1B,WAAW,eAAe;;UAYlB;EACR;;KAKG,qBAAqB,uBAAuB;cAEpC;UAiCD;mBAhCO;UACT;UACA;UACA;UACA;UACA;UAEA;UACA;UAIA;UAGA;UACA;UAKA;UACA;UACA;UACA;UACA;UACA;UACA;UAEA;EAER,YACU,SAAS,qBAEf,OACA,OACA,qBACA,cACA,mBACA,uBACA,wBACC;EAeE;EAIA,mBAAmB,MAAM,eAAe;EAMxC,mBACL,MAAM,mBACL;EAMI,iBAAiB;EAKjB,mBAAmB;EAQnB,mBAAmB;EAQpB,mBACJ,OACA,qBACA,cACA,mBACA,yBACC,QAAQ,0BAA0B;EAwE9B,2BAA2B;EAI3B,wBAAwB;EAMxB,wBAAwB;UAIjB;EA6CP,wBAAwB,UAAU;EASlC,0BAA0B,UAAU;EAKpC,uBACL,WAAW,OAAO;UASZ;UAKA;EAWD,aAAa,UAAU;EAkBvB;EAIM,WAAW,YAAW,uBAA4B;UAyFjD;UAiBA;;;;;;;;;UAgGN;UA8BA;EA2BD,iBACL,UAAU,sBACV,MAAM;EAqBD,wBAAwB,MAAM,eAAe;UAe5C;EAgCD,gBACL,MAAM,cACN,sBACA,oBACA,mBACC;EAgBI,iBACL,UAAU,sBACV,MAAM;EAqBD,wBAAwB,MAAM,mBAAmB;UAehD;EAgCD,gBACL,MAAM,kBACN,sBACA,oBACA,gBAAgB,YAAY,6BAC5B,qCACC;EAiBI;UAoBC;UAIA;UAUA;UAWA;EAOD,YAAY;UAwBX;UA+DA;UA0CA;UAcM;UA0DN;UAsHA;UACA;UAMA;UAYA;UAqBA;UAmCA;UAeA;UAUA;UA8BA;UAOA;UAOA;UAWA;UASA;UAgBA;UAeA;UAWA;UAUA;UAOA;UAMA;UAOA;UAOA;UAkBA;UAQA;UASA;UAMA;UAQA;UAYA;UAYA;UAQA;UAiBA;UAiBA;UAKA;UAIC;UAWD"}
+{"version":3,"file":"WorkerPoolManager.d.ts","names":[],"sources":["../../src/worker/WorkerPoolManager.ts"],"mappings":";;;;UAmFU;EACR,WAAW,eAAe;EAC1B,WAAW,eAAe;;UAYlB;EACR;;KAKG,qBAAqB,uBAAuB;cAEpC;UAkCD;mBAjCO;UACT;UACA;UACA;UACA;UACA;UAEA;UACA;UAIA;UAGA;UACA;UAKA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UAEA;EAER,YACU,SAAS,qBAEf,OACA,OACA,qBACA,cACA,mBACA,uBACA,wBACC;EAeE;;;;;;EASA,4BACL,YAAY,eAAe;EAUtB,mBAAmB,MAAM,eAAe;EAMxC,mBACL,MAAM,mBACL;EAQI,mBACL,gCACE,QAAQ,WAAW;EAehB,mBACL,gCACE,QAAQ,WAAW;EAahB,iBAAiB;EAKjB,mBAAmB;EAQnB,mBAAmB;EAQpB,mBACJ,OACA,qBACA,cACA,mBACA,yBACC,QAAQ,0BAA0B;EAmF9B,2BAA2B;EAI3B,wBAAwB;EAMxB,wBAAwB;UAIjB;EA6CP,wBAAwB,UAAU;EASlC,0BAA0B,UAAU;EAKpC,uBACL,WAAW,OAAO;UASZ;UAKA;EAWD,aAAa,UAAU;EAkBvB;EAIM,WAAW,YAAW,uBAA4B;UAwFjD;UAiBA;;;;;;;;;UAgGN;UA8BA;EA2BD,iBACL,UAAU,sBACV,MAAM;EAqBD,wBAAwB,MAAM,eAAe;UAgC5C;UAkBA;EA2BD,gBACL,MAAM,cACN,sBACA,oBACA,mBACC;EAgBI,iBACL,UAAU,sBACV,MAAM;EAqBD,wBAAwB,MAAM,mBAAmB;UAgChD;UAuBA;UA0BA;EA2BD,gBACL,MAAM,kBACN,sBACA,oBACA,gBAAgB,YAAY,6BAC5B,qCACC;EAiBI;UAqBC;UAIA;UAUA;UAWA;EAOD,YAAY;UAwBX;UA+DA;UA0CA;UAcM;UA0DN;UAsHA;UACA;UAMA;UAYA;UAqBA;UAmCA;UAeA;UAUA;UA8BA;UAOA;UAOA;UAWA;UASA;UAgBA;UAeA;UAWA;UAUA;UAOA;UAMA;UAOA;UAOA;UAkBA;UAQA;UASA;UAMA;UAQA;UAYA;UAYA;UAQA;UAiBA;UAiBA;UAKA;UAIC;UAWD"}

package/dist/worker/WorkerPoolManager.js

@@ -41,6 +41,7 @@ var WorkerPoolManager = class {
 	nextRequestId = 0;
 	themeSubscribers = /* @__PURE__ */ new Set();
 	workersFailed = false;
+	terminated = false;
 	statSubscribers = /* @__PURE__ */ new Set();
 	fileCache;
 	diffCache;
@@ -61,7 +62,16 @@ var WorkerPoolManager = class {
 		this.queueInitialization(langs);
 	}
 	isWorkingPool() {
-		return !this.workersFailed;
+		return !this.workersFailed && !this.terminated;
+	}
+	/**
+	* Whether a file or diff fits within `mainThreadMaxCharacters`, so it
+	* highlights on the main thread instead of a worker. Files count `contents`;
+	* diffs count both sides.
+	*/
+	shouldHighlightOnMainThread(fileOrDiff) {
+		const { mainThreadMaxCharacters = -1 } = this.options;
+		return ("contents" in fileOrDiff ? fileOrDiff.contents.length : fileOrDiff.deletionCharacterCount + fileOrDiff.additionCharacterCount) <= mainThreadMaxCharacters;
 	}
 	getFileResultCache(file) {
 		return file.cacheKey != null ? this.fileCache.get(file.cacheKey) : void 0;
@@ -69,6 +79,24 @@ var WorkerPoolManager = class {
 	getDiffResultCache(diff) {
 		return diff.cacheKey != null ? this.diffCache.get(diff.cacheKey) : void 0;
 	}
+	setFileResultCache(cacheKey, { result, options }) {
+		if (cacheKey == null || !areFileRenderOptionsEqual(options, this.getFileRenderOptions())) return false;
+		this.fileCache.set(cacheKey, {
+			result,
+			options
+		});
+		this.queueBroadcastStateChanges();
+		return true;
+	}
+	setDiffResultCache(cacheKey, { result, options }) {
+		if (cacheKey == null || !areDiffRenderOptionsEqual(options, this.getDiffRenderOptions())) return false;
+		this.diffCache.set(cacheKey, {
+			result,
+			options
+		});
+		this.queueBroadcastStateChanges();
+		return true;
+	}
 	inspectCaches() {
 		const { fileCache, diffCache } = this;
 		return {
@@ -102,7 +130,11 @@ var WorkerPoolManager = class {
 				maxLineDiffLength,
 				tokenizeMaxLineLength
 			};
-			if (!this.isInitialized()) await this.initialize();
+			if (!this.isInitialized()) try {
+				await this.initialize();
+			} catch (error) {
+				if (!this.workersFailed) throw error;
+			}
 			if (!isCurrentRequest() || areDiffRenderOptionsEqual(newRenderOptions, this.renderOptions)) return;
 			const themeNames = getThemes(theme);
 			let resolvedThemes = [];
@@ -222,6 +254,7 @@ var WorkerPoolManager = class {
 			if (getHighlighterIfLoaded({ theme: this.renderOptions.theme }) == null) await this.loadSharedHighlighter(getThemes(this.renderOptions.theme), ["text", ...languages]);
 			return;
 		} else if (this.initialized === false) {
+			this.terminated = false;
 			const { lifecycleGeneration } = this;
 			const initialization = new Promise((resolve, reject) => {
 				(async () => {
@@ -245,8 +278,6 @@ var WorkerPoolManager = class {
 							return;
 						}
 						this.initialized = true;
-						this.diffCache.clear();
-						this.fileCache.clear();
 						this.drainQueue();
 						this.queueBroadcastStateChanges();
 						resolve();
@@ -377,7 +408,7 @@ var WorkerPoolManager = class {
 				i++;
 				continue;
 			}
-			const langs = getLangsFromTask(task);
+			const langs = getLangsFromRequest(task.request);
 			const availableWorker = this.getAvailableWorker(langs);
 			if (availableWorker == null) break;
 			this.queuedTasks.splice(i, 1);
@@ -396,27 +427,43 @@ var WorkerPoolManager = class {
 	}
 	primeFileHighlightCache(file) {
 		if (!this.isWorkingPool()) return Promise.reject(/* @__PURE__ */ new Error("WorkerPoolManager.primeFileHighlightCache: worker pool is not working"));
+		if (!this.shouldPrimeFileHighlightCache(file)) return Promise.resolve();
+		if (this.shouldHighlightOnMainThread(file)) {
+			const options = this.getFileRenderOptions();
+			return this.primeHighlightCacheOnMainThread(getLangsFromRequest({
+				type: "file",
+				file
+			}), options.theme, (highlighter) => this.setFileResultCache(file.cacheKey, {
+				result: renderFileWithHighlighter(file, highlighter, options),
+				options
+			}));
+		}
 		const task = this.getOrCreateFileHighlightCacheTask(file);
 		return task != null ? this.createRenderTaskCallbacks(task) : Promise.resolve();
 	}
-	getOrCreateFileHighlightCacheTask(file) {
+	shouldPrimeFileHighlightCache(file) {
 		if (file.cacheKey == null) {
 			console.warn(`WorkerPoolManager.primeFileHighlightCache: priming highlight cache requires file.cacheKey; skipping "${file.name}".`);
-			return;
+			return false;
 		}
 		const cachedResult = this.getFileResultCache(file);
+		return !isFilePlainText(file) && (cachedResult == null || !areFileRenderOptionsEqual(cachedResult.options, this.getFileRenderOptions()));
+	}
+	getOrCreateFileHighlightCacheTask(file) {
 		const highlightKey = this.getFileHighlightKey(file);
-		if (highlightKey == null || isFilePlainText(file) || cachedResult != null && areFileRenderOptionsEqual(cachedResult.options, this.getFileRenderOptions())) return;
+		if (highlightKey == null) return;
 		const existingTask = this.getTaskByHighlightKey(highlightKey);
 		if (existingTask != null) {
+			if (existingTask.type !== "file") throw new Error("WorkerPoolManager.getOrCreateFileHighlightCacheTask: Invalid task type");
 			existingTask.primeCache = true;
-			return existingTask.type === "file" ? existingTask : void 0;
+			return existingTask;
 		} else {
 			const task = this.submitCacheTask({
 				type: "file",
 				file
 			}, highlightKey);
-			return task.type === "file" ? task : void 0;
+			if (task.type !== "file") throw new Error("WorkerPoolManager.getOrCreateFileHighlightCacheTask: Invalid task created");
+			return task;
 		}
 	}
 	getPlainFileAST(file, startingLine, totalLines, lines) {
@@ -442,27 +489,58 @@ var WorkerPoolManager = class {
 	}
 	primeDiffHighlightCache(diff) {
 		if (!this.isWorkingPool()) return Promise.reject(/* @__PURE__ */ new Error("WorkerPoolManager.primeDiffHighlightCache: worker pool is not working"));
+		if (!this.shouldPrimeDiffHighlightCache(diff)) return Promise.resolve();
+		if (this.shouldHighlightOnMainThread(diff)) {
+			const options = this.getDiffRenderOptions();
+			return this.primeHighlightCacheOnMainThread(getLangsFromRequest({
+				type: "diff",
+				diff
+			}), options.theme, (highlighter) => this.setDiffResultCache(diff.cacheKey, {
+				result: renderDiffWithHighlighter(diff, highlighter, options),
+				options
+			}));
+		}
 		const task = this.getOrCreateDiffHighlightCacheTask(diff);
 		return task != null ? this.createRenderTaskCallbacks(task) : Promise.resolve();
 	}
-	getOrCreateDiffHighlightCacheTask(diff) {
+	shouldPrimeDiffHighlightCache(diff) {
 		if (diff.cacheKey == null) {
 			console.warn(`WorkerPoolManager.primeDiffHighlightCache: priming highlight cache requires diff.cacheKey; skipping "${diff.prevName ?? diff.name}" -> "${diff.name}".`);
-			return;
+			return false;
 		}
 		const cachedResult = this.getDiffResultCache(diff);
+		return !isDiffPlainText(diff) && (cachedResult == null || !areDiffRenderOptionsEqual(cachedResult.options, this.getDiffRenderOptions()));
+	}
+	primeHighlightCacheOnMainThread(langs, theme, highlightAndCacheResult) {
+		function highlightAndCacheIfLoaded() {
+			const highlighter = getHighlighterIfLoaded({
+				theme,
+				langs
+			});
+			return highlighter != null && highlightAndCacheResult(highlighter);
+		}
+		if (highlightAndCacheIfLoaded()) return Promise.resolve();
+		const { lifecycleGeneration } = this;
+		return this.loadSharedHighlighter(getThemes(theme), ["text", ...langs]).then(() => {
+			if (!this.isCurrentLifecycle(lifecycleGeneration)) throw new WorkerPoolTerminatedError();
+			if (!highlightAndCacheIfLoaded()) throw new WorkerPoolTaskCanceledError();
+		});
+	}
+	getOrCreateDiffHighlightCacheTask(diff) {
 		const highlightKey = this.getDiffHighlightKey(diff);
-		if (highlightKey == null || isDiffPlainText(diff) || cachedResult != null && areDiffRenderOptionsEqual(cachedResult.options, this.getDiffRenderOptions())) return;
+		if (highlightKey == null) return;
 		const existingTask = this.getTaskByHighlightKey(highlightKey);
 		if (existingTask != null) {
+			if (existingTask.type !== "diff") throw new Error("WorkerPoolManager.getOrCreateDiffHighlightCacheTask: Invalid task type");
 			existingTask.primeCache = true;
-			return existingTask.type === "diff" ? existingTask : void 0;
+			return existingTask;
 		} else {
 			const task = this.submitCacheTask({
 				type: "diff",
 				diff
 			}, highlightKey);
-			return task.type === "diff" ? task : void 0;
+			if (task.type !== "diff") throw new Error("WorkerPoolManager.getOrCreateDiffHighlightCacheTask: Invalid task created");
+			return task;
 		}
 	}
 	getPlainDiffAST(diff, startingLine, totalLines, expandedHunks, collapsedContextThreshold) {
@@ -494,6 +572,7 @@ var WorkerPoolManager = class {
 		this.activeTaskById.clear();
 		this.initialized = false;
 		this.workersFailed = false;
+		this.terminated = true;
 		this.queueBroadcastStateChanges();
 	}
 	isCurrentLifecycle(lifecycleGeneration) {
@@ -914,16 +993,15 @@ var WorkerPoolManager = class {
 function shouldSyncCustomExtensions(request) {
 	return request.type === "initialize" || request.type === "file" || request.type === "diff";
 }
-function getLangsFromTask(task) {
+function getLangsFromRequest(request) {
 	const langs = /* @__PURE__ */ new Set();
-	if (task.type === "initialize" || task.type === "set-render-options") return [];
-	switch (task.type) {
+	switch (request.type) {
 		case "file":
-			langs.add(task.request.file.lang ?? getFiletypeFromFileName(task.request.file.name));
+			langs.add(request.file.lang ?? getFiletypeFromFileName(request.file.name));
 			break;
 		case "diff":
-			langs.add(task.request.diff.lang ?? getFiletypeFromFileName(task.request.diff.name));
-			langs.add(task.request.diff.lang ?? getFiletypeFromFileName(task.request.diff.prevName ?? "-"));
+			langs.add(request.diff.lang ?? getFiletypeFromFileName(request.diff.name));
+			langs.add(request.diff.lang ?? getFiletypeFromFileName(request.diff.prevName ?? "-"));
 	}
 	langs.delete("text");
 	return Array.from(langs);