@pierre/diffs 1.1.0-beta.9 → 1.1.0

package/dist/utils/getMergeConflictLineTypes.d.ts

@@ -0,0 +1,15 @@
+import { MergeConflictRegion } from "../types.js";
+
+//#region src/utils/getMergeConflictLineTypes.d.ts
+type MergeConflictLineType = 'none' | 'marker-start' | 'marker-base' | 'marker-separator' | 'marker-end' | 'current' | 'base' | 'incoming';
+interface MergeConflictParseResult {
+  lineTypes: MergeConflictLineType[];
+  regions: MergeConflictRegion[];
+}
+declare function getMergeConflictLineTypes(lines: string[]): MergeConflictLineType[];
+declare function getMergeConflictRegions(lines: string[]): MergeConflictRegion[];
+declare function getMergeConflictParseResult(lines: string[]): MergeConflictParseResult;
+declare function getMergeConflictActionLineNumber(conflict: MergeConflictRegion): number;
+//#endregion
+export { MergeConflictLineType, MergeConflictParseResult, getMergeConflictActionLineNumber, getMergeConflictLineTypes, getMergeConflictParseResult, getMergeConflictRegions };
+//# sourceMappingURL=getMergeConflictLineTypes.d.ts.map

package/dist/utils/getMergeConflictLineTypes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getMergeConflictLineTypes.d.ts","names":["MergeConflictRegion","MergeConflictLineType","MergeConflictParseResult","getMergeConflictLineTypes","getMergeConflictRegions","getMergeConflictParseResult","getMergeConflictActionLineNumber"],"sources":["../../src/utils/getMergeConflictLineTypes.d.ts"],"sourcesContent":["import type { MergeConflictRegion } from '../types';\nexport type MergeConflictLineType = 'none' | 'marker-start' | 'marker-base' | 'marker-separator' | 'marker-end' | 'current' | 'base' | 'incoming';\nexport interface MergeConflictParseResult {\n    lineTypes: MergeConflictLineType[];\n    regions: MergeConflictRegion[];\n}\nexport declare function getMergeConflictLineTypes(lines: string[]): MergeConflictLineType[];\nexport declare function getMergeConflictRegions(lines: string[]): MergeConflictRegion[];\nexport declare function getMergeConflictParseResult(lines: string[]): MergeConflictParseResult;\nexport declare function getMergeConflictActionLineNumber(conflict: MergeConflictRegion): number;\n//# sourceMappingURL=getMergeConflictLineTypes.d.ts.map"],"mappings":";;;KACYC,qBAAAA;UACKC,wBAAAA;EADLD,SAAAA,EAEGA,qBAFkB,EAAA;EAChBC,OAAAA,EAEJF,mBAF4B,EAAA;AAIzC;AACwBI,iBADAD,yBAAAA,CAC0CH,KAAAA,EAAAA,MAAmB,EAAA,CAAA,EADjBC,qBACiB,EAAA;AAC7DI,iBADAD,uBAAAA,CAC8CF,KAAAA,EAAAA,MAAAA,EAAAA,CAAAA,EADJF,mBAC4B,EAAA;AACtEM,iBADAD,2BAAAA,CAC2CL,KAAAA,EAAAA,MAAAA,EAAAA,CAAAA,EADGE,wBACgB;iBAA9DI,gCAAAA,WAA2CN"}

package/dist/utils/getMergeConflictLineTypes.js

@@ -0,0 +1,81 @@
+//#region src/utils/getMergeConflictLineTypes.ts
+const START_MARKER = /^<{7,}(?:\s.*)?$/;
+const BASE_MARKER = /^\|{7,}(?:\s.*)?$/;
+const SEPARATOR_MARKER = /^={7,}(?:\s.*)?$/;
+const END_MARKER = /^>{7,}(?:\s.*)?$/;
+function trimLineEnding(line) {
+	return line.replace(/(?:\r\n|\n|\r)$/, "");
+}
+function getMergeConflictLineTypes(lines) {
+	return getMergeConflictParseResult(lines).lineTypes;
+}
+function getMergeConflictRegions(lines) {
+	return getMergeConflictParseResult(lines).regions;
+}
+function getMergeConflictParseResult(lines) {
+	return parseMergeConflicts(lines);
+}
+function getMergeConflictActionLineNumber(conflict) {
+	return Math.max(1, conflict.startLineNumber - 1);
+}
+function parseMergeConflicts(lines) {
+	const lineTypes = new Array(lines.length);
+	const stack = [];
+	const regions = [];
+	for (let index = 0; index < lines.length; index++) {
+		const line = trimLineEnding(lines[index]);
+		if (START_MARKER.test(line)) {
+			stack.push({
+				stage: "current",
+				startLineIndex: index
+			});
+			lineTypes[index] = "marker-start";
+			continue;
+		}
+		const frame = stack.at(-1);
+		if (frame == null) {
+			lineTypes[index] = "none";
+			continue;
+		}
+		if (BASE_MARKER.test(line)) {
+			frame.stage = "base";
+			frame.baseMarkerLineIndex = index;
+			lineTypes[index] = "marker-base";
+			continue;
+		}
+		if (SEPARATOR_MARKER.test(line)) {
+			frame.stage = "incoming";
+			frame.separatorLineIndex = index;
+			lineTypes[index] = "marker-separator";
+			continue;
+		}
+		if (END_MARKER.test(line)) {
+			const completedFrame = stack.pop();
+			lineTypes[index] = "marker-end";
+			if (completedFrame?.separatorLineIndex != null) {
+				const conflictIndex = regions.length;
+				regions.push({
+					conflictIndex,
+					startLineIndex: completedFrame.startLineIndex,
+					startLineNumber: completedFrame.startLineIndex + 1,
+					separatorLineIndex: completedFrame.separatorLineIndex,
+					separatorLineNumber: completedFrame.separatorLineIndex + 1,
+					endLineIndex: index,
+					endLineNumber: index + 1,
+					baseMarkerLineIndex: completedFrame.baseMarkerLineIndex,
+					baseMarkerLineNumber: completedFrame.baseMarkerLineIndex != null ? completedFrame.baseMarkerLineIndex + 1 : void 0
+				});
+			}
+			continue;
+		}
+		lineTypes[index] = frame.stage;
+	}
+	return {
+		lineTypes,
+		regions
+	};
+}
+
+//#endregion
+export { getMergeConflictActionLineNumber, getMergeConflictLineTypes, getMergeConflictParseResult, getMergeConflictRegions };
+//# sourceMappingURL=getMergeConflictLineTypes.js.map

package/dist/utils/getMergeConflictLineTypes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getMergeConflictLineTypes.js","names":["stack: MergeConflictFrame[]","regions: MergeConflictRegion[]"],"sources":["../../src/utils/getMergeConflictLineTypes.ts"],"sourcesContent":["import type { MergeConflictRegion } from '../types';\n\nexport type MergeConflictLineType =\n  | 'none'\n  | 'marker-start'\n  | 'marker-base'\n  | 'marker-separator'\n  | 'marker-end'\n  | 'current'\n  | 'base'\n  | 'incoming';\n\ntype MergeConflictStage = 'current' | 'base' | 'incoming';\n\ninterface MergeConflictFrame {\n  stage: MergeConflictStage;\n  startLineIndex: number;\n  baseMarkerLineIndex?: number;\n  separatorLineIndex?: number;\n}\n\nexport interface MergeConflictParseResult {\n  lineTypes: MergeConflictLineType[];\n  regions: MergeConflictRegion[];\n}\n\nconst START_MARKER = /^<{7,}(?:\\s.*)?$/;\nconst BASE_MARKER = /^\\|{7,}(?:\\s.*)?$/;\nconst SEPARATOR_MARKER = /^={7,}(?:\\s.*)?$/;\nconst END_MARKER = /^>{7,}(?:\\s.*)?$/;\n\nfunction trimLineEnding(line: string): string {\n  return line.replace(/(?:\\r\\n|\\n|\\r)$/, '');\n}\n\nexport function getMergeConflictLineTypes(\n  lines: string[]\n): MergeConflictLineType[] {\n  return getMergeConflictParseResult(lines).lineTypes;\n}\n\nexport function getMergeConflictRegions(\n  lines: string[]\n): MergeConflictRegion[] {\n  return getMergeConflictParseResult(lines).regions;\n}\n\nexport function getMergeConflictParseResult(\n  lines: string[]\n): MergeConflictParseResult {\n  return parseMergeConflicts(lines);\n}\n\nexport function getMergeConflictActionLineNumber(\n  conflict: MergeConflictRegion\n): number {\n  return Math.max(1, conflict.startLineNumber - 1);\n}\n\nfunction parseMergeConflicts(lines: string[]): MergeConflictParseResult {\n  const lineTypes = new Array<MergeConflictLineType>(lines.length);\n  const stack: MergeConflictFrame[] = [];\n  const regions: MergeConflictRegion[] = [];\n\n  for (let index = 0; index < lines.length; index++) {\n    const line = trimLineEnding(lines[index]);\n\n    if (START_MARKER.test(line)) {\n      stack.push({ stage: 'current', startLineIndex: index });\n      lineTypes[index] = 'marker-start';\n      continue;\n    }\n\n    const frame = stack.at(-1);\n    if (frame == null) {\n      lineTypes[index] = 'none';\n      continue;\n    }\n\n    if (BASE_MARKER.test(line)) {\n      frame.stage = 'base';\n      frame.baseMarkerLineIndex = index;\n      lineTypes[index] = 'marker-base';\n      continue;\n    }\n\n    if (SEPARATOR_MARKER.test(line)) {\n      frame.stage = 'incoming';\n      frame.separatorLineIndex = index;\n      lineTypes[index] = 'marker-separator';\n      continue;\n    }\n\n    if (END_MARKER.test(line)) {\n      const completedFrame = stack.pop();\n      lineTypes[index] = 'marker-end';\n      if (completedFrame?.separatorLineIndex != null) {\n        const conflictIndex = regions.length;\n        regions.push({\n          conflictIndex,\n          startLineIndex: completedFrame.startLineIndex,\n          startLineNumber: completedFrame.startLineIndex + 1,\n          separatorLineIndex: completedFrame.separatorLineIndex,\n          separatorLineNumber: completedFrame.separatorLineIndex + 1,\n          endLineIndex: index,\n          endLineNumber: index + 1,\n          baseMarkerLineIndex: completedFrame.baseMarkerLineIndex,\n          baseMarkerLineNumber:\n            completedFrame.baseMarkerLineIndex != null\n              ? completedFrame.baseMarkerLineIndex + 1\n              : undefined,\n        });\n      }\n      continue;\n    }\n\n    lineTypes[index] = frame.stage;\n  }\n\n  return { lineTypes, regions };\n}\n"],"mappings":";AA0BA,MAAM,eAAe;AACrB,MAAM,cAAc;AACpB,MAAM,mBAAmB;AACzB,MAAM,aAAa;AAEnB,SAAS,eAAe,MAAsB;AAC5C,QAAO,KAAK,QAAQ,mBAAmB,GAAG;;AAG5C,SAAgB,0BACd,OACyB;AACzB,QAAO,4BAA4B,MAAM,CAAC;;AAG5C,SAAgB,wBACd,OACuB;AACvB,QAAO,4BAA4B,MAAM,CAAC;;AAG5C,SAAgB,4BACd,OAC0B;AAC1B,QAAO,oBAAoB,MAAM;;AAGnC,SAAgB,iCACd,UACQ;AACR,QAAO,KAAK,IAAI,GAAG,SAAS,kBAAkB,EAAE;;AAGlD,SAAS,oBAAoB,OAA2C;CACtE,MAAM,YAAY,IAAI,MAA6B,MAAM,OAAO;CAChE,MAAMA,QAA8B,EAAE;CACtC,MAAMC,UAAiC,EAAE;AAEzC,MAAK,IAAI,QAAQ,GAAG,QAAQ,MAAM,QAAQ,SAAS;EACjD,MAAM,OAAO,eAAe,MAAM,OAAO;AAEzC,MAAI,aAAa,KAAK,KAAK,EAAE;AAC3B,SAAM,KAAK;IAAE,OAAO;IAAW,gBAAgB;IAAO,CAAC;AACvD,aAAU,SAAS;AACnB;;EAGF,MAAM,QAAQ,MAAM,GAAG,GAAG;AAC1B,MAAI,SAAS,MAAM;AACjB,aAAU,SAAS;AACnB;;AAGF,MAAI,YAAY,KAAK,KAAK,EAAE;AAC1B,SAAM,QAAQ;AACd,SAAM,sBAAsB;AAC5B,aAAU,SAAS;AACnB;;AAGF,MAAI,iBAAiB,KAAK,KAAK,EAAE;AAC/B,SAAM,QAAQ;AACd,SAAM,qBAAqB;AAC3B,aAAU,SAAS;AACnB;;AAGF,MAAI,WAAW,KAAK,KAAK,EAAE;GACzB,MAAM,iBAAiB,MAAM,KAAK;AAClC,aAAU,SAAS;AACnB,OAAI,gBAAgB,sBAAsB,MAAM;IAC9C,MAAM,gBAAgB,QAAQ;AAC9B,YAAQ,KAAK;KACX;KACA,gBAAgB,eAAe;KAC/B,iBAAiB,eAAe,iBAAiB;KACjD,oBAAoB,eAAe;KACnC,qBAAqB,eAAe,qBAAqB;KACzD,cAAc;KACd,eAAe,QAAQ;KACvB,qBAAqB,eAAe;KACpC,sBACE,eAAe,uBAAuB,OAClC,eAAe,sBAAsB,IACrC;KACP,CAAC;;AAEJ;;AAGF,YAAU,SAAS,MAAM;;AAG3B,QAAO;EAAE;EAAW;EAAS"}

