@openclaw/diffs 2026.9.5 → 2026.9.7

package/node_modules/@pierre/diffs/dist/components/FileStream.d.ts

@@ -1,5 +1,6 @@
 import { BaseCodeOptions, SupportedLanguages, ThemeTypes, ThemedToken } from "../types.js";
 import { RecallToken } from "../shiki-stream/types.js";
+import "../shiki-stream/index.js";
 //#region src/components/FileStream.d.ts
 interface FileStreamOptions extends BaseCodeOptions {
   lang?: SupportedLanguages;

package/node_modules/@pierre/diffs/dist/components/FileStream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FileStream.d.ts","names":[],"sources":["../../src/components/FileStream.ts"],"mappings":";;;UAyBiB,iBAAA,SAA0B,eAAA;EACzC,IAAA,GAAO,kBAAA;EACP,iBAAA;EAEA,WAAA,EAAa,QAAA,EAAU,UAAA;EACvB,YAAA,EAAc,QAAA,EAAU,UAAA;EAExB,aAAA,EAAe,UAAA,EAAY,+BAAA;EAC3B,aAAA,EAAe,KAAA,EAAO,WAAA,GAAc,WAAA;EACpC,aAAA;EACA,aAAA,EAAe,MAAA;AAAA;AAAA,cAKJ,UAAA;EAeQ,OAAA,EAAS,iBAAA;EAAA,SAdnB,IAAA;EAAA,QAED,WAAA;EAAA,QACA,MAAA;EAAA,QACA,eAAA;EAAA,QACA,aAAA;EAAA,QACA,GAAA;EAAA,QACA,IAAA;EAAA,QACA,aAAA;EAAA,QACA,cAAA;EAAA,QACA,aAAA;EAAA,QACA,eAAA;EAAA,QACA,eAAA;EAER,WAAA,CAAmB,OAAA,GAAS,iBAAA;EAI5B,OAAA;EAMA,YAAA,CAAa,SAAA,EAAW,UAAA;EAAA,QAoBV,qBAAA;EAAA,QAON,eAAA;EACF,KAAA,CACJ,OAAA,EAAS,cAAA,UACT,QAAA,EAAU,WAAA,GACT,OAAA;EAAA,QAkBK,WAAA;EAAA,QA+FA,YAAA;EAAA,QACA,WAAA;EAAA,QAYA,gBAAA;EAAA,QACA,kBAAA;EAAA,QACA,MAAA;EAAA,QA8CA,wBAAA;EAAA,QAqBA,aAAA;EAAA,QASA,UAAA;EAAA,QAwBA,wBAAA;EAAA,QAoBA,eAAA;AAAA"}
+{"version":3,"file":"FileStream.d.ts","names":[],"sources":["../../src/components/FileStream.ts"],"mappings":";;;;UAyBiB,0BAA0B;EACzC,OAAO;EACP;EAEA,aAAa,UAAU;EACvB,cAAc,UAAU;EAExB,eAAe,YAAY;EAC3B,eAAe,OAAO,cAAc;EACpC;EACA,eAAe;;cAKJ;EAeQ,SAAS;WAdnB;UAED;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;EAER,YAAmB,UAAS;EAI5B;EAMA,aAAa,WAAW;UAoBV;UAON;EACF,MACJ,SAAS,wBACT,UAAU,cACT;UAkBK;UA+FA;UACA;UAYA;UACA;UACA;UA8CA;UAqBA;UASA;UAwBA;UAoBA"}

package/node_modules/@pierre/diffs/dist/components/UnresolvedFile.d.ts

@@ -1,10 +1,10 @@
 import { FileContents, FileDiffMetadata, MergeConflictActionPayload, MergeConflictMarkerRow, MergeConflictResolution, PostRenderPhase } from "../types.js";
 import { WorkerPoolManager } from "../worker/WorkerPoolManager.js";
+import "../worker/index.js";
 import { HunksRenderResult } from "../renderers/DiffHunksRenderer.js";
 import { FileDiff, FileDiffOptions, FileDiffRenderBaseProps } from "./FileDiff.js";
 import { MergeConflictDiffAction } from "../utils/parseMergeConflictDiffFromFile.js";
 import { UnresolvedFileHunksRenderer, UnresolvedFileHunksRendererOptions } from "../renderers/UnresolvedFileHunksRenderer.js";
-
 //#region src/components/UnresolvedFile.d.ts
 type RenderMergeConflictActions<LAnnotation> = (action: MergeConflictDiffAction, instance: UnresolvedFile<LAnnotation>) => HTMLElement | DocumentFragment | null | undefined;
 type MergeConflictActionsTypeOption<LAnnotation> = 'none' | 'default' | RenderMergeConflictActions<LAnnotation>;

package/node_modules/@pierre/diffs/dist/components/UnresolvedFile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UnresolvedFile.d.ts","names":[],"sources":["../../src/components/UnresolvedFile.ts"],"mappings":";;;;;;;;KAqCY,0BAAA,iBACV,MAAA,EAAQ,uBAAA,EACR,QAAA,EAAU,cAAA,CAAe,WAAA,MACtB,WAAA,GAAc,gBAAA;AAAA,KAEP,8BAAA,qCAGR,0BAA0B,CAAC,WAAA;AAAA,UAEd,qBAAA,sBAA2C,IAAA,CAC1D,eAAA,CAAgB,WAAA;EAGhB,YAAA,EACE,IAAA,EAAM,WAAA,EACN,QAAA,EAAU,cAAA,CAAe,WAAA,GACzB,KAAA,EAAO,eAAA;EAET,wBAAA,GAA2B,8BAAA,CAA+B,WAAA;EAC1D,qBAAA,EACE,OAAA,EAAS,0BAAA,EACT,QAAA,EAAU,cAAA,CAAe,WAAA;EAE3B,sBAAA,EACE,IAAA,EAAM,YAAA,EACN,OAAA,EAAS,0BAAA;EAEX,eAAA;AAAA;AAAA,UAGe,yBAAA,sBAEP,uBAAA,CAAwB,WAAA;EAChC,IAAA,GAAO,YAAA;EACP,OAAA,IAAW,uBAAA;EACX,UAAA,GAAa,sBAAA;AAAA;AAAA,UAGE,4BAAA,sBAAkD,IAAA,CACjE,yBAAA,CAA0B,WAAA;EAG1B,IAAA,GAAO,YAAA;EACP,aAAA,EAAe,WAAA;EACf,eAAA;AAAA;AAAA,UAQQ,qBAAA;EACR,IAAA,EAAM,YAAA;EACN,QAAA,EAAU,gBAAA;EACV,OAAA,GAAU,uBAAA;EACV,UAAA,EAAY,sBAAA;AAAA;AAAA,UASJ,qBAAA;EACR,IAAA,EAAM,YAAA;EACN,QAAA,EAAU,gBAAA;EACV,OAAA,GAAU,uBAAA;EACV,UAAA,EAAY,sBAAA;AAAA;AAAA,KAGT,uBAAA,GAA0B,qBAAqB;AAAA,cAIvC,cAAA,kCAAgD,QAAA,CAC3D,WAAA;EAkBkB,OAAA,EAAS,qBAAA,CAAsB,WAAA;EAAA,SAf/B,IAAA;EAAA,SACA,IAAA;EAAA,UAER,aAAA,EAAe,uBAAA;EAAA,QAMjB,eAAA;EAAA,QACA,UAAA;EAAA,QACA,mBAAA;EAGR,WAAA,CACkB,OAAA,GAAS,qBAAA,CAAsB,WAAA,GAG/C,aAAA,GAAgB,iBAAA,cAChB,kBAAA;EAMO,UAAA,CACP,OAAA,EAAS,qBAAA,CAAsB,WAAA;EAAA,UAyBd,sBAAA;EAAA,UAeA,mBAAA,CACjB,OAAA,EAAS,qBAAA,CAAsB,WAAA,IAC9B,2BAAA,CAA4B,WAAA;EAAA,UAUZ,uBAAA,CACjB,OAAA,EAAS,qBAAA,CAAsB,WAAA,IAC9B,kCAAA;EAAA,UAIgB,sBAAA,CACjB,GAAA,EAAK,cAAA,EACL,MAAA,EAAQ,iBAAA;EAOD,OAAA;EAAA,QAaD,gBAAA;EA6HC,OAAA,CAAQ,KAAA,EAAO,4BAAA,CAA6B,WAAA;EA8C5C,QAAA;EAOA,MAAA,CAAO,KAAA,GAAO,yBAAA,CAA0B,WAAA;EAmC1C,eAAA,CACL,aAAA,UACA,UAAA,EAAY,uBAAA,EACZ,QAAA,GAAU,gBAAA,eACT,qBAAA;EAAA,QA+BK,wBAAA;EAAA,QA+CA,2BAAA;EAAA,QAkBA,8BAAA;EAAA,QAwBA,8BAAA;EAAA,QA+DA,yBAAA;EAAA,QAyBA,6BAAA;AAAA;AAAA,iBAyNM,qCAAA,cACd,OAAA,GAAU,qBAAA,CAAsB,WAAA,GAChC,WAAA,GAAc,qBAAA,CAAsB,WAAA,IACnC,kCAAA"}
+{"version":3,"file":"UnresolvedFile.d.ts","names":[],"sources":["../../src/components/UnresolvedFile.ts"],"mappings":";;;;;;;;KAqCY,2BAA2B,gBACrC,QAAQ,yBACR,UAAU,eAAe,iBACtB,cAAc;KAEP,+BAA+B,oCAGvC,2BAA2B;UAEd,sBAAsB,qBAAqB,KAC1D,gBAAgB;EAGhB,cACE,MAAM,aACN,UAAU,eAAe,cACzB,OAAO;EAET,2BAA2B,+BAA+B;EAC1D,uBACE,SAAS,4BACT,UAAU,eAAe;EAE3B,wBACE,MAAM,cACN,SAAS;EAEX;;UAGe,0BACf,qBACQ,wBAAwB;EAChC,OAAO;EACP,WAAW;EACX,aAAa;;UAGE,6BAA6B,qBAAqB,KACjE,0BAA0B;EAG1B,OAAO;EACP,eAAe;EACf;;UAQQ;EACR,MAAM;EACN,UAAU;EACV,UAAU;EACV,YAAY;;UASJ;EACR,MAAM;EACN,UAAU;EACV,UAAU;EACV,YAAY;;KAGT,0BAA0B;cAIlB,eAAe,iCAAiC,SAC3D;EAkBkB,SAAS,sBAAsB;WAf/B;WACA;YAER,eAAe;UAMjB;UACA;UACA;EAGR,YACkB,UAAS,sBAAsB,cAG/C,gBAAgB,+BAChB;EAMO,WACP,SAAS,sBAAsB;YAyBd;YAeA,oBACjB,SAAS,sBAAsB,eAC9B,4BAA4B;YAUZ,wBACjB,SAAS,sBAAsB,eAC9B;YAIgB,uBACjB,KAAK,gBACL,QAAQ;EAOD;UAaD;EA6HC,QAAQ,OAAO,6BAA6B;EA8C5C;EAOA,OAAO,QAAO,0BAA0B;EAmC1C,gBACL,uBACA,YAAY,yBACZ,WAAU,+BACT;UA+BK;UA+CA;UAkBA;UAwBA;UA+DA;UAyBA;;iBAyNM,sCAAsC,aACpD,UAAU,sBAAsB,cAChC,cAAc,sBAAsB,eACnC"}

package/node_modules/@pierre/diffs/dist/components/UnresolvedFile.js

@@ -332,7 +332,8 @@ function rebuildFileAndActions({ fileDiff, previousActions, resolvedConflictInde
 	};
 }
 function rebuildUnresolvedFile({ resolvedAction, resolvedConflictIndex, previousFile, fileDiff, resolution }) {
-	const lines = splitFileContents(previousFile?.contents ?? "");
+	const previousContents = previousFile?.contents ?? "";
+	const lines = splitFileContents(previousContents);
 	const { conflict } = resolvedAction;
 	const replacementLines = getResolvedConflictReplacementLines(lines, conflict, resolution);
 	const contents = [

package/node_modules/@pierre/diffs/dist/components/UnresolvedFile.js.map

@@ -1 +1 @@
-{"version":3,"file":"UnresolvedFile.js","names":["resolveConflictDiff"],"sources":["../../src/components/UnresolvedFile.ts"],"sourcesContent":["import { DEFAULT_THEMES } from '../constants';\nimport type { MergeConflictActionTarget } from '../managers/InteractionManager';\nimport { pluckInteractionOptions } from '../managers/InteractionManager';\nimport type { HunksRenderResult } from '../renderers/DiffHunksRenderer';\nimport {\n  UnresolvedFileHunksRenderer,\n  type UnresolvedFileHunksRendererOptions,\n} from '../renderers/UnresolvedFileHunksRenderer';\nimport type {\n  FileContents,\n  FileDiffMetadata,\n  MergeConflictActionPayload,\n  MergeConflictMarkerRow,\n  MergeConflictRegion,\n  MergeConflictResolution,\n  PostRenderPhase,\n} from '../types';\nimport { areFilesEqual } from '../utils/areFilesEqual';\nimport { areMergeConflictActionsEqual } from '../utils/areMergeConflictActionsEqual';\nimport { createAnnotationWrapperNode } from '../utils/createAnnotationWrapperNode';\nimport { getMergeConflictActionSlotName } from '../utils/getMergeConflictActionSlotName';\nimport {\n  buildMergeConflictMarkerRows,\n  getMergeConflictActionAnchor,\n  type MergeConflictDiffAction,\n  parseMergeConflictDiffFromFile,\n} from '../utils/parseMergeConflictDiffFromFile';\nimport { resolveConflict as resolveConflictDiff } from '../utils/resolveConflict';\nimport { shouldUseTokenTransformer } from '../utils/shouldUseTokenTransformer';\nimport { splitFileContents } from '../utils/splitFileContents';\nimport type { WorkerPoolManager } from '../worker';\nimport {\n  FileDiff,\n  type FileDiffOptions,\n  type FileDiffRenderBaseProps,\n} from './FileDiff';\n\nexport type RenderMergeConflictActions<LAnnotation> = (\n  action: MergeConflictDiffAction,\n  instance: UnresolvedFile<LAnnotation>\n) => HTMLElement | DocumentFragment | null | undefined;\n\nexport type MergeConflictActionsTypeOption<LAnnotation> =\n  | 'none'\n  | 'default'\n  | RenderMergeConflictActions<LAnnotation>;\n\nexport interface UnresolvedFileOptions<LAnnotation> extends Omit<\n  FileDiffOptions<LAnnotation, undefined>,\n  'diffStyle' | 'onPostRender'\n> {\n  onPostRender?(\n    node: HTMLElement,\n    instance: UnresolvedFile<LAnnotation>,\n    phase: PostRenderPhase\n  ): unknown;\n  mergeConflictActionsType?: MergeConflictActionsTypeOption<LAnnotation>;\n  onMergeConflictAction?(\n    payload: MergeConflictActionPayload,\n    instance: UnresolvedFile<LAnnotation>\n  ): void;\n  onMergeConflictResolve?(\n    file: FileContents,\n    payload: MergeConflictActionPayload\n  ): void;\n  maxContextLines?: number;\n}\n\nexport interface UnresolvedFileRenderProps<\n  LAnnotation,\n> extends FileDiffRenderBaseProps<LAnnotation> {\n  file?: FileContents;\n  actions?: (MergeConflictDiffAction | undefined)[];\n  markerRows?: MergeConflictMarkerRow[];\n}\n\nexport interface UnresolvedFileHydrationProps<LAnnotation> extends Omit<\n  UnresolvedFileRenderProps<LAnnotation>,\n  'file'\n> {\n  file?: FileContents;\n  fileContainer: HTMLElement;\n  prerenderedHTML?: string;\n}\n\ninterface MergeConflictActionElementCache {\n  element: HTMLElement;\n  action: MergeConflictDiffAction;\n}\n\ninterface GetOrComputeDiffProps {\n  file: FileContents | undefined;\n  fileDiff: FileDiffMetadata | undefined;\n  actions: (MergeConflictDiffAction | undefined)[] | undefined;\n  markerRows: MergeConflictMarkerRow[] | undefined;\n}\n\ninterface GetOrComputeDiffResult {\n  fileDiff: FileDiffMetadata;\n  actions: (MergeConflictDiffAction | undefined)[];\n  markerRows: MergeConflictMarkerRow[];\n}\n\ninterface ResolveConflictReturn {\n  file: FileContents;\n  fileDiff: FileDiffMetadata;\n  actions: (MergeConflictDiffAction | undefined)[];\n  markerRows: MergeConflictMarkerRow[];\n}\n\ntype UnresolvedFileDataCache = GetOrComputeDiffProps;\n\nlet instanceId = -1;\n\nexport class UnresolvedFile<LAnnotation = undefined> extends FileDiff<\n  LAnnotation,\n  undefined\n> {\n  override readonly __id: string = `unresolved-file:${++instanceId}`;\n  override readonly type = 'unresolved-file';\n\n  protected computedCache: UnresolvedFileDataCache = {\n    file: undefined,\n    fileDiff: undefined,\n    actions: undefined,\n    markerRows: undefined,\n  };\n  private conflictActions: (MergeConflictDiffAction | undefined)[] = [];\n  private markerRows: MergeConflictMarkerRow[] = [];\n  private conflictActionCache: Map<string, MergeConflictActionElementCache> =\n    new Map();\n\n  constructor(\n    public override options: UnresolvedFileOptions<LAnnotation> = {\n      theme: DEFAULT_THEMES,\n    },\n    workerManager?: WorkerPoolManager | undefined,\n    isContainerManaged = false\n  ) {\n    super(undefined, workerManager, isContainerManaged);\n    this.setOptions(options);\n  }\n\n  override setOptions(\n    options: UnresolvedFileOptions<LAnnotation> | undefined\n  ): void {\n    if (options == null) {\n      return;\n    }\n\n    if (\n      options.onMergeConflictAction != null &&\n      options.onMergeConflictResolve != null\n    ) {\n      throw new Error(\n        'UnresolvedFile: onMergeConflictAction and onMergeConflictResolve are mutually exclusive. Use only one callback.'\n      );\n    }\n\n    this.options = options;\n    this.hunksRenderer.setOptions(this.getHunksRendererOptions(options));\n    this.syncInteractionOptions();\n  }\n\n  // UnresolvedFile adds a merge-conflict-action click handler to the\n  // InteractionManager. FileDiff.syncInteractionOptions() re-runs on every\n  // re-render and during hydration; without this override it would rebuild the\n  // interaction options without that handler, so resolving one conflict (which\n  // re-renders the diff) would silently disable every remaining action button.\n  protected override syncInteractionOptions(): void {\n    this.interactionManager.setOptions(\n      pluckInteractionOptions(\n        this.options,\n        typeof this.options.hunkSeparators === 'function' ||\n          (this.options.hunkSeparators ?? 'line-info') === 'line-info' ||\n          this.options.hunkSeparators === 'line-info-basic'\n          ? this.handleExpandHunk\n          : undefined,\n        this.getLineIndex,\n        this.handleMergeConflictActionClick\n      )\n    );\n  }\n\n  protected override createHunksRenderer(\n    options: UnresolvedFileOptions<LAnnotation>\n  ): UnresolvedFileHunksRenderer<LAnnotation> {\n    const renderer = new UnresolvedFileHunksRenderer<LAnnotation>(\n      this.getHunksRendererOptions(options),\n      this.getAnnotationSlotName,\n      this.handleHighlightRender,\n      this.workerManager\n    );\n    return renderer;\n  }\n\n  protected override getHunksRendererOptions(\n    options: UnresolvedFileOptions<LAnnotation>\n  ): UnresolvedFileHunksRendererOptions {\n    return getUnresolvedDiffHunksRendererOptions(options, this.options);\n  }\n\n  protected override applyPreNodeAttributes(\n    pre: HTMLPreElement,\n    result: HunksRenderResult\n  ): void {\n    super.applyPreNodeAttributes(pre, result, {\n      'data-has-merge-conflict': '',\n    });\n  }\n\n  override cleanUp(): void {\n    this.emitPostRender(true);\n    this.clearMergeConflictActionCache();\n    this.computedCache = {\n      file: undefined,\n      fileDiff: undefined,\n      actions: undefined,\n      markerRows: undefined,\n    };\n    this.conflictActions = [];\n    super.cleanUp();\n  }\n\n  private getOrComputeDiff({\n    file,\n    fileDiff,\n    actions,\n    markerRows,\n  }: GetOrComputeDiffProps): GetOrComputeDiffResult | undefined {\n    const { maxContextLines, onMergeConflictAction } = this.options;\n    wrapper: {\n      // We are dealing with a controlled component\n      if (onMergeConflictAction != null) {\n        const hasFileDiff = fileDiff != null;\n        const hasActions = actions != null;\n        const hasMarkerRows = markerRows != null;\n        if (hasFileDiff !== hasActions || hasFileDiff !== hasMarkerRows) {\n          throw new Error(\n            'UnresolvedFile.getOrComputeDiff: fileDiff, actions, and markerRows must be passed together'\n          );\n        }\n        // If we were provided a new fileDiff/actions/markerRows, we are a FULLY\n        // controlled component, which means we will not do any computation\n        if (fileDiff != null && actions != null && markerRows != null) {\n          this.computedCache = {\n            file: file ?? this.computedCache.file,\n            fileDiff,\n            actions,\n            markerRows,\n          };\n          break wrapper;\n        }\n        // If we were provided a new file, we should attempt to parse out a new\n        // diff/actions if we haven't computed it before. Once we initialize from\n        // a file, later updates must flow through fileDiff/actions instead of\n        // reparsing from a new file input.\n        else if (file != null || this.computedCache.file != null) {\n          if (\n            file != null &&\n            this.computedCache.file != null &&\n            !areFilesEqual(file, this.computedCache.file) &&\n            this.computedCache.fileDiff != null &&\n            this.computedCache.actions != null\n          ) {\n            throw new Error(\n              'UnresolvedFile.getOrComputeDiff: file can only be used to initialize unresolved state once. Pass fileDiff and actions for subsequent updates.'\n            );\n          }\n          file ??= this.computedCache.file;\n          if (file == null) {\n            throw new Error(\n              'UnresolvedFile.getOrComputeDiff: file is null, should be impossible'\n            );\n          }\n          if (\n            !areFilesEqual(file, this.computedCache.file) ||\n            this.computedCache.fileDiff == null ||\n            this.computedCache.actions == null\n          ) {\n            const computed = parseMergeConflictDiffFromFile(\n              file,\n              maxContextLines\n            );\n            this.computedCache = {\n              file,\n              fileDiff: computed.fileDiff,\n              actions: computed.actions,\n              markerRows: computed.markerRows,\n            };\n          }\n          fileDiff = this.computedCache.fileDiff;\n          actions = this.computedCache.actions;\n          markerRows = this.computedCache.markerRows;\n          break wrapper;\n        }\n        // Otherwise we should fall through and try to use the cache if it exists\n        else {\n          fileDiff = this.computedCache.fileDiff;\n          actions = this.computedCache.actions;\n          markerRows = this.computedCache.markerRows;\n          break wrapper;\n        }\n      }\n      // If we are uncontrolled we only rely on the file and only use the first\n      // version. After that, the cached diff/action pair is the source of\n      // truth and we should not accept a new file input.\n      else {\n        if (fileDiff != null || actions != null || markerRows != null) {\n          throw new Error(\n            'UnresolvedFile.getOrComputeDiff: fileDiff, actions, and markerRows are only usable in controlled mode, you must pass in `onMergeConflictAction`'\n          );\n        }\n        if (\n          file != null &&\n          this.computedCache.file != null &&\n          !areFilesEqual(file, this.computedCache.file)\n        ) {\n          throw new Error(\n            'UnresolvedFile.getOrComputeDiff: uncontrolled unresolved files parse the file only once. Later updates must come from the cached diff state.'\n          );\n        }\n        this.computedCache.file ??= file;\n        if (\n          this.computedCache.fileDiff == null &&\n          this.computedCache.file != null\n        ) {\n          const computed = parseMergeConflictDiffFromFile(\n            this.computedCache.file,\n            maxContextLines\n          );\n          this.computedCache.fileDiff = computed.fileDiff;\n          this.computedCache.actions = computed.actions;\n          this.computedCache.markerRows = computed.markerRows;\n        }\n        // Because we are uncontrolled, the source of truth is the\n        // computedCache\n        fileDiff = this.computedCache.fileDiff;\n        actions = this.computedCache.actions;\n        markerRows = this.computedCache.markerRows;\n        break wrapper;\n      }\n    }\n    if (fileDiff == null || actions == null || markerRows == null) {\n      return undefined;\n    }\n    return { fileDiff, actions, markerRows };\n  }\n\n  override hydrate(props: UnresolvedFileHydrationProps<LAnnotation>): void {\n    const {\n      file,\n      fileDiff,\n      actions,\n      markerRows,\n      lineAnnotations,\n      fileContainer,\n      prerenderedHTML,\n      preventEmit = false,\n    } = props;\n    const source = this.getOrComputeDiff({\n      file,\n      fileDiff,\n      actions,\n      markerRows,\n    });\n    if (source == null) {\n      return;\n    }\n    this.hydrateElements(fileContainer, prerenderedHTML);\n    this.setActiveMergeConflictState(source.actions, source.markerRows);\n    // If necessary hydration elements don't exist, we should assume a full\n    // render\n    if (\n      shouldRenderCode(this.pre, source.fileDiff, this.options.collapsed) ||\n      shouldRenderHeader(\n        this.headerElement,\n        source.fileDiff,\n        this.options.disableFileHeader\n      )\n    ) {\n      this.render({ ...props, preventEmit: true });\n    }\n    // Otherwise orchestrate our setup\n    else {\n      this.hydrationSetup({ fileDiff: source.fileDiff, lineAnnotations });\n      if (this.pre != null) {\n        this.renderMergeConflictActionSlots();\n      }\n    }\n    if (!preventEmit) {\n      this.emitPostRender();\n    }\n  }\n\n  override rerender(): void {\n    if (!this.enabled || this.fileDiff == null) {\n      return;\n    }\n    this.render({ forceRender: true, renderRange: this.renderRange });\n  }\n\n  override render(props: UnresolvedFileRenderProps<LAnnotation> = {}): boolean {\n    const {\n      file,\n      fileDiff,\n      actions,\n      markerRows,\n      lineAnnotations,\n      preventEmit = false,\n      ...rest\n    } = props;\n    const source = this.getOrComputeDiff({\n      file,\n      fileDiff,\n      actions,\n      markerRows,\n    });\n    if (source == null) {\n      return false;\n    }\n    this.setActiveMergeConflictState(source.actions, source.markerRows);\n    const didRender = super.render({\n      ...rest,\n      fileDiff: source.fileDiff,\n      lineAnnotations,\n      preventEmit: true,\n    });\n    if (didRender) {\n      this.renderMergeConflictActionSlots();\n      if (!preventEmit) {\n        this.emitPostRender();\n      }\n    }\n    return didRender;\n  }\n\n  public resolveConflict(\n    conflictIndex: number,\n    resolution: MergeConflictResolution,\n    fileDiff: FileDiffMetadata | undefined = this.computedCache.fileDiff\n  ): ResolveConflictReturn | undefined {\n    const action = this.conflictActions[conflictIndex];\n    if (fileDiff == null || action == null) {\n      return undefined;\n    }\n\n    if (action.conflictIndex !== conflictIndex) {\n      console.error({ conflictIndex, action });\n      throw new Error(\n        \"UnresolvedFile.resolveConflict: conflictIndex and conflictAction don't match\"\n      );\n    }\n\n    const newFileDiff = resolveConflictDiff(fileDiff, action, resolution);\n    const previousFile = this.computedCache.file;\n    const { file, actions, markerRows } = rebuildFileAndActions({\n      fileDiff: newFileDiff,\n      previousActions: this.conflictActions,\n      resolvedConflictIndex: conflictIndex,\n      previousFile,\n      resolution,\n    });\n\n    return {\n      file,\n      fileDiff: newFileDiff,\n      actions,\n      markerRows,\n    };\n  }\n\n  private resolveConflictAndRender(\n    conflictIndex: number,\n    resolution: MergeConflictResolution\n  ): void {\n    const action = this.conflictActions[conflictIndex];\n    if (action == null) {\n      return;\n    }\n    if (action.conflictIndex !== conflictIndex) {\n      console.error({ conflictIndex, action });\n      throw new Error(\n        \"UnresolvedFile.resolveConflictAndRender: conflictIndex and conflictAction don't match\"\n      );\n    }\n    const payload: MergeConflictActionPayload = {\n      resolution,\n      conflict: action.conflict,\n    };\n    const { file, fileDiff, actions, markerRows } =\n      this.resolveConflict(conflictIndex, resolution) ?? {};\n    if (\n      file == null ||\n      fileDiff == null ||\n      actions == null ||\n      markerRows == null\n    ) {\n      return;\n    }\n\n    this.computedCache = { file, fileDiff, actions, markerRows };\n    this.setActiveMergeConflictState(actions, markerRows);\n    // NOTE(amadeus): This is a bit jank, but helps to ensure we don't see a\n    // bunch of jittery re-renders as things resolve out.  In a more perfect\n    // world we would have a more elegant way to kick off a render to the\n    // highlighter and then resolve actions in a cleaner way, but time is short\n    // right now.  Can't let perfect be the enemy of good\n    if (this.workerManager != null) {\n      // Because we are using a workerManager, if we fire off the renderDiff\n      // call, it will eventually get back to us in a callback which will\n      // trigger a re-render\n      this.hunksRenderer.renderDiff(fileDiff);\n    } else {\n      this.render({ forceRender: true });\n    }\n    this.options.onMergeConflictResolve?.(file, payload);\n  }\n\n  private setActiveMergeConflictState(\n    actions: (MergeConflictDiffAction | undefined)[] = this.conflictActions,\n    markerRows: MergeConflictMarkerRow[] = this.markerRows\n  ): void {\n    this.conflictActions = actions;\n    this.markerRows = markerRows;\n    if (\n      this.computedCache.fileDiff != null &&\n      this.hunksRenderer instanceof UnresolvedFileHunksRenderer\n    ) {\n      this.hunksRenderer.setConflictState(\n        this.options.mergeConflictActionsType === 'none' ? [] : actions,\n        markerRows,\n        this.computedCache.fileDiff\n      );\n    }\n  }\n\n  private handleMergeConflictActionClick = (\n    target: MergeConflictActionTarget\n  ): void => {\n    const action = this.conflictActions[target.conflictIndex];\n    if (action == null) {\n      return;\n    }\n    if (action.conflictIndex !== target.conflictIndex) {\n      console.error({ conflictIndex: target.conflictIndex, action });\n      throw new Error(\n        \"UnresolvedFile.handleMergeConflictActionClick: conflictIndex and conflictAction don't match\"\n      );\n    }\n    const payload: MergeConflictActionPayload = {\n      resolution: target.resolution,\n      conflict: action.conflict,\n    };\n    if (this.options.onMergeConflictAction != null) {\n      this.options.onMergeConflictAction(payload, this);\n      return;\n    }\n    this.resolveConflictAndRender(target.conflictIndex, target.resolution);\n  };\n\n  private renderMergeConflictActionSlots(): void {\n    const { fileDiff } = this.computedCache;\n    if (\n      this.isContainerManaged ||\n      this.fileContainer == null ||\n      typeof this.options.mergeConflictActionsType !== 'function' ||\n      this.conflictActions.length === 0 ||\n      fileDiff == null\n    ) {\n      this.clearMergeConflictActionCache();\n      return;\n    }\n    const staleActions = new Map(this.conflictActionCache);\n    for (\n      let actionIndex = 0;\n      actionIndex < this.conflictActions.length;\n      actionIndex++\n    ) {\n      const action = this.conflictActions[actionIndex];\n      if (action == null) {\n        continue;\n      }\n      if (action.conflictIndex !== actionIndex) {\n        console.error({ conflictIndex: actionIndex, action });\n        throw new Error(\n          \"UnresolvedFile.renderMergeConflictActionSlots: conflictIndex and conflictAction don't match\"\n        );\n      }\n      const anchor = getMergeConflictActionAnchor(action, fileDiff);\n      if (anchor == null) {\n        continue;\n      }\n      const conflictIndex = action.conflictIndex;\n      const slotName = getMergeConflictActionSlotName({\n        hunkIndex: anchor.hunkIndex,\n        lineIndex: anchor.lineIndex,\n        conflictIndex,\n      });\n      const id = `${actionIndex}-${slotName}`;\n      let cache = this.conflictActionCache.get(id);\n      if (\n        cache == null ||\n        !areMergeConflictActionsEqual(cache.action, action)\n      ) {\n        cache?.element.remove();\n        const rendered = this.renderMergeConflictAction(action);\n        if (rendered == null) {\n          continue;\n        }\n        const element = createAnnotationWrapperNode(slotName);\n        element.appendChild(rendered);\n        this.fileContainer.appendChild(element);\n        cache = { element, action };\n        this.conflictActionCache.set(id, cache);\n      }\n      staleActions.delete(id);\n    }\n    for (const [id, { element }] of staleActions.entries()) {\n      this.conflictActionCache.delete(id);\n      element.remove();\n    }\n  }\n\n  private renderMergeConflictAction(\n    action: MergeConflictDiffAction\n  ): HTMLElement | undefined {\n    if (typeof this.options.mergeConflictActionsType !== 'function') {\n      return undefined;\n    }\n    const rendered = this.options.mergeConflictActionsType(action, this);\n    if (rendered == null) {\n      return undefined;\n    }\n    if (rendered instanceof HTMLElement) {\n      return rendered;\n    }\n    if (\n      typeof DocumentFragment !== 'undefined' &&\n      rendered instanceof DocumentFragment\n    ) {\n      const wrapper = document.createElement('div');\n      wrapper.style.display = 'contents';\n      wrapper.appendChild(rendered);\n      return wrapper;\n    }\n    return undefined;\n  }\n\n  private clearMergeConflictActionCache(): void {\n    for (const { element } of this.conflictActionCache.values()) {\n      element.remove();\n    }\n    this.conflictActionCache.clear();\n  }\n}\n\ninterface RebuildFileAndActionsProps {\n  fileDiff: FileDiffMetadata;\n  previousActions: (MergeConflictDiffAction | undefined)[];\n  resolvedConflictIndex: number;\n  // FIXME: Probably should remove this...\n  // additionOffset: number;\n  // deletionOffset: number;\n  previousFile: FileContents | undefined;\n  resolution: MergeConflictResolution;\n}\n\n// Rebuild the emitted unresolved file contents and remaining action anchors in\n// one pass over the post-resolution diff state.\nfunction rebuildFileAndActions({\n  fileDiff,\n  previousActions,\n  resolvedConflictIndex,\n  previousFile,\n  resolution,\n}: RebuildFileAndActionsProps): Pick<\n  ResolveConflictReturn,\n  'file' | 'actions' | 'markerRows'\n> {\n  const resolvedAction = previousActions[resolvedConflictIndex];\n  if (resolvedAction == null) {\n    throw new Error(\n      'rebuildFileAndActions: missing resolved action for unresolved file rebuild'\n    );\n  }\n\n  const actions = updateConflictActionsAfterResolution(\n    previousActions,\n    resolvedConflictIndex,\n    resolvedAction,\n    resolution\n  );\n  const markerRows = buildMergeConflictMarkerRows(fileDiff, actions);\n\n  const file = rebuildUnresolvedFile({\n    fileDiff,\n    resolvedAction,\n    resolvedConflictIndex,\n    previousFile,\n    resolution,\n  });\n\n  return {\n    file,\n    actions,\n    markerRows,\n  };\n}\n\ninterface RebuildUnresolvedFileProps {\n  fileDiff: FileDiffMetadata;\n  resolvedAction: MergeConflictDiffAction;\n  resolvedConflictIndex: number;\n  previousFile: FileContents | undefined;\n  resolution: MergeConflictResolution;\n}\n\n// Rebuild the unresolved file text from the previous unresolved source so we\n// preserve remaining marker blocks exactly while the diff state stays in-place.\nfunction rebuildUnresolvedFile({\n  resolvedAction,\n  resolvedConflictIndex,\n  previousFile,\n  fileDiff,\n  resolution,\n}: RebuildUnresolvedFileProps): FileContents {\n  const previousContents = previousFile?.contents ?? '';\n  const lines = splitFileContents(previousContents);\n  const { conflict } = resolvedAction;\n  const replacementLines = getResolvedConflictReplacementLines(\n    lines,\n    conflict,\n    resolution\n  );\n  const contents = [\n    ...lines.slice(0, conflict.startLineIndex),\n    ...replacementLines,\n    ...lines.slice(conflict.endLineIndex + 1),\n  ].join('');\n\n  return {\n    name: previousFile?.name ?? fileDiff.name,\n    contents,\n    cacheKey:\n      previousFile?.cacheKey != null\n        ? `${previousFile.cacheKey}:mc-${resolvedConflictIndex}-${resolution}`\n        : undefined,\n  };\n}\n\nfunction getResolvedConflictReplacementLines(\n  lines: string[],\n  conflict: MergeConflictDiffAction['conflict'],\n  resolution: MergeConflictResolution\n): string[] {\n  const currentLines = lines.slice(\n    conflict.startLineIndex + 1,\n    conflict.baseMarkerLineIndex ?? conflict.separatorLineIndex\n  );\n  const incomingLines = lines.slice(\n    conflict.separatorLineIndex + 1,\n    conflict.endLineIndex\n  );\n\n  if (resolution === 'current') {\n    return currentLines;\n  }\n  if (resolution === 'incoming') {\n    return incomingLines;\n  }\n  return [...currentLines, ...incomingLines];\n}\n\n// The diff resolver keeps hunk/content group indexes stable, so the only\n// follow-up update we need here is shifting unresolved source-region line\n// numbers for later conflicts in the rebuilt file text.\nfunction updateConflictActionsAfterResolution(\n  previousActions: (MergeConflictDiffAction | undefined)[],\n  resolvedConflictIndex: number,\n  resolvedAction: MergeConflictDiffAction,\n  resolution: MergeConflictResolution\n): (MergeConflictDiffAction | undefined)[] {\n  const lineDelta = getResolvedConflictLineDelta(\n    resolvedAction.conflict,\n    resolution\n  );\n\n  return previousActions.map((action, index) => {\n    if (index === resolvedConflictIndex) {\n      return undefined;\n    }\n    if (action == null) {\n      return undefined;\n    }\n    if (action.conflict.startLineIndex > resolvedAction.conflict.endLineIndex) {\n      return {\n        ...action,\n        conflict: shiftMergeConflictRegion(action.conflict, lineDelta),\n      };\n    }\n    return action;\n  });\n}\n\nfunction getResolvedConflictLineDelta(\n  conflict: MergeConflictRegion,\n  resolution: MergeConflictResolution\n): number {\n  const currentLineCount =\n    (conflict.baseMarkerLineIndex ?? conflict.separatorLineIndex) -\n    conflict.startLineIndex -\n    1;\n  const incomingLineCount =\n    conflict.endLineIndex - conflict.separatorLineIndex - 1;\n  const replacementLineCount =\n    resolution === 'current'\n      ? currentLineCount\n      : resolution === 'incoming'\n        ? incomingLineCount\n        : currentLineCount + incomingLineCount;\n  const conflictLineCount = conflict.endLineIndex - conflict.startLineIndex + 1;\n  return replacementLineCount - conflictLineCount;\n}\n\nfunction shiftMergeConflictRegion(\n  conflict: MergeConflictRegion,\n  lineDelta: number\n): MergeConflictRegion {\n  return {\n    ...conflict,\n    startLineIndex: conflict.startLineIndex + lineDelta,\n    startLineNumber: conflict.startLineNumber + lineDelta,\n    separatorLineIndex: conflict.separatorLineIndex + lineDelta,\n    separatorLineNumber: conflict.separatorLineNumber + lineDelta,\n    endLineIndex: conflict.endLineIndex + lineDelta,\n    endLineNumber: conflict.endLineNumber + lineDelta,\n    baseMarkerLineIndex:\n      conflict.baseMarkerLineIndex != null\n        ? conflict.baseMarkerLineIndex + lineDelta\n        : undefined,\n    baseMarkerLineNumber:\n      conflict.baseMarkerLineNumber != null\n        ? conflict.baseMarkerLineNumber + lineDelta\n        : undefined,\n  };\n}\n\nfunction shouldRenderCode(\n  pre: HTMLPreElement | undefined,\n  fileDiff: FileDiffMetadata | undefined,\n  collapsed = false\n): boolean {\n  return !collapsed && pre == null && fileDiff != null;\n}\n\nfunction shouldRenderHeader(\n  headerElement: HTMLElement | undefined,\n  fileDiff: FileDiffMetadata | undefined,\n  disableFileHeader = false\n): boolean {\n  return headerElement == null && fileDiff != null && !disableFileHeader;\n}\n\n// NOTE(amadeus): Should probably pull this out into a util, and make variants\n// for all component types\nexport function getUnresolvedDiffHunksRendererOptions<LAnnotation>(\n  options?: UnresolvedFileOptions<LAnnotation>,\n  baseOptions?: UnresolvedFileOptions<LAnnotation>\n): UnresolvedFileHunksRendererOptions {\n  const merged = { ...baseOptions, ...options };\n  return {\n    ...merged,\n    useTokenTransformer: shouldUseTokenTransformer<'diff'>(merged),\n    hunkSeparators:\n      typeof options?.hunkSeparators === 'function'\n        ? 'custom'\n        : options?.hunkSeparators,\n    mergeConflictActionsType:\n      typeof options?.mergeConflictActionsType === 'function'\n        ? 'custom'\n        : options?.mergeConflictActionsType,\n  };\n}\n"],"mappings":"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"}
+{"version":3,"file":"UnresolvedFile.js","names":["resolveConflictDiff"],"sources":["../../src/components/UnresolvedFile.ts"],"sourcesContent":["import { DEFAULT_THEMES } from '../constants';\nimport type { MergeConflictActionTarget } from '../managers/InteractionManager';\nimport { pluckInteractionOptions } from '../managers/InteractionManager';\nimport type { HunksRenderResult } from '../renderers/DiffHunksRenderer';\nimport {\n  UnresolvedFileHunksRenderer,\n  type UnresolvedFileHunksRendererOptions,\n} from '../renderers/UnresolvedFileHunksRenderer';\nimport type {\n  FileContents,\n  FileDiffMetadata,\n  MergeConflictActionPayload,\n  MergeConflictMarkerRow,\n  MergeConflictRegion,\n  MergeConflictResolution,\n  PostRenderPhase,\n} from '../types';\nimport { areFilesEqual } from '../utils/areFilesEqual';\nimport { areMergeConflictActionsEqual } from '../utils/areMergeConflictActionsEqual';\nimport { createAnnotationWrapperNode } from '../utils/createAnnotationWrapperNode';\nimport { getMergeConflictActionSlotName } from '../utils/getMergeConflictActionSlotName';\nimport {\n  buildMergeConflictMarkerRows,\n  getMergeConflictActionAnchor,\n  type MergeConflictDiffAction,\n  parseMergeConflictDiffFromFile,\n} from '../utils/parseMergeConflictDiffFromFile';\nimport { resolveConflict as resolveConflictDiff } from '../utils/resolveConflict';\nimport { shouldUseTokenTransformer } from '../utils/shouldUseTokenTransformer';\nimport { splitFileContents } from '../utils/splitFileContents';\nimport type { WorkerPoolManager } from '../worker';\nimport {\n  FileDiff,\n  type FileDiffOptions,\n  type FileDiffRenderBaseProps,\n} from './FileDiff';\n\nexport type RenderMergeConflictActions<LAnnotation> = (\n  action: MergeConflictDiffAction,\n  instance: UnresolvedFile<LAnnotation>\n) => HTMLElement | DocumentFragment | null | undefined;\n\nexport type MergeConflictActionsTypeOption<LAnnotation> =\n  | 'none'\n  | 'default'\n  | RenderMergeConflictActions<LAnnotation>;\n\nexport interface UnresolvedFileOptions<LAnnotation> extends Omit<\n  FileDiffOptions<LAnnotation, undefined>,\n  'diffStyle' | 'onPostRender'\n> {\n  onPostRender?(\n    node: HTMLElement,\n    instance: UnresolvedFile<LAnnotation>,\n    phase: PostRenderPhase\n  ): unknown;\n  mergeConflictActionsType?: MergeConflictActionsTypeOption<LAnnotation>;\n  onMergeConflictAction?(\n    payload: MergeConflictActionPayload,\n    instance: UnresolvedFile<LAnnotation>\n  ): void;\n  onMergeConflictResolve?(\n    file: FileContents,\n    payload: MergeConflictActionPayload\n  ): void;\n  maxContextLines?: number;\n}\n\nexport interface UnresolvedFileRenderProps<\n  LAnnotation,\n> extends FileDiffRenderBaseProps<LAnnotation> {\n  file?: FileContents;\n  actions?: (MergeConflictDiffAction | undefined)[];\n  markerRows?: MergeConflictMarkerRow[];\n}\n\nexport interface UnresolvedFileHydrationProps<LAnnotation> extends Omit<\n  UnresolvedFileRenderProps<LAnnotation>,\n  'file'\n> {\n  file?: FileContents;\n  fileContainer: HTMLElement;\n  prerenderedHTML?: string;\n}\n\ninterface MergeConflictActionElementCache {\n  element: HTMLElement;\n  action: MergeConflictDiffAction;\n}\n\ninterface GetOrComputeDiffProps {\n  file: FileContents | undefined;\n  fileDiff: FileDiffMetadata | undefined;\n  actions: (MergeConflictDiffAction | undefined)[] | undefined;\n  markerRows: MergeConflictMarkerRow[] | undefined;\n}\n\ninterface GetOrComputeDiffResult {\n  fileDiff: FileDiffMetadata;\n  actions: (MergeConflictDiffAction | undefined)[];\n  markerRows: MergeConflictMarkerRow[];\n}\n\ninterface ResolveConflictReturn {\n  file: FileContents;\n  fileDiff: FileDiffMetadata;\n  actions: (MergeConflictDiffAction | undefined)[];\n  markerRows: MergeConflictMarkerRow[];\n}\n\ntype UnresolvedFileDataCache = GetOrComputeDiffProps;\n\nlet instanceId = -1;\n\nexport class UnresolvedFile<LAnnotation = undefined> extends FileDiff<\n  LAnnotation,\n  undefined\n> {\n  override readonly __id: string = `unresolved-file:${++instanceId}`;\n  override readonly type = 'unresolved-file';\n\n  protected computedCache: UnresolvedFileDataCache = {\n    file: undefined,\n    fileDiff: undefined,\n    actions: undefined,\n    markerRows: undefined,\n  };\n  private conflictActions: (MergeConflictDiffAction | undefined)[] = [];\n  private markerRows: MergeConflictMarkerRow[] = [];\n  private conflictActionCache: Map<string, MergeConflictActionElementCache> =\n    new Map();\n\n  constructor(\n    public override options: UnresolvedFileOptions<LAnnotation> = {\n      theme: DEFAULT_THEMES,\n    },\n    workerManager?: WorkerPoolManager | undefined,\n    isContainerManaged = false\n  ) {\n    super(undefined, workerManager, isContainerManaged);\n    this.setOptions(options);\n  }\n\n  override setOptions(\n    options: UnresolvedFileOptions<LAnnotation> | undefined\n  ): void {\n    if (options == null) {\n      return;\n    }\n\n    if (\n      options.onMergeConflictAction != null &&\n      options.onMergeConflictResolve != null\n    ) {\n      throw new Error(\n        'UnresolvedFile: onMergeConflictAction and onMergeConflictResolve are mutually exclusive. Use only one callback.'\n      );\n    }\n\n    this.options = options;\n    this.hunksRenderer.setOptions(this.getHunksRendererOptions(options));\n    this.syncInteractionOptions();\n  }\n\n  // UnresolvedFile adds a merge-conflict-action click handler to the\n  // InteractionManager. FileDiff.syncInteractionOptions() re-runs on every\n  // re-render and during hydration; without this override it would rebuild the\n  // interaction options without that handler, so resolving one conflict (which\n  // re-renders the diff) would silently disable every remaining action button.\n  protected override syncInteractionOptions(): void {\n    this.interactionManager.setOptions(\n      pluckInteractionOptions(\n        this.options,\n        typeof this.options.hunkSeparators === 'function' ||\n          (this.options.hunkSeparators ?? 'line-info') === 'line-info' ||\n          this.options.hunkSeparators === 'line-info-basic'\n          ? this.handleExpandHunk\n          : undefined,\n        this.getLineIndex,\n        this.handleMergeConflictActionClick\n      )\n    );\n  }\n\n  protected override createHunksRenderer(\n    options: UnresolvedFileOptions<LAnnotation>\n  ): UnresolvedFileHunksRenderer<LAnnotation> {\n    const renderer = new UnresolvedFileHunksRenderer<LAnnotation>(\n      this.getHunksRendererOptions(options),\n      this.getAnnotationSlotName,\n      this.handleHighlightRender,\n      this.workerManager\n    );\n    return renderer;\n  }\n\n  protected override getHunksRendererOptions(\n    options: UnresolvedFileOptions<LAnnotation>\n  ): UnresolvedFileHunksRendererOptions {\n    return getUnresolvedDiffHunksRendererOptions(options, this.options);\n  }\n\n  protected override applyPreNodeAttributes(\n    pre: HTMLPreElement,\n    result: HunksRenderResult\n  ): void {\n    super.applyPreNodeAttributes(pre, result, {\n      'data-has-merge-conflict': '',\n    });\n  }\n\n  override cleanUp(): void {\n    this.emitPostRender(true);\n    this.clearMergeConflictActionCache();\n    this.computedCache = {\n      file: undefined,\n      fileDiff: undefined,\n      actions: undefined,\n      markerRows: undefined,\n    };\n    this.conflictActions = [];\n    super.cleanUp();\n  }\n\n  private getOrComputeDiff({\n    file,\n    fileDiff,\n    actions,\n    markerRows,\n  }: GetOrComputeDiffProps): GetOrComputeDiffResult | undefined {\n    const { maxContextLines, onMergeConflictAction } = this.options;\n    wrapper: {\n      // We are dealing with a controlled component\n      if (onMergeConflictAction != null) {\n        const hasFileDiff = fileDiff != null;\n        const hasActions = actions != null;\n        const hasMarkerRows = markerRows != null;\n        if (hasFileDiff !== hasActions || hasFileDiff !== hasMarkerRows) {\n          throw new Error(\n            'UnresolvedFile.getOrComputeDiff: fileDiff, actions, and markerRows must be passed together'\n          );\n        }\n        // If we were provided a new fileDiff/actions/markerRows, we are a FULLY\n        // controlled component, which means we will not do any computation\n        if (fileDiff != null && actions != null && markerRows != null) {\n          this.computedCache = {\n            file: file ?? this.computedCache.file,\n            fileDiff,\n            actions,\n            markerRows,\n          };\n          break wrapper;\n        }\n        // If we were provided a new file, we should attempt to parse out a new\n        // diff/actions if we haven't computed it before. Once we initialize from\n        // a file, later updates must flow through fileDiff/actions instead of\n        // reparsing from a new file input.\n        else if (file != null || this.computedCache.file != null) {\n          if (\n            file != null &&\n            this.computedCache.file != null &&\n            !areFilesEqual(file, this.computedCache.file) &&\n            this.computedCache.fileDiff != null &&\n            this.computedCache.actions != null\n          ) {\n            throw new Error(\n              'UnresolvedFile.getOrComputeDiff: file can only be used to initialize unresolved state once. Pass fileDiff and actions for subsequent updates.'\n            );\n          }\n          file ??= this.computedCache.file;\n          if (file == null) {\n            throw new Error(\n              'UnresolvedFile.getOrComputeDiff: file is null, should be impossible'\n            );\n          }\n          if (\n            !areFilesEqual(file, this.computedCache.file) ||\n            this.computedCache.fileDiff == null ||\n            this.computedCache.actions == null\n          ) {\n            const computed = parseMergeConflictDiffFromFile(\n              file,\n              maxContextLines\n            );\n            this.computedCache = {\n              file,\n              fileDiff: computed.fileDiff,\n              actions: computed.actions,\n              markerRows: computed.markerRows,\n            };\n          }\n          fileDiff = this.computedCache.fileDiff;\n          actions = this.computedCache.actions;\n          markerRows = this.computedCache.markerRows;\n          break wrapper;\n        }\n        // Otherwise we should fall through and try to use the cache if it exists\n        else {\n          fileDiff = this.computedCache.fileDiff;\n          actions = this.computedCache.actions;\n          markerRows = this.computedCache.markerRows;\n          break wrapper;\n        }\n      }\n      // If we are uncontrolled we only rely on the file and only use the first\n      // version. After that, the cached diff/action pair is the source of\n      // truth and we should not accept a new file input.\n      else {\n        if (fileDiff != null || actions != null || markerRows != null) {\n          throw new Error(\n            'UnresolvedFile.getOrComputeDiff: fileDiff, actions, and markerRows are only usable in controlled mode, you must pass in `onMergeConflictAction`'\n          );\n        }\n        if (\n          file != null &&\n          this.computedCache.file != null &&\n          !areFilesEqual(file, this.computedCache.file)\n        ) {\n          throw new Error(\n            'UnresolvedFile.getOrComputeDiff: uncontrolled unresolved files parse the file only once. Later updates must come from the cached diff state.'\n          );\n        }\n        this.computedCache.file ??= file;\n        if (\n          this.computedCache.fileDiff == null &&\n          this.computedCache.file != null\n        ) {\n          const computed = parseMergeConflictDiffFromFile(\n            this.computedCache.file,\n            maxContextLines\n          );\n          this.computedCache.fileDiff = computed.fileDiff;\n          this.computedCache.actions = computed.actions;\n          this.computedCache.markerRows = computed.markerRows;\n        }\n        // Because we are uncontrolled, the source of truth is the\n        // computedCache\n        fileDiff = this.computedCache.fileDiff;\n        actions = this.computedCache.actions;\n        markerRows = this.computedCache.markerRows;\n        break wrapper;\n      }\n    }\n    if (fileDiff == null || actions == null || markerRows == null) {\n      return undefined;\n    }\n    return { fileDiff, actions, markerRows };\n  }\n\n  override hydrate(props: UnresolvedFileHydrationProps<LAnnotation>): void {\n    const {\n      file,\n      fileDiff,\n      actions,\n      markerRows,\n      lineAnnotations,\n      fileContainer,\n      prerenderedHTML,\n      preventEmit = false,\n    } = props;\n    const source = this.getOrComputeDiff({\n      file,\n      fileDiff,\n      actions,\n      markerRows,\n    });\n    if (source == null) {\n      return;\n    }\n    this.hydrateElements(fileContainer, prerenderedHTML);\n    this.setActiveMergeConflictState(source.actions, source.markerRows);\n    // If necessary hydration elements don't exist, we should assume a full\n    // render\n    if (\n      shouldRenderCode(this.pre, source.fileDiff, this.options.collapsed) ||\n      shouldRenderHeader(\n        this.headerElement,\n        source.fileDiff,\n        this.options.disableFileHeader\n      )\n    ) {\n      this.render({ ...props, preventEmit: true });\n    }\n    // Otherwise orchestrate our setup\n    else {\n      this.hydrationSetup({ fileDiff: source.fileDiff, lineAnnotations });\n      if (this.pre != null) {\n        this.renderMergeConflictActionSlots();\n      }\n    }\n    if (!preventEmit) {\n      this.emitPostRender();\n    }\n  }\n\n  override rerender(): void {\n    if (!this.enabled || this.fileDiff == null) {\n      return;\n    }\n    this.render({ forceRender: true, renderRange: this.renderRange });\n  }\n\n  override render(props: UnresolvedFileRenderProps<LAnnotation> = {}): boolean {\n    const {\n      file,\n      fileDiff,\n      actions,\n      markerRows,\n      lineAnnotations,\n      preventEmit = false,\n      ...rest\n    } = props;\n    const source = this.getOrComputeDiff({\n      file,\n      fileDiff,\n      actions,\n      markerRows,\n    });\n    if (source == null) {\n      return false;\n    }\n    this.setActiveMergeConflictState(source.actions, source.markerRows);\n    const didRender = super.render({\n      ...rest,\n      fileDiff: source.fileDiff,\n      lineAnnotations,\n      preventEmit: true,\n    });\n    if (didRender) {\n      this.renderMergeConflictActionSlots();\n      if (!preventEmit) {\n        this.emitPostRender();\n      }\n    }\n    return didRender;\n  }\n\n  public resolveConflict(\n    conflictIndex: number,\n    resolution: MergeConflictResolution,\n    fileDiff: FileDiffMetadata | undefined = this.computedCache.fileDiff\n  ): ResolveConflictReturn | undefined {\n    const action = this.conflictActions[conflictIndex];\n    if (fileDiff == null || action == null) {\n      return undefined;\n    }\n\n    if (action.conflictIndex !== conflictIndex) {\n      console.error({ conflictIndex, action });\n      throw new Error(\n        \"UnresolvedFile.resolveConflict: conflictIndex and conflictAction don't match\"\n      );\n    }\n\n    const newFileDiff = resolveConflictDiff(fileDiff, action, resolution);\n    const previousFile = this.computedCache.file;\n    const { file, actions, markerRows } = rebuildFileAndActions({\n      fileDiff: newFileDiff,\n      previousActions: this.conflictActions,\n      resolvedConflictIndex: conflictIndex,\n      previousFile,\n      resolution,\n    });\n\n    return {\n      file,\n      fileDiff: newFileDiff,\n      actions,\n      markerRows,\n    };\n  }\n\n  private resolveConflictAndRender(\n    conflictIndex: number,\n    resolution: MergeConflictResolution\n  ): void {\n    const action = this.conflictActions[conflictIndex];\n    if (action == null) {\n      return;\n    }\n    if (action.conflictIndex !== conflictIndex) {\n      console.error({ conflictIndex, action });\n      throw new Error(\n        \"UnresolvedFile.resolveConflictAndRender: conflictIndex and conflictAction don't match\"\n      );\n    }\n    const payload: MergeConflictActionPayload = {\n      resolution,\n      conflict: action.conflict,\n    };\n    const { file, fileDiff, actions, markerRows } =\n      this.resolveConflict(conflictIndex, resolution) ?? {};\n    if (\n      file == null ||\n      fileDiff == null ||\n      actions == null ||\n      markerRows == null\n    ) {\n      return;\n    }\n\n    this.computedCache = { file, fileDiff, actions, markerRows };\n    this.setActiveMergeConflictState(actions, markerRows);\n    // NOTE(amadeus): This is a bit jank, but helps to ensure we don't see a\n    // bunch of jittery re-renders as things resolve out.  In a more perfect\n    // world we would have a more elegant way to kick off a render to the\n    // highlighter and then resolve actions in a cleaner way, but time is short\n    // right now.  Can't let perfect be the enemy of good\n    if (this.workerManager != null) {\n      // Because we are using a workerManager, if we fire off the renderDiff\n      // call, it will eventually get back to us in a callback which will\n      // trigger a re-render\n      this.hunksRenderer.renderDiff(fileDiff);\n    } else {\n      this.render({ forceRender: true });\n    }\n    this.options.onMergeConflictResolve?.(file, payload);\n  }\n\n  private setActiveMergeConflictState(\n    actions: (MergeConflictDiffAction | undefined)[] = this.conflictActions,\n    markerRows: MergeConflictMarkerRow[] = this.markerRows\n  ): void {\n    this.conflictActions = actions;\n    this.markerRows = markerRows;\n    if (\n      this.computedCache.fileDiff != null &&\n      this.hunksRenderer instanceof UnresolvedFileHunksRenderer\n    ) {\n      this.hunksRenderer.setConflictState(\n        this.options.mergeConflictActionsType === 'none' ? [] : actions,\n        markerRows,\n        this.computedCache.fileDiff\n      );\n    }\n  }\n\n  private handleMergeConflictActionClick = (\n    target: MergeConflictActionTarget\n  ): void => {\n    const action = this.conflictActions[target.conflictIndex];\n    if (action == null) {\n      return;\n    }\n    if (action.conflictIndex !== target.conflictIndex) {\n      console.error({ conflictIndex: target.conflictIndex, action });\n      throw new Error(\n        \"UnresolvedFile.handleMergeConflictActionClick: conflictIndex and conflictAction don't match\"\n      );\n    }\n    const payload: MergeConflictActionPayload = {\n      resolution: target.resolution,\n      conflict: action.conflict,\n    };\n    if (this.options.onMergeConflictAction != null) {\n      this.options.onMergeConflictAction(payload, this);\n      return;\n    }\n    this.resolveConflictAndRender(target.conflictIndex, target.resolution);\n  };\n\n  private renderMergeConflictActionSlots(): void {\n    const { fileDiff } = this.computedCache;\n    if (\n      this.isContainerManaged ||\n      this.fileContainer == null ||\n      typeof this.options.mergeConflictActionsType !== 'function' ||\n      this.conflictActions.length === 0 ||\n      fileDiff == null\n    ) {\n      this.clearMergeConflictActionCache();\n      return;\n    }\n    const staleActions = new Map(this.conflictActionCache);\n    for (\n      let actionIndex = 0;\n      actionIndex < this.conflictActions.length;\n      actionIndex++\n    ) {\n      const action = this.conflictActions[actionIndex];\n      if (action == null) {\n        continue;\n      }\n      if (action.conflictIndex !== actionIndex) {\n        console.error({ conflictIndex: actionIndex, action });\n        throw new Error(\n          \"UnresolvedFile.renderMergeConflictActionSlots: conflictIndex and conflictAction don't match\"\n        );\n      }\n      const anchor = getMergeConflictActionAnchor(action, fileDiff);\n      if (anchor == null) {\n        continue;\n      }\n      const conflictIndex = action.conflictIndex;\n      const slotName = getMergeConflictActionSlotName({\n        hunkIndex: anchor.hunkIndex,\n        lineIndex: anchor.lineIndex,\n        conflictIndex,\n      });\n      const id = `${actionIndex}-${slotName}`;\n      let cache = this.conflictActionCache.get(id);\n      if (\n        cache == null ||\n        !areMergeConflictActionsEqual(cache.action, action)\n      ) {\n        cache?.element.remove();\n        const rendered = this.renderMergeConflictAction(action);\n        if (rendered == null) {\n          continue;\n        }\n        const element = createAnnotationWrapperNode(slotName);\n        element.appendChild(rendered);\n        this.fileContainer.appendChild(element);\n        cache = { element, action };\n        this.conflictActionCache.set(id, cache);\n      }\n      staleActions.delete(id);\n    }\n    for (const [id, { element }] of staleActions.entries()) {\n      this.conflictActionCache.delete(id);\n      element.remove();\n    }\n  }\n\n  private renderMergeConflictAction(\n    action: MergeConflictDiffAction\n  ): HTMLElement | undefined {\n    if (typeof this.options.mergeConflictActionsType !== 'function') {\n      return undefined;\n    }\n    const rendered = this.options.mergeConflictActionsType(action, this);\n    if (rendered == null) {\n      return undefined;\n    }\n    if (rendered instanceof HTMLElement) {\n      return rendered;\n    }\n    if (\n      typeof DocumentFragment !== 'undefined' &&\n      rendered instanceof DocumentFragment\n    ) {\n      const wrapper = document.createElement('div');\n      wrapper.style.display = 'contents';\n      wrapper.appendChild(rendered);\n      return wrapper;\n    }\n    return undefined;\n  }\n\n  private clearMergeConflictActionCache(): void {\n    for (const { element } of this.conflictActionCache.values()) {\n      element.remove();\n    }\n    this.conflictActionCache.clear();\n  }\n}\n\ninterface RebuildFileAndActionsProps {\n  fileDiff: FileDiffMetadata;\n  previousActions: (MergeConflictDiffAction | undefined)[];\n  resolvedConflictIndex: number;\n  // FIXME: Probably should remove this...\n  // additionOffset: number;\n  // deletionOffset: number;\n  previousFile: FileContents | undefined;\n  resolution: MergeConflictResolution;\n}\n\n// Rebuild the emitted unresolved file contents and remaining action anchors in\n// one pass over the post-resolution diff state.\nfunction rebuildFileAndActions({\n  fileDiff,\n  previousActions,\n  resolvedConflictIndex,\n  previousFile,\n  resolution,\n}: RebuildFileAndActionsProps): Pick<\n  ResolveConflictReturn,\n  'file' | 'actions' | 'markerRows'\n> {\n  const resolvedAction = previousActions[resolvedConflictIndex];\n  if (resolvedAction == null) {\n    throw new Error(\n      'rebuildFileAndActions: missing resolved action for unresolved file rebuild'\n    );\n  }\n\n  const actions = updateConflictActionsAfterResolution(\n    previousActions,\n    resolvedConflictIndex,\n    resolvedAction,\n    resolution\n  );\n  const markerRows = buildMergeConflictMarkerRows(fileDiff, actions);\n\n  const file = rebuildUnresolvedFile({\n    fileDiff,\n    resolvedAction,\n    resolvedConflictIndex,\n    previousFile,\n    resolution,\n  });\n\n  return {\n    file,\n    actions,\n    markerRows,\n  };\n}\n\ninterface RebuildUnresolvedFileProps {\n  fileDiff: FileDiffMetadata;\n  resolvedAction: MergeConflictDiffAction;\n  resolvedConflictIndex: number;\n  previousFile: FileContents | undefined;\n  resolution: MergeConflictResolution;\n}\n\n// Rebuild the unresolved file text from the previous unresolved source so we\n// preserve remaining marker blocks exactly while the diff state stays in-place.\nfunction rebuildUnresolvedFile({\n  resolvedAction,\n  resolvedConflictIndex,\n  previousFile,\n  fileDiff,\n  resolution,\n}: RebuildUnresolvedFileProps): FileContents {\n  const previousContents = previousFile?.contents ?? '';\n  const lines = splitFileContents(previousContents);\n  const { conflict } = resolvedAction;\n  const replacementLines = getResolvedConflictReplacementLines(\n    lines,\n    conflict,\n    resolution\n  );\n  const contents = [\n    ...lines.slice(0, conflict.startLineIndex),\n    ...replacementLines,\n    ...lines.slice(conflict.endLineIndex + 1),\n  ].join('');\n\n  return {\n    name: previousFile?.name ?? fileDiff.name,\n    contents,\n    cacheKey:\n      previousFile?.cacheKey != null\n        ? `${previousFile.cacheKey}:mc-${resolvedConflictIndex}-${resolution}`\n        : undefined,\n  };\n}\n\nfunction getResolvedConflictReplacementLines(\n  lines: string[],\n  conflict: MergeConflictDiffAction['conflict'],\n  resolution: MergeConflictResolution\n): string[] {\n  const currentLines = lines.slice(\n    conflict.startLineIndex + 1,\n    conflict.baseMarkerLineIndex ?? conflict.separatorLineIndex\n  );\n  const incomingLines = lines.slice(\n    conflict.separatorLineIndex + 1,\n    conflict.endLineIndex\n  );\n\n  if (resolution === 'current') {\n    return currentLines;\n  }\n  if (resolution === 'incoming') {\n    return incomingLines;\n  }\n  return [...currentLines, ...incomingLines];\n}\n\n// The diff resolver keeps hunk/content group indexes stable, so the only\n// follow-up update we need here is shifting unresolved source-region line\n// numbers for later conflicts in the rebuilt file text.\nfunction updateConflictActionsAfterResolution(\n  previousActions: (MergeConflictDiffAction | undefined)[],\n  resolvedConflictIndex: number,\n  resolvedAction: MergeConflictDiffAction,\n  resolution: MergeConflictResolution\n): (MergeConflictDiffAction | undefined)[] {\n  const lineDelta = getResolvedConflictLineDelta(\n    resolvedAction.conflict,\n    resolution\n  );\n\n  return previousActions.map((action, index) => {\n    if (index === resolvedConflictIndex) {\n      return undefined;\n    }\n    if (action == null) {\n      return undefined;\n    }\n    if (action.conflict.startLineIndex > resolvedAction.conflict.endLineIndex) {\n      return {\n        ...action,\n        conflict: shiftMergeConflictRegion(action.conflict, lineDelta),\n      };\n    }\n    return action;\n  });\n}\n\nfunction getResolvedConflictLineDelta(\n  conflict: MergeConflictRegion,\n  resolution: MergeConflictResolution\n): number {\n  const currentLineCount =\n    (conflict.baseMarkerLineIndex ?? conflict.separatorLineIndex) -\n    conflict.startLineIndex -\n    1;\n  const incomingLineCount =\n    conflict.endLineIndex - conflict.separatorLineIndex - 1;\n  const replacementLineCount =\n    resolution === 'current'\n      ? currentLineCount\n      : resolution === 'incoming'\n        ? incomingLineCount\n        : currentLineCount + incomingLineCount;\n  const conflictLineCount = conflict.endLineIndex - conflict.startLineIndex + 1;\n  return replacementLineCount - conflictLineCount;\n}\n\nfunction shiftMergeConflictRegion(\n  conflict: MergeConflictRegion,\n  lineDelta: number\n): MergeConflictRegion {\n  return {\n    ...conflict,\n    startLineIndex: conflict.startLineIndex + lineDelta,\n    startLineNumber: conflict.startLineNumber + lineDelta,\n    separatorLineIndex: conflict.separatorLineIndex + lineDelta,\n    separatorLineNumber: conflict.separatorLineNumber + lineDelta,\n    endLineIndex: conflict.endLineIndex + lineDelta,\n    endLineNumber: conflict.endLineNumber + lineDelta,\n    baseMarkerLineIndex:\n      conflict.baseMarkerLineIndex != null\n        ? conflict.baseMarkerLineIndex + lineDelta\n        : undefined,\n    baseMarkerLineNumber:\n      conflict.baseMarkerLineNumber != null\n        ? conflict.baseMarkerLineNumber + lineDelta\n        : undefined,\n  };\n}\n\nfunction shouldRenderCode(\n  pre: HTMLPreElement | undefined,\n  fileDiff: FileDiffMetadata | undefined,\n  collapsed = false\n): boolean {\n  return !collapsed && pre == null && fileDiff != null;\n}\n\nfunction shouldRenderHeader(\n  headerElement: HTMLElement | undefined,\n  fileDiff: FileDiffMetadata | undefined,\n  disableFileHeader = false\n): boolean {\n  return headerElement == null && fileDiff != null && !disableFileHeader;\n}\n\n// NOTE(amadeus): Should probably pull this out into a util, and make variants\n// for all component types\nexport function getUnresolvedDiffHunksRendererOptions<LAnnotation>(\n  options?: UnresolvedFileOptions<LAnnotation>,\n  baseOptions?: UnresolvedFileOptions<LAnnotation>\n): UnresolvedFileHunksRendererOptions {\n  const merged = { ...baseOptions, ...options };\n  return {\n    ...merged,\n    useTokenTransformer: shouldUseTokenTransformer<'diff'>(merged),\n    hunkSeparators:\n      typeof options?.hunkSeparators === 'function'\n        ? 'custom'\n        : options?.hunkSeparators,\n    mergeConflictActionsType:\n      typeof options?.mergeConflictActionsType === 'function'\n        ? 'custom'\n        : options?.mergeConflictActionsType,\n  };\n}\n"],"mappings":"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"}

package/node_modules/@pierre/diffs/dist/components/VirtualizedFile.d.ts

@@ -1,10 +1,10 @@
 import { FileContents, LineAnnotation, NumericScrollLineAnchor, PendingCodeViewLayoutReset, RenderWindow, StickySpecs, ThemeTypes, VirtualFileMetrics } from "../types.js";
 import { TextDocument } from "../editor/textDocument.js";
 import { WorkerPoolManager } from "../worker/WorkerPoolManager.js";
+import "../worker/index.js";
 import { File, FileOptions, FileRenderProps } from "./File.js";
 import { Virtualizer } from "./Virtualizer.js";
 import { CodeView } from "./CodeView.js";
-
 //#region src/components/VirtualizedFile.d.ts
 declare class VirtualizedFile<LAnnotation = undefined, Caret = undefined> extends File<LAnnotation, Caret> {
   private virtualizer;
@@ -50,13 +50,7 @@ declare class VirtualizedFile<LAnnotation = undefined, Caret = undefined> extend
   rerender(): void;
   syncGhostTextRows(): void;
   applyDocumentChange(textDocument: TextDocument<'file', LAnnotation>, newLineAnnotations?: LineAnnotation<LAnnotation>[], shouldUpdateBuffer?: boolean): void;
-  render({
-    fileContainer,
-    file,
-    forceRender,
-    lineAnnotations,
-    ...props
-  }: FileRenderProps<LAnnotation>): boolean;
+  render({ fileContainer, file, forceRender, lineAnnotations, ...props }: FileRenderProps<LAnnotation>): boolean;
   protected finalizeRender(): void;
   private updatePendingRender;
   syncVirtualizedTop(): void;

package/node_modules/@pierre/diffs/dist/components/VirtualizedFile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VirtualizedFile.d.ts","names":[],"sources":["../../src/components/VirtualizedFile.ts"],"mappings":";;;;;;;;cA8Ea,eAAA,qDAGH,IAAA,CAAK,WAAA,EAAa,KAAA;EAAA,QAqBhB,WAAA;EAAA,QACA,OAAA;EAAA,SArBQ,IAAA;EAAA,SACF,UAAA;EAET,GAAA;EACA,MAAA;EAAA,QACC,KAAA;EAAA,QAMA,aAAA;EAAA,QACA,SAAA;EAAA,QACA,OAAA;EAAA,QACA,WAAA;EAAA,QACA,mBAAA;EAAA,QACA,gBAAA;EAER,WAAA,CACE,OAAA,EAAS,WAAA,CAAY,WAAA,EAAa,KAAA,eAC1B,WAAA,EAAa,WAAA,GAAc,QAAA,CAAS,WAAA,EAAa,KAAA,GACjD,OAAA,GAAS,kBAAA,EACjB,aAAA,GAAgB,iBAAA,EAChB,kBAAA;EAKK,UAAA,CACL,OAAA,GAAU,OAAA,CAAQ,kBAAA,GAClB,KAAA;EAWO,kBAAA,CACP,eAAA,EAAiB,cAAA,CAAe,WAAA;EAAA,QAO1B,mBAAA;EAAA,UAiBW,oCAAA,CACjB,eAAA,EAAiB,cAAA,CAAe,WAAA;EAAA,QAS1B,kBAAA;EAAA,QASA,qBAAA;EAYD,aAAA,CAAc,SAAA,UAAmB,eAAA;EAS/B,UAAA,CACP,OAAA,EAAS,WAAA,CAAY,WAAA,EAAa,KAAA;EA4B3B,YAAA,CAAa,SAAA,EAAW,UAAA;EAAA,QAUzB,gBAAA;EAAA,QAyBA,kBAAA;EAkCD,gBAAA;EA2GA,QAAA,GAAQ,KAAA;EAYR,oBAAA,CACL,IAAA,EAAM,YAAA,EACN,GAAA,UACA,KAAA,GAAQ,0BAAA,EACR,eAAA,GAAkB,cAAA,CAAe,WAAA;EAAA,QA+C3B,aAAA;EAID,eAAA,CACL,UAAA;IACG,GAAA;IAAa,MAAA;EAAA;EA6CX,iBAAA,IAAqB,WAAA,GAAc,QAAA;EAMnC,sBAAA,CACL,gBAAA,WACC,uBAAA;EAgFI,oBAAA;EAIA,sBAAA,CACL,WAAA,GAAc,YAAA,GACb,WAAA;EAyCM,OAAA,CAAQ,OAAA;EAAA,QAiCT,sBAAA;EAsED,aAAA,CAAc,OAAA;EAcZ,QAAA;EAwBF,iBAAA;EAYE,mBAAA,CACP,YAAA,EAAc,YAAA,SAAqB,WAAA,GACnC,kBAAA,GAAqB,cAAA,CAAe,WAAA,KACpC,kBAAA;EAoCO,MAAA;IACP,aAAA;IACA,IAAA;IACA,WAAA;IACA,eAAA;IAAA,GACG;EAAA,GACF,eAAA,CAAgB,WAAA;EAAA,UA8FA,cAAA;EAAA,QAiBX,mBAAA;EA0BD,kBAAA;EAAA,UAIY,kCAAA;EAAA,UAMA,wBAAA;EAAA,QAIX,YAAA;EAAA,QAIA,cAAA;EAAA,QAIA,mBAAA;EAAA,QAWA,kCAAA;EAAA,QAiCA,4BAAA;EAAA,QAuCA,iBAAA;EAAA,QASA,oBAAA;EAAA,QAIA,sBAAA;EAAA,QAIA,wBAAA;EAAA,QAIA,4BAAA;AAAA"}
+{"version":3,"file":"VirtualizedFile.d.ts","names":[],"sources":["../../src/components/VirtualizedFile.ts"],"mappings":";;;;;;;;cA8Ea,gBACX,yBACA,2BACQ,KAAK,aAAa;UAyBhB;UACA;WAzBQ;WACF;EAET;EACA;UACC;UAUA;UACA;UACA;UACA;UACA;UACA;EAER,YACE,SAAS,YAAY,aAAa,oBAC1B,aAAa,cAAc,SAAS,aAAa,QACjD,UAAS,oBACjB,gBAAgB,mBAChB;EAKK,WACL,UAAU,QAAQ,qBAClB;EAWO,mBACP,iBAAiB,eAAe;UAO1B;YAiBW,qCACjB,iBAAiB,eAAe;UAS1B;UASA;EAYD,cAAc,mBAAmB;EAS/B,WACP,SAAS,YAAY,aAAa;EA4B3B,aAAa,WAAW;UAUzB;UAyBA;EAkCD;EA4GA,WAAQ;EAYR,qBACL,MAAM,cACN,aACA,QAAQ,4BACR,kBAAkB,eAAe;UA+C3B;EAID,gBACL;IACG;IAAa;;EA6CX,qBAAqB,cAAc;EAMnC,uBACL,2BACC;EAgFI;EAIA,uBACL,cAAc,eACb;EAyCM,QAAQ;UAiCT;EAsED,cAAc;EAcZ;EAwBF;EAYE,oBACP,cAAc,qBAAqB,cACnC,qBAAqB,eAAe,gBACpC;EAoCO,SACP,eACA,MACA,aACA,oBACG,SACF,gBAAgB;YA4FA;UAiBX;EA0BD;YAIY;YAMA;UAIX;UAIA;UAIA;UAWA;UAiCA;UAuCA;UASA;UAIA;UAIA;UAIA"}

package/node_modules/@pierre/diffs/dist/components/VirtualizedFile.js

@@ -123,8 +123,11 @@ var VirtualizedFile = class extends File {
 		this.top = this.getVirtualizedTop();
 		const ghostTextRows = this.editor?.__getGhostTextRows() ?? NO_GHOST_TEXT_ROWS;
 		hasHeightChange = this.applyGhostTextRows(ghostTextRows);
-		if (overflow === "scroll" && this.getLatestAnnotations().length === 0 && !this.isResizeDebuggingEnabled()) {
-			if (hasHeightChange) this.computeApproximateSize(true);
+		if (this.placeHolder != null || overflow === "scroll" && this.getLatestAnnotations().length === 0 && !this.isResizeDebuggingEnabled()) {
+			if (hasHeightChange) {
+				this.computeApproximateSize(true);
+				this.setPlaceholderHeight(this.height);
+			}
 			return hasHeightChange;
 		}
 		const { lineHeight } = this.metrics;
@@ -377,7 +380,7 @@ var VirtualizedFile = class extends File {
 				pendingRenderFile: this.pendingRender.file,
 				layoutFileChanged: false,
 				renderedFileChanged: false,
-				annotationsChanged: false
+				annotationsChanged: this.syncLineAnnotations(lineAnnotations)
 			};
 			return this.updatePendingRender(file, lineAnnotations);
 		})();
@@ -398,16 +401,12 @@ var VirtualizedFile = class extends File {
 			this.isSetup = true;
 		} else {
 			this.top ??= this.getVirtualizedTop();
-			if (layoutFileChanged && this.isSimpleMode()) {
+			if (this.layoutDirty && this.isSimpleMode()) {
 				this.getSimpleVirtualizer()?.markDOMDirty();
-				this.resetLayoutCache(false);
 				this.computeApproximateSize(false, pendingRenderFile);
 			}
 		}
-		if (!this.isVisible && this.isSimpleMode() && (!didFileChange || !isSetup)) {
-			this.pendingRender = void 0;
-			return this.renderPlaceholder(this.height);
-		}
+		if (!this.isVisible && this.isSimpleMode() && (!didFileChange || !isSetup)) return this.renderPlaceholder(this.height);
 		const windowSpecs = this.virtualizer.getWindowSpecs();
 		const fileTop = this.top ?? 0;
 		const renderRange = this.computeRenderRangeFromWindow(pendingRenderFile, fileTop, windowSpecs);
@@ -590,15 +589,17 @@ var VirtualizedFile = class extends File {
 			currentLine++;
 			absoluteLineTop += lineHeight;
 		}
-		if (firstVisibleHunk == null) if (measuredFileAnnotationVisible) {
-			firstVisibleHunk = 0;
-			centerHunk = 0;
-		} else return {
-			startingLine: 0,
-			totalLines: 0,
-			bufferBefore: 0,
-			bufferAfter: fileHeight - headerRegion - paddingBottom
-		};
+		if (firstVisibleHunk == null) {
+			if (measuredFileAnnotationVisible) {
+				firstVisibleHunk = 0;
+				centerHunk = 0;
+			} else return {
+				startingLine: 0,
+				totalLines: 0,
+				bufferBefore: 0,
+				bufferAfter: fileHeight - headerRegion - paddingBottom
+			};
+		}
 		centerHunk ??= firstVisibleHunk;
 		const idealStartHunk = Math.round(centerHunk - totalHunks / 2);
 		const maxStartHunk = Math.max(0, Math.ceil(lineCount / hunkLineCount) - totalHunks);