@pierre/diffs 1.5.2 → 1.6.0

package/dist/react/utils/useNextRenderData.js

@@ -0,0 +1,9 @@
+//#region src/react/utils/useNextRenderData.ts
+function useNextRenderData(instanceRef, input) {
+	"use no memo";
+	return instanceRef.current?.__getNextRenderData(input);
+}
+//#endregion
+export { useNextRenderData };
+
+//# sourceMappingURL=useNextRenderData.js.map

package/dist/react/utils/useNextRenderData.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useNextRenderData.js","names":[],"sources":["../../../src/react/utils/useNextRenderData.ts"],"sourcesContent":["import type { RefObject } from 'react';\n\ninterface NextRenderDataSource<TInput, TData> {\n  __getNextRenderData(input: TInput): TData;\n}\n\n// Read the data the instance will display once render() receives this input.\n// The instance can change it without new props, so this must not be memoized.\n// Returns undefined before the instance exists.\nexport function useNextRenderData<TInput, TData>(\n  instanceRef: RefObject<NextRenderDataSource<TInput, TData> | null>,\n  input: TInput\n): TData | undefined {\n  'use no memo';\n  // oxlint-disable-next-line react/refs -- the instance changes without new props\n  return instanceRef.current?.__getNextRenderData(input);\n}\n"],"mappings":";AASA,SAAgB,kBACd,aACA,OACmB;CACnB;CAEA,OAAO,YAAY,SAAS,oBAAoB,KAAK;AACvD"}

package/dist/react/utils/useUnresolvedFileInstance.d.ts