package/dist/utils/getOrCreateCodeNode.d.ts

@@ -4,12 +4,14 @@ interface CreateCodeNodeProps {
   code?: HTMLElement;
   columnType?: 'additions' | 'deletions' | 'unified';
   rowSpan?: number;
+  containerSize?: boolean;
 }
 declare function getOrCreateCodeNode({
   code,
   pre,
   columnType,
-  rowSpan
+  rowSpan,
+  containerSize
 }?: CreateCodeNodeProps): HTMLElement;
 //#endregion
 export { getOrCreateCodeNode };

package/dist/utils/getOrCreateCodeNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getOrCreateCodeNode.d.ts","names":["CreateCodeNodeProps","HTMLPreElement","HTMLElement","getOrCreateCodeNode","code","pre","columnType","rowSpan"],"sources":["../../src/utils/getOrCreateCodeNode.d.ts"],"sourcesContent":["interface CreateCodeNodeProps {\n    pre?: HTMLPreElement;\n    code?: HTMLElement;\n    columnType?: 'additions' | 'deletions' | 'unified';\n    rowSpan?: number;\n}\nexport declare function getOrCreateCodeNode({ code, pre, columnType, rowSpan }?: CreateCodeNodeProps): HTMLElement;\nexport {};\n//# sourceMappingURL=getOrCreateCodeNode.d.ts.map"],"mappings":";UAAUA,mBAAAA;EAAAA,GAAAA,CAAAA,EACAC,cADAD;EAMcG,IAAAA,CAAAA,EAJbD,WAIaC;EAAsBC,UAAAA,CAAAA,EAAAA,WAAAA,GAAAA,WAAAA,GAAAA,SAAAA;EAAMC,OAAAA,CAAAA,EAAAA,MAAAA;;AAAiBE,iBAA7CJ,mBAAAA,CAA6CI;EAAAA,IAAAA;EAAAA,GAAAA;EAAAA,UAAAA;EAAAA;AAAAA,CAAAA,CAAAA,EAAYP,mBAAZO,CAAAA,EAAkCL,WAAlCK"}
+{"version":3,"file":"getOrCreateCodeNode.d.ts","names":["CreateCodeNodeProps","HTMLPreElement","HTMLElement","getOrCreateCodeNode","code","pre","columnType","rowSpan","containerSize"],"sources":["../../src/utils/getOrCreateCodeNode.d.ts"],"sourcesContent":["interface CreateCodeNodeProps {\n    pre?: HTMLPreElement;\n    code?: HTMLElement;\n    columnType?: 'additions' | 'deletions' | 'unified';\n    rowSpan?: number;\n    containerSize?: boolean;\n}\nexport declare function getOrCreateCodeNode({ code, pre, columnType, rowSpan, containerSize }?: CreateCodeNodeProps): HTMLElement;\nexport {};\n//# sourceMappingURL=getOrCreateCodeNode.d.ts.map"],"mappings":";UAAUA,mBAAAA;EAAAA,GAAAA,CAAAA,EACAC,cADAD;EAOcG,IAAAA,CAAAA,EALbD,WAKaC;EAAsBC,UAAAA,CAAAA,EAAAA,WAAAA,GAAAA,WAAAA,GAAAA,SAAAA;EAAMC,OAAAA,CAAAA,EAAAA,MAAAA;EAAKC,aAAAA,CAAAA,EAAAA,OAAAA;;AAAqBE,iBAAtDL,mBAAAA,CAAsDK;EAAAA,IAAAA;EAAAA,GAAAA;EAAAA,UAAAA;EAAAA,OAAAA;EAAAA;AAAAA,CAAAA,CAAAA,EAAkBR,mBAAlBQ,CAAAA,EAAwCN,WAAxCM"}

package/dist/utils/getOrCreateCodeNode.js

@@ -1,13 +1,15 @@
 //#region src/utils/getOrCreateCodeNode.ts
-function getOrCreateCodeNode({ code, pre, columnType, rowSpan } = {}) {
+function getOrCreateCodeNode({ code, pre, columnType, rowSpan, containerSize = false } = {}) {
 	if (code == null) {
 		code = document.createElement("code");
-		code.dataset.code = "";
-		if (columnType != null) code.dataset[columnType] = "";
+		code.setAttribute("data-code", "");
+		if (columnType != null) code.setAttribute(`data-${columnType}`, "");
 		pre?.appendChild(code);
 	}
 	if (rowSpan != null) code.style.setProperty("grid-row", `span ${rowSpan}`);
 	else code.style.removeProperty("grid-row");
+	if (containerSize) code.setAttribute("data-container-size", "");
+	else code.removeAttribute("data-container-size");
 	return code;
 }
 

package/dist/utils/getOrCreateCodeNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"getOrCreateCodeNode.js","names":[],"sources":["../../src/utils/getOrCreateCodeNode.ts"],"sourcesContent":["interface CreateCodeNodeProps {\n  pre?: HTMLPreElement;\n  code?: HTMLElement;\n  columnType?: 'additions' | 'deletions' | 'unified';\n  rowSpan?: number;\n}\n\nexport function getOrCreateCodeNode({\n  code,\n  pre,\n  columnType,\n  rowSpan,\n}: CreateCodeNodeProps = {}): HTMLElement {\n  if (code == null) {\n    code = document.createElement('code');\n    code.dataset.code = '';\n    if (columnType != null) {\n      code.dataset[columnType] = '';\n    }\n    pre?.appendChild(code);\n  }\n  if (rowSpan != null) {\n    code.style.setProperty('grid-row', `span ${rowSpan}`);\n  } else {\n    code.style.removeProperty('grid-row');\n  }\n  return code;\n}\n"],"mappings":";AAOA,SAAgB,oBAAoB,EAClC,MACA,KACA,YACA,YACuB,EAAE,EAAe;AACxC,KAAI,QAAQ,MAAM;AAChB,SAAO,SAAS,cAAc,OAAO;AACrC,OAAK,QAAQ,OAAO;AACpB,MAAI,cAAc,KAChB,MAAK,QAAQ,cAAc;AAE7B,OAAK,YAAY,KAAK;;AAExB,KAAI,WAAW,KACb,MAAK,MAAM,YAAY,YAAY,QAAQ,UAAU;KAErD,MAAK,MAAM,eAAe,WAAW;AAEvC,QAAO"}
+{"version":3,"file":"getOrCreateCodeNode.js","names":[],"sources":["../../src/utils/getOrCreateCodeNode.ts"],"sourcesContent":["interface CreateCodeNodeProps {\n  pre?: HTMLPreElement;\n  code?: HTMLElement;\n  columnType?: 'additions' | 'deletions' | 'unified';\n  rowSpan?: number;\n  containerSize?: boolean;\n}\n\nexport function getOrCreateCodeNode({\n  code,\n  pre,\n  columnType,\n  rowSpan,\n  containerSize = false,\n}: CreateCodeNodeProps = {}): HTMLElement {\n  if (code == null) {\n    code = document.createElement('code');\n    code.setAttribute('data-code', '');\n    if (columnType != null) {\n      code.setAttribute(`data-${columnType}`, '');\n    }\n    pre?.appendChild(code);\n  }\n  if (rowSpan != null) {\n    code.style.setProperty('grid-row', `span ${rowSpan}`);\n  } else {\n    code.style.removeProperty('grid-row');\n  }\n  if (containerSize) {\n    code.setAttribute('data-container-size', '');\n  } else {\n    code.removeAttribute('data-container-size');\n  }\n  return code;\n}\n"],"mappings":";AAQA,SAAgB,oBAAoB,EAClC,MACA,KACA,YACA,SACA,gBAAgB,UACO,EAAE,EAAe;AACxC,KAAI,QAAQ,MAAM;AAChB,SAAO,SAAS,cAAc,OAAO;AACrC,OAAK,aAAa,aAAa,GAAG;AAClC,MAAI,cAAc,KAChB,MAAK,aAAa,QAAQ,cAAc,GAAG;AAE7C,OAAK,YAAY,KAAK;;AAExB,KAAI,WAAW,KACb,MAAK,MAAM,YAAY,YAAY,QAAQ,UAAU;KAErD,MAAK,MAAM,eAAe,WAAW;AAEvC,KAAI,cACF,MAAK,aAAa,uBAAuB,GAAG;KAE5C,MAAK,gBAAgB,sBAAsB;AAE7C,QAAO"}

package/dist/utils/hast_utils.d.ts

@@ -5,7 +5,7 @@ import { Element, ElementContent, Properties, Root, Text } from "hast";
 //#region src/utils/hast_utils.d.ts
 declare function createTextNodeElement(value: string): Text;
 interface CreateHastElementProps {
-  tagName: 'span' | 'div' | 'code' | 'pre' | 'slot' | 'svg' | 'use' | 'style' | 'template';
+  tagName: 'span' | 'div' | 'button' | 'code' | 'pre' | 'slot' | 'svg' | 'use' | 'style' | 'template';
   children?: ElementContent[];
   properties?: Properties;
 }
@@ -28,7 +28,7 @@ declare function createIconElement({
 }: CreateIconProps): Element;
 declare function findCodeElement(nodes: Root | Element): Element | undefined;
 declare function createGutterWrapper(children?: ElementContent[]): Element;
-declare function createGutterItem(lineType: LineTypes | 'buffer' | 'separator' | 'annotation', lineNumber: number, lineIndex: string): Element;
+declare function createGutterItem(lineType: LineTypes | 'buffer' | 'separator' | 'annotation', lineNumber: number, lineIndex: string, properties?: Properties): Element;
 declare function createGutterGap(type: LineTypes | undefined, bufferType: 'annotation' | 'buffer' | 'metadata', size: number): Element;
 //#endregion
 export { createGutterGap, createGutterItem, createGutterWrapper, createHastElement, createIconElement, createTextNodeElement, findCodeElement };

