@lvce-editor/static-server 0.109.1 → 0.109.2

package/static/{1963c72 → 148e07f}/packages/editor-worker/dist/editorWorkerMain.js

@@ -1199,7 +1199,7 @@ const create$a = rpcId => {
 };
 
 const Audio = 0;
-const Button$2 = 1;
+const Button$3 = 1;
 const Col = 2;
 const ColGroup = 3;
 const Div$1 = 4;
@@ -1290,7 +1290,7 @@ const VirtualDomElements = {
   Audio,
   BlockQuote,
   Br,
-  Button: Button$2,
+  Button: Button$3,
   Canvas,
   Circle,
   Cite,
@@ -1368,7 +1368,7 @@ const VirtualDomElements = {
 };
 
 const AltKey = 'event.altKey';
-const Button$1 = 'event.button';
+const Button$2 = 'event.button';
 const ClientX = 'event.clientX';
 const ClientY = 'event.clientY';
 const DeltaMode = 'event.deltaMode';
@@ -2008,6 +2008,103 @@ const clamp = (num, min, max) => {
   return Math.min(Math.max(num, min), max);
 };
 
+const toMergeConflictActionsRow = rowIndex => ~rowIndex;
+const isMergeConflictActionsRow = viewRow => viewRow < 0;
+const getMergeConflictRowIndex = viewRow => ~viewRow;
+const getViewLineIndices = (lineCount, isRowHidden, mergeConflicts) => {
+  const conflictStartRows = new Set(mergeConflicts.map(conflict => conflict.startRowIndex));
+  const result = [];
+  for (let rowIndex = 0; rowIndex < lineCount; rowIndex++) {
+    if (isRowHidden(rowIndex)) {
+      continue;
+    }
+    if (conflictStartRows.has(rowIndex)) {
+      result.push(toMergeConflictActionsRow(rowIndex));
+    }
+    result.push(rowIndex);
+  }
+  return result;
+};
+const getVisibleViewLineIndices = (viewLineIndices, startVisualRow, numberOfVisibleLines) => {
+  return viewLineIndices.slice(startVisualRow, startVisualRow + numberOfVisibleLines);
+};
+const getVisibleLineIndices = visibleViewLineIndices => {
+  return visibleViewLineIndices.filter(viewRow => !isMergeConflictActionsRow(viewRow));
+};
+const getVisualRowForDocumentRow$1 = (rowIndex, viewLineIndices) => {
+  const visualRow = viewLineIndices.indexOf(rowIndex);
+  return visualRow === -1 ? rowIndex : visualRow;
+};
+const getDocumentRowForVisualRow$1 = (visualRow, viewLineIndices) => {
+  if (visualRow < 0 || visualRow >= viewLineIndices.length) {
+    return visualRow;
+  }
+  const viewRow = viewLineIndices[visualRow];
+  return isMergeConflictActionsRow(viewRow) ? getMergeConflictRowIndex(viewRow) : viewRow;
+};
+
+const isStartMarker = line => /^<{7}(?: .*)?$/.test(line);
+const isBaseMarker = line => /^\|{7}(?: .*)?$/.test(line);
+const isSeparatorMarker = line => /^={7}$/.test(line);
+const isEndMarker = line => /^>{7}(?: .*)?$/.test(line);
+const getMergeConflict = (lines, startRowIndex) => {
+  let baseMarkerRowIndex = -1;
+  let separatorRowIndex = -1;
+  let endRowIndex = -1;
+  for (let rowIndex = startRowIndex + 1; rowIndex < lines.length; rowIndex++) {
+    const line = lines[rowIndex];
+    if (isStartMarker(line)) {
+      return undefined;
+    }
+    if (separatorRowIndex === -1 && baseMarkerRowIndex === -1 && isBaseMarker(line)) {
+      baseMarkerRowIndex = rowIndex;
+      continue;
+    }
+    if (separatorRowIndex === -1 && isSeparatorMarker(line)) {
+      separatorRowIndex = rowIndex;
+      continue;
+    }
+    if (isEndMarker(line)) {
+      endRowIndex = rowIndex;
+      break;
+    }
+  }
+  if (separatorRowIndex === -1 || endRowIndex === -1 || baseMarkerRowIndex > separatorRowIndex) {
+    return undefined;
+  }
+  const currentEndRowIndex = baseMarkerRowIndex === -1 ? separatorRowIndex : baseMarkerRowIndex;
+  return {
+    baseEndRowIndex: separatorRowIndex,
+    baseStartRowIndex: baseMarkerRowIndex === -1 ? separatorRowIndex : baseMarkerRowIndex + 1,
+    currentEndRowIndex,
+    currentStartRowIndex: startRowIndex + 1,
+    endRowIndex,
+    incomingEndRowIndex: endRowIndex,
+    incomingStartRowIndex: separatorRowIndex + 1,
+    separatorRowIndex,
+    startRowIndex
+  };
+};
+const getMergeConflicts = lines => {
+  const conflicts = [];
+  let rowIndex = 0;
+  while (rowIndex < lines.length) {
+    if (!isStartMarker(lines[rowIndex])) {
+      rowIndex++;
+      continue;
+    }
+    const conflict = getMergeConflict(lines, rowIndex);
+    if (conflict) {
+      conflicts.push(conflict);
+      rowIndex = conflict.endRowIndex + 1;
+      continue;
+    }
+    const nextEndMarker = lines.findIndex((line, index) => index > rowIndex && isEndMarker(line));
+    rowIndex = (nextEndMarker === -1 ? rowIndex : nextEndMarker) + 1;
+  }
+  return conflicts;
+};
+
 const getScrollBarOffset = (delta, finalDelta, size, scrollBarSize) => {
   const scrollBarOffset = delta / finalDelta * (size - scrollBarSize);
   if (!Number.isFinite(scrollBarOffset)) {
@@ -2057,6 +2154,14 @@ const getNewDeltaPercent = (height, scrollBarHeight, relativeY) => {
 const getSortedRanges = ranges => {
   return ranges.toSorted((a, b) => a.start - b.start || b.end - a.end);
 };
+const isRowHidden = (rowIndex, ranges) => {
+  for (const range of ranges) {
+    if (rowIndex > range.start && rowIndex <= range.end) {
+      return true;
+    }
+  }
+  return false;
+};
 const getUnhiddenRow = (rowIndex, previousRowIndex, lineCount, ranges) => {
   for (const range of ranges) {
     if (rowIndex > range.start && rowIndex <= range.end) {
@@ -2123,12 +2228,16 @@ const updateLayout = (editor, foldingRanges) => {
     numberOfVisibleLines,
     rowHeight
   } = editor;
-  const visibleLineCount = getVisibleLineCount(lines.length, foldingRanges);
+  const mergeConflicts = editor.mergeConflictActionsEnabled ? getMergeConflicts(lines) : [];
+  const hasMergeConflictRows = mergeConflicts.length > 0;
+  const viewLineIndices = hasMergeConflictRows ? getViewLineIndices(lines.length, rowIndex => isRowHidden(rowIndex, foldingRanges), mergeConflicts) : [];
+  const visibleLineCount = hasMergeConflictRows ? viewLineIndices.length : getVisibleLineCount(lines.length, foldingRanges);
   const finalY = Math.max(visibleLineCount - numberOfVisibleLines, 0);
   const finalDeltaY = finalY * itemHeight;
   const deltaY = clamp(editor.deltaY, 0, finalDeltaY);
   const startVisualRow = Math.floor(deltaY / itemHeight);
-  const visibleLineIndices = getViewportLineIndices(lines.length, foldingRanges, startVisualRow, numberOfVisibleLines);
+  const visibleViewLineIndices = hasMergeConflictRows ? getVisibleViewLineIndices(viewLineIndices, startVisualRow, numberOfVisibleLines) : getViewportLineIndices(lines.length, foldingRanges, startVisualRow, numberOfVisibleLines);
+  const visibleLineIndices = hasMergeConflictRows ? getVisibleLineIndices(visibleViewLineIndices) : visibleViewLineIndices;
   const minLineY = visibleLineIndices[0] ?? 0;
   const maxLineY = visibleLineIndices.length === 0 ? 0 : visibleLineIndices.at(-1) + 1;
   const contentHeight = visibleLineCount * rowHeight;
@@ -2141,10 +2250,13 @@ const updateLayout = (editor, foldingRanges) => {
     finalY,
     foldingRanges,
     maxLineY,
+    mergeConflicts,
     minLineY,
     scrollBarHeight,
     scrollBarY,
-    visibleLineIndices
+    viewLineIndices,
+    visibleLineIndices,
+    visibleViewLineIndices
   };
 };
 const addRange = (ranges, range) => {
@@ -3288,22 +3400,20 @@ const setDeltaY$1 = async (state, value) => {
   if (deltaY === newDeltaY) {
     return state;
   }
-  const minLineY = Math.floor(newDeltaY / itemHeight);
-  const maxLineY = minLineY + numberOfVisibleLines;
-  const newEditor1 = state.foldingRanges?.length > 0 ? updateLayout({
-    ...state,
-    deltaY: newDeltaY
-  }, state.foldingRanges) : {
+  const startVisualRow = Math.floor(newDeltaY / itemHeight);
+  const hasMergeConflictRows = state.viewLineIndices?.length > 0;
+  const visibleViewLineIndices = hasMergeConflictRows ? getVisibleViewLineIndices(state.viewLineIndices, startVisualRow, numberOfVisibleLines) : getViewportLineIndices(state.lines.length, state.foldingRanges || [], startVisualRow, numberOfVisibleLines);
+  const visibleLineIndices = hasMergeConflictRows ? getVisibleLineIndices(visibleViewLineIndices) : visibleViewLineIndices;
+  const minLineY = visibleLineIndices[0] ?? 0;
+  const maxLineY = visibleLineIndices.length === 0 ? 0 : visibleLineIndices.at(-1) + 1;
+  const newEditor1 = {
     ...state,
     deltaY: newDeltaY,
     maxLineY,
     minLineY,
     scrollBarY: getScrollBarY(newDeltaY, finalDeltaY, height, scrollBarHeight),
-    ...('visibleLineIndices' in state && {
-      visibleLineIndices: Array.from({
-        length: Math.max(Math.min(maxLineY, state.lines.length) - minLineY, 0)
-      }, (_, index) => minLineY + index)
-    })
+    visibleLineIndices,
+    visibleViewLineIndices
   };
   const syncIncremental = getEnabled();
   const {
@@ -3847,7 +3957,9 @@ const getVisible = async editor => {
     rowHeight,
     selections,
     tabSize,
+    viewLineIndices,
     visibleLineIndices,
+    visibleViewLineIndices,
     width
   } = editor;
   const averageCharWidth = charWidth;
@@ -3855,18 +3967,20 @@ const getVisible = async editor => {
   const actualVisibleLineIndices = visibleLineIndices || Array.from({
     length: maxLineY - minLineY
   }, (_, index) => minLineY + index);
-  const startVisualRow = itemHeight ? Math.floor(deltaY / itemHeight) : getVisualRowForDocumentRow(minLineY, foldingRanges);
-  const endVisualRow = startVisualRow + actualVisibleLineIndices.length;
-  const getRelativeRow = rowIndex => getVisualRowForDocumentRow(rowIndex, foldingRanges) - startVisualRow;
+  const getVisualRow = rowIndex => viewLineIndices ? getVisualRowForDocumentRow$1(rowIndex, viewLineIndices) : getVisualRowForDocumentRow(rowIndex, foldingRanges);
+  const startVisualRow = itemHeight ? Math.floor(deltaY / itemHeight) : getVisualRow(minLineY);
+  const endVisualRow = startVisualRow + (visibleViewLineIndices?.length || actualVisibleLineIndices.length);
+  const getRelativeRow = rowIndex => getVisualRow(rowIndex) - startVisualRow;
+  const getDifference = rowIndex => differences[actualVisibleLineIndices.indexOf(rowIndex)];
   for (let i = 0; i < selections.length; i += 4) {
     const [selectionStartRow, selectionStartColumn, selectionEndRow, selectionEndColumn, reversed] = getSelectionPairs(selections, i);
-    const selectionStartVisualRow = getVisualRowForDocumentRow(selectionStartRow, foldingRanges);
-    const selectionEndVisualRow = getVisualRowForDocumentRow(selectionEndRow, foldingRanges);
+    const selectionStartVisualRow = getVisualRow(selectionStartRow);
+    const selectionEndVisualRow = getVisualRow(selectionEndRow);
     if (selectionEndVisualRow < startVisualRow || selectionStartVisualRow >= endVisualRow) {
       continue;
     }
     const relativeEndLineRow = getRelativeRow(selectionEndRow);
-    const endLineDifference = differences[relativeEndLineRow];
+    const endLineDifference = getDifference(selectionEndRow);
     const endLine = lines[selectionEndRow];
     const endLineEndX = await getX(endLine, selectionEndColumn, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, width, averageCharWidth, endLineDifference);
     const endLineY = relativeEndLineRow * rowHeight;
@@ -3876,7 +3990,7 @@ const getVisible = async editor => {
     }
     const startLineYRelative = getRelativeRow(selectionStartRow);
     const startLineY = startLineYRelative * rowHeight;
-    const startLineDifference = differences[startLineYRelative];
+    const startLineDifference = getDifference(selectionStartRow);
     if (selectionStartRow === selectionEndRow) {
       const startX = await getX(endLine, selectionStartColumn, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, width, averageCharWidth, startLineDifference);
       if (reversed) {
@@ -3903,7 +4017,7 @@ const getVisible = async editor => {
         const currentLine = lines[rowIndex];
         const relativeLine = getRelativeRow(rowIndex);
         const currentLineY = relativeLine * rowHeight;
-        const difference = differences[relativeLine];
+        const difference = getDifference(rowIndex);
         const selectionWidth = await getX(currentLine, currentLine.length, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, width, averageCharWidth, difference);
         visibleSelections.push(0, currentLineY, selectionWidth, rowHeight);
       }
@@ -3967,7 +4081,7 @@ const setSelections$2 = (editor, selections) => {
     });
     const previousActiveRowIndex = editor.selections[primarySelectionIndex + 2] ?? activeRowIndex;
     const rowIndex = getUnhiddenRow(activeRowIndex, previousActiveRowIndex, editor.lines.length, foldingRanges);
-    const visualRow = getVisualRowForDocumentRow(rowIndex, foldingRanges);
+    const visualRow = editor.viewLineIndices ? getVisualRowForDocumentRow$1(rowIndex, editor.viewLineIndices) : getVisualRowForDocumentRow(rowIndex, foldingRanges);
     const startVisualRow = Math.floor(editor.deltaY / editor.itemHeight);
     const endVisualRow = startVisualRow + editor.numberOfVisibleLines;
     if (visualRow >= startVisualRow && visualRow < endVisualRow) {
@@ -4718,9 +4832,9 @@ const getInfo = async (editor, position, visibleLineIndices, startVisualRow) =>
     tabSize,
     width
   } = editor;
-  const visualRow = getVisualRowForDocumentRow(position.rowIndex, foldingRanges);
+  const visualRow = editor.viewLineIndices ? getVisualRowForDocumentRow$1(position.rowIndex, editor.viewLineIndices) : getVisualRowForDocumentRow(position.rowIndex, foldingRanges);
   const relativeRow = visualRow - startVisualRow;
-  const difference = differences[relativeRow] ?? 0;
+  const difference = differences[visibleLineIndices.indexOf(position.rowIndex)] ?? 0;
   const line = lines[position.rowIndex];
   const x = await getX(line, position.columnIndex, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, 0, width, charWidth, difference);
   const endX = await getX(line, position.columnIndex + 1, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, 0, width, charWidth, difference);
@@ -4740,12 +4854,13 @@ const getVisibleBracketMatches = async editor => {
     maxLineY,
     minLineY,
     selections,
+    viewLineIndices,
     visibleLineIndices
   } = editor;
   const actualVisibleLineIndices = visibleLineIndices || Array.from({
     length: maxLineY - minLineY
   }, (_, index) => minLineY + index);
-  const startVisualRow = itemHeight ? Math.floor(deltaY / itemHeight) : getVisualRowForDocumentRow(minLineY, foldingRanges);
+  const startVisualRow = itemHeight ? Math.floor(deltaY / itemHeight) : viewLineIndices ? getVisualRowForDocumentRow$1(minLineY, viewLineIndices) : getVisualRowForDocumentRow(minLineY, foldingRanges);
   const positions = new Map();
   for (let i = 0; i < selections.length; i += 4) {
     const startRowIndex = selections[i];
@@ -4770,25 +4885,24 @@ const getDiagnosticType = diagnostic => {
   return diagnostic.type;
 };
 
-const getY = (row, minLineY, rowHeight) => {
-  return (row - minLineY) * rowHeight;
-};
-
 const getVisibleDiagnostics = async (editor, diagnostics) => {
   const visibleDiagnostics = [];
   const {
     charWidth,
+    deltaY,
     fontFamily,
     fontSize,
     fontWeight,
     isMonospaceFont,
+    itemHeight,
     letterSpacing,
     lines,
-    minLineY,
     rowHeight,
     tabSize,
+    viewLineIndices,
     width
   } = editor;
+  const startVisualRow = itemHeight ? Math.floor(deltaY / itemHeight) : editor.minLineY || 0;
   for (const diagnostic of diagnostics) {
     const {
       columnIndex,
@@ -4800,7 +4914,8 @@ const getVisibleDiagnostics = async (editor, diagnostics) => {
     const endLineDifference = 0;
     const halfCursorWidth = 0;
     const x = await getX(lines[rowIndex], columnIndex, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, width, charWidth, endLineDifference);
-    const y = getY(rowIndex, minLineY, rowHeight);
+    const visualRow = viewLineIndices ? getVisualRowForDocumentRow$1(rowIndex, viewLineIndices) : rowIndex;
+    const y = (visualRow - startVisualRow) * rowHeight;
     visibleDiagnostics.push({
       height: rowHeight,
       type: getDiagnosticType(diagnostic),
@@ -4816,26 +4931,41 @@ const shouldUpdateDiagnosticData = (oldState, newState) => {
   return oldState.diagnostics !== newState.diagnostics || (newState.diagnostics?.length ?? 0) > 0 && (oldState.minLineY !== newState.minLineY || oldState.charWidth !== newState.charWidth || oldState.fontFamily !== newState.fontFamily || oldState.fontSize !== newState.fontSize || oldState.fontWeight !== newState.fontWeight || oldState.isMonospaceFont !== newState.isMonospaceFont || oldState.letterSpacing !== newState.letterSpacing || oldState.lines !== newState.lines || oldState.rowHeight !== newState.rowHeight || oldState.tabSize !== newState.tabSize || oldState.width !== newState.width);
 };
 const shouldUpdateSelectionData = (oldState, newState) => {
-  return oldState.selections !== newState.selections || oldState.focused !== newState.focused || oldState.minLineY !== newState.minLineY || oldState.maxLineY !== newState.maxLineY || oldState.foldingRanges !== newState.foldingRanges || oldState.differences !== newState.differences || oldState.charWidth !== newState.charWidth || oldState.cursorWidth !== newState.cursorWidth || oldState.fontFamily !== newState.fontFamily || oldState.fontSize !== newState.fontSize || oldState.fontWeight !== newState.fontWeight || oldState.isMonospaceFont !== newState.isMonospaceFont || oldState.letterSpacing !== newState.letterSpacing || oldState.lines !== newState.lines || oldState.rowHeight !== newState.rowHeight || oldState.tabSize !== newState.tabSize || oldState.width !== newState.width;
+  return oldState.selections !== newState.selections || oldState.focused !== newState.focused || oldState.minLineY !== newState.minLineY || oldState.maxLineY !== newState.maxLineY || oldState.visibleViewLineIndices !== newState.visibleViewLineIndices || oldState.foldingRanges !== newState.foldingRanges || oldState.differences !== newState.differences || oldState.charWidth !== newState.charWidth || oldState.cursorWidth !== newState.cursorWidth || oldState.fontFamily !== newState.fontFamily || oldState.fontSize !== newState.fontSize || oldState.fontWeight !== newState.fontWeight || oldState.isMonospaceFont !== newState.isMonospaceFont || oldState.letterSpacing !== newState.letterSpacing || oldState.lines !== newState.lines || oldState.rowHeight !== newState.rowHeight || oldState.tabSize !== newState.tabSize || oldState.width !== newState.width;
 };
 const shouldUpdateBracketMatchData = (oldState, newState) => {
   if (!('bracketMatchInfos' in newState)) {
     return false;
   }
-  return oldState.selections !== newState.selections || oldState.lines !== newState.lines || oldState.minLineY !== newState.minLineY || oldState.maxLineY !== newState.maxLineY || oldState.visibleLineIndices !== newState.visibleLineIndices || oldState.foldingRanges !== newState.foldingRanges || oldState.differences !== newState.differences || oldState.charWidth !== newState.charWidth || oldState.fontFamily !== newState.fontFamily || oldState.fontSize !== newState.fontSize || oldState.fontWeight !== newState.fontWeight || oldState.isMonospaceFont !== newState.isMonospaceFont || oldState.letterSpacing !== newState.letterSpacing || oldState.rowHeight !== newState.rowHeight || oldState.tabSize !== newState.tabSize || oldState.width !== newState.width;
+  return oldState.selections !== newState.selections || oldState.lines !== newState.lines || oldState.minLineY !== newState.minLineY || oldState.maxLineY !== newState.maxLineY || oldState.visibleLineIndices !== newState.visibleLineIndices || oldState.visibleViewLineIndices !== newState.visibleViewLineIndices || oldState.foldingRanges !== newState.foldingRanges || oldState.differences !== newState.differences || oldState.charWidth !== newState.charWidth || oldState.fontFamily !== newState.fontFamily || oldState.fontSize !== newState.fontSize || oldState.fontWeight !== newState.fontWeight || oldState.isMonospaceFont !== newState.isMonospaceFont || oldState.letterSpacing !== newState.letterSpacing || oldState.rowHeight !== newState.rowHeight || oldState.tabSize !== newState.tabSize || oldState.width !== newState.width;
 };
 const shouldUpdateLightBulb = (oldState, newState) => oldState.diagnostics !== newState.diagnostics || oldState.languageId !== newState.languageId || oldState.selections !== newState.selections || oldState.uri !== newState.uri;
 const shouldUpdateVisibleTextData = (oldState, newState) => {
   if (oldState.textInfos !== newState.textInfos || oldState.differences !== newState.differences) {
     return false;
   }
-  return oldState.lines !== newState.lines || oldState.tokenizerId !== newState.tokenizerId || oldState.minLineY !== newState.minLineY || oldState.maxLineY !== newState.maxLineY || oldState.decorations !== newState.decorations || oldState.embeds !== newState.embeds || oldState.deltaX !== newState.deltaX || oldState.width !== newState.width || oldState.highlightedLine !== newState.highlightedLine || oldState.foldingRanges !== newState.foldingRanges || oldState.debugEnabled !== newState.debugEnabled;
+  return oldState.lines !== newState.lines || oldState.tokenizerId !== newState.tokenizerId || oldState.minLineY !== newState.minLineY || oldState.maxLineY !== newState.maxLineY || oldState.visibleLineIndices !== newState.visibleLineIndices || oldState.visibleViewLineIndices !== newState.visibleViewLineIndices || oldState.decorations !== newState.decorations || oldState.embeds !== newState.embeds || oldState.deltaX !== newState.deltaX || oldState.width !== newState.width || oldState.highlightedLine !== newState.highlightedLine || oldState.foldingRanges !== newState.foldingRanges || oldState.debugEnabled !== newState.debugEnabled;
 };
 const shouldUpdateMinimapData = (oldState, newState) => {
   return newState.minimapEnabled && (!oldState.minimapEnabled || oldState.lines !== newState.lines || oldState.tokenizerId !== newState.tokenizerId);
 };
+const mergeConflictsEqual$1 = (oldState, newState) => {
+  const oldConflicts = oldState.mergeConflicts || [];
+  const newConflicts = newState.mergeConflicts || [];
+  if (oldConflicts.length !== newConflicts.length) {
+    return false;
+  }
+  return oldConflicts.every((conflict, index) => {
+    const other = newConflicts[index];
+    return conflict.startRowIndex === other.startRowIndex && conflict.endRowIndex === other.endRowIndex;
+  });
+};
 const updateDerivedState = async (oldState, newState) => {
-  const nextState = oldState.lines !== newState.lines && 'foldingRanges' in newState ? updateLayout(newState, []) : newState;
+  const layoutState = oldState.lines !== newState.lines && 'foldingRanges' in newState ? updateLayout(newState, []) : newState;
+  const nextState = mergeConflictsEqual$1(oldState, layoutState) ? layoutState : {
+    ...layoutState,
+    incrementalEdits: emptyIncrementalEdits
+  };
   let finalState = nextState;
   if (shouldUpdateVisibleTextData(oldState, nextState)) {
     const syncIncremental = getEnabled();
@@ -5063,6 +5193,8 @@ const createEditor2 = (id, uri, x, y, width, height, platform, assetDir) => {
     lines: [],
     longestLineWidth: 0,
     maxLineY: 0,
+    mergeConflictActionsEnabled: false,
+    mergeConflicts: [],
     minimapEnabled: false,
     minimapLines: [],
     minimapRevision: 0,
@@ -5102,7 +5234,9 @@ const createEditor2 = (id, uri, x, y, width, height, platform, assetDir) => {
     undoStack: [],
     uri,
     validLines: [],
+    viewLineIndices: [],
     visibleLineIndices: [],
+    visibleViewLineIndices: [],
     visualDecorations: [],
     widgetRevision: 0,
     widgets: [],
@@ -5145,6 +5279,8 @@ const emptyEditor = {
   lines: [],
   longestLineWidth: 0,
   maxLineY: 0,
+  mergeConflictActionsEnabled: false,
+  mergeConflicts: [],
   minimapEnabled: false,
   minimapLines: [],
   minimapRevision: 0,
@@ -5172,7 +5308,9 @@ const emptyEditor = {
   tokenizerId: 0,
   undoStack: [],
   uri: '',
+  viewLineIndices: [],
   visibleLineIndices: [],
+  visibleViewLineIndices: [],
   width: 0,
   workspaceUri: '',
   x: 0,
@@ -5359,6 +5497,8 @@ const createEditor = async ({
     lines: [],
     longestLineWidth: 0,
     maxLineY: 0,
+    mergeConflictActionsEnabled: false,
+    mergeConflicts: [],
     minimumSliderSize: 20,
     minLineY: 0,
     modified: false,
@@ -5394,7 +5534,9 @@ const createEditor = async ({
     uri,
     useFunctionalRendering,
     validLines: [],
+    viewLineIndices: [],
     visibleLineIndices: [],
+    visibleViewLineIndices: [],
     widgetRevision: 0,
     widgets: [],
     width,
@@ -5535,7 +5677,7 @@ const isEqual$3 = (oldState, newState) => {
 };
 
 const isEqual$2 = (oldState, newState) => {
-  return oldState.breadcrumbsEnabled === newState.breadcrumbsEnabled && oldState.breakPoints === newState.breakPoints && oldState.bracketMatchInfos === newState.bracketMatchInfos && oldState.cursorInfos === newState.cursorInfos && oldState.diagnostics === newState.diagnostics && oldState.documentSymbols === newState.documentSymbols && oldState.endOfLineDecorations === newState.endOfLineDecorations && oldState.focused === newState.focused && oldState.gutterDecorations === newState.gutterDecorations && oldState.highlightActiveLineNumber === newState.highlightActiveLineNumber && oldState.highlightedLine === newState.highlightedLine && oldState.lineNumbers === newState.lineNumbers && oldState.loadError === newState.loadError && oldState.textInfos === newState.textInfos && oldState.differences === newState.differences && oldState.initial === newState.initial && oldState.selectionInfos === newState.selectionInfos && oldState.selections === newState.selections && oldState.workspaceUri === newState.workspaceUri;
+  return oldState.breadcrumbsEnabled === newState.breadcrumbsEnabled && oldState.breakPoints === newState.breakPoints && oldState.bracketMatchInfos === newState.bracketMatchInfos && oldState.cursorInfos === newState.cursorInfos && oldState.diagnostics === newState.diagnostics && oldState.documentSymbols === newState.documentSymbols && oldState.endOfLineDecorations === newState.endOfLineDecorations && oldState.focused === newState.focused && oldState.gutterDecorations === newState.gutterDecorations && oldState.highlightActiveLineNumber === newState.highlightActiveLineNumber && oldState.highlightedLine === newState.highlightedLine && oldState.lineNumbers === newState.lineNumbers && oldState.loadError === newState.loadError && oldState.textInfos === newState.textInfos && oldState.visibleViewLineIndices === newState.visibleViewLineIndices && oldState.differences === newState.differences && oldState.initial === newState.initial && oldState.selectionInfos === newState.selectionInfos && oldState.selections === newState.selections && oldState.workspaceUri === newState.workspaceUri;
 };
 
 const isEqual$1 = (oldState, newState) => {
@@ -5749,6 +5891,58 @@ const disposeEditor = async editorUid => {
   return commands;
 };
 
+const getAcceptedLines = (lines, conflict, action) => {
+  const current = lines.slice(conflict.currentStartRowIndex, conflict.currentEndRowIndex);
+  const incoming = lines.slice(conflict.incomingStartRowIndex, conflict.incomingEndRowIndex);
+  switch (action) {
+    case 'both':
+      return [...current, ...incoming];
+    case 'current':
+      return current;
+    case 'incoming':
+      return incoming;
+    default:
+      return undefined;
+  }
+};
+const acceptMergeConflict = async (state, action, rowIndexValue) => {
+  const rowIndex = Number(rowIndexValue);
+  if (!Number.isSafeInteger(rowIndex)) {
+    return state;
+  }
+  const conflict = getMergeConflicts(state.lines).find(candidate => candidate.startRowIndex === rowIndex);
+  if (!conflict) {
+    return state;
+  }
+  const acceptedLines = getAcceptedLines(state.lines, conflict, action);
+  if (!acceptedLines) {
+    return state;
+  }
+  const inserted = acceptedLines.length === 0 ? [''] : acceptedLines;
+  const start = {
+    columnIndex: 0,
+    rowIndex: conflict.startRowIndex
+  };
+  const end = {
+    columnIndex: state.lines[conflict.endRowIndex].length,
+    rowIndex: conflict.endRowIndex
+  };
+  const deleted = state.lines.slice(conflict.startRowIndex, conflict.endRowIndex + 1);
+  const selections = new Uint32Array([conflict.startRowIndex, 0, conflict.startRowIndex, 0]);
+  const result = await scheduleDocumentAndCursorsSelections(state, [{
+    deleted,
+    end,
+    inserted,
+    origin: Unknown$2,
+    start
+  }], selections);
+  return {
+    ...result,
+    incrementalEdits: emptyIncrementalEdits
+  };
+};
+const handleMergeConflictActionsMouseDown = state => state;
+
 // @ts-ignore
 const getNewSelections$d = selections => {
   const newSelections = [];
@@ -6089,6 +6283,7 @@ const at = async (editor, eventX, eventY) => {
     lines,
     rowHeight,
     tabSize,
+    viewLineIndices,
     x,
     y
   } = editor;
@@ -6099,7 +6294,7 @@ const at = async (editor, eventX, eventY) => {
       rowIndex: 0
     };
   }
-  const rowIndex = getDocumentRowForVisualRow(visualRowIndex, foldingRanges);
+  const rowIndex = viewLineIndices ? getDocumentRowForVisualRow$1(visualRowIndex, viewLineIndices) : getDocumentRowForVisualRow(visualRowIndex, foldingRanges);
   const relativeX = eventX - x - gutterWidth + deltaX;
   const clampedRowIndex = clamp(rowIndex, 0, lines.length - 1);
   const line = lines[clampedRowIndex];
@@ -6934,6 +7129,7 @@ const getColorPickerBounds = editor => {
     height: editorHeight,
     rowHeight,
     selections,
+    viewLineIndices,
     width: editorWidth,
     x: editorX,
     y: editorY
@@ -6945,7 +7141,7 @@ const getColorPickerBounds = editor => {
   const editorRight = editorX + editorWidth;
   const editorBottom = editorY + editorHeight;
   const cursorX = editorX + columnIndex * columnWidth - deltaX;
-  const visualRowIndex = getVisualRowForDocumentRow(rowIndex, foldingRanges);
+  const visualRowIndex = viewLineIndices ? getVisualRowForDocumentRow$1(rowIndex, viewLineIndices) : getVisualRowForDocumentRow(rowIndex, foldingRanges);
   const lineTop = editorY + visualRowIndex * rowHeight - deltaY;
   const lineBottom = lineTop + rowHeight;
   const yAbove = lineTop - height;
@@ -12583,7 +12779,10 @@ const HandleScrollBarVerticalPointerUp = 32;
 const HandleWheel = 33;
 const HandleKeyUp = 34;
 const HandleLightBulbClick = 35;
+const HandleMergeConflictActionClick = 36;
+const HandleMergeConflictActionsMouseDown = 37;
 
+const Button$1 = 1;
 const Div = 4;
 const Input = 6;
 const Span = 8;
@@ -13697,6 +13896,7 @@ const kAutoClosingBrackets = 'editor.autoclosingBrackets';
 const kFontWeight = 'editor.fontWeight';
 const kHover = 'editor.hover';
 const kMinimapEnabled = 'editor.minimap.enabled';
+const kMergeConflictActions = 'editor.mergeConflictActions';
 const kBreadcrumbsEnabled = 'breadcrumbs.enabled';
 const kDragAndDropEnabled = 'editor.dragAndDrop';
 const getDragAndDropEnabled = async () => {
@@ -13756,12 +13956,15 @@ const getFontWeight = async () => {
 const getMinimapEnabled = async () => {
   return (await get$3(kMinimapEnabled)) ?? false;
 };
+const getMergeConflictActionsEnabled = async () => {
+  return (await get$3(kMergeConflictActions)) ?? false;
+};
 const getBreadcrumbsEnabled = async () => {
   return (await get$3(kBreadcrumbsEnabled)) ?? false;
 };
 
 const getEditorPreferences = async () => {
-  const [diagnosticsEnabled$1, fontFamily, fontSize, fontWeight, hoverEnabled, isAutoClosingBracketsEnabled$1, isAutoClosingQuotesEnabled$1, isAutoClosingTagsEnabled$1, isQuickSuggestionsEnabled$1, lineNumbers, highlightActiveLineNumber, rowHeight, tabSize, letterSpacing, completionTriggerCharacters, minimapEnabled, breadcrumbsEnabled, insertSpaces, dragAndDropEnabled] = await Promise.all([diagnosticsEnabled(), getFontFamily(), getFontSize(), getFontWeight(), getHoverEnabled(), isAutoClosingBracketsEnabled(), isAutoClosingQuotesEnabled(), isAutoClosingTagsEnabled(), isQuickSuggestionsEnabled(), getLineNumbers(), getHighlightActiveLineNumber(), getRowHeight(), getTabSize(), getLetterSpacing(), getCompletionTriggerCharacters(), getMinimapEnabled(), getBreadcrumbsEnabled(), getInsertSpaces(), getDragAndDropEnabled()]);
+  const [diagnosticsEnabled$1, fontFamily, fontSize, fontWeight, hoverEnabled, isAutoClosingBracketsEnabled$1, isAutoClosingQuotesEnabled$1, isAutoClosingTagsEnabled$1, isQuickSuggestionsEnabled$1, lineNumbers, highlightActiveLineNumber, rowHeight, tabSize, letterSpacing, completionTriggerCharacters, minimapEnabled, mergeConflictActionsEnabled, breadcrumbsEnabled, insertSpaces, dragAndDropEnabled] = await Promise.all([diagnosticsEnabled(), getFontFamily(), getFontSize(), getFontWeight(), getHoverEnabled(), isAutoClosingBracketsEnabled(), isAutoClosingQuotesEnabled(), isAutoClosingTagsEnabled(), isQuickSuggestionsEnabled(), getLineNumbers(), getHighlightActiveLineNumber(), getRowHeight(), getTabSize(), getLetterSpacing(), getCompletionTriggerCharacters(), getMinimapEnabled(), getMergeConflictActionsEnabled(), getBreadcrumbsEnabled(), getInsertSpaces(), getDragAndDropEnabled()]);
   return {
     breadcrumbsEnabled,
     completionTriggerCharacters,
@@ -13779,6 +13982,7 @@ const getEditorPreferences = async () => {
     isQuickSuggestionsEnabled: isQuickSuggestionsEnabled$1,
     letterSpacing,
     lineNumbers,
+    mergeConflictActionsEnabled,
     minimapEnabled,
     rowHeight,
     tabSize
@@ -14120,6 +14324,7 @@ const loadContent = async (state, savedState) => {
     isQuickSuggestionsEnabled,
     letterSpacing,
     lineNumbers,
+    mergeConflictActionsEnabled,
     minimapEnabled,
     rowHeight,
     tabSize
@@ -14155,6 +14360,7 @@ const loadContent = async (state, savedState) => {
     letterSpacing,
     lineNumbers,
     loadError: '',
+    mergeConflictActionsEnabled,
     minimapEnabled,
     rowHeight,
     tabSize,
@@ -14366,6 +14572,34 @@ ${editorSelector} .EditorRow {
   height: var(--EditorRowHeight);
   line-height: var(--EditorRowHeight);
 }
+${editorSelector} .MergeConflictActions,
+${editorSelector} .MergeConflictActionsGutter {
+  box-sizing: border-box;
+  height: var(--EditorRowHeight);
+  line-height: var(--EditorRowHeight);
+}
+${editorSelector} .MergeConflictActions {
+  align-items: center;
+  display: flex;
+  gap: 12px;
+  padding-left: 4px;
+  user-select: none;
+}
+${editorSelector} .MergeConflictAction {
+  appearance: none;
+  background: none;
+  border: 0;
+  color: var(--TextLinkForeground, #3794ff);
+  cursor: pointer;
+  font: inherit;
+  padding: 0;
+}
+${editorSelector} .MergeConflictAction:hover,
+${editorSelector} .MergeConflictAction:focus-visible {
+  color: var(--TextLinkActiveForeground, #4daafc);
+  outline: none;
+  text-decoration: underline;
+}
 ${editorSelector} .EditorLineDecoration {
   color: var(--EditorInlineBlameForeground, rgba(255, 255, 255, 0.5));
   font-style: italic;
@@ -14928,15 +15162,57 @@ const editorLineDecorationNode = {
   className: EditorLineDecoration,
   type: Span
 };
-const getEditorRowsVirtualDom$1 = (textInfos, differences, lineNumbers = true, highlightedLine = -1, visibleLineIndices = [], endOfLineDecorations = []) => {
+const mergeConflictActions = [{
+  action: 'current',
+  label: 'Accept Current Change'
+}, {
+  action: 'incoming',
+  label: 'Accept Incoming Change'
+}, {
+  action: 'both',
+  label: 'Accept Both Changes'
+}];
+const addMergeConflictActions = (dom, rowIndex) => {
+  dom.push({
+    childCount: mergeConflictActions.length,
+    className: 'MergeConflictActions',
+    'data-rowIndex': rowIndex,
+    onMouseDown: HandleMergeConflictActionsMouseDown,
+    type: Div
+  });
+  for (const {
+    action,
+    label
+  } of mergeConflictActions) {
+    dom.push({
+      ariaLabel: `${label} at line ${rowIndex + 1}`,
+      childCount: 1,
+      className: 'MergeConflictAction',
+      'data-action': action,
+      'data-rowIndex': rowIndex,
+      onClick: HandleMergeConflictActionClick,
+      title: label,
+      type: Button$1
+    }, text(label));
+  }
+};
+const getEditorRowsVirtualDom$1 = (textInfos, differences, lineNumbers = true, highlightedLine = -1, visibleLineIndices = [], endOfLineDecorations = [], visibleViewLineIndices = []) => {
   const dom = [];
-  for (let i = 0; i < textInfos.length; i++) {
-    const textInfo = textInfos[i];
-    const difference = differences[i];
-    const rowIndex = visibleLineIndices[i] ?? i;
+  const actualViewRows = visibleViewLineIndices.length === 0 ? Array.from({
+    length: textInfos.length
+  }, (_, index) => visibleLineIndices[index] ?? index) : visibleViewLineIndices;
+  let textInfoIndex = 0;
+  for (const viewRow of actualViewRows) {
+    if (isMergeConflictActionsRow(viewRow)) {
+      addMergeConflictActions(dom, getMergeConflictRowIndex(viewRow));
+      continue;
+    }
+    const textInfo = textInfos[textInfoIndex];
+    const difference = differences[textInfoIndex];
+    const rowIndex = viewRow;
     const rowDecorations = endOfLineDecorations.filter(decoration => decoration.rowIndex === rowIndex);
     let className = EditorRow;
-    if (i === highlightedLine) {
+    if (rowIndex === highlightedLine) {
       className = mergeClassNames(className, EditorRowHighlighted);
     }
     dom.push({
@@ -14957,14 +15233,15 @@ const getEditorRowsVirtualDom$1 = (textInfos, differences, lineNumbers = true, h
     for (const decoration of rowDecorations) {
       dom.push(editorLineDecorationNode, text(decoration.text));
     }
+    textInfoIndex++;
   }
   return dom;
 };
 
-const getEditorRowsVirtualDom = (textInfos, differences, lineNumbers = true, highlightedLine = -1, visibleLineIndices = [], endOfLineDecorations = []) => {
-  const rowsDom = getEditorRowsVirtualDom$1(textInfos, differences, lineNumbers, highlightedLine, visibleLineIndices, endOfLineDecorations);
+const getEditorRowsVirtualDom = (textInfos, differences, lineNumbers = true, highlightedLine = -1, visibleLineIndices = [], endOfLineDecorations = [], visibleViewLineIndices = []) => {
+  const rowsDom = getEditorRowsVirtualDom$1(textInfos, differences, lineNumbers, highlightedLine, visibleLineIndices, endOfLineDecorations, visibleViewLineIndices);
   return [{
-    childCount: textInfos.length,
+    childCount: visibleViewLineIndices.length || textInfos.length,
     className: 'EditorRows',
     onMouseDown: HandleMouseDown,
     onPointerDown: HandlePointerDown,
@@ -15007,8 +15284,8 @@ const editorLayersNode = {
   className: 'EditorLayers',
   type: Div
 };
-const getEditorLayersVirtualDom = (selectionInfos, textInfos, differences, lineNumbers = true, highlightedLine = -1, cursorInfos = [], diagnostics = [], visibleLineIndices = [], endOfLineDecorations = [], bracketMatchInfos = [], focused = true) => {
-  return [editorLayersNode, ...getEditorSelectionsVirtualDom(selectionInfos, focused), ...getEditorRowsVirtualDom(textInfos, differences, lineNumbers, highlightedLine, visibleLineIndices, endOfLineDecorations), ...getEditorCursorsVirtualDom(cursorInfos), ...getEditorDiagnosticsVirtualDom(diagnostics, bracketMatchInfos)];
+const getEditorLayersVirtualDom = (selectionInfos, textInfos, differences, lineNumbers = true, highlightedLine = -1, cursorInfos = [], diagnostics = [], visibleLineIndices = [], endOfLineDecorations = [], bracketMatchInfos = [], focused = true, visibleViewLineIndices = []) => {
+  return [editorLayersNode, ...getEditorSelectionsVirtualDom(selectionInfos, focused), ...getEditorRowsVirtualDom(textInfos, differences, lineNumbers, highlightedLine, visibleLineIndices, endOfLineDecorations, visibleViewLineIndices), ...getEditorCursorsVirtualDom(cursorInfos), ...getEditorDiagnosticsVirtualDom(diagnostics, bracketMatchInfos)];
 };
 
 const getEditorScrollBarDiagnosticsVirtualDom = scrollBarDiagnostics => {
@@ -15076,20 +15353,24 @@ const getEditorContentVirtualDom = ({
   scrollBarDiagnostics = [],
   selectionInfos = [],
   textInfos,
-  visibleLineIndices = []
+  visibleLineIndices = [],
+  visibleViewLineIndices = []
 }) => {
-  return [editorContentNode, ...getEditorInputVirtualDom(), ...getEditorLayersVirtualDom(selectionInfos, textInfos, differences, lineNumbers, highlightedLine, cursorInfos, diagnostics, visibleLineIndices, endOfLineDecorations, bracketMatchInfos, focused), ...getEditorScrollBarDiagnosticsVirtualDom(scrollBarDiagnostics), ...getScrollBarVirtualDom()];
+  return [editorContentNode, ...getEditorInputVirtualDom(), ...getEditorLayersVirtualDom(selectionInfos, textInfos, differences, lineNumbers, highlightedLine, cursorInfos, diagnostics, visibleLineIndices, endOfLineDecorations, bracketMatchInfos, focused, visibleViewLineIndices), ...getEditorScrollBarDiagnosticsVirtualDom(scrollBarDiagnostics), ...getScrollBarVirtualDom()];
 };
 
 const getGutterInfoVirtualDom = (gutterInfo, activeLineNumber) => {
   const isBreakpoint = typeof gutterInfo === 'object' && gutterInfo.isBreakpoint;
   const isLightBulb = typeof gutterInfo === 'object' && gutterInfo.isLightBulb;
+  const isMergeConflictActions = typeof gutterInfo === 'object' && gutterInfo.isMergeConflictActions;
   const lineNumber = typeof gutterInfo === 'object' ? gutterInfo.lineNumber : gutterInfo;
   const gutterDecorations = typeof gutterInfo === 'object' ? gutterInfo.gutterDecorations || [] : [];
   const showLineNumber = typeof gutterInfo !== 'object' || gutterInfo.showLineNumber !== false;
   const label = isLightBulb ? `Show Code Actions on line ${lineNumber}` : `Breakpoint on line ${lineNumber}`;
   let className = lineNumber === activeLineNumber ? 'LineNumber LineNumberActive' : 'LineNumber';
-  if (isLightBulb) {
+  if (isMergeConflictActions) {
+    className += ' MergeConflictActionsGutter';
+  } else if (isLightBulb) {
     className += ' LineNumberLightBulb MaskIconLightBulb';
   } else if (isBreakpoint) {
     className += ' LineNumberBreakpoint';
@@ -15115,7 +15396,7 @@ const getGutterInfoVirtualDom = (gutterInfo, activeLineNumber) => {
     className: mergeClassNames('EditorGutterDecoration', `EditorGutterDecoration${decoration.type[0].toUpperCase()}${decoration.type.slice(1)}`),
     title: `${decoration.type[0].toUpperCase()}${decoration.type.slice(1)} line ${lineNumber}`,
     type: Span
-  })), text(isLightBulb ? '' : isBreakpoint ? '●' : showLineNumber ? lineNumber : '')];
+  })), text(isMergeConflictActions || isLightBulb ? '' : isBreakpoint ? '●' : showLineNumber ? lineNumber : '')];
 };
 const getEditorGutterVirtualDom$1 = (gutterInfos, activeLineNumber = -1) => {
   const dom = gutterInfos.flatMap(gutterInfo => getGutterInfoVirtualDom(gutterInfo, activeLineNumber));
@@ -15137,6 +15418,14 @@ const getGutterInfos = (minLineY, maxLineY, breakPoints, showLineNumbers = true,
     length: maxLineY - minLineY
   }, (_, index) => minLineY + index);
   for (const rowIndex of rows) {
+    if (rowIndex < 0) {
+      gutterInfos.push({
+        isMergeConflictActions: true,
+        lineNumber: 0,
+        showLineNumber: false
+      });
+      continue;
+    }
     const lineNumber = rowIndex + 1;
     const isBreakpoint = breakPoints.includes(rowIndex);
     const isLightBulb = rowIndex === lightBulbRowIndex;
@@ -15228,6 +15517,7 @@ const getEditorVirtualDom = ({
   uid,
   uri = '',
   visibleLineIndices,
+  visibleViewLineIndices = [],
   workspaceUri = ''
 }) => {
   if (loadError) {
@@ -15239,7 +15529,8 @@ const getEditorVirtualDom = ({
       type: Div
     }, textEditorErrorIconNode, textEditorErrorMessageNode, text(loadError)];
   }
-  const visibleGutterInfos = breakPoints.length > 0 || gutterDecorations.length > 0 || visibleLineIndices ? getGutterInfos(minLineY, maxLineY, breakPoints, lineNumbers, visibleLineIndices, lightBulbRowIndex, gutterDecorations) : gutterInfos;
+  const gutterLineIndices = visibleViewLineIndices.length > 0 ? visibleViewLineIndices : visibleLineIndices;
+  const visibleGutterInfos = breakPoints.length > 0 || gutterDecorations.length > 0 || visibleLineIndices ? getGutterInfos(minLineY, maxLineY, breakPoints, lineNumbers, gutterLineIndices, lightBulbRowIndex, gutterDecorations) : gutterInfos;
   const showGutter = lineNumbers || breakPoints.length > 0 || lightBulbRowIndex >= 0 || gutterDecorations.length > 0;
   const primaryCursorRowIndex = getPrimaryCursorRowIndex(selections, primarySelectionIndex);
   const activeLineNumber = highlightActiveLineNumber ? primaryCursorRowIndex + 1 : -1;
@@ -15273,17 +15564,18 @@ const getEditorVirtualDom = ({
     scrollBarDiagnostics,
     selectionInfos,
     textInfos,
-    visibleLineIndices: visibleLineIndices || []
+    visibleLineIndices: visibleLineIndices || [],
+    visibleViewLineIndices
   }), ...minimapDom];
 };
 
 const getScrollBarDiagnostics = (editor, diagnostics) => {
   const height = editor.height || 0;
-  const lineCount = Math.max(editor.lines?.length || 0, 1);
+  const lineCount = Math.max(editor.viewLineIndices?.length || editor.lines?.length || 0, 1);
   const markerHeight = 3;
   const scrollBarDecorations = Array.from(diagnostics, diagnostic => ({
     height: markerHeight,
-    top: Math.min(Math.round(diagnostic.rowIndex / lineCount * height), Math.max(height - markerHeight, 0)),
+    top: Math.min(Math.round((editor.viewLineIndices ? getVisualRowForDocumentRow$1(diagnostic.rowIndex, editor.viewLineIndices) : diagnostic.rowIndex) / lineCount * height), Math.max(height - markerHeight, 0)),
     type: diagnostic.type
   }));
   return scrollBarDecorations;
@@ -15313,8 +15605,16 @@ const getDom = state => {
     scrollBarDiagnostics: getScrollBarDiagnostics(state, diagnostics)
   });
 };
+const mergeConflictsEqual = (oldState, newState) => {
+  const oldConflicts = oldState.mergeConflicts || [];
+  const newConflicts = newState.mergeConflicts || [];
+  return oldConflicts.length === newConflicts.length && oldConflicts.every((conflict, index) => {
+    const other = newConflicts[index];
+    return conflict.startRowIndex === other.startRowIndex && conflict.endRowIndex === other.endRowIndex;
+  });
+};
 const renderIncremental = (oldState, newState) => {
-  const oldDom = oldState.initial ? getDom(oldState) : get(newState.uid) || getDom(oldState);
+  const oldDom = oldState.initial || !mergeConflictsEqual(oldState, newState) ? getDom(oldState) : get(newState.uid) || getDom(oldState);
   const newDom = getDom(newState);
   const patches = diffTree(oldDom, newDom);
   if (patches.length === 0) {
@@ -15459,13 +15759,13 @@ const renderLines = {
     newState.differences = differences;
     const {
       highlightedLine,
-      visibleLineIndices
+      visibleLineIndices,
+      visibleViewLineIndices
     } = newState;
-    const relativeLine = visibleLineIndices.indexOf(highlightedLine);
-    const dom = getEditorRowsVirtualDom$1(textInfos, differences, true, relativeLine, visibleLineIndices, endOfLineDecorations);
+    const dom = getEditorRowsVirtualDom$1(textInfos, differences, true, highlightedLine, visibleLineIndices, endOfLineDecorations, visibleViewLineIndices);
     return [/* method */'setText', dom];
   },
-  isEqual: (oldState, newState) => oldState.lines === newState.lines && oldState.foldingRanges === newState.foldingRanges && oldState.tokenizerId === newState.tokenizerId && oldState.minLineY === newState.minLineY && oldState.decorations === newState.decorations && oldState.embeds === newState.embeds && oldState.endOfLineDecorations === newState.endOfLineDecorations && oldState.deltaX === newState.deltaX && oldState.width === newState.width && oldState.highlightedLine === newState.highlightedLine && oldState.debugEnabled === newState.debugEnabled
+  isEqual: (oldState, newState) => oldState.lines === newState.lines && oldState.foldingRanges === newState.foldingRanges && oldState.visibleViewLineIndices === newState.visibleViewLineIndices && oldState.tokenizerId === newState.tokenizerId && oldState.minLineY === newState.minLineY && oldState.decorations === newState.decorations && oldState.embeds === newState.embeds && oldState.endOfLineDecorations === newState.endOfLineDecorations && oldState.deltaX === newState.deltaX && oldState.width === newState.width && oldState.highlightedLine === newState.highlightedLine && oldState.debugEnabled === newState.debugEnabled
 };
 const renderSelections = {
   apply: (oldState, newState) => {
@@ -15516,18 +15816,20 @@ const renderGutterInfo = {
       minLineY,
       primarySelectionIndex,
       selections,
-      visibleLineIndices
+      visibleLineIndices,
+      visibleViewLineIndices = []
     } = newState;
     if (!lineNumbers && breakPoints.length === 0 && lightBulbRowIndex === -1 && gutterDecorations.length === 0) {
       return ['renderGutter', []];
     }
-    const gutterInfos = getGutterInfos(minLineY, maxLineY, breakPoints, lineNumbers, visibleLineIndices, lightBulbRowIndex, gutterDecorations);
+    const gutterLineIndices = visibleViewLineIndices.length > 0 ? visibleViewLineIndices : visibleLineIndices;
+    const gutterInfos = getGutterInfos(minLineY, maxLineY, breakPoints, lineNumbers, gutterLineIndices, lightBulbRowIndex, gutterDecorations);
     const primaryCursorRowIndex = getPrimaryCursorRowIndex(selections, primarySelectionIndex);
     const activeLineNumber = highlightActiveLineNumber ? primaryCursorRowIndex + 1 : -1;
     const dom = getEditorGutterVirtualDom$1(gutterInfos, activeLineNumber);
     return ['renderGutter', dom];
   },
-  isEqual: (oldState, newState) => oldState.breakPoints === newState.breakPoints && oldState.gutterDecorations === newState.gutterDecorations && oldState.lightBulbRowIndex === newState.lightBulbRowIndex && oldState.foldingRanges === newState.foldingRanges && oldState.highlightActiveLineNumber === newState.highlightActiveLineNumber && oldState.lineNumbers === newState.lineNumbers && oldState.minLineY === newState.minLineY && oldState.maxLineY === newState.maxLineY && (!newState.highlightActiveLineNumber || getPrimaryCursorRowIndex(oldState.selections, oldState.primarySelectionIndex) === getPrimaryCursorRowIndex(newState.selections, newState.primarySelectionIndex))
+  isEqual: (oldState, newState) => oldState.breakPoints === newState.breakPoints && oldState.gutterDecorations === newState.gutterDecorations && oldState.lightBulbRowIndex === newState.lightBulbRowIndex && oldState.foldingRanges === newState.foldingRanges && oldState.highlightActiveLineNumber === newState.highlightActiveLineNumber && oldState.lineNumbers === newState.lineNumbers && oldState.minLineY === newState.minLineY && oldState.maxLineY === newState.maxLineY && oldState.visibleViewLineIndices === newState.visibleViewLineIndices && (!newState.highlightActiveLineNumber || getPrimaryCursorRowIndex(oldState.selections, oldState.primarySelectionIndex) === getPrimaryCursorRowIndex(newState.selections, newState.primarySelectionIndex))
 };
 const renderWidgets = {
   apply: renderWidgets$1,
@@ -15566,6 +15868,16 @@ const renderEventListeners = () => {
     name: HandleLightBulbClick,
     params: ['showSourceActions3'],
     preventDefault: true
+  }, {
+    name: HandleMergeConflictActionClick,
+    params: ['acceptMergeConflict', 'event.target.dataset.action', 'event.target.dataset.rowIndex'],
+    preventDefault: true,
+    stopPropagation: true
+  }, {
+    name: HandleMergeConflictActionsMouseDown,
+    params: ['handleMergeConflictActionsMouseDown'],
+    preventDefault: true,
+    stopPropagation: true
   }, {
     name: HandleFocus,
     params: ['handleFocus']
@@ -15618,7 +15930,7 @@ const renderEventListeners = () => {
     passive: true
   }, {
     name: HandleContextMenu,
-    params: ['handleContextMenu', Button$1, ClientX, ClientY],
+    params: ['handleContextMenu', Button$2, ClientX, ClientY],
     preventDefault: true
   }, {
     name: HandleScrollBarVerticalPointerDown,
@@ -15973,6 +16285,7 @@ const commandMap = {
   'ActivateByEvent.activateByEvent': activateByEvent,
   'CodeGenerator.accept': codeGeneratorAccept,
   'ColorPicker.loadContent': loadContent$3,
+  'Editor.acceptMergeConflict': wrapCommand(acceptMergeConflict),
   'Editor.addCursorAbove': wrapCommand(addCursorAbove),
   'Editor.addCursorBelow': wrapCommand(addCursorBelow),
   'Editor.applyDocumentEdits': wrapCommand(applyDocumentEdits$1),
@@ -16074,6 +16387,7 @@ const commandMap = {
   'Editor.handleDoubleClick': wrapCommand(handleDoubleClick),
   'Editor.handleFocus': wrapCommand(handleFocus$1),
   'Editor.handleKeyUp': wrapCommand(handleKeyUp, true),
+  'Editor.handleMergeConflictActionsMouseDown': wrapCommand(handleMergeConflictActionsMouseDown),
   'Editor.handleMouseDown': wrapCommand(handleMouseDown),
   'Editor.handleMouseMove': wrapCommand(handleMouseMove),
   'Editor.handleMouseMoveWithAltKey': wrapCommand(handleMouseMoveWithAltKey),