@@ -16,6 +16,7 @@ interface UseUnresolvedFileInstanceProps<LAnnotation> {
   disableWorkerPool: boolean;
 }
 interface UseUnresolvedFileInstanceReturn<LAnnotation> {
+  lineAnnotations: DiffLineAnnotation<LAnnotation>[];
   fileDiff: FileDiffMetadata;
   actions: (MergeConflictDiffAction | undefined)[];
   markerRows: MergeConflictMarkerRow[];

package/dist/react/utils/useUnresolvedFileInstance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useUnresolvedFileInstance.d.ts","names":[],"sources":["../../../src/react/utils/useUnresolvedFileInstance.ts"],"mappings":";;;;;;UAoCU,+BAA+B;EACvC,MAAM;EACN,UAAU,2BAA2B;EACrC,iBAAiB,mBAAmB;EACpC,eAAe;EACf;EACA;EACA;EACA;EACA;;UAGQ,gCAAgC;EACxC,UAAU;EACV,UAAU;EACV,YAAY;EACZ,IAAI,MAAM;EACV,kBAAkB;EAClB,eAAe,eAAe;;iBAGhB,0BAA0B,eACxC,MACA,SACA,iBACA,eACA,iBACA,oBACA,wBACA,iBACA,qBACC,+BAA+B,eAAe,gCAAgC"}
+{"version":3,"file":"useUnresolvedFileInstance.d.ts","names":[],"sources":["../../../src/react/utils/useUnresolvedFileInstance.ts"],"mappings":";;;;;;UAuCU,+BAA+B;EACvC,MAAM;EACN,UAAU,2BAA2B;EACrC,iBAAiB,mBAAmB;EACpC,eAAe;EACf;EACA;EACA;EACA;EACA;;UAGQ,gCAAgC;EACxC,iBAAiB,mBAAmB;EACpC,UAAU;EACV,UAAU;EACV,YAAY;EACZ,IAAI,MAAM;EACV,kBAAkB;EAClB,eAAe,eAAe;;iBAGhB,0BAA0B,eACxC,MACA,SACA,iBACA,eACA,iBACA,oBACA,wBACA,iBACA,qBACC,+BAA+B,eAAe,gCAAgC"}

package/dist/react/utils/useUnresolvedFileInstance.js

@@ -1,9 +1,12 @@
+import { EMPTY_LINE_ANNOTATIONS } from "../../constants.js";
 import { areOptionsEqual } from "../../utils/areOptionsEqual.js";
 import { parseMergeConflictDiffFromFile } from "../../utils/parseMergeConflictDiffFromFile.js";
 import { UnresolvedFile } from "../../components/UnresolvedFile.js";
 import { useStableCallback } from "./useStableCallback.js";
 import { noopRender } from "../constants.js";
 import { WorkerPoolContext } from "../WorkerPoolContext.js";
+import { useForceUpdate } from "./useForceUpdate.js";
+import { useNextRenderData } from "./useNextRenderData.js";
 import { useCallback, useContext, useEffect, useLayoutEffect, useRef, useState } from "react";
 //#region src/react/utils/useUnresolvedFileInstance.ts
 const useIsomorphicLayoutEffect = typeof window === "undefined" ? useEffect : useLayoutEffect;
@@ -30,6 +33,18 @@ function useUnresolvedFileInstance({ file, options, lineAnnotations, selectedLin
 	const controlledSelection = selectedLines !== void 0;
 	const poolManager = useContext(WorkerPoolContext);
 	const instanceRef = useRef(null);
+	const forceUpdate = useForceUpdate();
+	const renderData = useNextRenderData(instanceRef, {
+		fileDiff,
+		actions,
+		markerRows,
+		lineAnnotations
+	}) ?? {
+		fileDiff,
+		actions,
+		markerRows,
+		lineAnnotations: lineAnnotations ?? EMPTY_LINE_ANNOTATIONS
+	};
 	const ref = useStableCallback((fileContainer) => {
 		if (fileContainer != null) {
 			if (instanceRef.current != null) throw new Error("useUnresolvedFileInstance: An instance should not already exist when a node is created");
@@ -40,7 +55,7 @@ function useUnresolvedFileInstance({ file, options, lineAnnotations, selectedLin
 				hasGutterRenderUtility,
 				onMergeConflictAction,
 				options
-			}), !disableWorkerPool ? poolManager : void 0, true);
+			}), !disableWorkerPool ? poolManager : void 0, forceUpdate);
 			instanceRef.current.hydrate({
 				fileDiff,
 				actions,
@@ -66,7 +81,7 @@ function useUnresolvedFileInstance({ file, options, lineAnnotations, selectedLin
 			onMergeConflictAction,
 			options
 		});
-		const forceRender = newOptions !== void 0 && !areOptionsEqual(instance.options, newOptions);
+		const forceRender = !areOptionsEqual(instance.options, newOptions);
 		instance.setOptions(newOptions);
 		instance.render({
 			fileDiff,
@@ -77,17 +92,17 @@ function useUnresolvedFileInstance({ file, options, lineAnnotations, selectedLin
 		});
 		if (selectedLines !== void 0) instance.setSelectedLines(selectedLines);
 	});
+	const getHoveredLine = useCallback(() => {
+		return instanceRef.current?.getHoveredLine();
+	}, []);
+	const getInstance = useCallback(() => {
+		return instanceRef.current ?? void 0;
+	}, []);
 	return {
+		...renderData,
 		ref,
-		getHoveredLine: useCallback(() => {
-			return instanceRef.current?.getHoveredLine();
-		}, []),
-		fileDiff,
-		actions,
-		markerRows,
-		getInstance: useCallback(() => {
-			return instanceRef.current ?? void 0;
-		}, [])
+		getHoveredLine,
+		getInstance
 	};
 }
 function mergeUnresolvedOptions({ options, controlledSelection, onMergeConflictAction, hasConflictUtility, hasCustomHeader, hasGutterRenderUtility }) {

package/dist/react/utils/useUnresolvedFileInstance.js.map

@@ -1 +1 @@
-{"version":3,"file":"useUnresolvedFileInstance.js","names":["UnresolvedFileClass"],"sources":["../../../src/react/utils/useUnresolvedFileInstance.ts"],"sourcesContent":["import {\n  useCallback,\n  useContext,\n  useEffect,\n  useLayoutEffect,\n  useRef,\n  useState,\n} from 'react';\n\nimport {\n  UnresolvedFile,\n  UnresolvedFile as UnresolvedFileClass,\n  type UnresolvedFileOptions,\n} from '../../components/UnresolvedFile';\nimport type { GetHoveredLineResult } from '../../managers/InteractionManager';\nimport type {\n  DiffLineAnnotation,\n  FileContents,\n  FileDiffMetadata,\n  MergeConflictActionPayload,\n  MergeConflictMarkerRow,\n  SelectedLineRange,\n} from '../../types';\nimport { areOptionsEqual } from '../../utils/areOptionsEqual';\nimport {\n  type MergeConflictDiffAction,\n  parseMergeConflictDiffFromFile,\n} from '../../utils/parseMergeConflictDiffFromFile';\nimport { noopRender } from '../constants';\nimport type { UnresolvedFileReactOptions } from '../UnresolvedFile';\nimport { WorkerPoolContext } from '../WorkerPoolContext';\nimport { useStableCallback } from './useStableCallback';\n\nconst useIsomorphicLayoutEffect =\n  typeof window === 'undefined' ? useEffect : useLayoutEffect;\n\ninterface UseUnresolvedFileInstanceProps<LAnnotation> {\n  file: FileContents;\n  options?: UnresolvedFileReactOptions<LAnnotation>;\n  lineAnnotations: DiffLineAnnotation<LAnnotation>[] | undefined;\n  selectedLines: SelectedLineRange | null | undefined;\n  prerenderedHTML: string | undefined;\n  hasConflictUtility: boolean;\n  hasGutterRenderUtility: boolean;\n  hasCustomHeader: boolean;\n  disableWorkerPool: boolean;\n}\n\ninterface UseUnresolvedFileInstanceReturn<LAnnotation> {\n  fileDiff: FileDiffMetadata;\n  actions: (MergeConflictDiffAction | undefined)[];\n  markerRows: MergeConflictMarkerRow[];\n  ref(node: HTMLElement | null): void;\n  getHoveredLine(): GetHoveredLineResult<'diff'> | undefined;\n  getInstance(): UnresolvedFile<LAnnotation> | undefined;\n}\n\nexport function useUnresolvedFileInstance<LAnnotation>({\n  file,\n  options,\n  lineAnnotations,\n  selectedLines,\n  prerenderedHTML,\n  hasConflictUtility,\n  hasGutterRenderUtility,\n  hasCustomHeader,\n  disableWorkerPool,\n}: UseUnresolvedFileInstanceProps<LAnnotation>): UseUnresolvedFileInstanceReturn<LAnnotation> {\n  const [{ fileDiff, actions, markerRows }, setState] = useState(() => {\n    const { fileDiff, actions, markerRows } = parseMergeConflictDiffFromFile(\n      file,\n      options?.maxContextLines\n    );\n    return { fileDiff, actions, markerRows };\n  });\n  // UnresolvedFile is intentionally uncontrolled in React. Keep an internal\n  // source-of-truth file so sequential conflict actions apply to the latest\n  // resolved contents rather than the initial prop value.\n  const onMergeConflictAction = useStableCallback(\n    (\n      payload: MergeConflictActionPayload,\n      instance: UnresolvedFile<LAnnotation>\n    ) => {\n      setState((prevState) => {\n        const { fileDiff, actions, markerRows } =\n          instance.resolveConflict(\n            payload.conflict.conflictIndex,\n            payload.resolution,\n            prevState.fileDiff\n          ) ?? {};\n        if (fileDiff == null || actions == null || markerRows == null) {\n          return prevState;\n        } else {\n          return { fileDiff, actions, markerRows };\n        }\n      });\n    }\n  );\n  const controlledSelection = selectedLines !== undefined;\n  const poolManager = useContext(WorkerPoolContext);\n  const instanceRef = useRef<UnresolvedFileClass<LAnnotation> | null>(null);\n  const ref = useStableCallback((fileContainer: HTMLElement | null) => {\n    if (fileContainer != null) {\n      if (instanceRef.current != null) {\n        throw new Error(\n          'useUnresolvedFileInstance: An instance should not already exist when a node is created'\n        );\n      }\n      instanceRef.current = new UnresolvedFileClass(\n        mergeUnresolvedOptions({\n          controlledSelection,\n          hasConflictUtility,\n          hasCustomHeader,\n          hasGutterRenderUtility,\n          onMergeConflictAction,\n          options,\n        }),\n        !disableWorkerPool ? poolManager : undefined,\n        true\n      );\n      void instanceRef.current.hydrate({\n        fileDiff,\n        actions,\n        markerRows,\n        fileContainer,\n        lineAnnotations,\n        prerenderedHTML,\n      });\n    } else {\n      if (instanceRef.current == null) {\n        throw new Error(\n          'useUnresolvedFileInstance: A UnresolvedFile instance should exist when unmounting'\n        );\n      }\n      instanceRef.current.cleanUp();\n      instanceRef.current = null;\n    }\n  });\n\n  useIsomorphicLayoutEffect(() => {\n    if (instanceRef.current == null) return;\n    const instance = instanceRef.current;\n    const newOptions = mergeUnresolvedOptions({\n      controlledSelection,\n      hasConflictUtility,\n      hasCustomHeader,\n      hasGutterRenderUtility,\n      onMergeConflictAction,\n      options,\n    });\n    // setOptions(undefined) is a no-op, so an undefined merge result never\n    // requires a forced render — comparing it against the instance's\n    // constructor-default options would force a full render on every commit.\n    const forceRender =\n      newOptions !== undefined &&\n      !areOptionsEqual(instance.options, newOptions);\n    instance.setOptions(newOptions);\n    void instance.render({\n      fileDiff,\n      actions,\n      markerRows,\n      lineAnnotations,\n      forceRender,\n    });\n    if (selectedLines !== undefined) {\n      instance.setSelectedLines(selectedLines);\n    }\n  });\n\n  const getHoveredLine = useCallback(():\n    | GetHoveredLineResult<'diff'>\n    | undefined => {\n    return instanceRef.current?.getHoveredLine();\n  }, []);\n\n  const getInstance = useCallback(() => {\n    return instanceRef.current ?? undefined;\n  }, []);\n\n  return { ref, getHoveredLine, fileDiff, actions, markerRows, getInstance };\n}\n\ninterface MergeUnresolvedOptionsProps<LAnnotation> {\n  options: UnresolvedFileReactOptions<LAnnotation> | undefined;\n  controlledSelection: boolean;\n  onMergeConflictAction: UnresolvedFileOptions<LAnnotation>['onMergeConflictAction'];\n  hasConflictUtility: boolean;\n  hasGutterRenderUtility: boolean;\n  hasCustomHeader: boolean;\n}\n\nfunction mergeUnresolvedOptions<LAnnotation>({\n  options,\n  controlledSelection,\n  onMergeConflictAction,\n  hasConflictUtility,\n  hasCustomHeader,\n  hasGutterRenderUtility,\n}: MergeUnresolvedOptionsProps<LAnnotation>): UnresolvedFileOptions<LAnnotation> {\n  return {\n    ...options,\n    controlledSelection,\n    onMergeConflictAction,\n    hunkSeparators:\n      options?.hunkSeparators === 'custom'\n        ? noopRender\n        : options?.hunkSeparators,\n    // Add a placeholder type for the custom render\n    mergeConflictActionsType:\n      hasConflictUtility || options?.mergeConflictActionsType === 'custom'\n        ? noopRender\n        : options?.mergeConflictActionsType,\n    renderCustomHeader: hasCustomHeader ? noopRender : undefined,\n    renderGutterUtility: hasGutterRenderUtility ? noopRender : undefined,\n  };\n}\n"],"mappings":";;;;;;;;AAiCA,MAAM,4BACJ,OAAO,WAAW,cAAc,YAAY;AAuB9C,SAAgB,0BAAuC,EACrD,MACA,SACA,iBACA,eACA,iBACA,oBACA,wBACA,iBACA,qBAC4F;CAC5F,MAAM,CAAC,EAAE,UAAU,SAAS,cAAc,YAAY,eAAe;EACnE,MAAM,EAAE,UAAU,SAAS,eAAe,+BACxC,MACA,SAAS,eACX;EACA,OAAO;GAAE;GAAU;GAAS;EAAW;CACzC,CAAC;CAID,MAAM,wBAAwB,mBAE1B,SACA,aACG;EACH,UAAU,cAAc;GACtB,MAAM,EAAE,UAAU,SAAS,eACzB,SAAS,gBACP,QAAQ,SAAS,eACjB,QAAQ,YACR,UAAU,QACZ,KAAK,CAAC;GACR,IAAI,YAAY,QAAQ,WAAW,QAAQ,cAAc,MACvD,OAAO;QAEP,OAAO;IAAE;IAAU;IAAS;GAAW;EAE3C,CAAC;CACH,CACF;CACA,MAAM,sBAAsB,kBAAkB,KAAA;CAC9C,MAAM,cAAc,WAAW,iBAAiB;CAChD,MAAM,cAAc,OAAgD,IAAI;CACxE,MAAM,MAAM,mBAAmB,kBAAsC;EACnE,IAAI,iBAAiB,MAAM;GACzB,IAAI,YAAY,WAAW,MACzB,MAAM,IAAI,MACR,wFACF;GAEF,YAAY,UAAU,IAAIA,eACxB,uBAAuB;IACrB;IACA;IACA;IACA;IACA;IACA;GACF,CAAC,GACD,CAAC,oBAAoB,cAAc,KAAA,GACnC,IACF;GACA,YAAiB,QAAQ,QAAQ;IAC/B;IACA;IACA;IACA;IACA;IACA;GACF,CAAC;EACH,OAAO;GACL,IAAI,YAAY,WAAW,MACzB,MAAM,IAAI,MACR,mFACF;GAEF,YAAY,QAAQ,QAAQ;GAC5B,YAAY,UAAU;EACxB;CACF,CAAC;CAED,gCAAgC;EAC9B,IAAI,YAAY,WAAW,MAAM;EACjC,MAAM,WAAW,YAAY;EAC7B,MAAM,aAAa,uBAAuB;GACxC;GACA;GACA;GACA;GACA;GACA;EACF,CAAC;EAID,MAAM,cACJ,eAAe,KAAA,KACf,CAAC,gBAAgB,SAAS,SAAS,UAAU;EAC/C,SAAS,WAAW,UAAU;EAC9B,SAAc,OAAO;GACnB;GACA;GACA;GACA;GACA;EACF,CAAC;EACD,IAAI,kBAAkB,KAAA,GACpB,SAAS,iBAAiB,aAAa;CAE3C,CAAC;CAYD,OAAO;EAAE;EAAK,gBAVS,kBAEN;GACf,OAAO,YAAY,SAAS,eAAe;EAC7C,GAAG,CAAC,CAMuB;EAAG;EAAU;EAAS;EAAY,aAJzC,kBAAkB;GACpC,OAAO,YAAY,WAAW,KAAA;EAChC,GAAG,CAAC,CAEmE;CAAE;AAC3E;AAWA,SAAS,uBAAoC,EAC3C,SACA,qBACA,uBACA,oBACA,iBACA,0BAC+E;CAC/E,OAAO;EACL,GAAG;EACH;EACA;EACA,gBACE,SAAS,mBAAmB,WACxB,aACA,SAAS;EAEf,0BACE,sBAAsB,SAAS,6BAA6B,WACxD,aACA,SAAS;EACf,oBAAoB,kBAAkB,aAAa,KAAA;EACnD,qBAAqB,yBAAyB,aAAa,KAAA;CAC7D;AACF"}
+{"version":3,"file":"useUnresolvedFileInstance.js","names":["UnresolvedFileClass"],"sources":["../../../src/react/utils/useUnresolvedFileInstance.ts"],"sourcesContent":["import {\n  useCallback,\n  useContext,\n  useEffect,\n  useLayoutEffect,\n  useRef,\n  useState,\n} from 'react';\n\nimport {\n  UnresolvedFile,\n  UnresolvedFile as UnresolvedFileClass,\n  type UnresolvedFileOptions,\n} from '../../components/UnresolvedFile';\nimport { EMPTY_LINE_ANNOTATIONS } from '../../constants';\nimport type { GetHoveredLineResult } from '../../managers/InteractionManager';\nimport type {\n  DiffLineAnnotation,\n  FileContents,\n  FileDiffMetadata,\n  MergeConflictActionPayload,\n  MergeConflictMarkerRow,\n  SelectedLineRange,\n} from '../../types';\nimport { areOptionsEqual } from '../../utils/areOptionsEqual';\nimport {\n  type MergeConflictDiffAction,\n  parseMergeConflictDiffFromFile,\n} from '../../utils/parseMergeConflictDiffFromFile';\nimport { noopRender } from '../constants';\nimport type { UnresolvedFileReactOptions } from '../UnresolvedFile';\nimport { WorkerPoolContext } from '../WorkerPoolContext';\nimport { useForceUpdate } from './useForceUpdate';\nimport { useNextRenderData } from './useNextRenderData';\nimport { useStableCallback } from './useStableCallback';\n\nconst useIsomorphicLayoutEffect =\n  typeof window === 'undefined' ? useEffect : useLayoutEffect;\n\ninterface UseUnresolvedFileInstanceProps<LAnnotation> {\n  file: FileContents;\n  options?: UnresolvedFileReactOptions<LAnnotation>;\n  lineAnnotations: DiffLineAnnotation<LAnnotation>[] | undefined;\n  selectedLines: SelectedLineRange | null | undefined;\n  prerenderedHTML: string | undefined;\n  hasConflictUtility: boolean;\n  hasGutterRenderUtility: boolean;\n  hasCustomHeader: boolean;\n  disableWorkerPool: boolean;\n}\n\ninterface UseUnresolvedFileInstanceReturn<LAnnotation> {\n  lineAnnotations: DiffLineAnnotation<LAnnotation>[];\n  fileDiff: FileDiffMetadata;\n  actions: (MergeConflictDiffAction | undefined)[];\n  markerRows: MergeConflictMarkerRow[];\n  ref(node: HTMLElement | null): void;\n  getHoveredLine(): GetHoveredLineResult<'diff'> | undefined;\n  getInstance(): UnresolvedFile<LAnnotation> | undefined;\n}\n\nexport function useUnresolvedFileInstance<LAnnotation>({\n  file,\n  options,\n  lineAnnotations,\n  selectedLines,\n  prerenderedHTML,\n  hasConflictUtility,\n  hasGutterRenderUtility,\n  hasCustomHeader,\n  disableWorkerPool,\n}: UseUnresolvedFileInstanceProps<LAnnotation>): UseUnresolvedFileInstanceReturn<LAnnotation> {\n  const [{ fileDiff, actions, markerRows }, setState] = useState(() => {\n    const { fileDiff, actions, markerRows } = parseMergeConflictDiffFromFile(\n      file,\n      options?.maxContextLines\n    );\n    return { fileDiff, actions, markerRows };\n  });\n  // UnresolvedFile is intentionally uncontrolled in React. Keep an internal\n  // source-of-truth file so sequential conflict actions apply to the latest\n  // resolved contents rather than the initial prop value.\n  const onMergeConflictAction = useStableCallback(\n    (\n      payload: MergeConflictActionPayload,\n      instance: UnresolvedFile<LAnnotation>\n    ) => {\n      setState((prevState) => {\n        const { fileDiff, actions, markerRows } =\n          instance.resolveConflict(\n            payload.conflict.conflictIndex,\n            payload.resolution,\n            prevState.fileDiff\n          ) ?? {};\n        if (fileDiff == null || actions == null || markerRows == null) {\n          return prevState;\n        } else {\n          return { fileDiff, actions, markerRows };\n        }\n      });\n    }\n  );\n  const controlledSelection = selectedLines !== undefined;\n  const poolManager = useContext(WorkerPoolContext);\n  const instanceRef = useRef<UnresolvedFileClass<LAnnotation> | null>(null);\n  const forceUpdate = useForceUpdate();\n  const renderData = useNextRenderData(instanceRef, {\n    fileDiff,\n    actions,\n    markerRows,\n    lineAnnotations,\n  }) ?? {\n    fileDiff,\n    actions,\n    markerRows,\n    lineAnnotations: lineAnnotations ?? EMPTY_LINE_ANNOTATIONS,\n  };\n  const ref = useStableCallback((fileContainer: HTMLElement | null) => {\n    if (fileContainer != null) {\n      if (instanceRef.current != null) {\n        throw new Error(\n          'useUnresolvedFileInstance: An instance should not already exist when a node is created'\n        );\n      }\n      instanceRef.current = new UnresolvedFileClass(\n        mergeUnresolvedOptions({\n          controlledSelection,\n          hasConflictUtility,\n          hasCustomHeader,\n          hasGutterRenderUtility,\n          onMergeConflictAction,\n          options,\n        }),\n        !disableWorkerPool ? poolManager : undefined,\n        forceUpdate\n      );\n      void instanceRef.current.hydrate({\n        fileDiff,\n        actions,\n        markerRows,\n        fileContainer,\n        lineAnnotations,\n        prerenderedHTML,\n      });\n    } else {\n      if (instanceRef.current == null) {\n        throw new Error(\n          'useUnresolvedFileInstance: A UnresolvedFile instance should exist when unmounting'\n        );\n      }\n      instanceRef.current.cleanUp();\n      instanceRef.current = null;\n    }\n  });\n\n  useIsomorphicLayoutEffect(() => {\n    if (instanceRef.current == null) return;\n    const instance = instanceRef.current;\n    const newOptions = mergeUnresolvedOptions({\n      controlledSelection,\n      hasConflictUtility,\n      hasCustomHeader,\n      hasGutterRenderUtility,\n      onMergeConflictAction,\n      options,\n    });\n    const forceRender = !areOptionsEqual(instance.options, newOptions);\n    instance.setOptions(newOptions);\n    void instance.render({\n      fileDiff,\n      actions,\n      markerRows,\n      lineAnnotations,\n      forceRender,\n    });\n    if (selectedLines !== undefined) {\n      instance.setSelectedLines(selectedLines);\n    }\n  });\n\n  const getHoveredLine = useCallback(():\n    | GetHoveredLineResult<'diff'>\n    | undefined => {\n    return instanceRef.current?.getHoveredLine();\n  }, []);\n\n  const getInstance = useCallback(() => {\n    return instanceRef.current ?? undefined;\n  }, []);\n\n  return { ...renderData, ref, getHoveredLine, getInstance };\n}\n\ninterface MergeUnresolvedOptionsProps<LAnnotation> {\n  options: UnresolvedFileReactOptions<LAnnotation> | undefined;\n  controlledSelection: boolean;\n  onMergeConflictAction: UnresolvedFileOptions<LAnnotation>['onMergeConflictAction'];\n  hasConflictUtility: boolean;\n  hasGutterRenderUtility: boolean;\n  hasCustomHeader: boolean;\n}\n\nfunction mergeUnresolvedOptions<LAnnotation>({\n  options,\n  controlledSelection,\n  onMergeConflictAction,\n  hasConflictUtility,\n  hasCustomHeader,\n  hasGutterRenderUtility,\n}: MergeUnresolvedOptionsProps<LAnnotation>): UnresolvedFileOptions<LAnnotation> {\n  return {\n    ...options,\n    controlledSelection,\n    onMergeConflictAction,\n    hunkSeparators:\n      options?.hunkSeparators === 'custom'\n        ? noopRender\n        : options?.hunkSeparators,\n    // Add a placeholder type for the custom render\n    mergeConflictActionsType:\n      hasConflictUtility || options?.mergeConflictActionsType === 'custom'\n        ? noopRender\n        : options?.mergeConflictActionsType,\n    renderCustomHeader: hasCustomHeader ? noopRender : undefined,\n    renderGutterUtility: hasGutterRenderUtility ? noopRender : undefined,\n  };\n}\n"],"mappings":";;;;;;;;;;;AAoCA,MAAM,4BACJ,OAAO,WAAW,cAAc,YAAY;AAwB9C,SAAgB,0BAAuC,EACrD,MACA,SACA,iBACA,eACA,iBACA,oBACA,wBACA,iBACA,qBAC4F;CAC5F,MAAM,CAAC,EAAE,UAAU,SAAS,cAAc,YAAY,eAAe;EACnE,MAAM,EAAE,UAAU,SAAS,eAAe,+BACxC,MACA,SAAS,eACX;EACA,OAAO;GAAE;GAAU;GAAS;EAAW;CACzC,CAAC;CAID,MAAM,wBAAwB,mBAE1B,SACA,aACG;EACH,UAAU,cAAc;GACtB,MAAM,EAAE,UAAU,SAAS,eACzB,SAAS,gBACP,QAAQ,SAAS,eACjB,QAAQ,YACR,UAAU,QACZ,KAAK,CAAC;GACR,IAAI,YAAY,QAAQ,WAAW,QAAQ,cAAc,MACvD,OAAO;QAEP,OAAO;IAAE;IAAU;IAAS;GAAW;EAE3C,CAAC;CACH,CACF;CACA,MAAM,sBAAsB,kBAAkB,KAAA;CAC9C,MAAM,cAAc,WAAW,iBAAiB;CAChD,MAAM,cAAc,OAAgD,IAAI;CACxE,MAAM,cAAc,eAAe;CACnC,MAAM,aAAa,kBAAkB,aAAa;EAChD;EACA;EACA;EACA;CACF,CAAC,KAAK;EACJ;EACA;EACA;EACA,iBAAiB,mBAAmB;CACtC;CACA,MAAM,MAAM,mBAAmB,kBAAsC;EACnE,IAAI,iBAAiB,MAAM;GACzB,IAAI,YAAY,WAAW,MACzB,MAAM,IAAI,MACR,wFACF;GAEF,YAAY,UAAU,IAAIA,eACxB,uBAAuB;IACrB;IACA;IACA;IACA;IACA;IACA;GACF,CAAC,GACD,CAAC,oBAAoB,cAAc,KAAA,GACnC,WACF;GACA,YAAiB,QAAQ,QAAQ;IAC/B;IACA;IACA;IACA;IACA;IACA;GACF,CAAC;EACH,OAAO;GACL,IAAI,YAAY,WAAW,MACzB,MAAM,IAAI,MACR,mFACF;GAEF,YAAY,QAAQ,QAAQ;GAC5B,YAAY,UAAU;EACxB;CACF,CAAC;CAED,gCAAgC;EAC9B,IAAI,YAAY,WAAW,MAAM;EACjC,MAAM,WAAW,YAAY;EAC7B,MAAM,aAAa,uBAAuB;GACxC;GACA;GACA;GACA;GACA;GACA;EACF,CAAC;EACD,MAAM,cAAc,CAAC,gBAAgB,SAAS,SAAS,UAAU;EACjE,SAAS,WAAW,UAAU;EAC9B,SAAc,OAAO;GACnB;GACA;GACA;GACA;GACA;EACF,CAAC;EACD,IAAI,kBAAkB,KAAA,GACpB,SAAS,iBAAiB,aAAa;CAE3C,CAAC;CAED,MAAM,iBAAiB,kBAEN;EACf,OAAO,YAAY,SAAS,eAAe;CAC7C,GAAG,CAAC,CAAC;CAEL,MAAM,cAAc,kBAAkB;EACpC,OAAO,YAAY,WAAW,KAAA;CAChC,GAAG,CAAC,CAAC;CAEL,OAAO;EAAE,GAAG;EAAY;EAAK;EAAgB;CAAY;AAC3D;AAWA,SAAS,uBAAoC,EAC3C,SACA,qBACA,uBACA,oBACA,iBACA,0BAC+E;CAC/E,OAAO;EACL,GAAG;EACH;EACA;EACA,gBACE,SAAS,mBAAmB,WACxB,aACA,SAAS;EAEf,0BACE,sBAAsB,SAAS,6BAA6B,WACxD,aACA,SAAS;EACf,oBAAoB,kBAAkB,aAAa,KAAA;EACnD,qBAAqB,yBAAyB,aAAa,KAAA;CAC7D;AACF"}

package/dist/renderers/DiffHunksRenderer.d.ts

@@ -1,5 +1,6 @@
 import { Element, ElementContent, Properties } from "../node_modules/.pnpm/@types_hast@3.0.4/node_modules/@types/hast/index.js";
-import { BaseCodeOptions, BaseDiffOptions, BaseDiffOptionsWithDefaults, CustomPreProperties, DiffLineAnnotation, DiffsHighlighter, ExpansionDirections, FileDiffMetadata, FileHeaderRenderMode, HighlightedToken, HunkData, HunkExpansionRegion, LineTypes, RenderDiffOptions, RenderRange, ThemedDiffResult } from "../types.js";
+import { DiffsHighlighter } from "../highlighter/DiffsHighlighter.js";
+import { BaseCodeOptions, BaseDiffOptions, BaseDiffOptionsWithDefaults, CustomPreProperties, DiffLineAnnotation, ExpansionDirections, FileDiffMetadata, FileHeaderRenderMode, HighlightedToken, HunkData, HunkExpansionRegion, LineTypes, RenderDiffOptions, RenderRange, ThemedDiffResult } from "../types.js";
 import { TextDocument } from "../editor/textDocument.js";
 import { WorkerPoolManager } from "../worker/WorkerPoolManager.js";
 import "../worker/index.js";
@@ -77,7 +78,6 @@ declare class DiffHunksRenderer<LAnnotation = undefined> {
   private onRenderUpdate?;
   private workerManager?;
   readonly __id: string;
-  private highlighter;
   private diff;
   private expandedHunks;
   private deletionAnnotations;
@@ -147,6 +147,8 @@ declare class DiffHunksRenderer<LAnnotation = undefined> {
   protected getOptionsWithDefaults(): DiffHunksRendererOptionsWithDefaults;
   initializeHighlighter(): Promise<DiffsHighlighter>;
   hydrate(diff: FileDiffMetadata | undefined): void;
+  private getHighlightWorkerManager;
+  private cacheHighlightResult;
   private getLocalHighlightTheme;
   getEffectiveCodeOptions(): Pick<BaseCodeOptions, 'theme' | 'tokenizeMaxLineLength'>;
   private getRenderOptions;

package/dist/renderers/DiffHunksRenderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DiffHunksRenderer.d.ts","names":[],"sources":["../../src/renderers/DiffHunksRenderer.ts"],"mappings":";;;;;;;UAoJiB,iCAAiC;EAChD,mBAAmB;;UAGJ,6CAA6C,KAC5D;EAGA,kBAAkB;;UAGH;EACf;EACA,UAAU;EACV;EACA;;UAGe;EACf;EACA;EACA;;UAGe;EACf,gBAAgB;EAChB,mBAAmB;EACnB,oBAAoB;;UAUL;EACf;EACA;EACA;EACA;EACA;EACA,eAAe;EACf,eAAe;;UAGA;EACf,SAAS;EACT,QAAQ;;UAGO;EACf,UAAU;EACV,UAAU;;UAGK;EACf,SAAS;EACT,QAAQ;;UAGO;EACf,SAAS;EACT,QAAQ;;UAGO;EACf,UAAU;EACV,kBAAkB;EAClB,mBAAmB;EACnB,oBAAoB;EACpB,qBAAqB;EACrB,oBAAoB;EACpB,qBAAqB;EACrB,UAAU;EACV;EACA,SAAS;EACT,eAAe;EACf;EACA;EACA;EACA;EACA;EACA;;cAKW,kBAAkB;EAgCpB,SAAS;UACR;UAGA;UACA;WApCD;UAED;UAIA;UAEA;UAEA;UACA;UAEA;UACA;UAGA;UAGA;UAQA;EAER,YACS,UAAS,0BACR,sBACN,YAAY,mBAAmB,yBAEzB,8CACA,gBAAgB;EASnB;EAQA;;;;;;;;;;EA4BA,iBACL,MAAM,kBACN,eAAe;;EA0EV;;;;EAWA;;;;;;;;;;EAiBA,4BAA4B;UAqC3B;MA4BG,aAAa;EAIjB;EAMA,WAAW,SAAS;EAIpB,aAAa,SAAS,QAAQ;EAI9B,WACL,eACA,WAAW,qBACX;EA0BK,gBAAgB,oBAAoB;EAIpC,uBAAuB,YAAY;;EAKnC,oBACL,eAAe,YAAY;EAKtB,mBACL,iBAAiB,mBAAmB;;;;;;;EAyB/B,kBACL,YAAY,YAAY,MAAM,oBAC9B,6BACA,mCACA,uBAAuB,6BACvB;UAoKM;EAWD,oBACL,cAAc,0BAA0B;UAkElC;UAwBA;UAaA;YAOE,2BACR,YACC,6BAA6B;YAStB,yBACR,MACA,QACC,2BAA2B;UAetB;YAKU,iCAChB,KAAK,wBACF;YAGa,+BAChB,KAAK,wBACF;YAEK,0BAA0B;EAiDvB,yBAAyB,QAAQ;EAYvC,QAAQ,MAAM;UAmCb;EAQD,2BAA2B,KAChC;UAeM;;;;;;EA2CD,qBAAqB,MAAM,mBAAmB;UAwB7C;EAiCD,WACL,OAAM,8BACN,cAAa,cACZ;EAiJU,YACX,MAAM,kBACN,cAAa,cACZ,QAAQ;YAMD,iBACR,gBACA,oBACA,mBAAmB,sBAClB;UAeW;UAuBN;EA2CD,mBACL,MAAM,kBACN,QAAQ,kBACR,SAAS,mBACT;UAQM;UAqCA;UAgBA;UAuBA;EAaD,iBAAiB;UAIhB;UAIA;EAgjBD,cACL,6CACA,QAAQ,oBACP;EAyBI,cACL,QAAQ,mBACR,WAAU,mBACT;EAkDI,eACL,QAAQ,mBACR,eAAc;EAKT,kBACL,UAAU,kBACV;UAqBM;UAiEA;UA+DA;UASA"}
+{"version":3,"file":"DiffHunksRenderer.d.ts","names":[],"sources":["../../src/renderers/DiffHunksRenderer.ts"],"mappings":";;;;;;;;UAuJiB,iCAAiC;EAChD,mBAAmB;;UAGJ,6CAA6C,KAC5D;EAGA,kBAAkB;;UAGH;EACf;EACA,UAAU;EACV;EACA;;UAGe;EACf;EACA;EACA;;UAGe;EACf,gBAAgB;EAChB,mBAAmB;EACnB,oBAAoB;;UAUL;EACf;EACA;EACA;EACA;EACA;EACA,eAAe;EACf,eAAe;;UAGA;EACf,SAAS;EACT,QAAQ;;UAGO;EACf,UAAU;EACV,UAAU;;UAGK;EACf,SAAS;EACT,QAAQ;;UAGO;EACf,SAAS;EACT,QAAQ;;UAGO;EACf,UAAU;EACV,kBAAkB;EAClB,mBAAmB;EACnB,oBAAoB;EACpB,qBAAqB;EACrB,oBAAoB;EACpB,qBAAqB;EACrB,UAAU;EACV;EACA,SAAS;EACT,eAAe;EACf;EACA;EACA;EACA;EACA;EACA;;cAKW,kBAAkB;EA+BpB,SAAS;UACR;UAGA;UACA;WAnCD;UAKD;UAEA;UAEA;UACA;UAEA;UACA;UAGA;UAGA;UAQA;EAER,YACS,UAAS,0BACR,sBACN,YAAY,mBAAmB,yBAEzB,8CACA,gBAAgB;EAGnB;EAQA;;;;;;;;;;EA2BA,iBACL,MAAM,kBACN,eAAe;;EA0EV;;;;EAWA;;;;;;;;;;EAiBA,4BAA4B;UA0C3B;MA4BG,aAAa;EAIjB;EAMA,WAAW,SAAS;EAIpB,aAAa,SAAS,QAAQ;EAI9B,WACL,eACA,WAAW,qBACX;EA0BK,gBAAgB,oBAAoB;EAIpC,uBAAuB,YAAY;;EAKnC,oBACL,eAAe,YAAY;EAKtB,mBACL,iBAAiB,mBAAmB;;;;;;;EAyB/B,kBACL,YAAY,YAAY,MAAM,oBAC9B,6BACA,mCACA,uBAAuB,6BACvB;UAwKM;EAWD,oBACL,cAAc,0BAA0B;UAoElC;UA6BA;UAaA;YAOE,2BACR,YACC,6BAA6B;YAStB,yBACR,MACA,QACC,2BAA2B;UAetB;YAKU,iCAChB,KAAK,wBACF;YAGa,+BAChB,KAAK,wBACF;YAEK,0BAA0B;EAiD7B,yBAAyB,QAAQ;EAYjC,QAAQ,MAAM;UAwCb;UAWA;UAUA;EAQD,2BAA2B,KAChC;UAeM;;;;;;EA2CD,qBAAqB,MAAM,mBAAmB;UAwB7C;EA+BD,WACL,OAAM,8BACN,cAAa,cACZ;EAuJU,YACX,MAAM,kBACN,cAAa,cACZ,QAAQ;YASD,iBACR,gBACA,oBACA,mBAAmB,sBAClB;UAeW;UA2BN;EA6CD,mBACL,MAAM,kBACN,QAAQ,kBACR,SAAS,mBACT;UAQM;UAqCA;UAgBA;UAuBA;EAaD,iBAAiB;UAIhB;UAIA;EAmjBD,cACL,6CACA,QAAQ,oBACP;EAyBI,cACL,QAAQ,mBACR,WAAU,mBACT;EAkDI,eACL,QAAQ,mBACR,eAAc;EAKT,kBACL,UAAU,kBACV;UAqBM;UAiEA;UA+DA;UASA"}

package/dist/renderers/DiffHunksRenderer.js

@@ -1,9 +1,12 @@
 import { DEFAULT_EXPANDED_REGION, DEFAULT_RENDER_RANGE, DEFAULT_THEMES, DEFAULT_TOKENIZE_MAX_LENGTH } from "../constants.js";
-import { areLanguagesAttached } from "../highlighter/languages/areLanguagesAttached.js";
+import { HighlighterDisposedError } from "../highlighter/highlighterType.js";
 import { areThemesAttached } from "../highlighter/themes/areThemesAttached.js";
 import { getHighlighterIfLoaded, getSharedHighlighter } from "../highlighter/shared_highlighter.js";
+import { resolvePreferredHighlighter } from "../utils/resolvePreferredHighlighter.js";
 import { getFileAnnotations, shouldRenderFileAnnotations } from "../utils/includesFileAnnotations.js";
 import { createGutterGap, createGutterItem, createGutterWrapper, createHastElement } from "../utils/hast_utils.js";
+import { hastToHtml } from "../utils/hastToHtml.js";
+import { areLanguagesAttached } from "../highlighter/languages/areLanguagesAttached.js";
 import { applyLineTextWithNewline } from "../utils/applyLineTextWithNewline.js";
 import { areRenderRangesEqual } from "../utils/areRenderRangesEqual.js";
 import { createAnnotationElement } from "../utils/createAnnotationElement.js";
@@ -14,6 +17,7 @@ import { getFiletypeFromFileName } from "../utils/getFiletypeFromFileName.js";
 import { getHighlighterOptions } from "../utils/getHighlighterOptions.js";
 import { getLineAnnotationName } from "../utils/getLineAnnotationName.js";
 import { isDefaultRenderRange } from "../utils/isDefaultRenderRange.js";
+import { isHandledWorkerPoolError } from "../worker/errors.js";
 import { areDiffTargetsEqual } from "../utils/areDiffTargetsEqual.js";
 import { getTrailingContextRangeSize } from "../utils/virtualDiffLayout.js";
 import { iterateOverDiff } from "../utils/iterateOverDiff.js";
@@ -28,7 +32,6 @@ import { getHunkSeparatorSlotName } from "../utils/getHunkSeparatorSlotName.js";
 import { getTotalLineCountFromHunks } from "../utils/getTotalLineCountFromHunks.js";
 import { isDiffPlainText } from "../utils/isDiffPlainText.js";
 import { renderDiffWithHighlighter } from "../utils/renderDiffWithHighlighter.js";
-import { toHtml } from "hast-util-to-html";
 //#region src/renderers/DiffHunksRenderer.ts
 let instanceId = -1;
 var DiffHunksRenderer = class {
@@ -37,7 +40,6 @@ var DiffHunksRenderer = class {
 	onRenderUpdate;
 	workerManager;
 	__id = `diff-hunks-renderer:${++instanceId}`;
-	highlighter;
 	diff;
 	expandedHunks = /* @__PURE__ */ new Map();
 	deletionAnnotations = {};
@@ -52,7 +54,6 @@ var DiffHunksRenderer = class {
 		this.annotationSlotName = annotationSlotName;
 		this.onRenderUpdate = onRenderUpdate;
 		this.workerManager = workerManager;
-		if (workerManager?.isWorkingPool() !== true) this.highlighter = areThemesAttached(options.theme ?? DEFAULT_THEMES) ? getHighlighterIfLoaded() : void 0;
 	}
 	cleanUp() {
 		this.endEditSession();
@@ -62,7 +63,6 @@ var DiffHunksRenderer = class {
 		this.onRenderUpdate = void 0;
 	}
 	recycle() {
-		this.highlighter = void 0;
 		this.diff = void 0;
 		if (this.editSessionActive) {
 			if (this.renderCache != null) this.renderCache.renderRange = void 0;
@@ -148,7 +148,9 @@ var DiffHunksRenderer = class {
 			workerManager.evictDiffFromCache(diff.cacheKey);
 			return workerManager.primeDiffHighlightCache(diff).then(() => {
 				this.applyRefreshedResult(diff, workerManager.getDiffResultCache(diff));
-			}).catch((error) => this.onHighlightError(error));
+			}).catch((error) => {
+				if (!isHandledWorkerPoolError(error)) this.onHighlightError(error);
+			});
 		}
 		return this.asyncHighlight(diff).then((fresh) => this.applyRefreshedResult(diff, fresh)).catch((error) => this.onHighlightError(error));
 	}
@@ -242,6 +244,7 @@ var DiffHunksRenderer = class {
 				const previous = diff.additionLines[line] ?? "";
 				if (previous !== text) {
 					diff.additionLines[line] = text;
+					diff.additionCharacterCount += text.length - previous.length;
 					changedAdditionLines.push(line);
 					previousAdditionLines.set(line, previous);
 					if (!dirtyLines.has(line)) hastLines[line] = createPlainAdditionLineElement(line, cleanLastNewline(text));
@@ -255,7 +258,9 @@ var DiffHunksRenderer = class {
 			const prevLine = canSyncDiffLine ? diff.additionLines[line] ?? "" : "";
 			const prevText = cleanLastNewline(prevLine);
 			if (pendingStructuralRows == null && canSyncDiffLine && changedDocumentLines?.has(line) !== true) {
-				diff.additionLines[line] = applyLineTextWithNewline(prevLine, lineText);
+				const nextLine = applyLineTextWithNewline(prevLine, lineText);
+				diff.additionLines[line] = nextLine;
+				diff.additionCharacterCount += nextLine.length - prevLine.length;
 				if (prevText !== lineText) {
 					changedAdditionLines.push(line);
 					previousAdditionLines.set(line, prevLine);
@@ -306,7 +311,7 @@ var DiffHunksRenderer = class {
 					this.applyRecomputePreservingSessionType(diff, recomputeEmptyDocumentDiff(diff, this.options.parseDiffOptions));
 					regionsChanged = true;
 				} else if (shouldTopAlignAdditionRecompute(diff, diff.additionLines)) {
-					this.applyRecomputePreservingSessionType(diff, recomputeTopAlignedAdditionDiff(diff, diff.additionLines, this.options.parseDiffOptions));
+					this.applyRecomputePreservingSessionType(diff, recomputeTopAlignedAdditionDiff(diff, diff.additionLines, diff.additionCharacterCount, this.options.parseDiffOptions));
 					regionsChanged = true;
 				} else {
 					const change = applySessionChangedLines(diff, changedAdditionLines, this.options.parseDiffOptions, previousAdditionLines);
@@ -330,7 +335,9 @@ var DiffHunksRenderer = class {
 		const result = renderCache?.result;
 		if (diff.isPartial) throw new Error("Could not apply document change for partial diff");
 		const { additionLines: previousAdditionLines } = diff;
-		diff.additionLines = getEditorDocumentLines(textDocument);
+		const { lines, characterCount } = getEditorDocumentLines(textDocument);
+		diff.additionLines = lines;
+		diff.additionCharacterCount = characterCount;
 		if (result != null) result.code.additionLines = realignAdditionHastLines(previousAdditionLines, diff.additionLines, result.code.additionLines, textDocument);
 		if (diff.additionLines.length <= 1 && diff.additionLines.join("") === "") {
 			this.applyRecomputePreservingSessionType(diff, recomputeEmptyDocumentDiff(diff, this.options.parseDiffOptions));
@@ -346,7 +353,7 @@ var DiffHunksRenderer = class {
 		const { parseDiffOptions } = this.options;
 		const rawLines = diff.additionLines;
 		if (shouldTopAlignAdditionRecompute(diff, rawLines)) {
-			this.applyRecomputePreservingSessionType(diff, recomputeTopAlignedAdditionDiff(diff, rawLines, parseDiffOptions));
+			this.applyRecomputePreservingSessionType(diff, recomputeTopAlignedAdditionDiff(diff, rawLines, diff.additionCharacterCount, parseDiffOptions));
 			return;
 		}
 		this.applyExpansionRemap(rebuildSessionHunks(diff, parseDiffOptions, (index) => previousAdditionLines[index]));
@@ -403,12 +410,11 @@ var DiffHunksRenderer = class {
 			useCSSClasses
 		};
 	}
-	async initializeHighlighter() {
-		this.highlighter = await getSharedHighlighter(getHighlighterOptions(this.computedLangs, {
+	initializeHighlighter() {
+		return getSharedHighlighter(getHighlighterOptions(this.computedLangs, {
 			theme: this.getLocalHighlightTheme(),
-			preferredHighlighter: this.workerManager?.getPreferredHighlighter() ?? this.options.preferredHighlighter
+			preferredHighlighter: resolvePreferredHighlighter(this.workerManager, this.options)
 		}));
-		return this.highlighter;
 	}
 	hydrate(diff) {
 		if (diff == null) return;
@@ -425,13 +431,24 @@ var DiffHunksRenderer = class {
 			result: massiveDiff ? void 0 : cache?.result,
 			renderRange: void 0
 		};
-		if (!this.editSessionActive && this.workerManager?.isWorkingPool() === true) {
-			if (this.renderCache.result == null && !massiveDiff) this.workerManager.highlightDiffAST(this, this.diff);
-		} else if (this.highlighter == null) {
+		const workerManager = this.getHighlightWorkerManager(diff);
+		if (workerManager != null) {
+			if (this.renderCache.result == null && !massiveDiff) workerManager.highlightDiffAST(this, this.diff);
+		} else if (getHighlighterIfLoaded({ theme: this.getLocalHighlightTheme() }) == null) {
 			this.computedLangs = getDiffLanguages(diff);
-			this.initializeHighlighter();
+			this.initializeHighlighter().catch((error) => {
+				if (!(error instanceof HighlighterDisposedError)) this.onHighlightError(error);
+			});
 		}
 	}
+	getHighlightWorkerManager(diff) {
+		const { editSessionActive, workerManager } = this;
+		return !editSessionActive && workerManager?.isWorkingPool() === true && !workerManager.shouldHighlightOnMainThread(diff) ? workerManager : void 0;
+	}
+	cacheHighlightResult(diff, renderResult) {
+		const { editSessionActive, workerManager } = this;
+		if (!editSessionActive && workerManager?.isWorkingPool() === true) workerManager.setDiffResultCache(diff.cacheKey, renderResult);
+	}
 	getLocalHighlightTheme() {
 		return this.workerManager?.getDiffRenderOptions().theme ?? this.options.theme ?? DEFAULT_THEMES;
 	}
@@ -492,10 +509,10 @@ var DiffHunksRenderer = class {
 	canRenderDiff(diff, options, forcePlainText) {
 		const { renderCache } = this;
 		if (renderCache == null || areDiffTargetsEqual(renderCache.diff, diff)) return true;
-		if (forcePlainText) return renderCache.result == null && renderCache.hydrated !== true || this.workerManager?.isWorkingPool() === true || this.highlighter != null && areThemesAttached(options.theme);
+		if (forcePlainText) return renderCache.result == null && renderCache.hydrated !== true || this.workerManager?.isWorkingPool() === true && !this.workerManager.shouldHighlightOnMainThread(diff) || getHighlighterIfLoaded({ theme: options.theme }) != null;
 		if (renderCache.result == null && renderCache.hydrated !== true) return true;
-		if (!this.editSessionActive && this.workerManager?.isWorkingPool() === true) return !renderCache.highlighted;
-		return this.highlighter != null && areThemesAttached(options.theme);
+		if (this.getHighlightWorkerManager(diff) != null) return !renderCache.highlighted;
+		return getHighlighterIfLoaded({ theme: options.theme }) != null;
 	}
 	renderDiff(diff = this.diff, renderRange = DEFAULT_RENDER_RANGE) {
 		this.diff = diff;
@@ -527,24 +544,26 @@ var DiffHunksRenderer = class {
 		const canRenderDiff = this.canRenderDiff(diff, options, forcePlainText);
 		const newContent = !areDiffTargetsEqual(diff, this.renderCache.diff);
 		const newRenderRange = !areRenderRangesEqual(this.renderCache.renderRange, renderRange);
-		if (!this.editSessionActive && this.workerManager?.isWorkingPool() === true) {
+		const workerManager = this.getHighlightWorkerManager(diff);
+		if (workerManager != null) {
 			const preserveHydratedContent = this.renderCache.result == null && this.renderCache.highlighted && !forcePlainText && !newContent && isDefaultRenderRange(renderRange);
 			if (canRenderDiff && !preserveHydratedContent && (forcePlainText || this.renderCache.result == null || !this.renderCache.highlighted && (newContent || newRenderRange))) {
 				this.renderCache.diff = diff;
 				this.renderCache.options = options;
 				this.renderCache.highlighted = false;
-				if (this.renderCache.result == null || newContent || newRenderRange || forceHighlight) this.renderCache.result = this.workerManager.getPlainDiffAST(diff, renderRange.startingLine, renderRange.totalLines, isDefaultRenderRange(renderRange) ? true : expandUnchanged ? true : this.expandedHunks, collapsedContextThreshold);
+				if (this.renderCache.result == null || newContent || newRenderRange || forceHighlight) this.renderCache.result = workerManager.getPlainDiffAST(diff, renderRange.startingLine, renderRange.totalLines, isDefaultRenderRange(renderRange) ? true : expandUnchanged ? true : this.expandedHunks, collapsedContextThreshold);
 				this.renderCache.renderRange = renderRange;
 			}
-			if (!forcePlainText && hasContent && (!this.renderCache.highlighted || forceHighlight)) this.workerManager.highlightDiffAST(this, diff);
+			if (!forcePlainText && hasContent && (!this.renderCache.highlighted || forceHighlight)) workerManager.highlightDiffAST(this, diff);
 		} else {
 			this.computedLangs = getDiffLanguages(diff);
-			this.highlighter ??= getHighlighterIfLoaded();
-			const hasThemes = this.highlighter != null && areThemesAttached(options.theme);
-			const hasLangs = this.highlighter != null && areLanguagesAttached(this.computedLangs);
+			const highlighter = getHighlighterIfLoaded();
+			const hasThemes = highlighter != null && areThemesAttached(options.theme, highlighter);
+			const hasLangs = highlighter != null && areLanguagesAttached(this.computedLangs, highlighter);
 			const canHighlight = !forcePlainText && hasLangs;
-			if (canRenderDiff && this.highlighter != null && hasThemes && (forceHighlight || forcePlainText || !this.renderCache.highlighted && canHighlight || this.renderCache.result == null)) {
-				const { result, options } = this.renderDiffWithHighlighter(diff, this.highlighter, forcePlainText || !hasLangs);
+			const lazyLineAST = Number.isFinite(renderRange.totalLines);
+			if (canRenderDiff && highlighter != null && hasThemes && (forceHighlight || forcePlainText || !this.renderCache.highlighted && canHighlight || this.renderCache.result == null)) {
+				const { result, options } = this.renderDiffWithHighlighter(diff, highlighter, forcePlainText || !hasLangs, lazyLineAST);
 				this.renderCache = {
 					diff,
 					options,
@@ -552,16 +571,26 @@ var DiffHunksRenderer = class {
 					result,
 					renderRange: void 0
 				};
+				if (canHighlight) this.cacheHighlightResult(diff, {
+					result,
+					options
+				});
 			}
-			if (!hasThemes || !forcePlainText && !hasLangs) this.asyncHighlight(diff).then(({ result, options }) => {
+			if (!hasThemes || !forcePlainText && !hasLangs) this.asyncHighlight(diff, lazyLineAST).then(({ result, options }) => {
+				if (!forcePlainText) this.cacheHighlightResult(diff, {
+					result,
+					options
+				});
 				this.applyHighlightResult(diff, result, options, !forcePlainText);
+			}).catch((error) => {
+				if (!(error instanceof HighlighterDisposedError)) this.onHighlightError(error);
 			});
 		}
 		return this.renderCache.result != null ? this.processDiffResult(this.renderCache.diff, renderRange, this.renderCache.result) : void 0;
 	}
 	async asyncRender(diff, renderRange = DEFAULT_RENDER_RANGE) {
 		this.diff = diff;
-		const { result } = await this.asyncHighlight(diff);
+		const { result } = await this.asyncHighlight(diff, Number.isFinite(renderRange.totalLines));
 		return this.processDiffResult(diff, renderRange, result);
 	}
 	createPreElement(split, totalLines, customProperties) {
@@ -577,19 +606,21 @@ var DiffHunksRenderer = class {
 			customProperties
 		});
 	}
-	async asyncHighlight(diff) {
+	async asyncHighlight(diff, lazyLineAST = false) {
 		const forcePlainText = isDiffMassive(diff, this.getTokenizeMaxLength());
 		this.computedLangs = forcePlainText ? ["text"] : getDiffLanguages(diff);
-		const hasThemes = this.highlighter != null && areThemesAttached(this.getLocalHighlightTheme());
-		const hasLangs = forcePlainText || this.highlighter != null && areLanguagesAttached(this.computedLangs);
-		if (this.highlighter == null || !hasThemes || !hasLangs) this.highlighter = await this.initializeHighlighter();
-		return this.renderDiffWithHighlighter(diff, this.highlighter, forcePlainText);
+		let highlighter = getHighlighterIfLoaded();
+		const hasThemes = highlighter != null && areThemesAttached(this.getLocalHighlightTheme(), highlighter);
+		const hasLangs = forcePlainText || highlighter != null && areLanguagesAttached(this.computedLangs, highlighter);
+		if (highlighter == null || !hasThemes || !hasLangs) highlighter = await this.initializeHighlighter();
+		return this.renderDiffWithHighlighter(diff, highlighter, forcePlainText, lazyLineAST);
 	}
-	renderDiffWithHighlighter(diff, highlighter, forcePlainText = false) {
+	renderDiffWithHighlighter(diff, highlighter, forcePlainText = false, lazyLineAST = false) {
 		const { options } = this.getRenderOptions(diff);
 		const { collapsedContextThreshold } = this.getOptionsWithDefaults();
 		const result = renderDiffWithHighlighter(diff, highlighter, options, {
 			forcePlainText,
+			lazyLineAST,
 			expandedHunks: forcePlainText ? true : void 0,
 			collapsedContextThreshold
 		});
@@ -882,7 +913,7 @@ var DiffHunksRenderer = class {
 							}
 						}
 					}
-					if (noEOFCRAddition) {
+					if (noEOFCRAddition && !(unified && noEOFCRDeletion && type !== "change")) {
 						const noEOFType = type === "context" || type === "context-expanded" ? type : "change-addition";
 						if (diffStyle === "unified") {
 							context.unifiedContentAST.push(createNoNewlineElement(noEOFType));
@@ -992,11 +1023,11 @@ var DiffHunksRenderer = class {
 		};
 	}
 	renderFullHTML(result, tempChildren = []) {
-		return toHtml(this.renderFullAST(result, tempChildren));
+		return hastToHtml(this.renderFullAST(result, tempChildren));
 	}
 	renderPartialHTML(children, columnType) {
-		if (columnType == null) return toHtml(children);
-		return toHtml(createHastElement({
+		if (columnType == null) return hastToHtml(children);
+		return hastToHtml(createHastElement({
 			tagName: "code",
 			children,
 			properties: {
@@ -1272,8 +1303,16 @@ function createPlainAdditionLineElement(lineIndex, lineText, unifiedLineIndex =
 }
 function getEditorDocumentLines(textDocument) {
 	const lines = [];
-	for (let line = 0; line < textDocument.lineCount; line++) lines.push(textDocument.getLineText(line, true));
-	return lines;
+	let characterCount = 0;
+	for (let line = 0; line < textDocument.lineCount; line++) {
+		const text = textDocument.getLineText(line, true);
+		lines.push(text);
+		characterCount += text.length;
+	}
+	return {
+		lines,
+		characterCount
+	};
 }
 function getDiffLanguages(diff) {
 	if (diff.lang != null) return [diff.lang];