openidea/src/features/vcs/conflicts.ts

/** Git conflict marker parsing and resolution (pure). */
import type { MergeSides } from "@/bindings";

export interface ConflictBlock {
  /** Offset of the `<<<<<<<` line start. */
  from: number;
  /** Offset just past the `>>>>>>>` line (including its terminator). */
  to: number;
  ours: string;
  /** diff3 base section, when present. */
  base: string | null;
  theirs: string;
  oursLabel: string;
  theirsLabel: string;
  /** Offsets of the separator lines (for decorations). */
  oursFrom: number;
  oursTo: number;
  theirsFrom: number;
  theirsTo: number;
}

const START = "<<<<<<<";
const BASE = "|||||||";
const SEP = "=======";
const END = ">>>>>>>";

const isMarker = (line: string, marker: string) =>
  line.startsWith(marker) && (line.length === 7 || line[7] === " " || line[7] === "\r" || line[7] === "\n");

/** Finds well-formed conflict blocks in `text`. */
export function parseConflicts(text: string): ConflictBlock[] {
  const out: ConflictBlock[] = [];
  const lines: Array<{ from: number; text: string; end: number }> = [];
  let pos = 0;
  while (pos < text.length) {
    const nl = text.indexOf("\n", pos);
    const end = nl < 0 ? text.length : nl + 1;
    lines.push({ from: pos, text: text.slice(pos, end), end });
    pos = end;
  }
  for (let i = 0; i < lines.length; i++) {
    const start = lines[i]!;
    if (!isMarker(start.text, START)) continue;
    let baseAt = -1;
    let sepAt = -1;
    let endAt = -1;
    for (let j = i + 1; j < lines.length; j++) {
      const t = lines[j]!.text;
      if (isMarker(t, START)) break;
      if (sepAt < 0 && baseAt < 0 && isMarker(t, BASE)) baseAt = j;
      else if (sepAt < 0 && isMarker(t, SEP)) sepAt = j;
      else if (sepAt >= 0 && isMarker(t, END)) {
        endAt = j;
        break;
      }
    }
    if (sepAt < 0 || endAt < 0) continue;
    const slice = (a: number, b: number) => (a >= b ? "" : text.slice(lines[a]!.from, lines[b - 1]!.end));
    const oursEnd = baseAt >= 0 ? baseAt : sepAt;
    const label = (l: string, m: string) => l.slice(m.length).trim();
    out.push({
      from: start.from,
      to: lines[endAt]!.end,
      ours: slice(i + 1, oursEnd),
      base: baseAt >= 0 ? slice(baseAt + 1, sepAt) : null,
      theirs: slice(sepAt + 1, endAt),
      oursLabel: label(start.text, START),
      theirsLabel: label(lines[endAt]!.text, END),
      oursFrom: lines[i + 1]?.from ?? start.end,
      oursTo: lines[oursEnd]!.from,
      theirsFrom: lines[sepAt]!.end,
      theirsTo: lines[endAt]!.from,
    });
    i = endAt;
  }
  return out;
}

/** A choice in user terms: "ours" is the user's work ("Accept Yours"). */
export type Resolution = "ours" | "theirs" | "both" | "base";

/**
 * Text replacing `block`. With `reversed` (a rebase, where git writes the upstream as
 * the `<<<<<<<` section and the user's commit as `>>>>>>>`) the sides swap, as IDEA does.
 */
export function resolutionText(
  block: Pick<ConflictBlock, "ours" | "base" | "theirs">,
  how: Resolution,
  reversed = false,
): string {
  const yours = reversed ? block.theirs : block.ours;
  const theirs = reversed ? block.ours : block.theirs;
  switch (how) {
    case "ours":
      return yours;
    case "theirs":
      return theirs;
    case "base":
      return block.base ?? "";
    case "both":
      return yours && !yours.endsWith("\n") ? `${yours}\n${theirs}` : yours + theirs;
  }
}

/** Resolves every block the same way. */
export function resolveAll(text: string, how: Resolution, reversed = false): string {
  const blocks = parseConflicts(text);
  let out = "";
  let pos = 0;
  for (const b of blocks) {
    out += text.slice(pos, b.from) + resolutionText(b, how, reversed);
    pos = b.to;
  }
  return out + text.slice(pos);
}

export function blockAt(blocks: readonly ConflictBlock[], offset: number): ConflictBlock | undefined {
  return blocks.find((b) => b.from <= offset && offset < Math.max(b.to, b.from + 1));
}

/**
 * Merge editor pane titles for the operation in progress (as IDEA
 * labels them). English source text, to be passed through `txTemplate`.
 */
export function mergeTitles(sides: MergeSides | null | undefined): { yours: string; theirs: string } {
  const branch = sides?.branch ?? null;
  const commit = sides?.commit ?? null;
  const other = sides?.otherBranch ?? null;
  switch (sides?.operation) {
    case "rebase":
      return {
        yours: commit && branch ? `Rebasing ${commit} from ${branch}` : "Your changes",
        theirs: other ? `Already rebased commits and commits from ${other}` : "Already rebased commits",
      };
    case "merge":
      return {
        yours: branch ? `Changes from ${branch}` : "Your version",
        theirs: other ? `Changes from ${other}` : commit ? `Changes from ${commit}` : "Changes from diverging branches",
      };
    case "unstash":
      return {
        yours: "Your uncommitted changes",
        theirs: branch ? `Changes from ${branch}` : "Changes from remote",
      };
    case "cherry-pick":
      return {
        yours: "Local Changes",
        theirs: commit ? `Changes from cherry-pick ${commit}` : "Changes from cherry-pick",
      };
    default:
      return {
        yours: branch ? `Your version, branch ${branch}` : "Your version",
        theirs: commit ? `Changes from ${commit}` : "Theirs (incoming)",
      };
  }
}

/** An unresolved conflict in the merge editor's result: `from`–`to` holds the base text. */
export interface ResultConflict {
  from: number;
  to: number;
  /** The user's side ("Accept Yours"). */
  ours: string;
  base: string | null;
  theirs: string;
}

/**
 * The merge editor's starting result, as IDEA shows it: the merged text with every
 * conflict block replaced by its base section, so no markers appear. `reversed` swaps
 * the sides of marker sections written in git's order (a rebase).
 */
export function initialResult(merged: string, reversed = false): { text: string; conflicts: ResultConflict[] } {
  const conflicts: ResultConflict[] = [];
  let text = "";
  let pos = 0;
  for (const b of parseConflicts(merged)) {
    text += merged.slice(pos, b.from);
    const base = b.base ?? "";
    const from = text.length;
    text += base;
    conflicts.push({
      from,
      to: text.length,
      ours: reversed ? b.theirs : b.ours,
      base: b.base,
      theirs: reversed ? b.ours : b.theirs,
    });
    pos = b.to;
  }
  return { text: text + merged.slice(pos), conflicts };
}