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

package/dist/react/utils/useUnresolvedFileInstance.js

@@ -1,12 +1,12 @@
 import { areOptionsEqual } from "../../utils/areOptionsEqual.js";
 import { parseMergeConflictDiffFromFile } from "../../utils/parseMergeConflictDiffFromFile.js";
 import { UnresolvedFile } from "../../components/UnresolvedFile.js";
-import { noopRender } from "../constants.js";
 import { useStableCallback } from "./useStableCallback.js";
+import { noopRender } from "../constants.js";
 import { WorkerPoolContext } from "../WorkerPoolContext.js";
 import { useCallback, useContext, useEffect, useLayoutEffect, useRef, useState } from "react";
 //#region src/react/utils/useUnresolvedFileInstance.ts
-const useIsometricEffect = typeof window === "undefined" ? useEffect : useLayoutEffect;
+const useIsomorphicLayoutEffect = typeof window === "undefined" ? useEffect : useLayoutEffect;
 function useUnresolvedFileInstance({ file, options, lineAnnotations, selectedLines, prerenderedHTML, hasConflictUtility, hasGutterRenderUtility, hasCustomHeader, disableWorkerPool }) {
 	const [{ fileDiff, actions, markerRows }, setState] = useState(() => {
 		const { fileDiff, actions, markerRows } = parseMergeConflictDiffFromFile(file, options?.maxContextLines);
@@ -55,7 +55,7 @@ function useUnresolvedFileInstance({ file, options, lineAnnotations, selectedLin
 			instanceRef.current = null;
 		}
 	});
-	useIsometricEffect(() => {
+	useIsomorphicLayoutEffect(() => {
 		if (instanceRef.current == null) return;
 		const instance = instanceRef.current;
 		const newOptions = mergeUnresolvedOptions({
@@ -66,7 +66,7 @@ function useUnresolvedFileInstance({ file, options, lineAnnotations, selectedLin
 			onMergeConflictAction,
 			options
 		});
-		const forceRender = !areOptionsEqual(instance.options, newOptions);
+		const forceRender = newOptions !== void 0 && !areOptionsEqual(instance.options, newOptions);
 		instance.setOptions(newOptions);
 		instance.render({
 			fileDiff,

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 useIsometricEffect =\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  useIsometricEffect(() => {\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 { 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,qBACJ,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,yBAAyB;EACvB,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;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 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"}

package/dist/renderers/DiffHunksRenderer.d.ts

@@ -81,9 +81,36 @@ declare class DiffHunksRenderer<LAnnotation = undefined> {
   private additionAnnotations;
   private computedLang;
   private renderCache;
+  private editSessionActive;
   constructor(options?: DiffHunksRendererOptions, onRenderUpdate?: (() => unknown) | undefined, workerManager?: WorkerPoolManager | undefined);
   cleanUp(): void;
   recycle(): void;
+  /**
+   * Enter edit-session mode: hunk updates preserve the current region
+   * skeleton instead of recomputing hunks, and rendering happens locally
+   * with the token transformer forced on (worker-pool requests/results are
+   * suspended for this renderer). Called on every editor attach, including
+   * a re-attach after recycle.
+   */
+  beginEditSession(): void;
+  /** Leave edit-session mode. The exit recompute is the host's concern. */
+  endEditSession(): void;
+  /**
+   * Ensures that the DOM is compatible with editor render updates
+   */
+  editorRenderReady(): boolean;
+  /**
+   * Re-highlights the current diff in the background and swaps the fresh
+   * result in (with a re-render) once it completes. Needed after an edit
+   * session's exit recompute: session passes plain-fill shifted lines in the
+   * cached result, and the recompute mutates the diff in place (same object,
+   * same cacheKey), so identity/cacheKey checks would otherwise treat the
+   * stale highlight as current forever. The current result — content-correct,
+   * mostly highlighted — keeps rendering until the fresh one lands, so no
+   * interim paint drops highlighting.
+   */
+  refreshHighlightedResult(): Promise<void>;
+  private applyRefreshedResult;
   get diffCache(): FileDiffMetadata | undefined;
   clearRenderCache(): void;
   setOptions(options: DiffHunksRendererOptions): void;
@@ -91,9 +118,20 @@ declare class DiffHunksRenderer<LAnnotation = undefined> {
   expandHunk(index: number, direction: ExpansionDirections, expansionLineCount?: number): void;
   getExpandedHunk(hunkIndex: number): HunkExpansionRegion;
   getExpandedHunksMap(): Map<number, HunkExpansionRegion>;
+  /** Replace the whole expansion map (session-exit expansion remapping). */
+  setExpandedHunksMap(expandedHunks: Map<number, HunkExpansionRegion>): void;
   setLineAnnotations(lineAnnotations: DiffLineAnnotation<LAnnotation>[]): void;
-  updateRenderCache(dirtyLines: Map<number, Array<HighlightedToken>>, themeType: 'dark' | 'light'): void;
+  /**
+   * Returns true when a session-mode pass changed the region skeleton itself
+   * (a gap edit synthesized or merged regions), which changes the rendered
+   * row set without a line-count change — the host must escalate to a full
+   * re-render instead of its cheap refresh path.
+   */
+  updateRenderCache(dirtyLines: Map<number, Array<HighlightedToken>>, themeType: 'dark' | 'light', lineCountChangeInFlight?: boolean): boolean;
+  private applyExpansionRemap;
   applyDocumentChange(textDocument: DiffsTextDocument): void;
+  private applySessionDocumentChange;
+  private markEditSessionPass;
   protected getUnifiedLineDecoration({
     lineType
   }: UnifiedLineDecorationProps): LineDecoration;
@@ -107,6 +145,7 @@ declare class DiffHunksRenderer<LAnnotation = undefined> {
   protected getOptionsWithDefaults(): DiffHunksRendererOptionsWithDefaults;
   initializeHighlighter(): Promise<DiffsHighlighter>;
   hydrate(diff: FileDiffMetadata | undefined): void;
+  private getLocalHighlightTheme;
   private getRenderOptions;
   renderDiff(diff?: FileDiffMetadata | undefined, renderRange?: RenderRange): HunksRenderResult | undefined;
   asyncRender(diff: FileDiffMetadata, renderRange?: RenderRange): Promise<HunksRenderResult>;
@@ -114,6 +153,7 @@ declare class DiffHunksRenderer<LAnnotation = undefined> {
   private asyncHighlight;
   private renderDiffWithHighlighter;
   onHighlightSuccess(diff: FileDiffMetadata, result: ThemedDiffResult, options: RenderDiffOptions, highlighted?: boolean): void;
+  private applyHighlightResult;
   private getMatchingWorkerResultCache;
   private hasHighlightedRenderCache;
   onHighlightError(error: unknown): void;

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

@@ -1 +1 @@
-{"version":3,"file":"DiffHunksRenderer.d.ts","names":[],"sources":["../../src/renderers/DiffHunksRenderer.ts"],"mappings":";;;;;;UAiIiB,wBAAA,SAAiC,eAAe;EAC/D,gBAAA,GAAmB,oBAAA;AAAA;AAAA,UAGJ,oCAAA,SAA6C,IAAA,CAC5D,2BAAA;EAGA,gBAAA,EAAkB,oBAAA;AAAA;AAAA,UAGH,0BAAA;EACf,IAAA;EACA,QAAA,EAAU,SAAS;EACnB,iBAAA;EACA,iBAAA;AAAA;AAAA,UAGe,wBAAA;EACf,IAAA;EACA,IAAA;EACA,SAAA;AAAA;AAAA,UAGe,cAAA;EACf,cAAA,EAAgB,SAAA;EAChB,gBAAA,GAAmB,UAAA;EACnB,iBAAA,GAAoB,UAAA;AAAA;AAAA,UAUL,mBAAA;EACf,IAAA;EACA,SAAA;EACA,SAAA;EACA,gBAAA;EACA,cAAA;EACA,YAAA,GAAe,gBAAA;EACf,YAAA,GAAe,gBAAgB;AAAA;AAAA,UAGhB,WAAA;EACf,OAAA,EAAS,OAAA;EACT,MAAA,EAAQ,OAAW;AAAA;AAAA,UAGJ,gBAAA;EACf,QAAA,EAAU,WAAA;EACV,QAAA,EAAU,WAAW;AAAA;AAAA,UAGN,2BAAA;EACf,MAAA,GAAS,WAAA;EACT,KAAA,GAAQ,WAAW;AAAA;AAAA,UAGJ,yBAAA;EACf,MAAA,GAAS,gBAAA;EACT,KAAA,GAAQ,gBAAgB;AAAA;AAAA,UAGT,iBAAA;EACf,gBAAA,EAAkB,cAAA;EAClB,iBAAA,EAAmB,cAAA;EACnB,kBAAA,EAAoB,cAAA;EACpB,mBAAA,EAAqB,cAAA;EACrB,kBAAA,EAAoB,cAAA;EACpB,mBAAA,EAAqB,cAAA;EACrB,QAAA,EAAU,QAAA;EACV,GAAA;EACA,OAAA,EAAS,OAAA;EACT,aAAA,EAAe,OAAA;EACf,UAAA;EACA,WAAA;EACA,aAAA;EACA,QAAA;EACA,YAAA;EACA,WAAA;AAAA;AAAA,cAKW,iBAAA;EAeF,OAAA,EAAS,wBAAA;EAAA,QACR,cAAA;EAAA,QACA,aAAA;EAAA,SAhBD,IAAA;EAAA,QAED,WAAA;EAAA,QACA,IAAA;EAAA,QAEA,aAAA;EAAA,QAEA,mBAAA;EAAA,QACA,mBAAA;EAAA,QAEA,YAAA;EAAA,QACA,WAAA;EAER,WAAA,CACS,OAAA,GAAS,wBAAA,EACR,cAAA,gCACA,aAAA,GAAgB,iBAAA;EASnB,OAAA;EAOA,OAAA;EAAA,IASI,SAAA,IAAa,gBAAA;EAIjB,gBAAA;EAcA,UAAA,CAAW,OAAA,EAAS,wBAAA;EAIpB,YAAA,CAAa,OAAA,EAAS,OAAA,CAAQ,wBAAA;EAI9B,UAAA,CACL,KAAA,UACA,SAAA,EAAW,mBAAA,EACX,kBAAA;EAuBK,eAAA,CAAgB,SAAA,WAAoB,mBAAA;EAIpC,mBAAA,IAAuB,GAAA,SAAY,mBAAA;EAInC,kBAAA,CACL,eAAA,EAAiB,kBAAA,CAAmB,WAAA;EAmB/B,iBAAA,CACL,UAAA,EAAY,GAAA,SAAY,KAAA,CAAM,gBAAA,IAC9B,SAAA;EAgFK,mBAAA,CAAoB,YAAA,EAAc,iBAAA;EAAA,UAqD/B,wBAAA;IACR;EAAA,GACC,0BAAA,GAA6B,cAAA;EAAA,UAStB,sBAAA;IACR,IAAA;IACA;EAAA,GACC,wBAAA,GAA2B,cAAA;EAAA,QAetB,uBAAA;EAAA,UAKU,6BAAA,IAChB,GAAA,EAAK,mBAAA,KACF,2BAAA;EAAA,UAGa,2BAAA,IAChB,GAAA,EAAK,mBAAA,KACF,yBAAA;EAAA,UAEK,sBAAA,IAA0B,oCAAA;EAiDvB,qBAAA,IAAyB,OAAA,CAAQ,gBAAA;EAOvC,OAAA,CAAQ,IAAA,EAAM,gBAAA;EAAA,QA+Bb,gBAAA;EA6BD,UAAA,CACL,IAAA,GAAM,gBAAA,cACN,WAAA,GAAa,WAAA,GACZ,iBAAA;EAoIU,WAAA,CACX,IAAA,EAAM,gBAAA,EACN,WAAA,GAAa,WAAA,GACZ,OAAA,CAAQ,iBAAA;EAAA,UAKD,gBAAA,CACR,KAAA,WACA,UAAA,UACA,gBAAA,GAAmB,mBAAA,GAClB,OAAA;EAAA,QAeW,cAAA;EAAA,QAyBN,yBAAA;EAeD,kBAAA,CACL,IAAA,EAAM,gBAAA,EACN,MAAA,EAAQ,gBAAA,EACR,OAAA,EAAS,iBAAA,EACT,WAAA;EAAA,QA0BM,4BAAA;EAAA,QAWA,yBAAA;EAaD,gBAAA,CAAiB,KAAA;EAAA,QAIhB,oBAAA;EAAA,QAIA,iBAAA;EA0iBD,aAAA,CACL,IAAA,yCACA,MAAA,EAAQ,iBAAA,GACP,cAAA;EAyBI,aAAA,CACL,MAAA,EAAQ,iBAAA,EACR,QAAA,GAAU,cAAA,KACT,OAAA;EAkDI,cAAA,CACL,MAAA,EAAQ,iBAAA,EACR,YAAA,GAAc,cAAA;EAKT,iBAAA,CACL,QAAA,EAAU,cAAA,IACV,UAAA;EAAA,QAqBM,wBAAA;EAAA,QAiEA,cAAA;EAAA,QA+DA,YAAA;AAAA"}
+{"version":3,"file":"DiffHunksRenderer.d.ts","names":[],"sources":["../../src/renderers/DiffHunksRenderer.ts"],"mappings":"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"}

package/dist/renderers/DiffHunksRenderer.js

@@ -1,4 +1,8 @@
 import { DEFAULT_EXPANDED_REGION, DEFAULT_RENDER_RANGE, DEFAULT_THEMES, DEFAULT_TOKENIZE_MAX_LENGTH } from "../constants.js";
+import { cleanLastNewline } from "../utils/cleanLastNewline.js";
+import { getTrailingContextRangeSize } from "../utils/virtualDiffLayout.js";
+import { recomputeDiffHunksForEdit, recomputeEmptyDocumentDiff, recomputeTopAlignedAdditionDiff, shouldTopAlignAdditionRecompute, updateDiffHunks } from "../utils/updateDiffHunks.js";
+import { applySessionChangedLines, rebuildSessionHunks, remapExpandedHunksForRegionChange } from "../utils/editSessionHunks.js";
 import { getFileAnnotations, shouldRenderFileAnnotations } from "../utils/includesFileAnnotations.js";
 import { createGutterGap, createGutterItem, createGutterWrapper, createHastElement } from "../utils/hast_utils.js";
 import { areLanguagesAttached } from "../highlighter/languages/areLanguagesAttached.js";
@@ -13,11 +17,8 @@ import { createPreElement } from "../utils/createPreElement.js";
 import { getFiletypeFromFileName } from "../utils/getFiletypeFromFileName.js";
 import { getHighlighterOptions } from "../utils/getHighlighterOptions.js";
 import { getLineAnnotationName } from "../utils/getLineAnnotationName.js";
-import { shouldUseTokenTransformer } from "../utils/shouldUseTokenTransformer.js";
 import { areDiffTargetsEqual } from "../utils/areDiffTargetsEqual.js";
-import { getTrailingContextRangeSize } from "../utils/virtualDiffLayout.js";
 import { iterateOverDiff } from "../utils/iterateOverDiff.js";
-import { cleanLastNewline } from "../utils/cleanLastNewline.js";
 import { areDiffRenderOptionsEqual } from "../utils/areDiffRenderOptionsEqual.js";
 import { createEmptyRowBuffer } from "../utils/createEmptyRowBuffer.js";
 import { createNoNewlineElement } from "../utils/createNoNewlineElement.js";
@@ -27,7 +28,6 @@ import { getTotalLineCountFromHunks } from "../utils/getTotalLineCountFromHunks.
 import { isDefaultRenderRange } from "../utils/isDefaultRenderRange.js";
 import { isDiffPlainText } from "../utils/isDiffPlainText.js";
 import { renderDiffWithHighlighter } from "../utils/renderDiffWithHighlighter.js";
-import { recomputeDiffHunksForEdit, recomputeEmptyDocumentDiff, updateDiffHunks } from "../utils/updateDiffHunks.js";
 import { toHtml } from "hast-util-to-html";
 //#region src/renderers/DiffHunksRenderer.ts
 let instanceId = -1;
@@ -43,6 +43,7 @@ var DiffHunksRenderer = class {
 	additionAnnotations = {};
 	computedLang = "text";
 	renderCache;
+	editSessionActive = false;
 	constructor(options = { theme: DEFAULT_THEMES }, onRenderUpdate, workerManager) {
 		this.options = options;
 		this.onRenderUpdate = onRenderUpdate;
@@ -62,6 +63,63 @@ var DiffHunksRenderer = class {
 		this.additionAnnotations = {};
 		this.deletionAnnotations = {};
 		this.workerManager?.cleanUpTasks(this);
+		this.endEditSession();
+	}
+	/**
+	* Enter edit-session mode: hunk updates preserve the current region
+	* skeleton instead of recomputing hunks, and rendering happens locally
+	* with the token transformer forced on (worker-pool requests/results are
+	* suspended for this renderer). Called on every editor attach, including
+	* a re-attach after recycle.
+	*/
+	beginEditSession() {
+		this.editSessionActive = true;
+	}
+	/** Leave edit-session mode. The exit recompute is the host's concern. */
+	endEditSession() {
+		this.editSessionActive = false;
+	}
+	/**
+	* Ensures that the DOM is compatible with editor render updates
+	*/
+	editorRenderReady() {
+		return this.renderCache?.options.useTokenTransformer === true && this.renderCache.highlighted && this.renderCache.result != null;
+	}
+	/**
+	* Re-highlights the current diff in the background and swaps the fresh
+	* result in (with a re-render) once it completes. Needed after an edit
+	* session's exit recompute: session passes plain-fill shifted lines in the
+	* cached result, and the recompute mutates the diff in place (same object,
+	* same cacheKey), so identity/cacheKey checks would otherwise treat the
+	* stale highlight as current forever. The current result — content-correct,
+	* mostly highlighted — keeps rendering until the fresh one lands, so no
+	* interim paint drops highlighting.
+	*/
+	refreshHighlightedResult() {
+		const { renderCache } = this;
+		if (renderCache == null || isDiffPlainText(renderCache.diff) || isDiffMassive(renderCache.diff, this.getTokenizeMaxLength())) return Promise.resolve();
+		const { diff } = renderCache;
+		const { workerManager } = this;
+		if (!this.editSessionActive && workerManager?.isWorkingPool() === true && diff.cacheKey != null) {
+			workerManager.evictDiffFromCache(diff.cacheKey);
+			return workerManager.primeDiffHighlightCache(diff).then(() => {
+				this.applyRefreshedResult(diff, workerManager.getDiffResultCache(diff));
+			}).catch((error) => this.onHighlightError(error));
+		}
+		return this.asyncHighlight(diff).then((fresh) => this.applyRefreshedResult(diff, fresh)).catch((error) => this.onHighlightError(error));
+	}
+	applyRefreshedResult(diff, fresh) {
+		if (fresh == null || this.renderCache == null || this.renderCache.diff !== diff || this.editSessionActive) return;
+		const { options } = this.getRenderOptions(diff);
+		if (!areDiffRenderOptionsEqual(options, fresh.options)) return;
+		this.renderCache = {
+			diff,
+			options: fresh.options,
+			highlighted: true,
+			result: fresh.result,
+			renderRange: void 0
+		};
+		this.onRenderUpdate?.();
 	}
 	get diffCache() {
 		return this.renderCache?.diff ?? this.diff;
@@ -96,6 +154,10 @@ var DiffHunksRenderer = class {
 	getExpandedHunksMap() {
 		return this.expandedHunks;
 	}
+	/** Replace the whole expansion map (session-exit expansion remapping). */
+	setExpandedHunksMap(expandedHunks) {
+		this.expandedHunks = expandedHunks;
+	}
 	setLineAnnotations(lineAnnotations) {
 		this.additionAnnotations = {};
 		this.deletionAnnotations = {};
@@ -111,13 +173,20 @@ var DiffHunksRenderer = class {
 			arr.push(annotation);
 		}
 	}
-	updateRenderCache(dirtyLines, themeType) {
-		if (this.renderCache == null) return;
+	/**
+	* Returns true when a session-mode pass changed the region skeleton itself
+	* (a gap edit synthesized or merged regions), which changes the rendered
+	* row set without a line-count change — the host must escalate to a full
+	* re-render instead of its cheap refresh path.
+	*/
+	updateRenderCache(dirtyLines, themeType, lineCountChangeInFlight = false) {
+		if (this.renderCache == null) return false;
 		const { result, diff } = this.renderCache;
-		if (result == null) return;
+		if (result == null) return false;
 		if (diff.isPartial) throw new Error("Could not update render cache for partial diff");
 		const hastLines = result.code.additionLines;
 		const changedAdditionLines = [];
+		const previousAdditionLines = /* @__PURE__ */ new Map();
 		for (const [line, tokens] of dirtyLines) {
 			const prevProps = hastLines[line]?.properties ?? {};
 			const lineText = tokens.map((a) => a[2]).join("");
@@ -126,7 +195,10 @@ var DiffHunksRenderer = class {
 			const prevText = cleanLastNewline(prevLine);
 			if (canSyncDiffLine) {
 				diff.additionLines[line] = applyLineTextWithNewline(prevLine, lineText);
-				if (prevText !== lineText) changedAdditionLines.push(line);
+				if (prevText !== lineText) {
+					changedAdditionLines.push(line);
+					previousAdditionLines.set(line, prevLine);
+				}
 			}
 			hastLines[line] = {
 				type: "element",
@@ -154,7 +226,7 @@ var DiffHunksRenderer = class {
 						tagName: "span",
 						properties: {
 							"data-char": char,
-							style: `--diffs-token-${themeType}:${fg};`
+							style: `color:${fg};`
 						},
 						children: [{
 							type: "text",
@@ -164,26 +236,59 @@ var DiffHunksRenderer = class {
 				})
 			};
 		}
-		if (changedAdditionLines.length > 0) Object.assign(diff, updateDiffHunks(diff, changedAdditionLines, this.options.parseDiffOptions));
+		let regionsChanged = false;
+		if (changedAdditionLines.length > 0) if (this.editSessionActive && !diff.isPartial) {
+			if (!lineCountChangeInFlight) if (diff.additionLines.length <= 1 && diff.additionLines.join("") === "") {
+				Object.assign(diff, recomputeEmptyDocumentDiff(diff, this.options.parseDiffOptions));
+				this.markEditSessionPass(diff);
+				regionsChanged = true;
+			} else if (shouldTopAlignAdditionRecompute(diff, diff.additionLines)) {
+				Object.assign(diff, recomputeTopAlignedAdditionDiff(diff, diff.additionLines, this.options.parseDiffOptions));
+				this.markEditSessionPass(diff);
+				regionsChanged = true;
+			} else {
+				const change = applySessionChangedLines(diff, changedAdditionLines, this.options.parseDiffOptions, previousAdditionLines);
+				this.applyExpansionRemap(change);
+				regionsChanged = change != null;
+			}
+		} else Object.assign(diff, updateDiffHunks(diff, changedAdditionLines, this.options.parseDiffOptions));
 		result.baseThemeType = themeType;
 		this.renderCache.isDirty = true;
+		return regionsChanged;
+	}
+	applyExpansionRemap(change) {
+		if (change != null) this.expandedHunks = remapExpandedHunksForRegionChange(this.expandedHunks, change);
 	}
 	applyDocumentChange(textDocument) {
 		if (this.renderCache == null) return;
 		const { diff, result } = this.renderCache;
 		if (result == null) return;
-		diff.additionLines = getEditorDocumentLines(textDocument, diff.additionLines);
-		const newLength = diff.additionLines.length;
-		const additionHastLines = result.code.additionLines;
-		const prevLen = additionHastLines.length;
-		if (newLength < prevLen) additionHastLines.length = newLength;
-		for (let i = prevLen; i < newLength; i++) additionHastLines[i] ??= createPlainAdditionLineElement(i, textDocument);
-		if (!diff.isPartial) if (diff.additionLines.length <= 1 && diff.additionLines.join("") === "") {
+		if (diff.isPartial) throw new Error("Could not apply document change for partial diff");
+		const { additionLines: previousAdditionLines } = diff;
+		diff.additionLines = getEditorDocumentLines(textDocument, previousAdditionLines);
+		result.code.additionLines = realignAdditionHastLines(previousAdditionLines, diff.additionLines, result.code.additionLines, textDocument);
+		if (diff.additionLines.length <= 1 && diff.additionLines.join("") === "") {
 			Object.assign(diff, recomputeEmptyDocumentDiff(diff, this.options.parseDiffOptions));
-			additionHastLines[0] = createPlainAdditionLineElement(0, textDocument);
-		} else Object.assign(diff, recomputeDiffHunksForEdit(diff, this.options.parseDiffOptions));
+			result.code.additionLines[0] = createPlainAdditionLineElement(0, textDocument);
+			this.markEditSessionPass(diff);
+		} else if (this.editSessionActive) this.applySessionDocumentChange(diff);
+		else Object.assign(diff, recomputeDiffHunksForEdit(diff, this.options.parseDiffOptions));
 		this.renderCache.isDirty = true;
 	}
+	applySessionDocumentChange(diff) {
+		const { parseDiffOptions } = this.options;
+		const rawLines = diff.additionLines;
+		if (shouldTopAlignAdditionRecompute(diff, rawLines)) {
+			Object.assign(diff, recomputeTopAlignedAdditionDiff(diff, rawLines, parseDiffOptions));
+			this.markEditSessionPass(diff);
+			return;
+		}
+		this.applyExpansionRemap(rebuildSessionHunks(diff, parseDiffOptions));
+	}
+	markEditSessionPass(diff) {
+		if (!this.editSessionActive) return;
+		diff.editSessionDirty = true;
+	}
 	getUnifiedLineDecoration({ lineType }) {
 		return {
 			gutterLineType: lineType,
@@ -227,7 +332,10 @@ var DiffHunksRenderer = class {
 		};
 	}
 	async initializeHighlighter() {
-		this.highlighter = await getSharedHighlighter(getHighlighterOptions(this.computedLang, this.options));
+		this.highlighter = await getSharedHighlighter(getHighlighterOptions(this.computedLang, {
+			theme: this.getLocalHighlightTheme(),
+			preferredHighlighter: this.workerManager?.getPreferredHighlighter() ?? this.options.preferredHighlighter
+		}));
 		return this.highlighter;
 	}
 	hydrate(diff) {
@@ -244,20 +352,30 @@ var DiffHunksRenderer = class {
 			result: massiveDiff ? void 0 : cache?.result,
 			renderRange: void 0
 		};
-		if (this.workerManager?.isWorkingPool() === true) {
+		if (!this.editSessionActive && this.workerManager?.isWorkingPool() === true) {
 			if (this.renderCache.result == null && !massiveDiff) this.workerManager.highlightDiffAST(this, this.diff);
 		} else if (this.highlighter == null) {
 			this.computedLang = diff.lang ?? getFiletypeFromFileName(diff.name);
 			this.initializeHighlighter();
 		}
 	}
+	getLocalHighlightTheme() {
+		return this.workerManager?.getDiffRenderOptions().theme ?? this.options.theme ?? DEFAULT_THEMES;
+	}
 	getRenderOptions(diff) {
 		const options = (() => {
-			if (this.workerManager?.isWorkingPool() === true) return this.workerManager.getDiffRenderOptions();
+			if (this.workerManager?.isWorkingPool() === true) {
+				const poolOptions = this.workerManager.getDiffRenderOptions();
+				if (this.editSessionActive && poolOptions.useTokenTransformer !== true) return {
+					...poolOptions,
+					useTokenTransformer: true
+				};
+				return poolOptions;
+			}
 			const { theme, tokenizeMaxLineLength, lineDiffType, maxLineDiffLength } = this.getOptionsWithDefaults();
 			return {
 				theme,
-				useTokenTransformer: shouldUseTokenTransformer(this.options),
+				useTokenTransformer: this.editSessionActive || this.options.useTokenTransformer === true,
 				tokenizeMaxLineLength,
 				lineDiffType,
 				maxLineDiffLength
@@ -303,8 +421,10 @@ var DiffHunksRenderer = class {
 		const forcePlainText = !hasContent || isDiffPlainText(diff) || isDiffMassive(diff, this.getTokenizeMaxLength());
 		const newContent = !areDiffTargetsEqual(diff, this.renderCache.diff);
 		const newRenderRange = !areRenderRangesEqual(this.renderCache.renderRange, renderRange);
-		if (this.workerManager?.isWorkingPool() === true) {
-			if (forcePlainText || this.renderCache.result == null || !this.renderCache.highlighted && (newContent || newRenderRange)) {
+		if (!this.editSessionActive && this.workerManager?.isWorkingPool() === true) {
+			const highlightPending = this.renderCache.result == null && this.renderCache.highlighted && !forcePlainText && !newContent && isDefaultRenderRange(renderRange);
+			if (highlightPending) this.renderCache.highlightPending = true;
+			if (!highlightPending && (forcePlainText || this.renderCache.result == null || !this.renderCache.highlighted && (newContent || newRenderRange))) {
 				this.renderCache.diff = diff;
 				this.renderCache.options = options;
 				this.renderCache.highlighted = false;
@@ -329,7 +449,7 @@ var DiffHunksRenderer = class {
 			}
 			if (!hasThemes || !forcePlainText && !hasLangs) this.asyncHighlight(diff).then(({ result, options }) => {
 				if (this.renderCache != null) this.renderCache.highlighted = false;
-				this.onHighlightSuccess(diff, result, options, !forcePlainText);
+				this.applyHighlightResult(diff, result, options, !forcePlainText);
 			});
 		}
 		return this.renderCache.result != null ? this.processDiffResult(this.renderCache.diff, renderRange, this.renderCache.result) : void 0;
@@ -354,7 +474,7 @@ var DiffHunksRenderer = class {
 	async asyncHighlight(diff) {
 		const forcePlainText = isDiffMassive(diff, this.getTokenizeMaxLength());
 		this.computedLang = forcePlainText ? "text" : diff.lang ?? getFiletypeFromFileName(diff.name);
-		const hasThemes = this.highlighter != null && areThemesAttached(this.options.theme ?? DEFAULT_THEMES);
+		const hasThemes = this.highlighter != null && areThemesAttached(this.getLocalHighlightTheme());
 		const hasLangs = forcePlainText || this.highlighter != null && areLanguagesAttached(this.computedLang);
 		if (this.highlighter == null || !hasThemes || !hasLangs) this.highlighter = await this.initializeHighlighter();
 		return this.renderDiffWithHighlighter(diff, this.highlighter, forcePlainText);
@@ -372,8 +492,12 @@ var DiffHunksRenderer = class {
 		};
 	}
 	onHighlightSuccess(diff, result, options, highlighted = true) {
+		if (this.editSessionActive) return;
+		this.applyHighlightResult(diff, result, options, highlighted);
+	}
+	applyHighlightResult(diff, result, options, highlighted = true) {
 		if (this.renderCache == null) return;
-		const triggerRenderUpdate = !this.renderCache.highlighted || !areDiffRenderOptionsEqual(this.renderCache.options, options) || !areDiffTargetsEqual(this.renderCache.diff, diff);
+		const triggerRenderUpdate = this.renderCache.highlightPending === true || !this.renderCache.highlighted || !areDiffRenderOptionsEqual(this.renderCache.options, options) || !areDiffTargetsEqual(this.renderCache.diff, diff);
 		this.renderCache = {
 			diff,
 			options,
@@ -384,6 +508,7 @@ var DiffHunksRenderer = class {
 		if (triggerRenderUpdate) this.onRenderUpdate?.();
 	}
 	getMatchingWorkerResultCache(diff, options) {
+		if (this.editSessionActive) return;
 		const cache = this.workerManager?.getDiffResultCache(diff);
 		if (cache == null || !areDiffRenderOptionsEqual(options, cache.options)) return;
 		return cache;
@@ -574,7 +699,7 @@ var DiffHunksRenderer = class {
 						if (pendingSplitContext.side != null && pendingSplitContext.side !== missingSide) pendingSplitContext.flush();
 						pendingSplitContext.side = missingSide;
 						pendingSplitContext.increment();
-					}
+					} else if (type === "change") pendingSplitContext.flush();
 					const annotationSpans = this.getAnnotations("split", deletionLine?.lineNumber, additionLine?.lineNumber, hunkIndex, lineIndex);
 					if (annotationSpans != null && pendingSplitContext.size > 0) pendingSplitContext.flush();
 					if (deletionLine != null) {
@@ -972,6 +1097,19 @@ function withContentProperties(lineNode, contentProperties, extendProperties) {
 		}
 	};
 }
+function realignAdditionHastLines(previousLines, nextLines, hastLines, textDocument) {
+	const maxShared = Math.min(previousLines.length, nextLines.length);
+	let prefix = 0;
+	while (prefix < maxShared && previousLines[prefix] === nextLines[prefix]) prefix++;
+	let suffix = 0;
+	while (suffix < maxShared - prefix && previousLines[previousLines.length - 1 - suffix] === nextLines[nextLines.length - 1 - suffix]) suffix++;
+	const realigned = new Array(nextLines.length);
+	for (let index = 0; index < prefix; index++) realigned[index] = hastLines[index];
+	for (let offset = 0; offset < suffix; offset++) realigned[nextLines.length - 1 - offset] = hastLines[previousLines.length - 1 - offset];
+	for (let index = previousLines.length; index < nextLines.length; index++) realigned[index] ??= hastLines[index];
+	for (let index = prefix; index < nextLines.length - suffix; index++) realigned[index] ??= createPlainAdditionLineElement(index, textDocument);
+	return realigned;
+}
 function createPlainAdditionLineElement(lineIndex, textDocument) {
 	return {
 		type: "element",