package/dist/utils/hast_utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hast_utils.d.ts","names":["ElementContent","Element","HASTElement","Properties","Root","Text","SVGSpriteNames","LineTypes","createTextNodeElement","CreateHastElementProps","createHastElement","tagName","children","properties","CreateIconProps","createIconElement","name","width","height","findCodeElement","createGutterWrapper","createGutterItem","createGutterGap"],"sources":["../../src/utils/hast_utils.d.ts"],"sourcesContent":["import type { ElementContent, Element as HASTElement, Properties, Root, Text } from 'hast';\nimport type { SVGSpriteNames } from '../sprite';\nimport type { LineTypes } from '../types';\nexport declare function createTextNodeElement(value: string): Text;\ninterface CreateHastElementProps {\n    tagName: 'span' | 'div' | 'code' | 'pre' | 'slot' | 'svg' | 'use' | 'style' | 'template';\n    children?: ElementContent[];\n    properties?: Properties;\n}\nexport declare function createHastElement({ tagName, children, properties }: CreateHastElementProps): HASTElement;\ninterface CreateIconProps {\n    name: SVGSpriteNames;\n    width?: number;\n    height?: number;\n    properties?: Properties;\n}\nexport declare function createIconElement({ name, width, height, properties }: CreateIconProps): HASTElement;\nexport declare function findCodeElement(nodes: Root | HASTElement): HASTElement | undefined;\nexport declare function createGutterWrapper(children?: ElementContent[]): HASTElement;\nexport declare function createGutterItem(lineType: LineTypes | 'buffer' | 'separator' | 'annotation', lineNumber: number, lineIndex: string): HASTElement;\nexport declare function createGutterGap(type: LineTypes | undefined, bufferType: 'annotation' | 'buffer' | 'metadata', size: number): HASTElement;\nexport {};\n//# sourceMappingURL=hast_utils.d.ts.map"],"mappings":";;;;;iBAGwBQ,qBAAAA,iBAAsCH;UACpDI,sBAAAA;EADcD,OAAAA,EAAAA,MAAAA,GAAAA,KAAAA,GAAqB,MAAA,GAAA,KAAiBH,GAAI,MAAA,GAAA,KAAA,GAAA,KAAA,GAAA,OAAA,GAAA,UAAA;EACxDI,QAAAA,CAAAA,EAEKT,cAFiB,EAAA;EAKRU,UAAAA,CAAAA,EAFPP,UAEwB;;AAAYS,iBAA7BF,iBAAAA,CAA6BE;EAAAA,OAAAA;EAAAA,QAAAA;EAAAA;AAAAA,CAAAA,EAAwBH,sBAAxBG,CAAAA,EAAiDV,OAAjDU;UAC3CE,eAAAA,CADqDD;EAAcJ,IAAAA,EAEnEH,cAFmEG;EAAyBP,KAAAA,CAAAA,EAAAA,MAAAA;EAAW,MAAA,CAAA,EAAA,MAAA;EACvGY,UAAAA,CAAAA,EAIOX,UAJQ;AAMzB;AAA4Ca,iBAApBD,iBAAAA,CAAoBC;EAAAA,IAAAA;EAAAA,KAAAA;EAAAA,MAAAA;EAAAA;AAAAA,CAAAA,EAAmCF,eAAnCE,CAAAA,EAAqDd,OAArDc;AAAMC,iBAC1BE,eAAAA,CAD0BF,KAAAA,EACHb,IADGa,GACIf,OADJe,CAAAA,EACkBf,OADlBe,GAAAA,SAAAA;AAAOC,iBAEjCE,mBAAAA,CAFiCF,QAAAA,CAAAA,EAEFlB,cAFEkB,EAAAA,CAAAA,EAEiBhB,OAFjBgB;AAAQL,iBAGzCQ,gBAAAA,CAHyCR,QAAAA,EAGdN,SAHcM,GAAAA,QAAAA,GAAAA,WAAAA,GAAAA,YAAAA,EAAAA,UAAAA,EAAAA,MAAAA,EAAAA,SAAAA,EAAAA,MAAAA,CAAAA,EAG6EX,OAH7EW;AAAcC,iBAIvDQ,eAAAA,CAJuDR,IAAAA,EAIjCP,SAJiCO,GAAAA,SAAAA,EAAAA,UAAAA,EAAAA,YAAAA,GAAAA,QAAAA,GAAAA,UAAAA,EAAAA,IAAAA,EAAAA,MAAAA,CAAAA,EAIuDZ,OAJvDY"}
+{"version":3,"file":"hast_utils.d.ts","names":["ElementContent","Element","HASTElement","Properties","Root","Text","SVGSpriteNames","LineTypes","createTextNodeElement","CreateHastElementProps","createHastElement","tagName","children","properties","CreateIconProps","createIconElement","name","width","height","findCodeElement","createGutterWrapper","createGutterItem","createGutterGap"],"sources":["../../src/utils/hast_utils.d.ts"],"sourcesContent":["import type { ElementContent, Element as HASTElement, Properties, Root, Text } from 'hast';\nimport type { SVGSpriteNames } from '../sprite';\nimport type { LineTypes } from '../types';\nexport declare function createTextNodeElement(value: string): Text;\ninterface CreateHastElementProps {\n    tagName: 'span' | 'div' | 'button' | 'code' | 'pre' | 'slot' | 'svg' | 'use' | 'style' | 'template';\n    children?: ElementContent[];\n    properties?: Properties;\n}\nexport declare function createHastElement({ tagName, children, properties }: CreateHastElementProps): HASTElement;\ninterface CreateIconProps {\n    name: SVGSpriteNames;\n    width?: number;\n    height?: number;\n    properties?: Properties;\n}\nexport declare function createIconElement({ name, width, height, properties }: CreateIconProps): HASTElement;\nexport declare function findCodeElement(nodes: Root | HASTElement): HASTElement | undefined;\nexport declare function createGutterWrapper(children?: ElementContent[]): HASTElement;\nexport declare function createGutterItem(lineType: LineTypes | 'buffer' | 'separator' | 'annotation', lineNumber: number, lineIndex: string, properties?: Properties): HASTElement;\nexport declare function createGutterGap(type: LineTypes | undefined, bufferType: 'annotation' | 'buffer' | 'metadata', size: number): HASTElement;\nexport {};\n//# sourceMappingURL=hast_utils.d.ts.map"],"mappings":";;;;;iBAGwBQ,qBAAAA,iBAAsCH;UACpDI,sBAAAA;EADcD,OAAAA,EAAAA,MAAAA,GAAAA,KAAAA,GAAqB,QAAA,GAAiBH,MAAI,GAAA,KAAA,GAAA,MAAA,GAAA,KAAA,GAAA,KAAA,GAAA,OAAA,GAAA,UAAA;EACxDI,QAAAA,CAAAA,EAEKT,cAFiB,EAAA;EAKRU,UAAAA,CAAAA,EAFPP,UAEwB;;AAAYS,iBAA7BF,iBAAAA,CAA6BE;EAAAA,OAAAA;EAAAA,QAAAA;EAAAA;AAAAA,CAAAA,EAAwBH,sBAAxBG,CAAAA,EAAiDV,OAAjDU;UAC3CE,eAAAA,CADqDD;EAAcJ,IAAAA,EAEnEH,cAFmEG;EAAyBP,KAAAA,CAAAA,EAAAA,MAAAA;EAAW,MAAA,CAAA,EAAA,MAAA;EACvGY,UAAAA,CAAAA,EAIOX,UAJQ;AAMzB;AAA4Ca,iBAApBD,iBAAAA,CAAoBC;EAAAA,IAAAA;EAAAA,KAAAA;EAAAA,MAAAA;EAAAA;AAAAA,CAAAA,EAAmCF,eAAnCE,CAAAA,EAAqDd,OAArDc;AAAMC,iBAC1BE,eAAAA,CAD0BF,KAAAA,EACHb,IADGa,GACIf,OADJe,CAAAA,EACkBf,OADlBe,GAAAA,SAAAA;AAAOC,iBAEjCE,mBAAAA,CAFiCF,QAAAA,CAAAA,EAEFlB,cAFEkB,EAAAA,CAAAA,EAEiBhB,OAFjBgB;AAAQL,iBAGzCQ,gBAAAA,CAHyCR,QAAAA,EAGdN,SAHcM,GAAAA,QAAAA,GAAAA,WAAAA,GAAAA,YAAAA,EAAAA,UAAAA,EAAAA,MAAAA,EAAAA,SAAAA,EAAAA,MAAAA,EAAAA,UAAAA,CAAAA,EAGyFV,UAHzFU,CAAAA,EAGsGX,OAHtGW;AAAcC,iBAIvDQ,eAAAA,CAJuDR,IAAAA,EAIjCP,SAJiCO,GAAAA,SAAAA,EAAAA,UAAAA,EAAAA,YAAAA,GAAAA,QAAAA,GAAAA,UAAAA,EAAAA,IAAAA,EAAAA,MAAAA,CAAAA,EAIuDZ,OAJvDY"}

package/dist/utils/hast_utils.js

@@ -43,13 +43,14 @@ function createGutterWrapper(children) {
 		children
 	});
 }
