@pierre/diffs 1.1.2 → 1.1.4

package/dist/components/UnresolvedFile.d.ts

@@ -1,4 +1,4 @@
-import { FileContents, FileDiffMetadata, MergeConflictActionPayload, MergeConflictResolution } from "../types.js";
+import { FileContents, FileDiffMetadata, MergeConflictActionPayload, MergeConflictMarkerRow, MergeConflictResolution } from "../types.js";
 import { WorkerPoolManager } from "../worker/WorkerPoolManager.js";
 import "../worker/index.js";
 import { HunksRenderResult } from "../renderers/DiffHunksRenderer.js";
@@ -9,27 +9,34 @@ import { FileDiff, FileDiffOptions, FileDiffRenderProps } from "./FileDiff.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>;
-interface UnresolvedFileOptions<LAnnotation> extends FileDiffOptions<LAnnotation> {
+interface UnresolvedFileOptions<LAnnotation> extends Omit<FileDiffOptions<LAnnotation>, 'diffStyle'> {
   onPostRender?(node: HTMLElement, instance: UnresolvedFile<LAnnotation>): unknown;
   mergeConflictActionsType?: MergeConflictActionsTypeOption<LAnnotation>;
   onMergeConflictAction?(payload: MergeConflictActionPayload, instance: UnresolvedFile<LAnnotation>): void;
   onMergeConflictResolve?(file: FileContents, payload: MergeConflictActionPayload): void;
+  maxContextLines?: number;
 }
 interface UnresolvedFileRenderProps<LAnnotation> extends Omit<FileDiffRenderProps<LAnnotation>, 'oldFile' | 'newFile'> {
   file?: FileContents;
-  actions?: MergeConflictDiffAction[];
+  actions?: (MergeConflictDiffAction | undefined)[];
+  markerRows?: MergeConflictMarkerRow[];
 }
 interface UnresolvedFileHydrationProps<LAnnotation> extends Omit<UnresolvedFileRenderProps<LAnnotation>, 'file'> {
   file?: FileContents;
-  fileDiff?: FileDiffMetadata;
-  actions?: MergeConflictDiffAction[];
   fileContainer: HTMLElement;
   prerenderedHTML?: string;
 }
 interface GetOrComputeDiffProps {
   file: FileContents | undefined;
   fileDiff: FileDiffMetadata | undefined;
-  actions: MergeConflictDiffAction[] | undefined;
+  actions: (MergeConflictDiffAction | undefined)[] | undefined;
+  markerRows: MergeConflictMarkerRow[] | undefined;
+}
+interface ResolveConflictReturn {
+  file: FileContents;
+  fileDiff: FileDiffMetadata;
+  actions: (MergeConflictDiffAction | undefined)[];
+  markerRows: MergeConflictMarkerRow[];
 }
 type UnresolvedFileDataCache = GetOrComputeDiffProps;
 declare class UnresolvedFile<LAnnotation = undefined> extends FileDiff<LAnnotation> {
@@ -37,6 +44,7 @@ declare class UnresolvedFile<LAnnotation = undefined> extends FileDiff<LAnnotati
   readonly __id: string;
   protected computedCache: UnresolvedFileDataCache;
   private conflictActions;
+  private markerRows;
   private conflictActionCache;
   constructor(options?: UnresolvedFileOptions<LAnnotation>, workerManager?: WorkerPoolManager | undefined, isContainerManaged?: boolean);
   setOptions(options: UnresolvedFileOptions<LAnnotation> | undefined): void;
@@ -48,14 +56,15 @@ declare class UnresolvedFile<LAnnotation = undefined> extends FileDiff<LAnnotati
   hydrate(props: UnresolvedFileHydrationProps<LAnnotation>): void;
   rerender(): void;
   render(props?: UnresolvedFileRenderProps<LAnnotation>): boolean;
-  resolveConflict(conflictIndex: number, resolution: MergeConflictResolution, file?: FileContents | undefined): FileContents | undefined;
+  resolveConflict(conflictIndex: number, resolution: MergeConflictResolution, fileDiff?: FileDiffMetadata | undefined): ResolveConflictReturn | undefined;
   private resolveConflictAndRender;
-  private setActiveMergeConflictActions;
+  private setActiveMergeConflictState;
   private handleMergeConflictActionClick;
   private renderMergeConflictActionSlots;
   private renderMergeConflictAction;
   private clearMergeConflictActionCache;
 }
+declare function getUnresolvedDiffHunksRendererOptions<LAnnotation>(options?: UnresolvedFileOptions<LAnnotation>, baseOptions?: UnresolvedFileOptions<LAnnotation>): UnresolvedFileHunksRendererOptions;
 //#endregion
-export { MergeConflictActionsTypeOption, RenderMergeConflictActions, UnresolvedFile, UnresolvedFileHydrationProps, UnresolvedFileOptions, UnresolvedFileRenderProps };
+export { MergeConflictActionsTypeOption, RenderMergeConflictActions, UnresolvedFile, UnresolvedFileHydrationProps, UnresolvedFileOptions, UnresolvedFileRenderProps, getUnresolvedDiffHunksRendererOptions };
 //# sourceMappingURL=UnresolvedFile.d.ts.map

package/dist/components/UnresolvedFile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UnresolvedFile.d.ts","names":["HunksRenderResult","UnresolvedFileHunksRenderer","UnresolvedFileHunksRendererOptions","FileContents","FileDiffMetadata","MergeConflictActionPayload","MergeConflictResolution","MergeConflictDiffAction","WorkerPoolManager","FileDiff","FileDiffOptions","FileDiffRenderProps","RenderMergeConflictActions","LAnnotation","UnresolvedFile","HTMLElement","DocumentFragment","MergeConflictActionsTypeOption","UnresolvedFileOptions","UnresolvedFileRenderProps","Omit","UnresolvedFileHydrationProps","GetOrComputeDiffProps","UnresolvedFileDataCache","HTMLPreElement"],"sources":["../../src/components/UnresolvedFile.d.ts"],"sourcesContent":["import type { HunksRenderResult } from '../renderers/DiffHunksRenderer';\nimport { UnresolvedFileHunksRenderer, type UnresolvedFileHunksRendererOptions } from '../renderers/UnresolvedFileHunksRenderer';\nimport type { FileContents, FileDiffMetadata, MergeConflictActionPayload, MergeConflictResolution } from '../types';\nimport { type MergeConflictDiffAction } from '../utils/parseMergeConflictDiffFromFile';\nimport type { WorkerPoolManager } from '../worker';\nimport { FileDiff, type FileDiffOptions, type FileDiffRenderProps } from './FileDiff';\nexport type RenderMergeConflictActions<LAnnotation> = (action: MergeConflictDiffAction, instance: UnresolvedFile<LAnnotation>) => HTMLElement | DocumentFragment | null | undefined;\nexport type MergeConflictActionsTypeOption<LAnnotation> = 'none' | 'default' | RenderMergeConflictActions<LAnnotation>;\nexport interface UnresolvedFileOptions<LAnnotation> extends FileDiffOptions<LAnnotation> {\n    onPostRender?(node: HTMLElement, instance: UnresolvedFile<LAnnotation>): unknown;\n    mergeConflictActionsType?: MergeConflictActionsTypeOption<LAnnotation>;\n    onMergeConflictAction?(payload: MergeConflictActionPayload, instance: UnresolvedFile<LAnnotation>): void;\n    onMergeConflictResolve?(file: FileContents, payload: MergeConflictActionPayload): void;\n}\nexport interface UnresolvedFileRenderProps<LAnnotation> extends Omit<FileDiffRenderProps<LAnnotation>, 'oldFile' | 'newFile'> {\n    file?: FileContents;\n    actions?: MergeConflictDiffAction[];\n}\nexport interface UnresolvedFileHydrationProps<LAnnotation> extends Omit<UnresolvedFileRenderProps<LAnnotation>, 'file'> {\n    file?: FileContents;\n    fileDiff?: FileDiffMetadata;\n    actions?: MergeConflictDiffAction[];\n    fileContainer: HTMLElement;\n    prerenderedHTML?: string;\n}\ninterface GetOrComputeDiffProps {\n    file: FileContents | undefined;\n    fileDiff: FileDiffMetadata | undefined;\n    actions: MergeConflictDiffAction[] | undefined;\n}\ntype UnresolvedFileDataCache = GetOrComputeDiffProps;\nexport declare class UnresolvedFile<LAnnotation = undefined> extends FileDiff<LAnnotation> {\n    options: UnresolvedFileOptions<LAnnotation>;\n    readonly __id: string;\n    protected computedCache: UnresolvedFileDataCache;\n    private conflictActions;\n    private conflictActionCache;\n    constructor(options?: UnresolvedFileOptions<LAnnotation>, workerManager?: WorkerPoolManager | undefined, isContainerManaged?: boolean);\n    setOptions(options: UnresolvedFileOptions<LAnnotation> | undefined): void;\n    protected createHunksRenderer(options: UnresolvedFileOptions<LAnnotation>): UnresolvedFileHunksRenderer<LAnnotation>;\n    protected getHunksRendererOptions(options: UnresolvedFileOptions<LAnnotation>): UnresolvedFileHunksRendererOptions;\n    protected applyPreNodeAttributes(pre: HTMLPreElement, result: HunksRenderResult): void;\n    cleanUp(): void;\n    private getOrComputeDiff;\n    hydrate(props: UnresolvedFileHydrationProps<LAnnotation>): void;\n    rerender(): void;\n    render(props?: UnresolvedFileRenderProps<LAnnotation>): boolean;\n    resolveConflict(conflictIndex: number, resolution: MergeConflictResolution, file?: FileContents | undefined): FileContents | undefined;\n    private resolveConflictAndRender;\n    private setActiveMergeConflictActions;\n    private handleMergeConflictActionClick;\n    private renderMergeConflictActionSlots;\n    private renderMergeConflictAction;\n    private clearMergeConflictActionCache;\n}\nexport {};\n//# sourceMappingURL=UnresolvedFile.d.ts.map"],"mappings":"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"}
+{"version":3,"file":"UnresolvedFile.d.ts","names":["HunksRenderResult","UnresolvedFileHunksRenderer","UnresolvedFileHunksRendererOptions","FileContents","FileDiffMetadata","MergeConflictActionPayload","MergeConflictMarkerRow","MergeConflictResolution","MergeConflictDiffAction","WorkerPoolManager","FileDiff","FileDiffOptions","FileDiffRenderProps","RenderMergeConflictActions","LAnnotation","UnresolvedFile","HTMLElement","DocumentFragment","MergeConflictActionsTypeOption","UnresolvedFileOptions","Omit","UnresolvedFileRenderProps","UnresolvedFileHydrationProps","GetOrComputeDiffProps","ResolveConflictReturn","UnresolvedFileDataCache","HTMLPreElement","getUnresolvedDiffHunksRendererOptions"],"sources":["../../src/components/UnresolvedFile.d.ts"],"sourcesContent":["import type { HunksRenderResult } from '../renderers/DiffHunksRenderer';\nimport { UnresolvedFileHunksRenderer, type UnresolvedFileHunksRendererOptions } from '../renderers/UnresolvedFileHunksRenderer';\nimport type { FileContents, FileDiffMetadata, MergeConflictActionPayload, MergeConflictMarkerRow, MergeConflictResolution } from '../types';\nimport { type MergeConflictDiffAction } from '../utils/parseMergeConflictDiffFromFile';\nimport type { WorkerPoolManager } from '../worker';\nimport { FileDiff, type FileDiffOptions, type FileDiffRenderProps } from './FileDiff';\nexport type RenderMergeConflictActions<LAnnotation> = (action: MergeConflictDiffAction, instance: UnresolvedFile<LAnnotation>) => HTMLElement | DocumentFragment | null | undefined;\nexport type MergeConflictActionsTypeOption<LAnnotation> = 'none' | 'default' | RenderMergeConflictActions<LAnnotation>;\nexport interface UnresolvedFileOptions<LAnnotation> extends Omit<FileDiffOptions<LAnnotation>, 'diffStyle'> {\n    onPostRender?(node: HTMLElement, instance: UnresolvedFile<LAnnotation>): unknown;\n    mergeConflictActionsType?: MergeConflictActionsTypeOption<LAnnotation>;\n    onMergeConflictAction?(payload: MergeConflictActionPayload, instance: UnresolvedFile<LAnnotation>): void;\n    onMergeConflictResolve?(file: FileContents, payload: MergeConflictActionPayload): void;\n    maxContextLines?: number;\n}\nexport interface UnresolvedFileRenderProps<LAnnotation> extends Omit<FileDiffRenderProps<LAnnotation>, 'oldFile' | 'newFile'> {\n    file?: FileContents;\n    actions?: (MergeConflictDiffAction | undefined)[];\n    markerRows?: MergeConflictMarkerRow[];\n}\nexport interface UnresolvedFileHydrationProps<LAnnotation> extends Omit<UnresolvedFileRenderProps<LAnnotation>, 'file'> {\n    file?: FileContents;\n    fileContainer: HTMLElement;\n    prerenderedHTML?: string;\n}\ninterface GetOrComputeDiffProps {\n    file: FileContents | undefined;\n    fileDiff: FileDiffMetadata | undefined;\n    actions: (MergeConflictDiffAction | undefined)[] | undefined;\n    markerRows: MergeConflictMarkerRow[] | undefined;\n}\ninterface ResolveConflictReturn {\n    file: FileContents;\n    fileDiff: FileDiffMetadata;\n    actions: (MergeConflictDiffAction | undefined)[];\n    markerRows: MergeConflictMarkerRow[];\n}\ntype UnresolvedFileDataCache = GetOrComputeDiffProps;\nexport declare class UnresolvedFile<LAnnotation = undefined> extends FileDiff<LAnnotation> {\n    options: UnresolvedFileOptions<LAnnotation>;\n    readonly __id: string;\n    protected computedCache: UnresolvedFileDataCache;\n    private conflictActions;\n    private markerRows;\n    private conflictActionCache;\n    constructor(options?: UnresolvedFileOptions<LAnnotation>, workerManager?: WorkerPoolManager | undefined, isContainerManaged?: boolean);\n    setOptions(options: UnresolvedFileOptions<LAnnotation> | undefined): void;\n    protected createHunksRenderer(options: UnresolvedFileOptions<LAnnotation>): UnresolvedFileHunksRenderer<LAnnotation>;\n    protected getHunksRendererOptions(options: UnresolvedFileOptions<LAnnotation>): UnresolvedFileHunksRendererOptions;\n    protected applyPreNodeAttributes(pre: HTMLPreElement, result: HunksRenderResult): void;\n    cleanUp(): void;\n    private getOrComputeDiff;\n    hydrate(props: UnresolvedFileHydrationProps<LAnnotation>): void;\n    rerender(): void;\n    render(props?: UnresolvedFileRenderProps<LAnnotation>): boolean;\n    resolveConflict(conflictIndex: number, resolution: MergeConflictResolution, fileDiff?: FileDiffMetadata | undefined): ResolveConflictReturn | undefined;\n    private resolveConflictAndRender;\n    private setActiveMergeConflictState;\n    private handleMergeConflictActionClick;\n    private renderMergeConflictActionSlots;\n    private renderMergeConflictAction;\n    private clearMergeConflictActionCache;\n}\nexport declare function getUnresolvedDiffHunksRendererOptions<LAnnotation>(options?: UnresolvedFileOptions<LAnnotation>, baseOptions?: UnresolvedFileOptions<LAnnotation>): UnresolvedFileHunksRendererOptions;\nexport {};\n//# sourceMappingURL=UnresolvedFile.d.ts.map"],"mappings":"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"}

package/dist/components/UnresolvedFile.js

@@ -1,13 +1,15 @@
-import { DEFAULT_THEMES } from "../constants.js";
+import { DEFAULT_THEMES, UNSAFE_CSS_ATTRIBUTE } from "../constants.js";
 import { pluckInteractionOptions } from "../managers/InteractionManager.js";
+import { splitFileContents } from "../utils/splitFileContents.js";
 import { areFilesEqual } from "../utils/areFilesEqual.js";
 import { createAnnotationWrapperNode } from "../utils/createAnnotationWrapperNode.js";
+import { prerenderHTMLIfNecessary } from "../utils/prerenderHTMLIfNecessary.js";
 import { FileDiff } from "./FileDiff.js";
 import { getMergeConflictActionSlotName } from "../utils/getMergeConflictActionSlotName.js";
-import { getMergeConflictActionAnchor, parseMergeConflictDiffFromFile } from "../utils/parseMergeConflictDiffFromFile.js";
+import { buildMergeConflictMarkerRows, getMergeConflictActionAnchor, parseMergeConflictDiffFromFile } from "../utils/parseMergeConflictDiffFromFile.js";
 import { UnresolvedFileHunksRenderer } from "../renderers/UnresolvedFileHunksRenderer.js";
 import { areMergeConflictActionsEqual } from "../utils/areMergeConflictActionsEqual.js";
-import { resolveMergeConflict } from "../utils/resolveMergeConflict.js";
+import { resolveConflict } from "../utils/resolveConflict.js";
 
 //#region src/components/UnresolvedFile.ts
 let instanceId = -1;
@@ -16,9 +18,11 @@ var UnresolvedFile = class extends FileDiff {
 	computedCache = {
 		file: void 0,
 		fileDiff: void 0,
-		actions: void 0
+		actions: void 0,
+		markerRows: void 0
 	};
 	conflictActions = [];
+	markerRows = [];
 	conflictActionCache = /* @__PURE__ */ new Map();
 	constructor(options = { theme: DEFAULT_THEMES }, workerManager, isContainerManaged = false) {
 		super(void 0, workerManager, isContainerManaged);
@@ -37,11 +41,7 @@ var UnresolvedFile = class extends FileDiff {
 		return new UnresolvedFileHunksRenderer(this.getHunksRendererOptions(options), this.handleHighlightRender, this.workerManager);
 	}
 	getHunksRendererOptions(options) {
-		return {
-			...this.options,
-			hunkSeparators: typeof options.hunkSeparators === "function" ? "custom" : options.hunkSeparators,
-			mergeConflictActionsType: typeof options.mergeConflictActionsType === "function" ? "custom" : options.mergeConflictActionsType
-		};
+		return getUnresolvedDiffHunksRendererOptions(options, this.options);
 	}
 	applyPreNodeAttributes(pre, result) {
 		super.applyPreNodeAttributes(pre, result, { "data-has-merge-conflict": "" });
@@ -51,73 +51,124 @@ var UnresolvedFile = class extends FileDiff {
 		this.computedCache = {
 			file: void 0,
 			fileDiff: void 0,
-			actions: void 0
+			actions: void 0,
+			markerRows: void 0
 		};
 		this.conflictActions = [];
 		super.cleanUp();
 	}
-	getOrComputeDiff({ file, fileDiff, actions }) {
-		wrapper: if (this.options.onMergeConflictAction != null) {
-			if (fileDiff != null !== (actions != null)) throw new Error("UnresolvedFile.getOrComputeDiff: fileDiff and actions must be passed together");
-			if (fileDiff != null && actions != null) {
+	getOrComputeDiff({ file, fileDiff, actions, markerRows }) {
+		const { maxContextLines, onMergeConflictAction } = this.options;
+		wrapper: if (onMergeConflictAction != null) {
+			const hasFileDiff = fileDiff != null;
+			if (hasFileDiff !== (actions != null) || hasFileDiff !== (markerRows != null)) throw new Error("UnresolvedFile.getOrComputeDiff: fileDiff, actions, and markerRows must be passed together");
+			if (fileDiff != null && actions != null && markerRows != null) {
 				this.computedCache = {
 					file: file ?? this.computedCache.file,
 					fileDiff,
-					actions
+					actions,
+					markerRows
 				};
 				break wrapper;
 			} else if (file != null || this.computedCache.file != null) {
+				if (file != null && this.computedCache.file != null && !areFilesEqual(file, this.computedCache.file) && this.computedCache.fileDiff != null && this.computedCache.actions != null) throw new Error("UnresolvedFile.getOrComputeDiff: file can only be used to initialize unresolved state once. Pass fileDiff and actions for subsequent updates.");
 				file ??= this.computedCache.file;
 				if (file == null) throw new Error("UnresolvedFile.getOrComputeDiff: file is null, should be impossible");
 				if (!areFilesEqual(file, this.computedCache.file) || this.computedCache.fileDiff == null || this.computedCache.actions == null) {
-					const computed = parseMergeConflictDiffFromFile(file);
+					const computed = parseMergeConflictDiffFromFile(file, maxContextLines);
 					this.computedCache = {
 						file,
 						fileDiff: computed.fileDiff,
-						actions: computed.actions
+						actions: computed.actions,
+						markerRows: computed.markerRows
 					};
 				}
 				fileDiff = this.computedCache.fileDiff;
 				actions = this.computedCache.actions;
+				markerRows = this.computedCache.markerRows;
 				break wrapper;
 			} else {
 				fileDiff = this.computedCache.fileDiff;
 				actions = this.computedCache.actions;
+				markerRows = this.computedCache.markerRows;
 				break wrapper;
 			}
 		} else {
-			if (fileDiff != null || actions != null) throw new Error("UnresolvedFile.getOrComputeDiff: fileDiff and actions are only usable in controlled mode, you must pass in `onMergeConflictAction`");
+			if (fileDiff != null || actions != null || markerRows != null) throw new Error("UnresolvedFile.getOrComputeDiff: fileDiff, actions, and markerRows are only usable in controlled mode, you must pass in `onMergeConflictAction`");
+			if (file != null && this.computedCache.file != null && !areFilesEqual(file, this.computedCache.file)) throw new Error("UnresolvedFile.getOrComputeDiff: uncontrolled unresolved files parse the file only once. Later updates must come from the cached diff state.");
 			this.computedCache.file ??= file;
 			if (this.computedCache.fileDiff == null && this.computedCache.file != null) {
-				const computed = parseMergeConflictDiffFromFile(this.computedCache.file);
+				const computed = parseMergeConflictDiffFromFile(this.computedCache.file, maxContextLines);
 				this.computedCache.fileDiff = computed.fileDiff;
 				this.computedCache.actions = computed.actions;
+				this.computedCache.markerRows = computed.markerRows;
 			}
 			fileDiff = this.computedCache.fileDiff;
 			actions = this.computedCache.actions;
+			markerRows = this.computedCache.markerRows;
 			break wrapper;
 		}
-		if (fileDiff == null || actions == null) return;
+		if (fileDiff == null || actions == null || markerRows == null) return;
 		return {
 			fileDiff,
-			actions
+			actions,
+			markerRows
 		};
 	}
 	hydrate(props) {
-		const { file, fileDiff, actions, lineAnnotations, preventEmit = false,...rest } = props;
+		const { file, fileDiff, actions, markerRows, lineAnnotations, fileContainer, prerenderedHTML, preventEmit = false } = props;
 		const source = this.getOrComputeDiff({
 			file,
 			fileDiff,
-			actions
+			actions,
+			markerRows
 		});
+		const { overflow = "scroll" } = this.options;
 		if (source == null) return;
-		this.setActiveMergeConflictActions(source.actions);
-		super.hydrate({
-			...rest,
-			fileDiff: source.fileDiff,
-			lineAnnotations,
+		prerenderHTMLIfNecessary(fileContainer, prerenderedHTML);
+		for (const element of fileContainer.shadowRoot?.children ?? []) {
+			if (element instanceof SVGElement) {
+				this.spriteSVG = element;
+				continue;
+			}
+			if (!(element instanceof HTMLElement)) continue;
+			if (element instanceof HTMLPreElement) {
+				this.pre = element;
+				for (const code of element.children) {
+					if (!(code instanceof HTMLElement) || code.tagName.toLowerCase() !== "code") continue;
+					if ("deletions" in code.dataset) this.codeDeletions = code;
+					if ("additions" in code.dataset) this.codeAdditions = code;
+					if ("unified" in code.dataset) this.codeUnified = code;
+				}
+				continue;
+			}
+			if ("diffsHeader" in element.dataset) {
+				this.headerElement = element;
+				continue;
+			}
+			if (element instanceof HTMLStyleElement && element.hasAttribute(UNSAFE_CSS_ATTRIBUTE)) {
+				this.unsafeCSSStyle = element;
+				continue;
+			}
+		}
+		if (this.pre != null) this.syncCodeNodesFromPre(this.pre);
+		this.setActiveMergeConflictState(source.actions, source.markerRows);
+		if (this.pre == null) this.render({
+			...props,
 			preventEmit: true
 		});
+		else {
+			this.fileContainer = fileContainer;
+			delete this.pre.dataset.dehydrated;
+			this.lineAnnotations = lineAnnotations ?? this.lineAnnotations;
+			this.fileDiff = source.fileDiff;
+			this.hunksRenderer.hydrate(this.fileDiff);
+			this.renderAnnotations();
+			this.renderGutterUtility();
+			this.injectUnsafeCSS();
+			this.interactionManager.setup(this.pre);
+			this.resizeManager.setup(this.pre, overflow === "wrap");
+		}
 		this.renderMergeConflictActionSlots();
 		if (!preventEmit) this.emitPostRender();
 	}
@@ -129,27 +180,30 @@ var UnresolvedFile = class extends FileDiff {
 		});
 	}
 	render(props = {}) {
-		let { file, fileDiff, actions, lineAnnotations, preventEmit = false,...rest } = props;
+		let { file, fileDiff, actions, markerRows, lineAnnotations, preventEmit = false,...rest } = props;
 		const source = this.getOrComputeDiff({
 			file,
 			fileDiff,
-			actions
+			actions,
+			markerRows
 		});
 		if (source == null) return false;
-		this.setActiveMergeConflictActions(source.actions);
+		this.setActiveMergeConflictState(source.actions, source.markerRows);
 		const didRender = super.render({
 			...rest,
 			fileDiff: source.fileDiff,
 			lineAnnotations,
 			preventEmit: true
 		});
-		this.renderMergeConflictActionSlots();
-		if (didRender && !preventEmit) this.emitPostRender();
+		if (didRender) {
+			this.renderMergeConflictActionSlots();
+			if (!preventEmit) this.emitPostRender();
+		}
 		return didRender;
 	}
-	resolveConflict(conflictIndex, resolution, file = this.computedCache.file) {
+	resolveConflict(conflictIndex, resolution, fileDiff = this.computedCache.fileDiff) {
 		const action = this.conflictActions[conflictIndex];
-		if (file == null || action == null) return;
+		if (fileDiff == null || action == null) return;
 		if (action.conflictIndex !== conflictIndex) {
 			console.error({
 				conflictIndex,
@@ -157,15 +211,20 @@ var UnresolvedFile = class extends FileDiff {
 			});
 			throw new Error("UnresolvedFile.resolveConflict: conflictIndex and conflictAction don't match");
 		}
-		const contents = resolveMergeConflict(file.contents, {
-			resolution,
-			conflict: action.conflict
+		const newFileDiff = resolveConflict(fileDiff, action, resolution);
+		const previousFile = this.computedCache.file;
+		const { file, actions, markerRows } = rebuildFileAndActions({
+			fileDiff: newFileDiff,
+			previousActions: this.conflictActions,
+			resolvedConflictIndex: conflictIndex,
+			previousFile,
+			resolution
 		});
-		if (contents === file.contents) return;
 		return {
-			...file,
-			contents,
-			cacheKey: file.cacheKey != null ? `${file.cacheKey}:mc-${conflictIndex}-${resolution}` : void 0
+			file,
+			fileDiff: newFileDiff,
+			actions,
+			markerRows
 		};
 	}
 	resolveConflictAndRender(conflictIndex, resolution) {
@@ -182,18 +241,23 @@ var UnresolvedFile = class extends FileDiff {
 			resolution,
 			conflict: action.conflict
 		};
-		const nextFile = this.resolveConflict(conflictIndex, resolution);
-		if (nextFile == null) return;
-		this.computedCache.file = nextFile;
-		this.computedCache.fileDiff = void 0;
-		this.computedCache.actions = void 0;
-		this.render();
-		this.options.onMergeConflictResolve?.(nextFile, payload);
-		return nextFile;
+		const { file, fileDiff, actions, markerRows } = this.resolveConflict(conflictIndex, resolution) ?? {};
+		if (file == null || fileDiff == null || actions == null || markerRows == null) return;
+		this.computedCache = {
+			file,
+			fileDiff,
+			actions,
+			markerRows
+		};
+		this.setActiveMergeConflictState(actions, markerRows);
+		if (this.workerManager != null) this.hunksRenderer.renderDiff(fileDiff);
+		else this.render({ forceRender: true });
+		this.options.onMergeConflictResolve?.(file, payload);
 	}
-	setActiveMergeConflictActions(actions) {
+	setActiveMergeConflictState(actions = this.conflictActions, markerRows = this.markerRows) {
 		this.conflictActions = actions;
-		if (this.hunksRenderer instanceof UnresolvedFileHunksRenderer) this.hunksRenderer.setConflictActions(this.options.mergeConflictActionsType === "none" ? [] : actions);
+		this.markerRows = markerRows;
+		if (this.computedCache.fileDiff != null && this.hunksRenderer instanceof UnresolvedFileHunksRenderer) this.hunksRenderer.setConflictState(this.options.mergeConflictActionsType === "none" ? [] : actions, markerRows, this.computedCache.fileDiff);
 	}
 	handleMergeConflictActionClick = (target) => {
 		const action = this.conflictActions[target.conflictIndex];
@@ -216,7 +280,8 @@ var UnresolvedFile = class extends FileDiff {
 		this.resolveConflictAndRender(target.conflictIndex, target.resolution);
 	};
 	renderMergeConflictActionSlots() {
-		if (this.isContainerManaged || this.fileContainer == null || typeof this.options.mergeConflictActionsType !== "function" || this.conflictActions.length === 0) {
+		const { fileDiff } = this.computedCache;
+		if (this.isContainerManaged || this.fileContainer == null || typeof this.options.mergeConflictActionsType !== "function" || this.conflictActions.length === 0 || fileDiff == null) {
 			this.clearMergeConflictActionCache();
 			return;
 		}
@@ -231,12 +296,12 @@ var UnresolvedFile = class extends FileDiff {
 				});
 				throw new Error("UnresolvedFile.renderMergeConflictActionSlots: conflictIndex and conflictAction don't match");
 			}
-			const anchor = getMergeConflictActionAnchor(action);
+			const anchor = getMergeConflictActionAnchor(action, fileDiff);
 			if (anchor == null) continue;
 			const conflictIndex = action.conflictIndex;
 			const slotName = getMergeConflictActionSlotName({
-				side: anchor.side,
-				lineNumber: anchor.lineNumber,
+				hunkIndex: anchor.hunkIndex,
+				lineIndex: anchor.lineIndex,
 				conflictIndex
 			});
 			const id = `${actionIndex}-${slotName}`;
@@ -278,7 +343,84 @@ var UnresolvedFile = class extends FileDiff {
 		this.conflictActionCache.clear();
 	}
 };
+function rebuildFileAndActions({ fileDiff, previousActions, resolvedConflictIndex, previousFile, resolution }) {
+	const resolvedAction = previousActions[resolvedConflictIndex];
+	if (resolvedAction == null) throw new Error("rebuildFileAndActions: missing resolved action for unresolved file rebuild");
+	const actions = updateConflictActionsAfterResolution(previousActions, resolvedConflictIndex, resolvedAction, resolution);
+	const markerRows = buildMergeConflictMarkerRows(fileDiff, actions);
+	return {
+		file: rebuildUnresolvedFile({
+			fileDiff,
+			resolvedAction,
+			resolvedConflictIndex,
+			previousFile,
+			resolution
+		}),
+		actions,
+		markerRows
+	};
+}
+function rebuildUnresolvedFile({ resolvedAction, resolvedConflictIndex, previousFile, fileDiff, resolution }) {
+	const lines = splitFileContents(previousFile?.contents ?? "");
+	const { conflict } = resolvedAction;
+	const replacementLines = getResolvedConflictReplacementLines(lines, conflict, resolution);
+	const contents = [
+		...lines.slice(0, conflict.startLineIndex),
+		...replacementLines,
+		...lines.slice(conflict.endLineIndex + 1)
+	].join("");
+	return {
+		name: previousFile?.name ?? fileDiff.name,
+		contents,
+		cacheKey: previousFile?.cacheKey != null ? `${previousFile.cacheKey}:mc-${resolvedConflictIndex}-${resolution}` : void 0
+	};
+}
+function getResolvedConflictReplacementLines(lines, conflict, resolution) {
+	const currentLines = lines.slice(conflict.startLineIndex + 1, conflict.baseMarkerLineIndex ?? conflict.separatorLineIndex);
+	const incomingLines = lines.slice(conflict.separatorLineIndex + 1, conflict.endLineIndex);
+	if (resolution === "current") return currentLines;
+	if (resolution === "incoming") return incomingLines;
+	return [...currentLines, ...incomingLines];
+}
+function updateConflictActionsAfterResolution(previousActions, resolvedConflictIndex, resolvedAction, resolution) {
+	const lineDelta = getResolvedConflictLineDelta(resolvedAction.conflict, resolution);
+	return previousActions.map((action, index) => {
+		if (index === resolvedConflictIndex) return;
+		if (action == null) return;
+		if (action.conflict.startLineIndex > resolvedAction.conflict.endLineIndex) return {
+			...action,
+			conflict: shiftMergeConflictRegion(action.conflict, lineDelta)
+		};
+		return action;
+	});
+}
+function getResolvedConflictLineDelta(conflict, resolution) {
+	const currentLineCount = (conflict.baseMarkerLineIndex ?? conflict.separatorLineIndex) - conflict.startLineIndex - 1;
+	const incomingLineCount = conflict.endLineIndex - conflict.separatorLineIndex - 1;
+	return (resolution === "current" ? currentLineCount : resolution === "incoming" ? incomingLineCount : currentLineCount + incomingLineCount) - (conflict.endLineIndex - conflict.startLineIndex + 1);
+}
+function shiftMergeConflictRegion(conflict, lineDelta) {
+	return {
+		...conflict,
+		startLineIndex: conflict.startLineIndex + lineDelta,
+		startLineNumber: conflict.startLineNumber + lineDelta,
+		separatorLineIndex: conflict.separatorLineIndex + lineDelta,
+		separatorLineNumber: conflict.separatorLineNumber + lineDelta,
+		endLineIndex: conflict.endLineIndex + lineDelta,
+		endLineNumber: conflict.endLineNumber + lineDelta,
+		baseMarkerLineIndex: conflict.baseMarkerLineIndex != null ? conflict.baseMarkerLineIndex + lineDelta : void 0,
+		baseMarkerLineNumber: conflict.baseMarkerLineNumber != null ? conflict.baseMarkerLineNumber + lineDelta : void 0
+	};
+}
+function getUnresolvedDiffHunksRendererOptions(options, baseOptions) {
+	return {
+		...baseOptions,
+		...options,
+		hunkSeparators: typeof options?.hunkSeparators === "function" ? "custom" : options?.hunkSeparators,
+		mergeConflictActionsType: typeof options?.mergeConflictActionsType === "function" ? "custom" : options?.mergeConflictActionsType
+	};
+}
 
 //#endregion
-export { UnresolvedFile };
+export { UnresolvedFile, getUnresolvedDiffHunksRendererOptions };
 //# sourceMappingURL=UnresolvedFile.js.map