@pierre/diffs 1.3.0-beta.6 → 1.3.0-beta.7

package/dist/react/utils/useFileDiffInstance.js

@@ -83,22 +83,21 @@ function mergeFileDiffOptions({ options, controlledSelection, contentEditable, h
 	const needsEditorOptions = contentEditable && hasEditor;
 	const needsReactOverrides = controlledSelection || hasGutterRenderUtility || hasCustomHeader;
 	if (!needsReactOverrides && !needsEditorOptions) return options;
-	let merged = { ...options };
-	if (needsReactOverrides) merged = {
-		...merged,
-		controlledSelection,
-		renderCustomHeader: hasCustomHeader ? noopRender : options?.renderCustomHeader,
-		renderGutterUtility: hasGutterRenderUtility ? noopRender : options?.renderGutterUtility
-	};
-	if (needsEditorOptions) merged = {
-		...merged,
-		useTokenTransformer: true,
-		enableGutterUtility: false,
-		enableLineSelection: false,
-		expandUnchanged: true,
-		lineHoverHighlight: "disabled"
+	return {
+		...options,
+		...needsReactOverrides ? {
+			controlledSelection,
+			renderCustomHeader: hasCustomHeader ? noopRender : options?.renderCustomHeader,
+			renderGutterUtility: hasGutterRenderUtility ? noopRender : options?.renderGutterUtility
+		} : null,
+		...needsEditorOptions ? {
+			useTokenTransformer: true,
+			enableGutterUtility: false,
+			enableLineSelection: false,
+			expandUnchanged: true,
+			lineHoverHighlight: "disabled"
+		} : null
 	};
-	return merged;
 }
 //#endregion
 export { useFileDiffInstance };

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

@@ -1 +1 @@
-{"version":3,"file":"useFileDiffInstance.js","names":[],"sources":["../../../src/react/utils/useFileDiffInstance.ts"],"sourcesContent":["import {\n  useCallback,\n  useContext,\n  useEffect,\n  useLayoutEffect,\n  useRef,\n} from 'react';\n\nimport { FileDiff, type FileDiffOptions } from '../../components/FileDiff';\nimport { VirtualizedFileDiff } from '../../components/VirtualizedFileDiff';\nimport type { GetHoveredLineResult } from '../../managers/InteractionManager';\nimport type {\n  DiffLineAnnotation,\n  FileDiffMetadata,\n  SelectedLineRange,\n  VirtualFileMetrics,\n} from '../../types';\nimport { areOptionsEqual } from '../../utils/areOptionsEqual';\nimport { noopRender } from '../constants';\nimport { useEditor } from '../EditorContext';\nimport { useVirtualizer } from '../Virtualizer';\nimport { WorkerPoolContext } from '../WorkerPoolContext';\nimport { useStableCallback } from './useStableCallback';\n\nconst useIsometricEffect =\n  typeof window === 'undefined' ? useEffect : useLayoutEffect;\n\ninterface UseFileDiffInstanceProps<LAnnotation> {\n  fileDiff: FileDiffMetadata;\n  options: FileDiffOptions<LAnnotation> | undefined;\n  lineAnnotations: DiffLineAnnotation<LAnnotation>[] | undefined;\n  selectedLines: SelectedLineRange | null | undefined;\n  prerenderedHTML: string | undefined;\n  metrics?: VirtualFileMetrics;\n  hasGutterRenderUtility: boolean;\n  hasCustomHeader: boolean;\n  disableWorkerPool: boolean;\n  contentEditable: boolean;\n}\n\ninterface UseFileDiffInstanceReturn {\n  ref(node: HTMLElement | null): void;\n  getHoveredLine(): GetHoveredLineResult<'diff'> | undefined;\n}\n\nexport function useFileDiffInstance<LAnnotation>({\n  fileDiff,\n  options,\n  lineAnnotations,\n  selectedLines,\n  prerenderedHTML,\n  metrics,\n  hasGutterRenderUtility,\n  hasCustomHeader,\n  disableWorkerPool,\n  contentEditable,\n}: UseFileDiffInstanceProps<LAnnotation>): UseFileDiffInstanceReturn {\n  const simpleVirtualizer = useVirtualizer();\n  const controlledSelection = selectedLines !== undefined;\n  const poolManager = useContext(WorkerPoolContext);\n  const editor = useEditor<LAnnotation>();\n  const instanceRef = useRef<\n    FileDiff<LAnnotation> | VirtualizedFileDiff<LAnnotation> | null\n  >(null);\n  const ref = useStableCallback((fileContainer: HTMLElement | null) => {\n    if (fileContainer != null) {\n      if (instanceRef.current != null) {\n        throw new Error(\n          'useFileDiffInstance: An instance should not already exist when a node is created'\n        );\n      }\n      if (simpleVirtualizer != null) {\n        instanceRef.current = new VirtualizedFileDiff(\n          mergeFileDiffOptions({\n            controlledSelection,\n            contentEditable,\n            hasCustomHeader,\n            hasEditor: editor !== undefined,\n            hasGutterRenderUtility,\n            options,\n          }),\n          simpleVirtualizer,\n          metrics,\n          !disableWorkerPool ? poolManager : undefined,\n          true\n        );\n      } else {\n        instanceRef.current = new FileDiff(\n          mergeFileDiffOptions({\n            controlledSelection,\n            contentEditable,\n            hasCustomHeader,\n            hasEditor: editor !== undefined,\n            hasGutterRenderUtility,\n            options,\n          }),\n          !disableWorkerPool ? poolManager : undefined,\n          true\n        );\n      }\n      void instanceRef.current.hydrate({\n        fileDiff,\n        fileContainer,\n        lineAnnotations,\n        prerenderedHTML,\n      });\n    } else {\n      if (instanceRef.current == null) {\n        throw new Error(\n          'useFileDiffInstance: A FileDiff instance should exist when unmounting'\n        );\n      }\n      instanceRef.current.cleanUp();\n      instanceRef.current = null;\n    }\n  });\n\n  useIsometricEffect(() => {\n    const { current: instance } = instanceRef;\n    if (instance == null) return;\n    const newOptions = mergeFileDiffOptions({\n      controlledSelection,\n      contentEditable,\n      hasCustomHeader,\n      hasEditor: editor !== undefined,\n      hasGutterRenderUtility,\n      options,\n    });\n    const forceRender = !areOptionsEqual(instance.options, newOptions);\n    instance.setOptions(newOptions);\n    void instance.render({\n      forceRender,\n      fileDiff,\n      lineAnnotations,\n    });\n    if (selectedLines !== undefined) {\n      instance.setSelectedLines(selectedLines);\n    }\n  });\n\n  useIsometricEffect(() => {\n    if (contentEditable && instanceRef.current != null) {\n      if (editor === undefined) {\n        throw new Error('FileDiff: Editor is not attached');\n      }\n      return editor.edit(instanceRef.current);\n    }\n    return undefined;\n  }, [contentEditable, editor]);\n\n  const getHoveredLine = useCallback(():\n    | GetHoveredLineResult<'diff'>\n    | undefined => {\n    return instanceRef.current?.getHoveredLine();\n  }, []);\n\n  return { ref, getHoveredLine };\n}\n\ninterface MergeFileDiffOptionsProps<LAnnotation> {\n  controlledSelection: boolean;\n  contentEditable: boolean;\n  hasEditor: boolean;\n  hasCustomHeader: boolean;\n  hasGutterRenderUtility: boolean;\n  options: FileDiffOptions<LAnnotation> | undefined;\n}\n\nfunction mergeFileDiffOptions<LAnnotation>({\n  options,\n  controlledSelection,\n  contentEditable,\n  hasCustomHeader,\n  hasEditor,\n  hasGutterRenderUtility,\n}: MergeFileDiffOptionsProps<LAnnotation>):\n  | FileDiffOptions<LAnnotation>\n  | undefined {\n  const needsEditorOptions = contentEditable && hasEditor;\n  const needsReactOverrides =\n    controlledSelection || hasGutterRenderUtility || hasCustomHeader;\n\n  if (!needsReactOverrides && !needsEditorOptions) {\n    return options;\n  }\n\n  let merged: FileDiffOptions<LAnnotation> = { ...options };\n\n  if (needsReactOverrides) {\n    merged = {\n      ...merged,\n      controlledSelection,\n      renderCustomHeader: hasCustomHeader\n        ? noopRender\n        : options?.renderCustomHeader,\n      renderGutterUtility: hasGutterRenderUtility\n        ? noopRender\n        : options?.renderGutterUtility,\n    };\n  }\n\n  if (needsEditorOptions) {\n    merged = {\n      ...merged,\n      useTokenTransformer: true,\n      enableGutterUtility: false,\n      enableLineSelection: false,\n      expandUnchanged: true,\n      lineHoverHighlight: 'disabled',\n    };\n  }\n\n  return merged;\n}\n"],"mappings":";;;;;;;;;;AAwBA,MAAM,qBACJ,OAAO,WAAW,cAAc,YAAY;AAoB9C,SAAgB,oBAAiC,EAC/C,UACA,SACA,iBACA,eACA,iBACA,SACA,wBACA,iBACA,mBACA,mBACmE;CACnE,MAAM,oBAAoB,eAAe;CACzC,MAAM,sBAAsB,kBAAkB,KAAA;CAC9C,MAAM,cAAc,WAAW,iBAAiB;CAChD,MAAM,SAAS,UAAuB;CACtC,MAAM,cAAc,OAElB,IAAI;CACN,MAAM,MAAM,mBAAmB,kBAAsC;EACnE,IAAI,iBAAiB,MAAM;GACzB,IAAI,YAAY,WAAW,MACzB,MAAM,IAAI,MACR,kFACF;GAEF,IAAI,qBAAqB,MACvB,YAAY,UAAU,IAAI,oBACxB,qBAAqB;IACnB;IACA;IACA;IACA,WAAW,WAAW,KAAA;IACtB;IACA;GACF,CAAC,GACD,mBACA,SACA,CAAC,oBAAoB,cAAc,KAAA,GACnC,IACF;QAEA,YAAY,UAAU,IAAI,SACxB,qBAAqB;IACnB;IACA;IACA;IACA,WAAW,WAAW,KAAA;IACtB;IACA;GACF,CAAC,GACD,CAAC,oBAAoB,cAAc,KAAA,GACnC,IACF;GAEF,YAAiB,QAAQ,QAAQ;IAC/B;IACA;IACA;IACA;GACF,CAAC;EACH,OAAO;GACL,IAAI,YAAY,WAAW,MACzB,MAAM,IAAI,MACR,uEACF;GAEF,YAAY,QAAQ,QAAQ;GAC5B,YAAY,UAAU;EACxB;CACF,CAAC;CAED,yBAAyB;EACvB,MAAM,EAAE,SAAS,aAAa;EAC9B,IAAI,YAAY,MAAM;EACtB,MAAM,aAAa,qBAAqB;GACtC;GACA;GACA;GACA,WAAW,WAAW,KAAA;GACtB;GACA;EACF,CAAC;EACD,MAAM,cAAc,CAAC,gBAAgB,SAAS,SAAS,UAAU;EACjE,SAAS,WAAW,UAAU;EAC9B,SAAc,OAAO;GACnB;GACA;GACA;EACF,CAAC;EACD,IAAI,kBAAkB,KAAA,GACpB,SAAS,iBAAiB,aAAa;CAE3C,CAAC;CAED,yBAAyB;EACvB,IAAI,mBAAmB,YAAY,WAAW,MAAM;GAClD,IAAI,WAAW,KAAA,GACb,MAAM,IAAI,MAAM,kCAAkC;GAEpD,OAAO,OAAO,KAAK,YAAY,OAAO;EACxC;CAEF,GAAG,CAAC,iBAAiB,MAAM,CAAC;CAQ5B,OAAO;EAAE;EAAK,gBANS,kBAEN;GACf,OAAO,YAAY,SAAS,eAAe;EAC7C,GAAG,CAAC,CAEuB;CAAE;AAC/B;AAWA,SAAS,qBAAkC,EACzC,SACA,qBACA,iBACA,iBACA,WACA,0BAGY;CACZ,MAAM,qBAAqB,mBAAmB;CAC9C,MAAM,sBACJ,uBAAuB,0BAA0B;CAEnD,IAAI,CAAC,uBAAuB,CAAC,oBAC3B,OAAO;CAGT,IAAI,SAAuC,EAAE,GAAG,QAAQ;CAExD,IAAI,qBACF,SAAS;EACP,GAAG;EACH;EACA,oBAAoB,kBAChB,aACA,SAAS;EACb,qBAAqB,yBACjB,aACA,SAAS;CACf;CAGF,IAAI,oBACF,SAAS;EACP,GAAG;EACH,qBAAqB;EACrB,qBAAqB;EACrB,qBAAqB;EACrB,iBAAiB;EACjB,oBAAoB;CACtB;CAGF,OAAO;AACT"}
+{"version":3,"file":"useFileDiffInstance.js","names":[],"sources":["../../../src/react/utils/useFileDiffInstance.ts"],"sourcesContent":["import {\n  useCallback,\n  useContext,\n  useEffect,\n  useLayoutEffect,\n  useRef,\n} from 'react';\n\nimport { FileDiff, type FileDiffOptions } from '../../components/FileDiff';\nimport { VirtualizedFileDiff } from '../../components/VirtualizedFileDiff';\nimport type { GetHoveredLineResult } from '../../managers/InteractionManager';\nimport type {\n  DiffLineAnnotation,\n  FileDiffMetadata,\n  SelectedLineRange,\n  VirtualFileMetrics,\n} from '../../types';\nimport { areOptionsEqual } from '../../utils/areOptionsEqual';\nimport { noopRender } from '../constants';\nimport { useEditor } from '../EditorContext';\nimport { useVirtualizer } from '../Virtualizer';\nimport { WorkerPoolContext } from '../WorkerPoolContext';\nimport { useStableCallback } from './useStableCallback';\n\nconst useIsometricEffect =\n  typeof window === 'undefined' ? useEffect : useLayoutEffect;\n\ninterface UseFileDiffInstanceProps<LAnnotation> {\n  fileDiff: FileDiffMetadata;\n  options: FileDiffOptions<LAnnotation> | undefined;\n  lineAnnotations: DiffLineAnnotation<LAnnotation>[] | undefined;\n  selectedLines: SelectedLineRange | null | undefined;\n  prerenderedHTML: string | undefined;\n  metrics?: VirtualFileMetrics;\n  hasGutterRenderUtility: boolean;\n  hasCustomHeader: boolean;\n  disableWorkerPool: boolean;\n  contentEditable: boolean;\n}\n\ninterface UseFileDiffInstanceReturn {\n  ref(node: HTMLElement | null): void;\n  getHoveredLine(): GetHoveredLineResult<'diff'> | undefined;\n}\n\nexport function useFileDiffInstance<LAnnotation>({\n  fileDiff,\n  options,\n  lineAnnotations,\n  selectedLines,\n  prerenderedHTML,\n  metrics,\n  hasGutterRenderUtility,\n  hasCustomHeader,\n  disableWorkerPool,\n  contentEditable,\n}: UseFileDiffInstanceProps<LAnnotation>): UseFileDiffInstanceReturn {\n  const simpleVirtualizer = useVirtualizer();\n  const controlledSelection = selectedLines !== undefined;\n  const poolManager = useContext(WorkerPoolContext);\n  const editor = useEditor<LAnnotation>();\n  const instanceRef = useRef<\n    FileDiff<LAnnotation> | VirtualizedFileDiff<LAnnotation> | null\n  >(null);\n  const ref = useStableCallback((fileContainer: HTMLElement | null) => {\n    if (fileContainer != null) {\n      if (instanceRef.current != null) {\n        throw new Error(\n          'useFileDiffInstance: An instance should not already exist when a node is created'\n        );\n      }\n      if (simpleVirtualizer != null) {\n        instanceRef.current = new VirtualizedFileDiff(\n          mergeFileDiffOptions({\n            controlledSelection,\n            contentEditable,\n            hasCustomHeader,\n            hasEditor: editor !== undefined,\n            hasGutterRenderUtility,\n            options,\n          }),\n          simpleVirtualizer,\n          metrics,\n          !disableWorkerPool ? poolManager : undefined,\n          true\n        );\n      } else {\n        instanceRef.current = new FileDiff(\n          mergeFileDiffOptions({\n            controlledSelection,\n            contentEditable,\n            hasCustomHeader,\n            hasEditor: editor !== undefined,\n            hasGutterRenderUtility,\n            options,\n          }),\n          !disableWorkerPool ? poolManager : undefined,\n          true\n        );\n      }\n      void instanceRef.current.hydrate({\n        fileDiff,\n        fileContainer,\n        lineAnnotations,\n        prerenderedHTML,\n      });\n    } else {\n      if (instanceRef.current == null) {\n        throw new Error(\n          'useFileDiffInstance: A FileDiff instance should exist when unmounting'\n        );\n      }\n      instanceRef.current.cleanUp();\n      instanceRef.current = null;\n    }\n  });\n\n  useIsometricEffect(() => {\n    const { current: instance } = instanceRef;\n    if (instance == null) return;\n    const newOptions = mergeFileDiffOptions({\n      controlledSelection,\n      contentEditable,\n      hasCustomHeader,\n      hasEditor: editor !== undefined,\n      hasGutterRenderUtility,\n      options,\n    });\n    const forceRender = !areOptionsEqual(instance.options, newOptions);\n    instance.setOptions(newOptions);\n    void instance.render({\n      forceRender,\n      fileDiff,\n      lineAnnotations,\n    });\n    if (selectedLines !== undefined) {\n      instance.setSelectedLines(selectedLines);\n    }\n  });\n\n  useIsometricEffect(() => {\n    if (contentEditable && instanceRef.current != null) {\n      if (editor === undefined) {\n        throw new Error('FileDiff: Editor is not attached');\n      }\n      return editor.edit(instanceRef.current);\n    }\n    return undefined;\n  }, [contentEditable, editor]);\n\n  const getHoveredLine = useCallback(():\n    | GetHoveredLineResult<'diff'>\n    | undefined => {\n    return instanceRef.current?.getHoveredLine();\n  }, []);\n\n  return {\n    ref,\n    getHoveredLine,\n  };\n}\n\ninterface MergeFileDiffOptionsProps<LAnnotation> {\n  controlledSelection: boolean;\n  contentEditable: boolean;\n  hasEditor: boolean;\n  hasCustomHeader: boolean;\n  hasGutterRenderUtility: boolean;\n  options: FileDiffOptions<LAnnotation> | undefined;\n}\n\nfunction mergeFileDiffOptions<LAnnotation>({\n  options,\n  controlledSelection,\n  contentEditable,\n  hasCustomHeader,\n  hasEditor,\n  hasGutterRenderUtility,\n}: MergeFileDiffOptionsProps<LAnnotation>):\n  | FileDiffOptions<LAnnotation>\n  | undefined {\n  const needsEditorOptions = contentEditable && hasEditor;\n  const needsReactOverrides =\n    controlledSelection || hasGutterRenderUtility || hasCustomHeader;\n\n  if (!needsReactOverrides && !needsEditorOptions) {\n    return options;\n  }\n\n  return {\n    ...options,\n    ...(needsReactOverrides\n      ? {\n          controlledSelection,\n          renderCustomHeader: hasCustomHeader\n            ? noopRender\n            : options?.renderCustomHeader,\n          renderGutterUtility: hasGutterRenderUtility\n            ? noopRender\n            : options?.renderGutterUtility,\n        }\n      : null),\n    ...(needsEditorOptions\n      ? {\n          useTokenTransformer: true,\n          enableGutterUtility: false,\n          enableLineSelection: false,\n          expandUnchanged: true,\n          lineHoverHighlight: 'disabled',\n        }\n      : null),\n  };\n}\n"],"mappings":";;;;;;;;;;AAwBA,MAAM,qBACJ,OAAO,WAAW,cAAc,YAAY;AAoB9C,SAAgB,oBAAiC,EAC/C,UACA,SACA,iBACA,eACA,iBACA,SACA,wBACA,iBACA,mBACA,mBACmE;CACnE,MAAM,oBAAoB,eAAe;CACzC,MAAM,sBAAsB,kBAAkB,KAAA;CAC9C,MAAM,cAAc,WAAW,iBAAiB;CAChD,MAAM,SAAS,UAAuB;CACtC,MAAM,cAAc,OAElB,IAAI;CACN,MAAM,MAAM,mBAAmB,kBAAsC;EACnE,IAAI,iBAAiB,MAAM;GACzB,IAAI,YAAY,WAAW,MACzB,MAAM,IAAI,MACR,kFACF;GAEF,IAAI,qBAAqB,MACvB,YAAY,UAAU,IAAI,oBACxB,qBAAqB;IACnB;IACA;IACA;IACA,WAAW,WAAW,KAAA;IACtB;IACA;GACF,CAAC,GACD,mBACA,SACA,CAAC,oBAAoB,cAAc,KAAA,GACnC,IACF;QAEA,YAAY,UAAU,IAAI,SACxB,qBAAqB;IACnB;IACA;IACA;IACA,WAAW,WAAW,KAAA;IACtB;IACA;GACF,CAAC,GACD,CAAC,oBAAoB,cAAc,KAAA,GACnC,IACF;GAEF,YAAiB,QAAQ,QAAQ;IAC/B;IACA;IACA;IACA;GACF,CAAC;EACH,OAAO;GACL,IAAI,YAAY,WAAW,MACzB,MAAM,IAAI,MACR,uEACF;GAEF,YAAY,QAAQ,QAAQ;GAC5B,YAAY,UAAU;EACxB;CACF,CAAC;CAED,yBAAyB;EACvB,MAAM,EAAE,SAAS,aAAa;EAC9B,IAAI,YAAY,MAAM;EACtB,MAAM,aAAa,qBAAqB;GACtC;GACA;GACA;GACA,WAAW,WAAW,KAAA;GACtB;GACA;EACF,CAAC;EACD,MAAM,cAAc,CAAC,gBAAgB,SAAS,SAAS,UAAU;EACjE,SAAS,WAAW,UAAU;EAC9B,SAAc,OAAO;GACnB;GACA;GACA;EACF,CAAC;EACD,IAAI,kBAAkB,KAAA,GACpB,SAAS,iBAAiB,aAAa;CAE3C,CAAC;CAED,yBAAyB;EACvB,IAAI,mBAAmB,YAAY,WAAW,MAAM;GAClD,IAAI,WAAW,KAAA,GACb,MAAM,IAAI,MAAM,kCAAkC;GAEpD,OAAO,OAAO,KAAK,YAAY,OAAO;EACxC;CAEF,GAAG,CAAC,iBAAiB,MAAM,CAAC;CAQ5B,OAAO;EACL;EACA,gBARqB,kBAEN;GACf,OAAO,YAAY,SAAS,eAAe;EAC7C,GAAG,CAAC,CAIW;CACf;AACF;AAWA,SAAS,qBAAkC,EACzC,SACA,qBACA,iBACA,iBACA,WACA,0BAGY;CACZ,MAAM,qBAAqB,mBAAmB;CAC9C,MAAM,sBACJ,uBAAuB,0BAA0B;CAEnD,IAAI,CAAC,uBAAuB,CAAC,oBAC3B,OAAO;CAGT,OAAO;EACL,GAAG;EACH,GAAI,sBACA;GACE;GACA,oBAAoB,kBAChB,aACA,SAAS;GACb,qBAAqB,yBACjB,aACA,SAAS;EACf,IACA;EACJ,GAAI,qBACA;GACE,qBAAqB;GACrB,qBAAqB;GACrB,qBAAqB;GACrB,iBAAiB;GACjB,oBAAoB;EACtB,IACA;CACN;AACF"}

package/dist/renderers/DiffHunksRenderer.d.ts

@@ -84,7 +84,7 @@ declare class DiffHunksRenderer<LAnnotation = undefined> {
   constructor(options?: DiffHunksRendererOptions, onRenderUpdate?: (() => unknown) | undefined, workerManager?: WorkerPoolManager | undefined);
   cleanUp(): void;
   recycle(): void;
-  getRenderDiff(): FileDiffMetadata | undefined;
+  getDiffCache(): FileDiffMetadata | undefined;
   clearRenderCache(): void;
   setOptions(options: DiffHunksRendererOptions): void;
   mergeOptions(options: Partial<DiffHunksRendererOptions>): void;
@@ -92,7 +92,7 @@ declare class DiffHunksRenderer<LAnnotation = undefined> {
   getExpandedHunk(hunkIndex: number): HunkExpansionRegion;
   getExpandedHunksMap(): Map<number, HunkExpansionRegion>;
   setLineAnnotations(lineAnnotations: DiffLineAnnotation<LAnnotation>[]): void;
-  updateRenderCache(dirtyLines: Map<number, Array<HighlightedToken>>, themeType: 'dark' | 'light', skipDiffRecompute?: boolean): void;
+  updateRenderCache(dirtyLines: Map<number, Array<HighlightedToken>>, themeType: 'dark' | 'light'): void;
   applyDocumentChange(textDocument: DiffsTextDocument): void;
   protected getUnifiedLineDecoration({
     lineType

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

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

package/dist/renderers/DiffHunksRenderer.js

@@ -15,6 +15,7 @@ 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 { splitFileContents } from "../utils/splitFileContents.js";
 import { iterateOverDiff } from "../utils/iterateOverDiff.js";
 import { cleanLastNewline } from "../utils/cleanLastNewline.js";
 import { areDiffRenderOptionsEqual } from "../utils/areDiffRenderOptionsEqual.js";
@@ -26,8 +27,7 @@ import { getTotalLineCountFromHunks } from "../utils/getTotalLineCountFromHunks.
 import { isDefaultRenderRange } from "../utils/isDefaultRenderRange.js";
 import { isDiffPlainText } from "../utils/isDiffPlainText.js";
 import { renderDiffWithHighlighter } from "../utils/renderDiffWithHighlighter.js";
-import { splitFileContents } from "../utils/splitFileContents.js";
-import { recomputeDiffHunks, recomputeEmptyDocumentDiff, updateDiffHunks } from "../utils/updateDiffHunks.js";
+import { recomputeDiffHunksForEdit, recomputeEmptyDocumentDiff, updateDiffHunks } from "../utils/updateDiffHunks.js";
 import { toHtml } from "hast-util-to-html";
 //#region src/renderers/DiffHunksRenderer.ts
 let instanceId = -1;
@@ -63,7 +63,7 @@ var DiffHunksRenderer = class {
 		this.deletionAnnotations = {};
 		this.workerManager?.cleanUpTasks(this);
 	}
-	getRenderDiff() {
+	getDiffCache() {
 		return this.renderCache?.diff ?? this.diff;
 	}
 	clearRenderCache() {
@@ -111,7 +111,7 @@ var DiffHunksRenderer = class {
 			arr.push(annotation);
 		}
 	}
-	updateRenderCache(dirtyLines, themeType, skipDiffRecompute = false) {
+	updateRenderCache(dirtyLines, themeType) {
 		if (this.renderCache == null) return;
 		const { result, diff } = this.renderCache;
 		if (result == null) return;
@@ -164,7 +164,7 @@ var DiffHunksRenderer = class {
 				})
 			};
 		}
-		if (!skipDiffRecompute && changedAdditionLines.length > 0) Object.assign(diff, updateDiffHunks(diff, changedAdditionLines, this.options.parseDiffOptions));
+		if (changedAdditionLines.length > 0) Object.assign(diff, updateDiffHunks(diff, changedAdditionLines, this.options.parseDiffOptions));
 		result.baseThemeType = themeType;
 		this.renderCache.isDirty = true;
 	}
@@ -172,16 +172,21 @@ var DiffHunksRenderer = class {
 		if (this.renderCache == null) return;
 		const { diff, result } = this.renderCache;
 		if (result == null) return;
-		diff.additionLines = splitFileContents(textDocument.getText());
+		const documentText = textDocument.getText();
+		if (documentText.trim().length === 0) {
+			const lines = [];
+			for (let line = 0; line < textDocument.lineCount; line++) lines.push(textDocument.getLineText(line, true));
+			diff.additionLines = lines;
+		} else diff.additionLines = splitFileContents(documentText);
 		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 (newLength === 0) {
+		if (!diff.isPartial) 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, recomputeDiffHunks(diff, this.options.parseDiffOptions));
+		} else Object.assign(diff, recomputeDiffHunksForEdit(diff, this.options.parseDiffOptions));
 		this.renderCache.isDirty = true;
 	}
 	getUnifiedLineDecoration({ lineType }) {
@@ -403,6 +408,8 @@ var DiffHunksRenderer = class {
 		const isRenderCacheDirty = this.renderCache?.isDirty ?? false;
 		this.diff = fileDiff;
 		const unified = diffStyle === "unified";
+		const canHydrateContext = canHydrateCollapsedContext(fileDiff, this.options.loadDiffFiles != null);
+		const isExpandableDiff = !fileDiff.isPartial || canHydrateContext;
 		let additionsContentAST = [];
 		let deletionsContentAST = [];
 		let unifiedContentAST = [];
@@ -494,7 +501,7 @@ var DiffHunksRenderer = class {
 					hunkSpecs: hunk?.hunkSpecs,
 					isFirstHunk: hunkIndex === 0,
 					isLastHunk: false,
-					isExpandable: !fileDiff.isPartial
+					isExpandable: isExpandableDiff
 				});
 				const lineIndex = diffStyle === "unified" ? unifiedLineIndex : splitLineIndex;
 				const renderedLineContext = {
@@ -603,6 +610,7 @@ var DiffHunksRenderer = class {
 					if (injectedRows?.after != null) pushSplitInjectedRows(injectedRows.after, context, pendingSplitContext);
 				}
 				const isFinalSplitHunkRow = diffStyle === "split" && hunk != null && splitLineIndex === hunk.splitLineStart + hunk.splitLineCount - 1;
+				const isFinalHunkRow = hunkIndex === fileDiff.hunks.length - 1 && hunk != null && (diffStyle === "split" ? splitLineIndex === hunk.splitLineStart + hunk.splitLineCount - 1 : unifiedLineIndex === hunk.unifiedLineStart + hunk.unifiedLineCount - 1);
 				const splitNoEOFCRDeletion = isFinalSplitHunkRow ? hunk.noEOFCRDeletions : false;
 				const splitNoEOFCRAddition = isFinalSplitHunkRow ? hunk.noEOFCRAdditions : false;
 				const noEOFCRDeletion = (deletionLine?.noEOFCR ?? false) || splitNoEOFCRDeletion;
@@ -639,14 +647,14 @@ var DiffHunksRenderer = class {
 					}
 					context.incrementRowCount(1);
 				}
-				if (collapsedAfter > 0 && hunkSeparators !== "simple") pushSeparators({
+				if (hunkSeparators !== "simple" && hunkSeparators !== "metadata" && (collapsedAfter > 0 || isFinalHunkRow && canHydrateContext)) pushSeparators({
 					hunkIndex: type === "context-expanded" ? hunkIndex : hunkIndex + 1,
-					collapsedLines: collapsedAfter,
+					collapsedLines: isFinalHunkRow && canHydrateContext ? "unknown" : collapsedAfter,
 					rangeSize: trailingRangeSize,
 					hunkSpecs: void 0,
 					isFirstHunk: false,
 					isLastHunk: true,
-					isExpandable: !fileDiff.isPartial
+					isExpandable: isExpandableDiff
 				});
 				context.incrementRowCount(1);
 			}
@@ -886,7 +894,7 @@ function pushLineWithAnnotation({ diffStyle, type, deletionLine, additionLine, u
 	if (hasAnnotationRow) context.incrementRowCount(1);
 }
 function pushSeparator(type, { hunkIndex, collapsedLines, rangeSize, hunkSpecs, isFirstHunk, isLastHunk, isExpandable }, context) {
-	if (collapsedLines <= 0) return;
+	if (typeof collapsedLines === "number" && collapsedLines <= 0) return;
 	const linesAST = type === "unified" ? context.unifiedContentAST : type === "deletions" ? context.deletionsContentAST : context.additionsContentAST;
 	if (context.hunkSeparators === "metadata") {
 		if (hunkSpecs != null) {
@@ -925,9 +933,10 @@ function pushSeparator(type, { hunkIndex, collapsedLines, rangeSize, hunkSpecs,
 	const slotName = getHunkSeparatorSlotName(type, hunkIndex);
 	const chunked = rangeSize > context.expansionLineCount;
 	const expandIndex = isExpandable ? hunkIndex : void 0;
+	const content = typeof collapsedLines === "number" ? getModifiedLinesString(collapsedLines) : "More unchanged context may be available";
 	context.pushToGutter(type, createSeparator({
 		type: context.hunkSeparators,
-		content: getModifiedLinesString(collapsedLines),
+		content,
 		expandIndex,
 		chunked,
 		slotName,
@@ -936,7 +945,7 @@ function pushSeparator(type, { hunkIndex, collapsedLines, rangeSize, hunkSpecs,
 	}));
 	linesAST.push(createSeparator({
 		type: context.hunkSeparators,
-		content: getModifiedLinesString(collapsedLines),
+		content,
 		expandIndex,
 		chunked,
 		slotName,
@@ -947,7 +956,8 @@ function pushSeparator(type, { hunkIndex, collapsedLines, rangeSize, hunkSpecs,
 	context.hunkData.push({
 		slotName,
 		hunkIndex,
-		lines: collapsedLines,
+		lines: typeof collapsedLines === "number" ? collapsedLines : 0,
+		lineCountKnown: typeof collapsedLines === "number",
 		type,
 		expandable: isExpandable ? {
 			up: !isFirstHunk,
@@ -996,6 +1006,9 @@ function applyLineTextWithNewline(line, lineText) {
 function isDiffMassive(diff, tokenizeMaxLength) {
 	return Math.max(diff.additionLines.length, diff.deletionLines.length) > tokenizeMaxLength;
 }
+function canHydrateCollapsedContext(fileDiff, hasFileLoader) {
+	return fileDiff.isPartial && hasFileLoader && (fileDiff.type === "change" || fileDiff.type === "rename-changed");
+}
 //#endregion
 export { DiffHunksRenderer };