-function createGutterItem(lineType, lineNumber, lineIndex) {
+function createGutterItem(lineType, lineNumber, lineIndex, properties = {}) {
 	return createHastElement({
 		tagName: "div",
 		properties: {
 			"data-line-type": lineType,
 			"data-column-number": lineNumber,
-			"data-line-index": lineIndex
+			"data-line-index": lineIndex,
+			...properties
 		},
 		children: lineNumber != null ? [createHastElement({
 			tagName: "span",

package/dist/utils/hast_utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"hast_utils.js","names":["firstChild: RootContent | HASTElement | Root | null"],"sources":["../../src/utils/hast_utils.ts"],"sourcesContent":["import type {\n  ElementContent,\n  Element as HASTElement,\n  Properties,\n  Root,\n  RootContent,\n  Text,\n} from 'hast';\n\nimport type { SVGSpriteNames } from '../sprite';\nimport type { LineTypes } from '../types';\n\nexport function createTextNodeElement(value: string): Text {\n  return { type: 'text', value };\n}\n\ninterface CreateHastElementProps {\n  tagName:\n    | 'span'\n    | 'div'\n    | 'code'\n    | 'pre'\n    | 'slot'\n    | 'svg'\n    | 'use'\n    | 'style'\n    | 'template';\n  children?: ElementContent[];\n  properties?: Properties;\n}\n\nexport function createHastElement({\n  tagName,\n  children = [],\n  properties = {},\n}: CreateHastElementProps): HASTElement {\n  return {\n    type: 'element',\n    tagName,\n    properties,\n    children,\n  };\n}\n\ninterface CreateIconProps {\n  name: SVGSpriteNames;\n  width?: number;\n  height?: number;\n  properties?: Properties;\n}\n\nexport function createIconElement({\n  name,\n  width = 16,\n  height = 16,\n  properties,\n}: CreateIconProps): HASTElement {\n  return createHastElement({\n    tagName: 'svg',\n    properties: { width, height, viewBox: '0 0 16 16', ...properties },\n    children: [\n      createHastElement({\n        tagName: 'use',\n        properties: { href: `#${name.replace(/^#/, '')}` },\n      }),\n    ],\n  });\n}\n\nexport function findCodeElement(\n  nodes: Root | HASTElement\n): HASTElement | undefined {\n  let firstChild: RootContent | HASTElement | Root | null = nodes.children[0];\n  while (firstChild != null) {\n    if (firstChild.type === 'element' && firstChild.tagName === 'code') {\n      return firstChild;\n    }\n    if ('children' in firstChild) {\n      firstChild = firstChild.children[0];\n    } else {\n      firstChild = null;\n    }\n  }\n  return undefined;\n}\n\nexport function createGutterWrapper(children?: ElementContent[]): HASTElement {\n  return createHastElement({\n    tagName: 'div',\n    properties: { 'data-gutter': '' },\n    children,\n  });\n}\n\nexport function createGutterItem(\n  lineType: LineTypes | 'buffer' | 'separator' | 'annotation',\n  lineNumber: number,\n  lineIndex: string\n): HASTElement {\n  return createHastElement({\n    tagName: 'div',\n    properties: {\n      'data-line-type': lineType,\n      'data-column-number': lineNumber,\n      'data-line-index': lineIndex,\n    },\n    children:\n      lineNumber != null\n        ? [\n            createHastElement({\n              tagName: 'span',\n              properties: { 'data-line-number-content': '' },\n              children: [createTextNodeElement(`${lineNumber}`)],\n            }),\n          ]\n        : undefined,\n  });\n}\n\nexport function createGutterGap(\n  type: LineTypes | undefined,\n  bufferType: 'annotation' | 'buffer' | 'metadata',\n  size: number\n): HASTElement {\n  return createHastElement({\n    tagName: 'div',\n    properties: {\n      'data-gutter-buffer': bufferType,\n      'data-buffer-size': size,\n      'data-line-type': bufferType === 'annotation' ? undefined : type,\n      style:\n        bufferType === 'annotation'\n          ? `grid-row: span ${size};`\n          : `grid-row: span ${size};min-height:calc(${size} * 1lh);`,\n    },\n  });\n}\n"],"mappings":";AAYA,SAAgB,sBAAsB,OAAqB;AACzD,QAAO;EAAE,MAAM;EAAQ;EAAO;;AAkBhC,SAAgB,kBAAkB,EAChC,SACA,WAAW,EAAE,EACb,aAAa,EAAE,IACuB;AACtC,QAAO;EACL,MAAM;EACN;EACA;EACA;EACD;;AAUH,SAAgB,kBAAkB,EAChC,MACA,QAAQ,IACR,SAAS,IACT,cAC+B;AAC/B,QAAO,kBAAkB;EACvB,SAAS;EACT,YAAY;GAAE;GAAO;GAAQ,SAAS;GAAa,GAAG;GAAY;EAClE,UAAU,CACR,kBAAkB;GAChB,SAAS;GACT,YAAY,EAAE,MAAM,IAAI,KAAK,QAAQ,MAAM,GAAG,IAAI;GACnD,CAAC,CACH;EACF,CAAC;;AAGJ,SAAgB,gBACd,OACyB;CACzB,IAAIA,aAAsD,MAAM,SAAS;AACzE,QAAO,cAAc,MAAM;AACzB,MAAI,WAAW,SAAS,aAAa,WAAW,YAAY,OAC1D,QAAO;AAET,MAAI,cAAc,WAChB,cAAa,WAAW,SAAS;MAEjC,cAAa;;;AAMnB,SAAgB,oBAAoB,UAA0C;AAC5E,QAAO,kBAAkB;EACvB,SAAS;EACT,YAAY,EAAE,eAAe,IAAI;EACjC;EACD,CAAC;;AAGJ,SAAgB,iBACd,UACA,YACA,WACa;AACb,QAAO,kBAAkB;EACvB,SAAS;EACT,YAAY;GACV,kBAAkB;GAClB,sBAAsB;GACtB,mBAAmB;GACpB;EACD,UACE,cAAc,OACV,CACE,kBAAkB;GAChB,SAAS;GACT,YAAY,EAAE,4BAA4B,IAAI;GAC9C,UAAU,CAAC,sBAAsB,GAAG,aAAa,CAAC;GACnD,CAAC,CACH,GACD;EACP,CAAC;;AAGJ,SAAgB,gBACd,MACA,YACA,MACa;AACb,QAAO,kBAAkB;EACvB,SAAS;EACT,YAAY;GACV,sBAAsB;GACtB,oBAAoB;GACpB,kBAAkB,eAAe,eAAe,SAAY;GAC5D,OACE,eAAe,eACX,kBAAkB,KAAK,KACvB,kBAAkB,KAAK,mBAAmB,KAAK;GACtD;EACF,CAAC"}
+{"version":3,"file":"hast_utils.js","names":["firstChild: RootContent | HASTElement | Root | null"],"sources":["../../src/utils/hast_utils.ts"],"sourcesContent":["import type {\n  ElementContent,\n  Element as HASTElement,\n  Properties,\n  Root,\n  RootContent,\n  Text,\n} from 'hast';\n\nimport type { SVGSpriteNames } from '../sprite';\nimport type { LineTypes } from '../types';\n\nexport function createTextNodeElement(value: string): Text {\n  return { type: 'text', value };\n}\n\ninterface CreateHastElementProps {\n  tagName:\n    | 'span'\n    | 'div'\n    | 'button'\n    | 'code'\n    | 'pre'\n    | 'slot'\n    | 'svg'\n    | 'use'\n    | 'style'\n    | 'template';\n  children?: ElementContent[];\n  properties?: Properties;\n}\n\nexport function createHastElement({\n  tagName,\n  children = [],\n  properties = {},\n}: CreateHastElementProps): HASTElement {\n  return {\n    type: 'element',\n    tagName,\n    properties,\n    children,\n  };\n}\n\ninterface CreateIconProps {\n  name: SVGSpriteNames;\n  width?: number;\n  height?: number;\n  properties?: Properties;\n}\n\nexport function createIconElement({\n  name,\n  width = 16,\n  height = 16,\n  properties,\n}: CreateIconProps): HASTElement {\n  return createHastElement({\n    tagName: 'svg',\n    properties: { width, height, viewBox: '0 0 16 16', ...properties },\n    children: [\n      createHastElement({\n        tagName: 'use',\n        properties: { href: `#${name.replace(/^#/, '')}` },\n      }),\n    ],\n  });\n}\n\nexport function findCodeElement(\n  nodes: Root | HASTElement\n): HASTElement | undefined {\n  let firstChild: RootContent | HASTElement | Root | null = nodes.children[0];\n  while (firstChild != null) {\n    if (firstChild.type === 'element' && firstChild.tagName === 'code') {\n      return firstChild;\n    }\n    if ('children' in firstChild) {\n      firstChild = firstChild.children[0];\n    } else {\n      firstChild = null;\n    }\n  }\n  return undefined;\n}\n\nexport function createGutterWrapper(children?: ElementContent[]): HASTElement {\n  return createHastElement({\n    tagName: 'div',\n    properties: { 'data-gutter': '' },\n    children,\n  });\n}\n\nexport function createGutterItem(\n  lineType: LineTypes | 'buffer' | 'separator' | 'annotation',\n  lineNumber: number,\n  lineIndex: string,\n  properties: Properties = {}\n): HASTElement {\n  return createHastElement({\n    tagName: 'div',\n    properties: {\n      'data-line-type': lineType,\n      'data-column-number': lineNumber,\n      'data-line-index': lineIndex,\n      ...properties,\n    },\n    children:\n      lineNumber != null\n        ? [\n            createHastElement({\n              tagName: 'span',\n              properties: { 'data-line-number-content': '' },\n              children: [createTextNodeElement(`${lineNumber}`)],\n            }),\n          ]\n        : undefined,\n  });\n}\n\nexport function createGutterGap(\n  type: LineTypes | undefined,\n  bufferType: 'annotation' | 'buffer' | 'metadata',\n  size: number\n): HASTElement {\n  return createHastElement({\n    tagName: 'div',\n    properties: {\n      'data-gutter-buffer': bufferType,\n      'data-buffer-size': size,\n      'data-line-type': bufferType === 'annotation' ? undefined : type,\n      style:\n        bufferType === 'annotation'\n          ? `grid-row: span ${size};`\n          : `grid-row: span ${size};min-height:calc(${size} * 1lh);`,\n    },\n  });\n}\n"],"mappings":";AAYA,SAAgB,sBAAsB,OAAqB;AACzD,QAAO;EAAE,MAAM;EAAQ;EAAO;;AAmBhC,SAAgB,kBAAkB,EAChC,SACA,WAAW,EAAE,EACb,aAAa,EAAE,IACuB;AACtC,QAAO;EACL,MAAM;EACN;EACA;EACA;EACD;;AAUH,SAAgB,kBAAkB,EAChC,MACA,QAAQ,IACR,SAAS,IACT,cAC+B;AAC/B,QAAO,kBAAkB;EACvB,SAAS;EACT,YAAY;GAAE;GAAO;GAAQ,SAAS;GAAa,GAAG;GAAY;EAClE,UAAU,CACR,kBAAkB;GAChB,SAAS;GACT,YAAY,EAAE,MAAM,IAAI,KAAK,QAAQ,MAAM,GAAG,IAAI;GACnD,CAAC,CACH;EACF,CAAC;;AAGJ,SAAgB,gBACd,OACyB;CACzB,IAAIA,aAAsD,MAAM,SAAS;AACzE,QAAO,cAAc,MAAM;AACzB,MAAI,WAAW,SAAS,aAAa,WAAW,YAAY,OAC1D,QAAO;AAET,MAAI,cAAc,WAChB,cAAa,WAAW,SAAS;MAEjC,cAAa;;;AAMnB,SAAgB,oBAAoB,UAA0C;AAC5E,QAAO,kBAAkB;EACvB,SAAS;EACT,YAAY,EAAE,eAAe,IAAI;EACjC;EACD,CAAC;;AAGJ,SAAgB,iBACd,UACA,YACA,WACA,aAAyB,EAAE,EACd;AACb,QAAO,kBAAkB;EACvB,SAAS;EACT,YAAY;GACV,kBAAkB;GAClB,sBAAsB;GACtB,mBAAmB;GACnB,GAAG;GACJ;EACD,UACE,cAAc,OACV,CACE,kBAAkB;GAChB,SAAS;GACT,YAAY,EAAE,4BAA4B,IAAI;GAC9C,UAAU,CAAC,sBAAsB,GAAG,aAAa,CAAC;GACnD,CAAC,CACH,GACD;EACP,CAAC;;AAGJ,SAAgB,gBACd,MACA,YACA,MACa;AACb,QAAO,kBAAkB;EACvB,SAAS;EACT,YAAY;GACV,sBAAsB;GACtB,oBAAoB;GACpB,kBAAkB,eAAe,eAAe,SAAY;GAC5D,OACE,eAAe,eACX,kBAAkB,KAAK,KACvB,kBAAkB,KAAK,mBAAmB,KAAK;GACtD;EACF,CAAC"}

package/dist/utils/parseMergeConflictDiffFromFile.d.ts

@@ -0,0 +1,26 @@
+import { FileContents, FileDiffMetadata, MergeConflictRegion } from "../types.js";
+
+//#region src/utils/parseMergeConflictDiffFromFile.d.ts
+interface ParseMergeConflictDiffFromFileResult {
+  fileDiff: FileDiffMetadata;
+  currentFile: FileContents;
+  incomingFile: FileContents;
+  actions: MergeConflictDiffAction[];
+}
+interface MergeConflictDiffAction {
+  actionOriginalLineIndex: number;
+  actionOriginalLineNumber: number;
+  currentLineNumber: number | undefined;
+  incomingLineNumber: number | undefined;
+  conflict: MergeConflictRegion;
+  conflictIndex: number;
+}
+interface GetMergeConflictActionAnchorReturn {
+  side: 'additions' | 'deletions';
+  lineNumber: number;
+}
+declare function getMergeConflictActionAnchor(action: MergeConflictDiffAction): GetMergeConflictActionAnchorReturn | undefined;
+declare function parseMergeConflictDiffFromFile(file: FileContents): ParseMergeConflictDiffFromFileResult;
+//#endregion
+export { MergeConflictDiffAction, ParseMergeConflictDiffFromFileResult, getMergeConflictActionAnchor, parseMergeConflictDiffFromFile };
+//# sourceMappingURL=parseMergeConflictDiffFromFile.d.ts.map

package/dist/utils/parseMergeConflictDiffFromFile.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"parseMergeConflictDiffFromFile.d.ts","names":["FileContents","FileDiffMetadata","MergeConflictRegion","ParseMergeConflictDiffFromFileResult","MergeConflictDiffAction","GetMergeConflictActionAnchorReturn","getMergeConflictActionAnchor","parseMergeConflictDiffFromFile"],"sources":["../../src/utils/parseMergeConflictDiffFromFile.d.ts"],"sourcesContent":["import type { FileContents, FileDiffMetadata, MergeConflictRegion } from '../types';\nexport interface ParseMergeConflictDiffFromFileResult {\n    fileDiff: FileDiffMetadata;\n    currentFile: FileContents;\n    incomingFile: FileContents;\n    actions: MergeConflictDiffAction[];\n}\nexport interface MergeConflictDiffAction {\n    actionOriginalLineIndex: number;\n    actionOriginalLineNumber: number;\n    currentLineNumber: number | undefined;\n    incomingLineNumber: number | undefined;\n    conflict: MergeConflictRegion;\n    conflictIndex: number;\n}\ninterface GetMergeConflictActionAnchorReturn {\n    side: 'additions' | 'deletions';\n    lineNumber: number;\n}\nexport declare function getMergeConflictActionAnchor(action: MergeConflictDiffAction): GetMergeConflictActionAnchorReturn | undefined;\nexport declare function parseMergeConflictDiffFromFile(file: FileContents): ParseMergeConflictDiffFromFileResult;\nexport {};\n//# sourceMappingURL=parseMergeConflictDiffFromFile.d.ts.map"],"mappings":";;;UACiBG,oCAAAA;YACHF;EADGE,WAAAA,EAEAH,YAFAG;EACHF,YAAAA,EAEID,YAFJC;EACGD,OAAAA,EAEJI,uBAFIJ,EAAAA;;AAEJI,UAEIA,uBAAAA,CAFJA;EAAuB,uBAAA,EAAA,MAAA;EAEnBA,wBAAAA,EAAuB,MAAA;EAQ9BC,iBAAAA,EAAAA,MAAAA,GAAAA,SAAkC;EAIpBC,kBAAAA,EAAAA,MAAAA,GAAAA,SAA4B;EAC5BC,QAAAA,EARVL,mBAQUK;;;UALdF,kCAAAA;;;;iBAIcC,4BAAAA,SAAqCF,0BAA0BC;iBAC/DE,8BAAAA,OAAqCP,eAAeG"}

package/dist/utils/parseMergeConflictDiffFromFile.js

@@ -0,0 +1,143 @@
+import { splitFileContents } from "./splitFileContents.js";
+import { processFile } from "./parsePatchFiles.js";
+import { getMergeConflictActionLineNumber, getMergeConflictParseResult } from "./getMergeConflictLineTypes.js";
+
+//#region src/utils/parseMergeConflictDiffFromFile.ts
+function getMergeConflictActionAnchor(action) {
+	if (action.incomingLineNumber != null) return {
+		side: "additions",
+		lineNumber: action.incomingLineNumber
+	};
+	if (action.currentLineNumber != null) return {
+		side: "deletions",
+		lineNumber: action.currentLineNumber
+	};
+}
+function parseMergeConflictDiffFromFile(file) {
+	const lines = splitFileContents(file.contents);
+	const { lineTypes, regions } = getMergeConflictParseResult(lines);
+	const currentContentChunks = [];
+	const incomingContentChunks = [];
+	const patchContentChunks = [];
+	const actions = new Array(regions.length);
+	const actionOriginalLineNumbersByRegion = new Array(regions.length);
+	const actionOriginalLineIndexesByRegion = new Array(regions.length);
+	const actionLineIndexSet = /* @__PURE__ */ new Set();
+	for (let regionIndex = 0; regionIndex < regions.length; regionIndex++) {
+		const actionOriginalLineNumber = getMergeConflictActionLineNumber(regions[regionIndex]);
+		const actionOriginalLineIndex = actionOriginalLineNumber - 1;
+		actionOriginalLineNumbersByRegion[regionIndex] = actionOriginalLineNumber;
+		actionOriginalLineIndexesByRegion[regionIndex] = actionOriginalLineIndex;
+		actionLineIndexSet.add(actionOriginalLineIndex);
+	}
+	const actionLineNumbersByOriginalIndex = /* @__PURE__ */ new Map();
+	let currentLineNumber = 0;
+	let incomingLineNumber = 0;
+	let actionIndex = 0;
+	let nextConflict = regions[actionIndex];
+	let nextActionOriginalLineNumber = nextConflict != null ? actionOriginalLineNumbersByRegion[actionIndex] : -1;
+	let nextActionOriginalLineIndex = nextConflict != null ? actionOriginalLineIndexesByRegion[actionIndex] : -1;
+	for (let index = 0; index < lines.length; index++) {
+		const line = lines[index];
+		const lineType = lineTypes[index];
+		let currentLineNumberAtIndex;
+		let incomingLineNumberAtIndex;
+		switch (lineType) {
+			case "none":
+				currentContentChunks.push(line);
+				incomingContentChunks.push(line);
+				patchContentChunks.push(` ${line}`);
+				currentLineNumber++;
+				incomingLineNumber++;
+				currentLineNumberAtIndex = currentLineNumber;
+				incomingLineNumberAtIndex = incomingLineNumber;
+				break;
+			case "current":
+				currentContentChunks.push(line);
+				patchContentChunks.push(`-${line}`);
+				currentLineNumber++;
+				currentLineNumberAtIndex = currentLineNumber;
+				break;
+			case "incoming":
+				incomingContentChunks.push(line);
+				patchContentChunks.push(`+${line}`);
+				incomingLineNumber++;
+				incomingLineNumberAtIndex = incomingLineNumber;
+				break;
+			case "base":
+			case "marker-start":
+			case "marker-base":
+			case "marker-separator":
+			case "marker-end":
+				currentContentChunks.push(line);
+				incomingContentChunks.push(line);
+				patchContentChunks.push(` ${line}`);
+				currentLineNumber++;
+				incomingLineNumber++;
+				currentLineNumberAtIndex = currentLineNumber;
+				incomingLineNumberAtIndex = incomingLineNumber;
+				break;
+			default: assertNever(lineType);
+		}
+		if (actionLineIndexSet.has(index)) actionLineNumbersByOriginalIndex.set(index, {
+			currentLineNumber: currentLineNumberAtIndex,
+			incomingLineNumber: incomingLineNumberAtIndex
+		});
+		while (nextConflict != null && nextActionOriginalLineIndex <= index) {
+			const actionLineNumbers = actionLineNumbersByOriginalIndex.get(nextActionOriginalLineIndex);
+			actions[actionIndex] = {
+				actionOriginalLineIndex: nextActionOriginalLineIndex,
+				actionOriginalLineNumber: nextActionOriginalLineNumber,
+				currentLineNumber: actionLineNumbers?.currentLineNumber,
+				incomingLineNumber: actionLineNumbers?.incomingLineNumber,
+				conflict: nextConflict,
+				conflictIndex: nextConflict.conflictIndex
+			};
+			actionIndex++;
+			nextConflict = regions[actionIndex];
+			if (nextConflict == null) break;
+			nextActionOriginalLineNumber = actionOriginalLineNumbersByRegion[actionIndex];
+			nextActionOriginalLineIndex = actionOriginalLineIndexesByRegion[actionIndex];
+		}
+	}
+	const currentContents = currentContentChunks.join("");
+	const incomingContents = incomingContentChunks.join("");
+	const patchContents = patchContentChunks.join("");
+	const currentFile = createResolvedConflictFile(file, "current", currentContents);
+	const incomingFile = createResolvedConflictFile(file, "incoming", incomingContents);
+	const fileDiff = processFile(createMergeConflictPatch({
+		name: file.name,
+		patchContents,
+		currentLineCount: currentLineNumber,
+		incomingLineCount: incomingLineNumber
+	}), {
+		oldFile: currentFile,
+		newFile: incomingFile,
+		cacheKey: file.cacheKey != null ? `${file.cacheKey}:merge-conflict-diff` : void 0,
+		throwOnError: true
+	});
+	if (fileDiff == null) throw new Error("parseMergeConflictDiffFromFile: failed to build merge conflict diff metadata");
+	return {
+		fileDiff,
+		currentFile,
+		incomingFile,
+		actions
+	};
+}
+function createMergeConflictPatch({ name, patchContents, currentLineCount, incomingLineCount }) {
+	return `--- ${name}\n+++ ${name}\n@@ -${currentLineCount > 0 ? 1 : 0},${currentLineCount} +${incomingLineCount > 0 ? 1 : 0},${incomingLineCount} @@\n` + patchContents;
+}
+function createResolvedConflictFile(file, side, contents) {
+	return {
+		...file,
+		contents,
+		cacheKey: file.cacheKey != null ? `${file.cacheKey}:merge-conflict-${side}` : void 0
+	};
+}
+function assertNever(value) {
+	throw new Error(`parseMergeConflictDiffFromFile: unknown merge conflict line type ${String(value)}`);
+}
+
+//#endregion
+export { getMergeConflictActionAnchor, parseMergeConflictDiffFromFile };
+//# sourceMappingURL=parseMergeConflictDiffFromFile.js.map

package/dist/utils/parseMergeConflictDiffFromFile.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"parseMergeConflictDiffFromFile.js","names":["currentContentChunks: string[]","incomingContentChunks: string[]","patchContentChunks: string[]","actions: MergeConflictDiffAction[]","currentLineNumberAtIndex: number | undefined","incomingLineNumberAtIndex: number | undefined"],"sources":["../../src/utils/parseMergeConflictDiffFromFile.ts"],"sourcesContent":["import type {\n  FileContents,\n  FileDiffMetadata,\n  MergeConflictRegion,\n} from '../types';\nimport {\n  getMergeConflictActionLineNumber,\n  getMergeConflictParseResult,\n} from './getMergeConflictLineTypes';\nimport { processFile } from './parsePatchFiles';\nimport { splitFileContents } from './splitFileContents';\n\nexport interface ParseMergeConflictDiffFromFileResult {\n  fileDiff: FileDiffMetadata;\n  currentFile: FileContents;\n  incomingFile: FileContents;\n  actions: MergeConflictDiffAction[];\n}\n\nexport interface MergeConflictDiffAction {\n  actionOriginalLineIndex: number;\n  actionOriginalLineNumber: number;\n  currentLineNumber: number | undefined;\n  incomingLineNumber: number | undefined;\n  conflict: MergeConflictRegion;\n  conflictIndex: number;\n}\n\ninterface GetMergeConflictActionAnchorReturn {\n  side: 'additions' | 'deletions';\n  lineNumber: number;\n}\n\nexport function getMergeConflictActionAnchor(\n  action: MergeConflictDiffAction\n): GetMergeConflictActionAnchorReturn | undefined {\n  if (action.incomingLineNumber != null) {\n    return {\n      side: 'additions',\n      lineNumber: action.incomingLineNumber,\n    };\n  }\n  if (action.currentLineNumber != null) {\n    return {\n      side: 'deletions',\n      lineNumber: action.currentLineNumber,\n    };\n  }\n  return undefined;\n}\n\nexport function parseMergeConflictDiffFromFile(\n  file: FileContents\n): ParseMergeConflictDiffFromFileResult {\n  const lines = splitFileContents(file.contents);\n  const { lineTypes, regions } = getMergeConflictParseResult(lines);\n  const currentContentChunks: string[] = [];\n  const incomingContentChunks: string[] = [];\n  const patchContentChunks: string[] = [];\n  const actions: MergeConflictDiffAction[] = new Array(regions.length);\n  const actionOriginalLineNumbersByRegion = new Array<number>(regions.length);\n  const actionOriginalLineIndexesByRegion = new Array<number>(regions.length);\n  const actionLineIndexSet = new Set<number>();\n  for (let regionIndex = 0; regionIndex < regions.length; regionIndex++) {\n    const actionOriginalLineNumber = getMergeConflictActionLineNumber(\n      regions[regionIndex]\n    );\n    const actionOriginalLineIndex = actionOriginalLineNumber - 1;\n    actionOriginalLineNumbersByRegion[regionIndex] = actionOriginalLineNumber;\n    actionOriginalLineIndexesByRegion[regionIndex] = actionOriginalLineIndex;\n    actionLineIndexSet.add(actionOriginalLineIndex);\n  }\n  const actionLineNumbersByOriginalIndex = new Map<\n    number,\n    {\n      currentLineNumber: number | undefined;\n      incomingLineNumber: number | undefined;\n    }\n  >();\n  let currentLineNumber = 0;\n  let incomingLineNumber = 0;\n  let actionIndex = 0;\n  let nextConflict = regions[actionIndex];\n  let nextActionOriginalLineNumber =\n    nextConflict != null ? actionOriginalLineNumbersByRegion[actionIndex] : -1;\n  let nextActionOriginalLineIndex =\n    nextConflict != null ? actionOriginalLineIndexesByRegion[actionIndex] : -1;\n  for (let index = 0; index < lines.length; index++) {\n    const line = lines[index];\n    const lineType = lineTypes[index];\n    let currentLineNumberAtIndex: number | undefined;\n    let incomingLineNumberAtIndex: number | undefined;\n    switch (lineType) {\n      case 'none': {\n        currentContentChunks.push(line);\n        incomingContentChunks.push(line);\n        patchContentChunks.push(` ${line}`);\n        currentLineNumber++;\n        incomingLineNumber++;\n        currentLineNumberAtIndex = currentLineNumber;\n        incomingLineNumberAtIndex = incomingLineNumber;\n        break;\n      }\n      case 'current': {\n        currentContentChunks.push(line);\n        patchContentChunks.push(`-${line}`);\n        currentLineNumber++;\n        currentLineNumberAtIndex = currentLineNumber;\n        break;\n      }\n      case 'incoming': {\n        incomingContentChunks.push(line);\n        patchContentChunks.push(`+${line}`);\n        incomingLineNumber++;\n        incomingLineNumberAtIndex = incomingLineNumber;\n        break;\n      }\n      case 'base':\n      case 'marker-start':\n      case 'marker-base':\n      case 'marker-separator':\n      case 'marker-end': {\n        currentContentChunks.push(line);\n        incomingContentChunks.push(line);\n        patchContentChunks.push(` ${line}`);\n        currentLineNumber++;\n        incomingLineNumber++;\n        currentLineNumberAtIndex = currentLineNumber;\n        incomingLineNumberAtIndex = incomingLineNumber;\n        break;\n      }\n      default: {\n        assertNever(lineType);\n      }\n    }\n\n    if (actionLineIndexSet.has(index)) {\n      actionLineNumbersByOriginalIndex.set(index, {\n        currentLineNumber: currentLineNumberAtIndex,\n        incomingLineNumber: incomingLineNumberAtIndex,\n      });\n    }\n\n    // Regions are emitted in a stable order; resolve actions as soon as their\n    // anchor original line has been processed.\n    while (nextConflict != null && nextActionOriginalLineIndex <= index) {\n      const actionLineNumbers = actionLineNumbersByOriginalIndex.get(\n        nextActionOriginalLineIndex\n      );\n      actions[actionIndex] = {\n        actionOriginalLineIndex: nextActionOriginalLineIndex,\n        actionOriginalLineNumber: nextActionOriginalLineNumber,\n        currentLineNumber: actionLineNumbers?.currentLineNumber,\n        incomingLineNumber: actionLineNumbers?.incomingLineNumber,\n        conflict: nextConflict,\n        conflictIndex: nextConflict.conflictIndex,\n      };\n      actionIndex++;\n      nextConflict = regions[actionIndex];\n      if (nextConflict == null) {\n        break;\n      }\n      nextActionOriginalLineNumber =\n        actionOriginalLineNumbersByRegion[actionIndex];\n      nextActionOriginalLineIndex =\n        actionOriginalLineIndexesByRegion[actionIndex];\n    }\n  }\n\n  const currentContents = currentContentChunks.join('');\n  const incomingContents = incomingContentChunks.join('');\n  const patchContents = patchContentChunks.join('');\n\n  const currentFile = createResolvedConflictFile(\n    file,\n    'current',\n    currentContents\n  );\n  const incomingFile = createResolvedConflictFile(\n    file,\n    'incoming',\n    incomingContents\n  );\n  const patch = createMergeConflictPatch({\n    name: file.name,\n    patchContents,\n    currentLineCount: currentLineNumber,\n    incomingLineCount: incomingLineNumber,\n  });\n\n  const fileDiff = processFile(patch, {\n    oldFile: currentFile,\n    newFile: incomingFile,\n    cacheKey:\n      file.cacheKey != null\n        ? `${file.cacheKey}:merge-conflict-diff`\n        : undefined,\n    throwOnError: true,\n  });\n\n  if (fileDiff == null) {\n    throw new Error(\n      'parseMergeConflictDiffFromFile: failed to build merge conflict diff metadata'\n    );\n  }\n\n  return {\n    fileDiff,\n    currentFile,\n    incomingFile,\n    actions,\n  };\n}\n\ninterface CreateMergeConflictPatchProps {\n  name: string;\n  patchContents: string;\n  currentLineCount: number;\n  incomingLineCount: number;\n}\n\nfunction createMergeConflictPatch({\n  name,\n  patchContents,\n  currentLineCount,\n  incomingLineCount,\n}: CreateMergeConflictPatchProps): string {\n  const currentStart = currentLineCount > 0 ? 1 : 0;\n  const incomingStart = incomingLineCount > 0 ? 1 : 0;\n  return (\n    `--- ${name}\\n` +\n    `+++ ${name}\\n` +\n    `@@ -${currentStart},${currentLineCount} +${incomingStart},${incomingLineCount} @@\\n` +\n    patchContents\n  );\n}\n\nfunction createResolvedConflictFile(\n  file: FileContents,\n  side: 'current' | 'incoming',\n  contents: string\n): FileContents {\n  return {\n    ...file,\n    contents,\n    cacheKey:\n      file.cacheKey != null\n        ? `${file.cacheKey}:merge-conflict-${side}`\n        : undefined,\n  };\n}\n\nfunction assertNever(value: never): never {\n  throw new Error(\n    `parseMergeConflictDiffFromFile: unknown merge conflict line type ${String(value)}`\n  );\n}\n"],"mappings":";;;;;AAiCA,SAAgB,6BACd,QACgD;AAChD,KAAI,OAAO,sBAAsB,KAC/B,QAAO;EACL,MAAM;EACN,YAAY,OAAO;EACpB;AAEH,KAAI,OAAO,qBAAqB,KAC9B,QAAO;EACL,MAAM;EACN,YAAY,OAAO;EACpB;;AAKL,SAAgB,+BACd,MACsC;CACtC,MAAM,QAAQ,kBAAkB,KAAK,SAAS;CAC9C,MAAM,EAAE,WAAW,YAAY,4BAA4B,MAAM;CACjE,MAAMA,uBAAiC,EAAE;CACzC,MAAMC,wBAAkC,EAAE;CAC1C,MAAMC,qBAA+B,EAAE;CACvC,MAAMC,UAAqC,IAAI,MAAM,QAAQ,OAAO;CACpE,MAAM,oCAAoC,IAAI,MAAc,QAAQ,OAAO;CAC3E,MAAM,oCAAoC,IAAI,MAAc,QAAQ,OAAO;CAC3E,MAAM,qCAAqB,IAAI,KAAa;AAC5C,MAAK,IAAI,cAAc,GAAG,cAAc,QAAQ,QAAQ,eAAe;EACrE,MAAM,2BAA2B,iCAC/B,QAAQ,aACT;EACD,MAAM,0BAA0B,2BAA2B;AAC3D,oCAAkC,eAAe;AACjD,oCAAkC,eAAe;AACjD,qBAAmB,IAAI,wBAAwB;;CAEjD,MAAM,mDAAmC,IAAI,KAM1C;CACH,IAAI,oBAAoB;CACxB,IAAI,qBAAqB;CACzB,IAAI,cAAc;CAClB,IAAI,eAAe,QAAQ;CAC3B,IAAI,+BACF,gBAAgB,OAAO,kCAAkC,eAAe;CAC1E,IAAI,8BACF,gBAAgB,OAAO,kCAAkC,eAAe;AAC1E,MAAK,IAAI,QAAQ,GAAG,QAAQ,MAAM,QAAQ,SAAS;EACjD,MAAM,OAAO,MAAM;EACnB,MAAM,WAAW,UAAU;EAC3B,IAAIC;EACJ,IAAIC;AACJ,UAAQ,UAAR;GACE,KAAK;AACH,yBAAqB,KAAK,KAAK;AAC/B,0BAAsB,KAAK,KAAK;AAChC,uBAAmB,KAAK,IAAI,OAAO;AACnC;AACA;AACA,+BAA2B;AAC3B,gCAA4B;AAC5B;GAEF,KAAK;AACH,yBAAqB,KAAK,KAAK;AAC/B,uBAAmB,KAAK,IAAI,OAAO;AACnC;AACA,+BAA2B;AAC3B;GAEF,KAAK;AACH,0BAAsB,KAAK,KAAK;AAChC,uBAAmB,KAAK,IAAI,OAAO;AACnC;AACA,gCAA4B;AAC5B;GAEF,KAAK;GACL,KAAK;GACL,KAAK;GACL,KAAK;GACL,KAAK;AACH,yBAAqB,KAAK,KAAK;AAC/B,0BAAsB,KAAK,KAAK;AAChC,uBAAmB,KAAK,IAAI,OAAO;AACnC;AACA;AACA,+BAA2B;AAC3B,gCAA4B;AAC5B;GAEF,QACE,aAAY,SAAS;;AAIzB,MAAI,mBAAmB,IAAI,MAAM,CAC/B,kCAAiC,IAAI,OAAO;GAC1C,mBAAmB;GACnB,oBAAoB;GACrB,CAAC;AAKJ,SAAO,gBAAgB,QAAQ,+BAA+B,OAAO;GACnE,MAAM,oBAAoB,iCAAiC,IACzD,4BACD;AACD,WAAQ,eAAe;IACrB,yBAAyB;IACzB,0BAA0B;IAC1B,mBAAmB,mBAAmB;IACtC,oBAAoB,mBAAmB;IACvC,UAAU;IACV,eAAe,aAAa;IAC7B;AACD;AACA,kBAAe,QAAQ;AACvB,OAAI,gBAAgB,KAClB;AAEF,kCACE,kCAAkC;AACpC,iCACE,kCAAkC;;;CAIxC,MAAM,kBAAkB,qBAAqB,KAAK,GAAG;CACrD,MAAM,mBAAmB,sBAAsB,KAAK,GAAG;CACvD,MAAM,gBAAgB,mBAAmB,KAAK,GAAG;CAEjD,MAAM,cAAc,2BAClB,MACA,WACA,gBACD;CACD,MAAM,eAAe,2BACnB,MACA,YACA,iBACD;CAQD,MAAM,WAAW,YAPH,yBAAyB;EACrC,MAAM,KAAK;EACX;EACA,kBAAkB;EAClB,mBAAmB;EACpB,CAAC,EAEkC;EAClC,SAAS;EACT,SAAS;EACT,UACE,KAAK,YAAY,OACb,GAAG,KAAK,SAAS,wBACjB;EACN,cAAc;EACf,CAAC;AAEF,KAAI,YAAY,KACd,OAAM,IAAI,MACR,+EACD;AAGH,QAAO;EACL;EACA;EACA;EACA;EACD;;AAUH,SAAS,yBAAyB,EAChC,MACA,eACA,kBACA,qBACwC;AAGxC,QACE,OAAO,KAAK,QACL,KAAK,QAJO,mBAAmB,IAAI,IAAI,EAK1B,GAAG,iBAAiB,IAJpB,oBAAoB,IAAI,IAAI,EAIU,GAAG,kBAAkB,SAC/E;;AAIJ,SAAS,2BACP,MACA,MACA,UACc;AACd,QAAO;EACL,GAAG;EACH;EACA,UACE,KAAK,YAAY,OACb,GAAG,KAAK,SAAS,kBAAkB,SACnC;EACP;;AAGH,SAAS,YAAY,OAAqB;AACxC,OAAM,IAAI,MACR,oEAAoE,OAAO,MAAM,GAClF"}

package/dist/utils/resolveMergeConflict.d.ts

@@ -0,0 +1,7 @@
+import { MergeConflictActionPayload } from "../types.js";
+
+//#region src/utils/resolveMergeConflict.d.ts
+declare function resolveMergeConflict(contents: string, payload: MergeConflictActionPayload): string;
+//#endregion
+export { resolveMergeConflict };
+//# sourceMappingURL=resolveMergeConflict.d.ts.map

package/dist/utils/resolveMergeConflict.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolveMergeConflict.d.ts","names":["MergeConflictActionPayload","resolveMergeConflict"],"sources":["../../src/utils/resolveMergeConflict.d.ts"],"sourcesContent":["import type { MergeConflictActionPayload } from '../types';\nexport declare function resolveMergeConflict(contents: string, payload: MergeConflictActionPayload): string;\n//# sourceMappingURL=resolveMergeConflict.d.ts.map"],"mappings":";;;iBACwBC,oBAAAA,4BAAgDD"}

package/dist/utils/resolveMergeConflict.js

@@ -0,0 +1,30 @@
+import { splitFileContents } from "./splitFileContents.js";
+import { getMergeConflictRegions } from "./getMergeConflictLineTypes.js";
+
+//#region src/utils/resolveMergeConflict.ts
+function resolveMergeConflict(contents, payload) {
+	const lines = splitFileContents(contents);
+	const conflict = getMergeConflictRegions(lines).find((region) => region.conflictIndex === payload.conflict.conflictIndex);
+	if (conflict == null) return contents;
+	return applyMergeConflictResolution(contents, lines, conflict, payload.resolution);
+}
+function applyMergeConflictResolution(contents, lines, conflict, resolution) {
+	if (!isConflictRegionValid(conflict, lines.length)) return contents;
+	const currentEnd = conflict.baseMarkerLineIndex ?? conflict.separatorLineIndex;
+	if (currentEnd <= conflict.startLineIndex || currentEnd > conflict.separatorLineIndex) return contents;
+	const currentLines = lines.slice(conflict.startLineIndex + 1, currentEnd);
+	const incomingLines = lines.slice(conflict.separatorLineIndex + 1, conflict.endLineIndex);
+	const mergedLines = resolution === "current" ? currentLines : resolution === "incoming" ? incomingLines : [...currentLines, ...incomingLines];
+	return [
+		...lines.slice(0, conflict.startLineIndex),
+		...mergedLines,
+		...lines.slice(conflict.endLineIndex + 1)
+	].join("");
+}
+function isConflictRegionValid(conflict, totalLines) {
+	return conflict.startLineIndex >= 0 && conflict.separatorLineIndex > conflict.startLineIndex && conflict.endLineIndex > conflict.separatorLineIndex && conflict.endLineIndex < totalLines;
+}
+
+//#endregion
+export { resolveMergeConflict };
+//# sourceMappingURL=resolveMergeConflict.js.map

package/dist/utils/resolveMergeConflict.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolveMergeConflict.js","names":[],"sources":["../../src/utils/resolveMergeConflict.ts"],"sourcesContent":["import type {\n  MergeConflictActionPayload,\n  MergeConflictRegion,\n  MergeConflictResolution,\n} from '../types';\nimport { getMergeConflictRegions } from './getMergeConflictLineTypes';\nimport { splitFileContents } from './splitFileContents';\n\nexport function resolveMergeConflict(\n  contents: string,\n  payload: MergeConflictActionPayload\n): string {\n  const lines = splitFileContents(contents);\n  const conflict = getMergeConflictRegions(lines).find(\n    (region) => region.conflictIndex === payload.conflict.conflictIndex\n  );\n  if (conflict == null) {\n    return contents;\n  }\n  return applyMergeConflictResolution(\n    contents,\n    lines,\n    conflict,\n    payload.resolution\n  );\n}\n\nfunction applyMergeConflictResolution(\n  contents: string,\n  lines: string[],\n  conflict: MergeConflictRegion,\n  resolution: MergeConflictResolution\n): string {\n  if (!isConflictRegionValid(conflict, lines.length)) {\n    return contents;\n  }\n\n  const currentEnd =\n    conflict.baseMarkerLineIndex ?? conflict.separatorLineIndex;\n  if (\n    currentEnd <= conflict.startLineIndex ||\n    currentEnd > conflict.separatorLineIndex\n  ) {\n    return contents;\n  }\n\n  const currentLines = lines.slice(conflict.startLineIndex + 1, currentEnd);\n  const incomingLines = lines.slice(\n    conflict.separatorLineIndex + 1,\n    conflict.endLineIndex\n  );\n\n  const mergedLines =\n    resolution === 'current'\n      ? currentLines\n      : resolution === 'incoming'\n        ? incomingLines\n        : [...currentLines, ...incomingLines];\n\n  return [\n    ...lines.slice(0, conflict.startLineIndex),\n    ...mergedLines,\n    ...lines.slice(conflict.endLineIndex + 1),\n  ].join('');\n}\n\nfunction isConflictRegionValid(\n  conflict: MergeConflictRegion,\n  totalLines: number\n): boolean {\n  return (\n    conflict.startLineIndex >= 0 &&\n    conflict.separatorLineIndex > conflict.startLineIndex &&\n    conflict.endLineIndex > conflict.separatorLineIndex &&\n    conflict.endLineIndex < totalLines\n  );\n}\n"],"mappings":";;;;AAQA,SAAgB,qBACd,UACA,SACQ;CACR,MAAM,QAAQ,kBAAkB,SAAS;CACzC,MAAM,WAAW,wBAAwB,MAAM,CAAC,MAC7C,WAAW,OAAO,kBAAkB,QAAQ,SAAS,cACvD;AACD,KAAI,YAAY,KACd,QAAO;AAET,QAAO,6BACL,UACA,OACA,UACA,QAAQ,WACT;;AAGH,SAAS,6BACP,UACA,OACA,UACA,YACQ;AACR,KAAI,CAAC,sBAAsB,UAAU,MAAM,OAAO,CAChD,QAAO;CAGT,MAAM,aACJ,SAAS,uBAAuB,SAAS;AAC3C,KACE,cAAc,SAAS,kBACvB,aAAa,SAAS,mBAEtB,QAAO;CAGT,MAAM,eAAe,MAAM,MAAM,SAAS,iBAAiB,GAAG,WAAW;CACzE,MAAM,gBAAgB,MAAM,MAC1B,SAAS,qBAAqB,GAC9B,SAAS,aACV;CAED,MAAM,cACJ,eAAe,YACX,eACA,eAAe,aACb,gBACA,CAAC,GAAG,cAAc,GAAG,cAAc;AAE3C,QAAO;EACL,GAAG,MAAM,MAAM,GAAG,SAAS,eAAe;EAC1C,GAAG;EACH,GAAG,MAAM,MAAM,SAAS,eAAe,EAAE;EAC1C,CAAC,KAAK,GAAG;;AAGZ,SAAS,sBACP,UACA,YACS;AACT,QACE,SAAS,kBAAkB,KAC3B,SAAS,qBAAqB,SAAS,kBACvC,SAAS,eAAe,SAAS,sBACjC,SAAS,eAAe"}

package/dist/utils/resolveVirtualFileMetrics.js

@@ -15,6 +15,7 @@ function getHunkSeparatorHeight(type, customHeight) {
 		case "simple": return 4;
 		case "metadata":
 		case "line-info":
+		case "line-info-basic":
 		case "custom": return 32;
 	}
 }

package/dist/utils/resolveVirtualFileMetrics.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolveVirtualFileMetrics.js","names":["metrics: VirtualFileMetrics"],"sources":["../../src/utils/resolveVirtualFileMetrics.ts"],"sourcesContent":["import { DEFAULT_VIRTUAL_FILE_METRICS } from '../constants';\nimport type { HunkSeparators, VirtualFileMetrics } from '../types';\n\nexport function resolveVirtualFileMetrics(\n  hunkSeparators: HunkSeparators,\n  metricsOverride?: Partial<VirtualFileMetrics>\n): VirtualFileMetrics {\n  const metrics: VirtualFileMetrics = {\n    ...DEFAULT_VIRTUAL_FILE_METRICS,\n    ...metricsOverride,\n  };\n  metrics.hunkSeparatorHeight = getHunkSeparatorHeight(\n    hunkSeparators,\n    metricsOverride?.hunkSeparatorHeight\n  );\n  return metrics;\n}\n\nfunction getHunkSeparatorHeight(\n  type: HunkSeparators,\n  customHeight: number | undefined\n): number {\n  if (customHeight != null) {\n    return customHeight;\n  }\n  switch (type) {\n    case 'simple':\n      return 4;\n    case 'metadata':\n    case 'line-info':\n    case 'custom':\n      return 32;\n  }\n}\n"],"mappings":";;;AAGA,SAAgB,0BACd,gBACA,iBACoB;CACpB,MAAMA,UAA8B;EAClC,GAAG;EACH,GAAG;EACJ;AACD,SAAQ,sBAAsB,uBAC5B,gBACA,iBAAiB,oBAClB;AACD,QAAO;;AAGT,SAAS,uBACP,MACA,cACQ;AACR,KAAI,gBAAgB,KAClB,QAAO;AAET,SAAQ,MAAR;EACE,KAAK,SACH,QAAO;EACT,KAAK;EACL,KAAK;EACL,KAAK,SACH,QAAO"}
+{"version":3,"file":"resolveVirtualFileMetrics.js","names":["metrics: VirtualFileMetrics"],"sources":["../../src/utils/resolveVirtualFileMetrics.ts"],"sourcesContent":["import { DEFAULT_VIRTUAL_FILE_METRICS } from '../constants';\nimport type { HunkSeparators, VirtualFileMetrics } from '../types';\n\nexport function resolveVirtualFileMetrics(\n  hunkSeparators: HunkSeparators,\n  metricsOverride?: Partial<VirtualFileMetrics>\n): VirtualFileMetrics {\n  const metrics: VirtualFileMetrics = {\n    ...DEFAULT_VIRTUAL_FILE_METRICS,\n    ...metricsOverride,\n  };\n  metrics.hunkSeparatorHeight = getHunkSeparatorHeight(\n    hunkSeparators,\n    metricsOverride?.hunkSeparatorHeight\n  );\n  return metrics;\n}\n\nfunction getHunkSeparatorHeight(\n  type: HunkSeparators,\n  customHeight: number | undefined\n): number {\n  if (customHeight != null) {\n    return customHeight;\n  }\n  switch (type) {\n    case 'simple':\n      return 4;\n    case 'metadata':\n    case 'line-info':\n    case 'line-info-basic':\n    case 'custom':\n      return 32;\n  }\n}\n"],"mappings":";;;AAGA,SAAgB,0BACd,gBACA,iBACoB;CACpB,MAAMA,UAA8B;EAClC,GAAG;EACH,GAAG;EACJ;AACD,SAAQ,sBAAsB,uBAC5B,gBACA,iBAAiB,oBAClB;AACD,QAAO;;AAGT,SAAS,uBACP,MACA,cACQ;AACR,KAAI,gBAAgB,KAClB,QAAO;AAET,SAAQ,MAAR;EACE,KAAK,SACH,QAAO;EACT,KAAK;EACL,KAAK;EACL,KAAK;EACL,KAAK,SACH,QAAO"}

package/dist/utils/setWrapperNodeProps.d.ts

@@ -10,7 +10,8 @@ declare function setPreNodeProperties(pre: HTMLPreElement, {
   split,
   themeStyles,
   themeType,
-  totalLines
+  totalLines,
+  customProperties
 }: PrePropertiesConfig): HTMLPreElement;
 //#endregion
 export { setPreNodeProperties };

package/dist/utils/setWrapperNodeProps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setWrapperNodeProps.d.ts","names":["PrePropertiesConfig","setPreNodeProperties","HTMLPreElement","type","diffIndicators","disableBackground","disableLineNumbers","overflow","split","themeStyles","themeType","totalLines"],"sources":["../../src/utils/setWrapperNodeProps.d.ts"],"sourcesContent":["import type { PrePropertiesConfig } from '../types';\nexport declare function setPreNodeProperties(pre: HTMLPreElement, { type, diffIndicators, disableBackground, disableLineNumbers, overflow, split, themeStyles, themeType, totalLines }: PrePropertiesConfig): HTMLPreElement;\n//# sourceMappingURL=setWrapperNodeProps.d.ts.map"],"mappings":";;;iBACwBC,oBAAAA,MAA0BC;;;;;;;;;;GAAsIF,sBAAsBE"}
+{"version":3,"file":"setWrapperNodeProps.d.ts","names":["PrePropertiesConfig","setPreNodeProperties","HTMLPreElement","type","diffIndicators","disableBackground","disableLineNumbers","overflow","split","themeStyles","themeType","totalLines","customProperties"],"sources":["../../src/utils/setWrapperNodeProps.d.ts"],"sourcesContent":["import type { PrePropertiesConfig } from '../types';\nexport declare function setPreNodeProperties(pre: HTMLPreElement, { type, diffIndicators, disableBackground, disableLineNumbers, overflow, split, themeStyles, themeType, totalLines, customProperties }: PrePropertiesConfig): HTMLPreElement;\n//# sourceMappingURL=setWrapperNodeProps.d.ts.map"],"mappings":";;;iBACwBC,oBAAAA,MAA0BC;;;;;;;;;;;GAAwJF,sBAAsBE"}

package/dist/utils/setWrapperNodeProps.js

@@ -1,5 +1,9 @@
 //#region src/utils/setWrapperNodeProps.ts
-function setPreNodeProperties(pre, { type, diffIndicators, disableBackground, disableLineNumbers, overflow, split, themeStyles, themeType, totalLines }) {
+function setPreNodeProperties(pre, { type, diffIndicators, disableBackground, disableLineNumbers, overflow, split, themeStyles, themeType, totalLines, customProperties }) {
+	if (customProperties != null) for (const key in customProperties) {
+		const value = customProperties[key];
+		if (value != null) pre.setAttribute(key, `${value}`);
+	}
 	if (type === "diff") {
 		pre.setAttribute("data-diff", "");
 		pre.removeAttribute("data-file");

package/dist/utils/setWrapperNodeProps.js.map

@@ -1 +1 @@
-{"version":3,"file":"setWrapperNodeProps.js","names":[],"sources":["../../src/utils/setWrapperNodeProps.ts"],"sourcesContent":["import type { PrePropertiesConfig } from '../types';\n\nexport function setPreNodeProperties(\n  pre: HTMLPreElement,\n  {\n    type,\n    diffIndicators,\n    disableBackground,\n    disableLineNumbers,\n    overflow,\n    split,\n    themeStyles,\n    themeType,\n    totalLines,\n  }: PrePropertiesConfig\n): HTMLPreElement {\n  if (type === 'diff') {\n    pre.setAttribute('data-diff', '');\n    pre.removeAttribute('data-file');\n  } else {\n    pre.setAttribute('data-file', '');\n    pre.removeAttribute('data-diff');\n  }\n  if (themeType === 'system') {\n    pre.removeAttribute('data-theme-type');\n  } else {\n    pre.setAttribute('data-theme-type', themeType);\n  }\n  switch (diffIndicators) {\n    case 'bars':\n    case 'classic':\n      pre.setAttribute('data-indicators', diffIndicators);\n      break;\n    case 'none':\n      pre.removeAttribute('data-indicators');\n      break;\n  }\n  if (disableLineNumbers) {\n    pre.setAttribute('data-disable-line-numbers', '');\n  } else {\n    pre.removeAttribute('data-disable-line-numbers');\n  }\n  if (disableBackground) {\n    pre.removeAttribute('data-background');\n  } else {\n    pre.setAttribute('data-background', '');\n  }\n  if (type === 'diff') {\n    pre.setAttribute('data-diff-type', split ? 'split' : 'single');\n  } else {\n    pre.removeAttribute('data-diff-type');\n  }\n  pre.setAttribute('data-overflow', overflow);\n  pre.tabIndex = 0;\n  // Set theme color custom properties as inline styles on pre element\n  pre.style = themeStyles;\n  // Set CSS custom property for line number column width\n  pre.style.setProperty(\n    '--diffs-min-number-column-width-default',\n    `${`${totalLines}`.length}ch`\n  );\n  return pre;\n}\n"],"mappings":";AAEA,SAAgB,qBACd,KACA,EACE,MACA,gBACA,mBACA,oBACA,UACA,OACA,aACA,WACA,cAEc;AAChB,KAAI,SAAS,QAAQ;AACnB,MAAI,aAAa,aAAa,GAAG;AACjC,MAAI,gBAAgB,YAAY;QAC3B;AACL,MAAI,aAAa,aAAa,GAAG;AACjC,MAAI,gBAAgB,YAAY;;AAElC,KAAI,cAAc,SAChB,KAAI,gBAAgB,kBAAkB;KAEtC,KAAI,aAAa,mBAAmB,UAAU;AAEhD,SAAQ,gBAAR;EACE,KAAK;EACL,KAAK;AACH,OAAI,aAAa,mBAAmB,eAAe;AACnD;EACF,KAAK;AACH,OAAI,gBAAgB,kBAAkB;AACtC;;AAEJ,KAAI,mBACF,KAAI,aAAa,6BAA6B,GAAG;KAEjD,KAAI,gBAAgB,4BAA4B;AAElD,KAAI,kBACF,KAAI,gBAAgB,kBAAkB;KAEtC,KAAI,aAAa,mBAAmB,GAAG;AAEzC,KAAI,SAAS,OACX,KAAI,aAAa,kBAAkB,QAAQ,UAAU,SAAS;KAE9D,KAAI,gBAAgB,iBAAiB;AAEvC,KAAI,aAAa,iBAAiB,SAAS;AAC3C,KAAI,WAAW;AAEf,KAAI,QAAQ;AAEZ,KAAI,MAAM,YACR,2CACA,GAAG,GAAG,aAAa,OAAO,IAC3B;AACD,QAAO"}
+{"version":3,"file":"setWrapperNodeProps.js","names":[],"sources":["../../src/utils/setWrapperNodeProps.ts"],"sourcesContent":["import type { PrePropertiesConfig } from '../types';\n\nexport function setPreNodeProperties(\n  pre: HTMLPreElement,\n  {\n    type,\n    diffIndicators,\n    disableBackground,\n    disableLineNumbers,\n    overflow,\n    split,\n    themeStyles,\n    themeType,\n    totalLines,\n    customProperties,\n  }: PrePropertiesConfig\n): HTMLPreElement {\n  // NOTE: We always apply custom properties first so the important properties\n  // cannot be overridden.\n  if (customProperties != null) {\n    for (const key in customProperties) {\n      const value = customProperties[key];\n      if (value != null) {\n        pre.setAttribute(key, `${value}`);\n      }\n    }\n  }\n  if (type === 'diff') {\n    pre.setAttribute('data-diff', '');\n    pre.removeAttribute('data-file');\n  } else {\n    pre.setAttribute('data-file', '');\n    pre.removeAttribute('data-diff');\n  }\n  if (themeType === 'system') {\n    pre.removeAttribute('data-theme-type');\n  } else {\n    pre.setAttribute('data-theme-type', themeType);\n  }\n  switch (diffIndicators) {\n    case 'bars':\n    case 'classic':\n      pre.setAttribute('data-indicators', diffIndicators);\n      break;\n    case 'none':\n      pre.removeAttribute('data-indicators');\n      break;\n  }\n  if (disableLineNumbers) {\n    pre.setAttribute('data-disable-line-numbers', '');\n  } else {\n    pre.removeAttribute('data-disable-line-numbers');\n  }\n  if (disableBackground) {\n    pre.removeAttribute('data-background');\n  } else {\n    pre.setAttribute('data-background', '');\n  }\n  if (type === 'diff') {\n    pre.setAttribute('data-diff-type', split ? 'split' : 'single');\n  } else {\n    pre.removeAttribute('data-diff-type');\n  }\n  pre.setAttribute('data-overflow', overflow);\n  pre.tabIndex = 0;\n  // Set theme color custom properties as inline styles on pre element\n  pre.style = themeStyles;\n  // Set CSS custom property for line number column width\n  pre.style.setProperty(\n    '--diffs-min-number-column-width-default',\n    `${`${totalLines}`.length}ch`\n  );\n  return pre;\n}\n"],"mappings":";AAEA,SAAgB,qBACd,KACA,EACE,MACA,gBACA,mBACA,oBACA,UACA,OACA,aACA,WACA,YACA,oBAEc;AAGhB,KAAI,oBAAoB,KACtB,MAAK,MAAM,OAAO,kBAAkB;EAClC,MAAM,QAAQ,iBAAiB;AAC/B,MAAI,SAAS,KACX,KAAI,aAAa,KAAK,GAAG,QAAQ;;AAIvC,KAAI,SAAS,QAAQ;AACnB,MAAI,aAAa,aAAa,GAAG;AACjC,MAAI,gBAAgB,YAAY;QAC3B;AACL,MAAI,aAAa,aAAa,GAAG;AACjC,MAAI,gBAAgB,YAAY;;AAElC,KAAI,cAAc,SAChB,KAAI,gBAAgB,kBAAkB;KAEtC,KAAI,aAAa,mBAAmB,UAAU;AAEhD,SAAQ,gBAAR;EACE,KAAK;EACL,KAAK;AACH,OAAI,aAAa,mBAAmB,eAAe;AACnD;EACF,KAAK;AACH,OAAI,gBAAgB,kBAAkB;AACtC;;AAEJ,KAAI,mBACF,KAAI,aAAa,6BAA6B,GAAG;KAEjD,KAAI,gBAAgB,4BAA4B;AAElD,KAAI,kBACF,KAAI,gBAAgB,kBAAkB;KAEtC,KAAI,aAAa,mBAAmB,GAAG;AAEzC,KAAI,SAAS,OACX,KAAI,aAAa,kBAAkB,QAAQ,UAAU,SAAS;KAE9D,KAAI,gBAAgB,iBAAiB;AAEvC,KAAI,aAAa,iBAAiB,SAAS;AAC3C,KAAI,WAAW;AAEf,KAAI,QAAQ;AAEZ,KAAI,MAAM,YACR,2CACA,GAAG,GAAG,aAAa,OAAO,IAC3B;AACD,QAAO"}

package/dist/worker/WorkerPoolManager.d.ts

@@ -13,6 +13,7 @@ interface ThemeSubscriber {
 declare class WorkerPoolManager {
   private options;
   private highlighter;
+  private readonly preferredHighlighter;
   private renderOptions;
   private initialized;
   private workers;
@@ -30,7 +31,8 @@ declare class WorkerPoolManager {
     langs,
     theme,
     lineDiffType,
-    tokenizeMaxLineLength
+    tokenizeMaxLineLength,
+    preferredHighlighter
   }: WorkerInitializationRenderOptions);
   isWorkingPool(): boolean;
   getFileResultCache(file: FileContents): RenderFileResult | undefined;
@@ -69,7 +71,7 @@ declare class WorkerPoolManager {
   private _queuedDrain;
   private queueDrain;
   private assignWorkerToTask;
-  private clearWorkerTask;
+  private cleanWorkerAndTask;
   private executeTask;
   private getAvailableWorker;
   private generateRequestId;