react-monaco-json-merge 1.1.16 → 1.1.17

package/dist/index.mjs

@@ -843,7 +843,7 @@ function hr(e, t, r = ut.DEFAULT) {
     }
     return g(), !0;
   }
-  function B() {
+  function F() {
     return n.getToken() !== 10 ? (b(3, [], [
       2,
       5
@@ -866,7 +866,7 @@ function hr(e, t, r = ut.DEFAULT) {
         if (A || b(4, [], []), h(","), g(), n.getToken() === 2 && S)
           break;
       } else A && b(6, [], []);
-      B() || b(4, [], [
+      F() || b(4, [], [
         2,
         5
         /* SyntaxKind.CommaToken */
@@ -1548,7 +1548,7 @@ function Mr(e, t, r, n, o, i) {
   for (const v of y) {
     const h = W(r, v), m = W(n, v), f = W(o, v);
     if (!Array.isArray(h) || !Array.isArray(m) || !Array.isArray(f)) {
-      const T = c.get(v) || [], B = a.get(v) || [];
+      const T = c.get(v) || [], F = a.get(v) || [];
       for (const M of T) {
         const x = M.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
         if (x) {
@@ -1558,7 +1558,7 @@ function Mr(e, t, r, n, o, i) {
           A && A.patches1.push(M);
         }
       }
-      for (const M of B) {
+      for (const M of F) {
         const x = M.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
         if (x) {
           const V = x[1];
@@ -1573,9 +1573,9 @@ function Mr(e, t, r, n, o, i) {
     if (g) {
       const T = Br(h, m, f, g);
       if (T.size > 0) {
-        const B = /* @__PURE__ */ new Map(), M = /* @__PURE__ */ new Map(), x = /* @__PURE__ */ new Map();
+        const F = /* @__PURE__ */ new Map(), M = /* @__PURE__ */ new Map(), x = /* @__PURE__ */ new Map();
         for (const [w, R] of T.entries())
-          R.base !== void 0 && B.set(R.base, w), R.input1 !== void 0 && M.set(R.input1, w), R.input2 !== void 0 && x.set(R.input2, w);
+          R.base !== void 0 && F.set(R.base, w), R.input1 !== void 0 && M.set(R.input1, w), R.input2 !== void 0 && x.set(R.input2, w);
         const V = c.get(v) || [], A = a.get(v) || [];
         for (const w of V) {
           const R = w.path.match(/^\/[^/]+(?:\/[^/]+)*\/(\d+)(?:\/|$)/);
@@ -1606,18 +1606,18 @@ function Mr(e, t, r, n, o, i) {
     }
     const b = c.get(v) || [], j = a.get(v) || [];
     for (const T of b) {
-      const B = T.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
-      if (B) {
-        const M = B[1];
+      const F = T.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
+      if (F) {
+        const M = F[1];
         s.has(M) || s.set(M, { patches1: [], patches2: [] });
         const x = s.get(M);
         x && x.patches1.push(T);
       }
     }
     for (const T of j) {
-      const B = T.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
-      if (B) {
-        const M = B[1];
+      const F = T.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
+      if (F) {
+        const M = F[1];
         s.has(M) || s.set(M, { patches1: [], patches2: [] });
         const x = s.get(M);
         x && x.patches2.push(T);
@@ -1809,9 +1809,9 @@ function Fr(e, t, r, n) {
           (Te) => Te.path.startsWith(`${h}/`) || Te.path === h
         ), me = [], je = [];
         for (const Te of ae) {
-          const C = Te.path, ie = e !== void 0 ? W(e, C) : void 0, ee = W(t, C), F = W(r, C);
+          const C = Te.path, re = e !== void 0 ? W(e, C) : void 0, K = W(t, C), $ = W(r, C);
           let fe = !1, Ie = !1;
-          Te.op === "replace" ? ie !== void 0 && (fe = !de(ie, ee), Ie = !de(ie, F)) : Te.op === "add" ? (fe = ie === void 0 && ee !== void 0, Ie = ie === void 0 && F !== void 0) : Te.op === "remove" && (fe = ie !== void 0 && ee === void 0, Ie = ie !== void 0 && F === void 0), ie !== void 0 && (ee !== void 0 && de(ie, ee) && (fe = !1), F !== void 0 && de(ie, F) && (Ie = !1)), fe && me.push(Te), Ie && je.push(Te);
+          Te.op === "replace" ? re !== void 0 && (fe = !de(re, K), Ie = !de(re, $)) : Te.op === "add" ? (fe = re === void 0 && K !== void 0, Ie = re === void 0 && $ !== void 0) : Te.op === "remove" && (fe = re !== void 0 && K === void 0, Ie = re !== void 0 && $ === void 0), re !== void 0 && (K !== void 0 && de(re, K) && (fe = !1), $ !== void 0 && de(re, $) && (Ie = !1)), fe && me.push(Te), Ie && je.push(Te);
         }
         l.push({
           path: h,
@@ -1879,7 +1879,7 @@ function Ur(e, t, r) {
       const g = $r(h, m, S), b = /* @__PURE__ */ new Map(), j = /* @__PURE__ */ new Map();
       for (const [x, V] of g.entries())
         V.input1 !== void 0 && b.set(V.input1, x), V.input2 !== void 0 && j.set(V.input2, x);
-      const T = /* @__PURE__ */ new Map(), B = [];
+      const T = /* @__PURE__ */ new Map(), F = [];
       for (const x of v) {
         const V = x.path.match(/^\/[^/]+(?:\/[^/]+)*\/(\d+)(?:\/|$)/);
         if (V) {
@@ -1890,7 +1890,7 @@ function Ur(e, t, r) {
             const R = T.get(w);
             R && R.push(x);
           } else
-            B.push(x);
+            F.push(x);
         }
       }
       for (const [x, V] of T) {
@@ -1900,7 +1900,7 @@ function Ur(e, t, r) {
         s.push(...Ze(w, V, e, t, void 0)), c.add(w);
       }
       const M = /* @__PURE__ */ new Map();
-      for (const x of B) {
+      for (const x of F) {
         const V = x.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
         if (V) {
           const A = V[1];
@@ -2317,7 +2317,7 @@ function qr(e, t, r, n, o) {
       continue;
     }
     try {
-      let B, M = T;
+      let F, M = T;
       const x = (S = g.path) == null ? void 0 : S.match(/^(.*\/\d+)(?:\/.*)?$/);
       let V = !1, A = "";
       if (x) {
@@ -2329,14 +2329,14 @@ function qr(e, t, r, n, o) {
       }
       if (b && j)
         if (g.conflictType === D.SAME_CHANGE)
-          V ? (B = W(p, A), M = A) : B = W(p, T);
+          V ? (F = W(p, A), M = A) : F = W(p, T);
         else {
           const w = V ? A : T, R = W(y, w), X = W(p, w), ne = o && l && typeof l == "object" && qe(o, w, l) || void 0, ae = mn(R, X, ne, w);
-          ae !== null ? (B = ae, M = w, i.push(`Smart-merged conflict at path ${w}`)) : (B = X, M = w, i.push(`Merge failed at path ${w}, using input2 value`));
+          ae !== null ? (F = ae, M = w, i.push(`Smart-merged conflict at path ${w}`)) : (F = X, M = w, i.push(`Merge failed at path ${w}, using input2 value`));
         }
       else if (b)
         if (V)
-          B = W(y, A), M = A;
+          F = W(y, A), M = A;
         else {
           const w = T.split("/").filter(Boolean);
           if (w.length > 1) {
@@ -2354,13 +2354,13 @@ function qr(e, t, r, n, o) {
                 }
               }
             }
-            B = W(y, T);
+            F = W(y, T);
           } else
-            B = W(y, T);
+            F = W(y, T);
         }
       else if (j)
         if (V)
-          B = W(p, A), M = A;
+          F = W(p, A), M = A;
         else {
           const w = T.split("/").filter(Boolean);
           if (w.length > 1) {
@@ -2378,20 +2378,20 @@ function qr(e, t, r, n, o) {
                 }
               }
             }
-            B = W(p, T);
+            F = W(p, T);
           } else
-            B = W(p, T);
+            F = W(p, T);
         }
       else {
         const w = V ? A : T, R = W(l, w);
         if (R !== void 0)
-          B = R, M = w;
+          F = R, M = w;
         else
           continue;
       }
-      B !== void 0 && (Gr(d, M, B), L.add(M), N.add(M));
-    } catch (B) {
-      i.push(`Failed to apply conflict at path ${T || g.id}: ${B instanceof Error ? B.message : String(B)}`);
+      F !== void 0 && (Gr(d, M, F), L.add(M), N.add(M));
+    } catch (F) {
+      i.push(`Failed to apply conflict at path ${T || g.id}: ${F instanceof Error ? F.message : String(F)}`);
     }
   }
   const m = JSON.stringify(d, null, 2);
@@ -2400,14 +2400,14 @@ function qr(e, t, r, n, o) {
     if (!b) continue;
     const j = g.input1State === te.first || g.input1State === te.second, T = g.input2State === te.first || g.input2State === te.second;
     if (j && T && g.conflictType === D.TRUE_CONFLICT) {
-      const B = Wr(m, b);
-      B && s.push({
+      const F = Wr(m, b);
+      F && s.push({
         conflictId: g.id,
         conflictPath: b,
         type: "warning",
         message: "Both conflicting changes were accepted - please review and manually resolve",
-        startLine: B.startLine,
-        endLine: B.endLine
+        startLine: F.startLine,
+        endLine: F.endLine
       });
     }
   }
@@ -2607,16 +2607,16 @@ function ro(e) {
     schema: N,
     patches: v,
     labels: h
-  } = e, m = n ? p : !1, f = !n || n === "", E = "json", [S, g] = _e(!1), [b, j] = _e(!0), [T, B] = _e([]), [M, x] = _e(null), [V, A] = _e([]), [w, R] = _e([]), [X, ne] = _e(!1), ae = le(""), me = Ee((k, O, I, $) => {
+  } = e, m = n ? p : !1, f = !n || n === "", E = "json", [S, g] = _e(!1), [b, j] = _e(!0), [T, F] = _e([]), [M, x] = _e(null), [V, A] = _e([]), [w, R] = _e([]), [X, ne] = _e(!1), ae = le(""), me = Ee((k, O, I, B) => {
     const P = document.createElement("div");
     P.className = "native-checkbox-container";
     const U = document.createElement("input");
     return U.type = "checkbox", U.className = "native-checkbox", U.checked = k === te.first || k === te.second, U.setAttribute("aria-label", U.checked ? "Undo accept" : "Accept change"), U.addEventListener("click", (Q) => {
       Q.preventDefault(), Q.stopPropagation(), requestAnimationFrame(() => {
-        $();
+        B();
       });
     }), P.appendChild(U), P;
-  }, []), [je, Te] = _e(0), C = le(null), ie = le(null), ee = le(null), F = le(null), fe = le(null), Ie = le(null), De = le(!1), gt = le(!1), $e = le(null), Ye = le(null), ke = le(null), Be = le(/* @__PURE__ */ new Map()), Le = le(null), Fe = le(null), Ue = le(null), Ve = le(null);
+  }, []), [je, Te] = _e(0), C = le(null), re = le(null), K = le(null), $ = le(null), fe = le(null), Ie = le(null), De = le(!1), gt = le(!1), $e = le(null), Ye = le(null), ke = le(null), Be = le(/* @__PURE__ */ new Map()), Le = le(null), Fe = le(null), Ue = le(null), Ve = le(null);
   Se(() => {
     let k = !0;
     const O = ur.init();
@@ -2631,9 +2631,9 @@ function ro(e) {
   const xt = Ee(
     (k, O, I) => {
       if (!fe.current) return [];
-      const $ = (k == null ? void 0 : k.getValue()) || "", P = O.getValue(), U = I.getValue();
+      const B = (k == null ? void 0 : k.getValue()) || "", P = O.getValue(), U = I.getValue();
       try {
-        const Q = performance.now(), Y = Jr($, P, U, {
+        const Q = performance.now(), Y = Jr(B, P, U, {
           comparisonMode: L,
           schema: N,
           patches: v
@@ -2659,51 +2659,51 @@ function ro(e) {
     }
   }, []), nt = Ee(
     (k) => {
-      if (!m || !F.current || !ke.current)
+      if (!m || !$.current || !ke.current)
         return;
       const O = fe.current;
       if (!O) return;
-      const I = o === "vs-dark" || typeof o == "string" && o.includes("dark"), $ = ze(F.current), P = Xe(F.current);
-      ke.current.style.left = `${$}px`, ke.current.style.width = `${P}px`;
-      const U = F.current.getScrollTop();
-      if (F.current.getModel()) {
+      const I = o === "vs-dark" || typeof o == "string" && o.includes("dark"), B = ze($.current), P = Xe($.current);
+      ke.current.style.left = `${B}px`, ke.current.style.width = `${P}px`;
+      const U = $.current.getScrollTop();
+      if ($.current.getModel()) {
         ke.current.innerHTML = "";
         for (const Y of k) {
-          const _ = Y.startLine, ue = Y.endLine, Z = F.current.getTopForLineNumber(_) - U, H = F.current.getTopForLineNumber(ue) - U, J = F.current.getOption(O.editor.EditorOption.lineHeight), re = ue > _ ? H - Z + J : J, G = document.createElement("div");
-          G.className = `conflict-issue-marker conflict-issue-${Y.type}`, G.setAttribute("data-conflict-id", Y.conflictId), G.setAttribute("data-issue-type", Y.type), G.title = Y.message, G.style.position = "absolute", G.style.top = `${Math.max(0, Z)}px`, G.style.height = `${re}px`, G.style.width = "26px", G.style.display = "flex", G.style.alignItems = "center", G.style.justifyContent = "center", G.style.cursor = "help", G.style.pointerEvents = "auto";
-          const oe = document.createElement("div");
-          oe.className = "issue-icon", Y.type === "error" ? (oe.textContent = "✗", oe.style.color = I ? "#ff6666" : "#cc0000") : Y.type === "warning" ? (oe.textContent = Nt, oe.style.color = I ? "#ffaa00" : "#ff8800") : Y.type === "smart-merge" && (oe.textContent = "↕", oe.style.color = I ? "#0096ff" : "#0078d4"), oe.style.fontSize = "14px", oe.style.fontWeight = "bold", G.appendChild(oe), ke.current.appendChild(G);
+          const _ = Y.startLine, ue = Y.endLine, Z = $.current.getTopForLineNumber(_) - U, H = $.current.getTopForLineNumber(ue) - U, J = $.current.getOption(O.editor.EditorOption.lineHeight), oe = ue > _ ? H - Z + J : J, G = document.createElement("div");
+          G.className = `conflict-issue-marker conflict-issue-${Y.type}`, G.setAttribute("data-conflict-id", Y.conflictId), G.setAttribute("data-issue-type", Y.type), G.title = Y.message, G.style.position = "absolute", G.style.top = `${Math.max(0, Z)}px`, G.style.height = `${oe}px`, G.style.width = "26px", G.style.display = "flex", G.style.alignItems = "center", G.style.justifyContent = "center", G.style.cursor = "help", G.style.pointerEvents = "auto";
+          const ie = document.createElement("div");
+          ie.className = "issue-icon", Y.type === "error" ? (ie.textContent = "✗", ie.style.color = I ? "#ff6666" : "#cc0000") : Y.type === "warning" ? (ie.textContent = Nt, ie.style.color = I ? "#ffaa00" : "#ff8800") : Y.type === "smart-merge" && (ie.textContent = "↕", ie.style.color = I ? "#0096ff" : "#0078d4"), ie.style.fontSize = "14px", ie.style.fontWeight = "bold", G.appendChild(ie), ke.current.appendChild(G);
         }
       }
     },
     [m, o, ze, Xe]
   ), rt = Ee(
     (k) => {
-      var se, re, G, oe;
-      if (!F.current || X)
+      var se, oe, G, ie;
+      if (!$.current || X)
         return;
-      const O = F.current.getModel(), I = (se = C.current) == null ? void 0 : se.getModel(), $ = (re = ee.current) == null ? void 0 : re.getModel(), P = (G = ie.current) == null ? void 0 : G.getModel();
-      if (!O || !I || !$ || !P)
+      const O = $.current.getModel(), I = (se = C.current) == null ? void 0 : se.getModel(), B = (oe = K.current) == null ? void 0 : oe.getModel(), P = (G = re.current) == null ? void 0 : G.getModel();
+      if (!O || !I || !B || !P)
         return;
-      const U = P.getLinesContent(), Q = I.getLinesContent(), Y = $.getLinesContent(), _ = qr(U, Q, Y, k, N);
+      const U = P.getLinesContent(), Q = I.getLinesContent(), Y = B.getLinesContent(), _ = qr(U, Q, Y, k, N);
       if (x(_.isValid ? null : _.validationError || "Invalid JSON"), A(_.warnings || []), R(_.conflictIssues || []), Le.current) {
         const z = (h == null ? void 0 : h.result) || "Result";
         _.isValid ? _.warnings && _.warnings.length > 0 ? (Le.current.textContent = `${z} ${Nt}`, Le.current.title = _.warnings.join(`
 `)) : (Le.current.textContent = z, Le.current.style.color = "", Le.current.title = "") : (Le.current.textContent = `${z} ${Nt} Invalid JSON`, Le.current.style.color = "#ff4444", Le.current.title = _.validationError || "Invalid JSON - please fix manually");
       }
       if (O.getValue() !== _.content) {
-        const z = F.current.getPosition(), q = F.current.getSelection();
+        const z = $.current.getPosition(), q = $.current.getSelection();
         if (gt.current = !0, O.setValue(_.content), gt.current = !1, z) {
-          const he = O.getLineCount(), K = O.getLineLength(he), ve = {
+          const he = O.getLineCount(), ee = O.getLineLength(he), ve = {
             lineNumber: Math.min(z.lineNumber, he),
-            column: z.lineNumber <= he ? Math.min(z.column, O.getLineLength(z.lineNumber) + 1) : K + 1
+            column: z.lineNumber <= he ? Math.min(z.column, O.getLineLength(z.lineNumber) + 1) : ee + 1
           };
-          F.current.setPosition(ve), q && !q.isEmpty() && F.current.setSelection(q);
+          $.current.setPosition(ve), q && !q.isEmpty() && $.current.setSelection(q);
         }
       }
       const Z = fe.current, H = O;
       let J = H._invalidDecorations;
-      if (!_.isValid && F.current && Z ? (J || (J = F.current.createDecorationsCollection([]), H._invalidDecorations = J), J.set([
+      if (!_.isValid && $.current && Z ? (J || (J = $.current.createDecorationsCollection([]), H._invalidDecorations = J), J.set([
         {
           range: new Z.Range(1, 1, O.getLineCount(), Number.MAX_SAFE_INTEGER),
           options: {
@@ -2712,23 +2712,23 @@ function ro(e) {
             hoverMessage: { value: _.validationError || "Invalid JSON - please fix manually" }
           }
         }
-      ])) : _.isValid && J && F.current && J.set([]), _.conflictIssues && _.conflictIssues.length > 0) {
-        if (nt(_.conflictIssues), F.current && Z) {
+      ])) : _.isValid && J && $.current && J.set([]), _.conflictIssues && _.conflictIssues.length > 0) {
+        if (nt(_.conflictIssues), $.current && Z) {
           const z = O;
           if (!z._conflictIssueDecorations) {
-            const K = F.current.createDecorationsCollection(
+            const ee = $.current.createDecorationsCollection(
               []
             );
-            z._conflictIssueDecorations = K;
+            z._conflictIssueDecorations = ee;
           }
-          const q = z._conflictIssueDecorations, he = _.conflictIssues.map((K) => {
+          const q = z._conflictIssueDecorations, he = _.conflictIssues.map((ee) => {
             let ve, Ae;
-            return K.type === "error" ? (ve = o === "vs-dark" ? "rgba(255, 0, 0, 0.1)" : "rgba(255, 0, 0, 0.05)", Ae = o === "vs-dark" ? "#ff6666" : "#cc0000") : K.type === "warning" ? (ve = o === "vs-dark" ? "rgba(255, 170, 0, 0.1)" : "rgba(255, 136, 0, 0.05)", Ae = o === "vs-dark" ? "#ffaa00" : "#ff8800") : (ve = o === "vs-dark" ? "rgba(0, 150, 255, 0.1)" : "rgba(0, 120, 212, 0.05)", Ae = o === "vs-dark" ? "#0096ff" : "#0078d4"), {
-              range: new Z.Range(K.startLine, 1, K.endLine, Number.MAX_SAFE_INTEGER),
+            return ee.type === "error" ? (ve = o === "vs-dark" ? "rgba(255, 0, 0, 0.1)" : "rgba(255, 0, 0, 0.05)", Ae = o === "vs-dark" ? "#ff6666" : "#cc0000") : ee.type === "warning" ? (ve = o === "vs-dark" ? "rgba(255, 170, 0, 0.1)" : "rgba(255, 136, 0, 0.05)", Ae = o === "vs-dark" ? "#ffaa00" : "#ff8800") : (ve = o === "vs-dark" ? "rgba(0, 150, 255, 0.1)" : "rgba(0, 120, 212, 0.05)", Ae = o === "vs-dark" ? "#0096ff" : "#0078d4"), {
+              range: new Z.Range(ee.startLine, 1, ee.endLine, Number.MAX_SAFE_INTEGER),
               options: {
                 isWholeLine: !0,
-                className: `conflict-issue-line conflict-issue-${K.type}`,
-                linesDecorationsClassName: `conflict-issue-line-decoration conflict-issue-${K.type}`,
+                className: `conflict-issue-line conflict-issue-${ee.type}`,
+                linesDecorationsClassName: `conflict-issue-line-decoration conflict-issue-${ee.type}`,
                 backgroundColor: ve,
                 overviewRuler: {
                   color: Ae,
@@ -2743,12 +2743,12 @@ function ro(e) {
           });
           q.set(he);
         }
-      } else if (F.current) {
+      } else if ($.current) {
         const z = O;
         z._conflictIssueDecorations && z._conflictIssueDecorations.set([]), ke.current && m && (ke.current.innerHTML = "");
       }
       if (y) {
-        const z = `${_.content}|${_.isValid}|${(oe = _.warnings) == null ? void 0 : oe.join(",")}`;
+        const z = `${_.content}|${_.isValid}|${(ie = _.warnings) == null ? void 0 : ie.join(",")}`;
         ae.current !== z && (ae.current = z, queueMicrotask(() => {
           y(_.content, {
             isValid: _.isValid,
@@ -2762,27 +2762,27 @@ function ro(e) {
     [y, N, h, o, nt, m, X]
   ), mt = Ee(
     (k, O) => {
-      ne(!1), B((I) => {
-        const $ = I.map((P) => {
+      ne(!1), F((I) => {
+        const B = I.map((P) => {
           if (P.id !== k) return P;
           const Q = (O === 1 ? P.input1State : P.input2State) === te.excluded ? te.first : te.excluded;
           return O === 1 ? { ...P, input1State: Q } : { ...P, input2State: Q };
         });
-        return m && F.current && rt($), $;
+        return m && $.current && rt(B), B;
       });
     },
     [m, rt]
   ), yt = Ee(
-    (k, O, I, $, P, U, Q) => {
+    (k, O, I, B, P, U, Q) => {
       if (!fe.current) return;
-      const _ = $ === 1 ? C.current : ee.current;
+      const _ = B === 1 ? C.current : K.current;
       if (!_) return;
-      const ue = $ === 1 ? I.input1Range : I.input2Range, Z = $ === 1 ? I.input1State : I.input2State, H = _.getModel();
+      const ue = B === 1 ? I.input1Range : I.input2Range, Z = B === 1 ? I.input1State : I.input2State, H = _.getModel();
       if (!H) return;
-      const J = H.getLineCount(), se = Math.max(1, Math.min(ue.startLineNumber, J)), re = Math.max(1, Math.min(ue.endLineNumberExclusive - 1, J));
-      if (se > J || re < 1 || se > re)
+      const J = H.getLineCount(), se = Math.max(1, Math.min(ue.startLineNumber, J)), oe = Math.max(1, Math.min(ue.endLineNumberExclusive - 1, J));
+      if (se > J || oe < 1 || se > oe)
         return;
-      const G = _.getTopForLineNumber(se) - P, z = _.getBottomForLineNumber(re) - P - G;
+      const G = _.getTopForLineNumber(se) - P, z = _.getBottomForLineNumber(oe) - P - G;
       let q = Be.current.get(O);
       if (!q) {
         q = document.createElement("div"), q.className = "merge-accept-gutter-marker";
@@ -2792,18 +2792,18 @@ function ro(e) {
         pe.className = "checkbox";
         const ye = document.createElement("div");
         ye.className = "checkbox-background";
-        const Ne = me(Z, $, I.id, () => mt(I.id, $));
+        const Ne = me(Z, B, I.id, () => mt(I.id, B));
         ye.appendChild(Ne), pe.appendChild(ye), q.appendChild(pe), k.appendChild(q), Be.current.set(O, q);
       }
       q.style.top = `${G}px`, q.style.height = `${z}px`;
       const he = q.querySelector(".checkbox-background");
       if (he) {
         he.innerHTML = "";
-        const ge = me(Z, $, I.id, () => mt(I.id, $));
+        const ge = me(Z, B, I.id, () => mt(I.id, B));
         he.appendChild(ge);
       }
-      const K = I.handled, ve = I.focused, Ae = z > 30;
-      q.className = "merge-accept-gutter-marker", K && q.classList.add("handled"), ve && q.classList.add("focused"), Ae ? q.classList.add("multi-line") : q.classList.add("single-line");
+      const ee = I.handled, ve = I.focused, Ae = z > 30;
+      q.className = "merge-accept-gutter-marker", ee && q.classList.add("handled"), ve && q.classList.add("focused"), Ae ? q.classList.add("multi-line") : q.classList.add("single-line");
       const Oe = q.querySelector(".checkbox");
       if (Oe) {
         const pe = z / 2 - 12, ye = 24;
@@ -2820,10 +2820,10 @@ function ro(e) {
         se.remove(), H.delete(J);
       return;
     }
-    if (!C.current || !ee.current || !$e.current || !Ye.current || !fe.current)
+    if (!C.current || !K.current || !$e.current || !Ye.current || !fe.current)
       return;
-    const O = o === "vs-dark" || typeof o == "string" && o.includes("dark"), I = ze(C.current), $ = Xe(C.current), P = ze(ee.current), U = Xe(ee.current);
-    $e.current.style.left = `${I}px`, $e.current.style.width = `${$}px`, Ye.current.style.left = `${P}px`, Ye.current.style.width = `${U}px`;
+    const O = o === "vs-dark" || typeof o == "string" && o.includes("dark"), I = ze(C.current), B = Xe(C.current), P = ze(K.current), U = Xe(K.current);
+    $e.current.style.left = `${I}px`, $e.current.style.width = `${B}px`, Ye.current.style.left = `${P}px`, Ye.current.style.width = `${U}px`;
     const Q = C.current.getVisibleRanges();
     if (!Q || Q.length === 0) return;
     const Y = C.current.getScrollTop(), _ = $e.current.clientHeight, ue = /* @__PURE__ */ new Set();
@@ -2842,10 +2842,10 @@ function ro(e) {
     for (const [H, J] of Z.entries())
       ue.has(H) || (J.remove(), Z.delete(H));
   }, [T, o, m, ze, Xe, yt]), be = Ee((k, O) => {
-    var I, $, P;
+    var I, B, P;
     try {
       if (fe.current) {
-        const U = ($ = (I = fe.current.editor).getTheme) == null ? void 0 : $.call(I);
+        const U = (B = (I = fe.current.editor).getTheme) == null ? void 0 : B.call(I);
         if ((P = U == null ? void 0 : U.colors) != null && P[k])
           return U.colors[k];
       }
@@ -2853,9 +2853,9 @@ function ro(e) {
     }
     return O;
   }, []), $t = Ee(() => {
-    if (!fe.current || !C.current || !ee.current)
+    if (!fe.current || !C.current || !K.current)
       return;
-    const k = fe.current, O = o === "vs-dark" || typeof o == "string" && o.includes("dark"), I = be("mergeEditor.change.background", O ? "rgba(255, 166, 0, 0.2)" : "rgba(255, 166, 0, 0.15)"), $ = be(
+    const k = fe.current, O = o === "vs-dark" || typeof o == "string" && o.includes("dark"), I = be("mergeEditor.change.background", O ? "rgba(255, 166, 0, 0.2)" : "rgba(255, 166, 0, 0.15)"), B = be(
       "diffEditor.insertedTextBackground",
       O ? "rgba(155, 185, 85, 0.2)" : "rgba(155, 185, 85, 0.15)"
     ), P = be(
@@ -2879,13 +2879,13 @@ function ro(e) {
       _,
       ue,
       k
-    ), se = be("input.background", O ? "#3c3c3c" : "#f3f3f3"), re = be("input.border", O ? "#6b6b6b" : "#c8c8c8"), G = be("focusBorder", O ? "#007acc" : "#0078d4"), oe = be("inputOption.activeForeground", O ? "#3794ff" : "#0078d4"), z = "monaco-three-way-diff-dynamic";
+    ), se = be("input.background", O ? "#3c3c3c" : "#f3f3f3"), oe = be("input.border", O ? "#6b6b6b" : "#c8c8c8"), G = be("focusBorder", O ? "#007acc" : "#0078d4"), ie = be("inputOption.activeForeground", O ? "#3794ff" : "#0078d4"), z = "monaco-three-way-diff-dynamic";
     let q = document.getElementById(z);
     q || (q = document.createElement("style"), q.id = z, document.head.appendChild(q));
     const he = be(
       "diffEditor.insertedTextBackground",
       O ? "rgba(100, 100, 255, 0.15)" : "rgba(100, 100, 255, 0.1)"
-    ), K = be(
+    ), ee = be(
       "diffEditor.insertedTextBackground",
       O ? "rgba(155, 185, 85, 0.2)" : "rgba(155, 185, 85, 0.15)"
     );
@@ -2904,10 +2904,10 @@ function ro(e) {
 
       /* Single-side change (green for input2/ours, orange for input1/theirs in 3-way) */
       .monaco-editor .merge-change-incoming {
-        background-color: ${K};
+        background-color: ${ee};
       }
       .monaco-editor .merge-change-current {
-        background-color: ${$};
+        background-color: ${B};
       }
 
       /* Same change on both sides (blue/purple) */
@@ -3019,7 +3019,7 @@ function ro(e) {
         height: 14px;
         border-radius: 3px;
         background-color: ${se};
-        border: 1px solid ${re};
+        border: 1px solid ${oe};
       }
 
       .merge-accept-gutter-marker.focused .checkbox-background {
@@ -3046,7 +3046,7 @@ function ro(e) {
         height: 16px;
         cursor: pointer;
         margin: 0;
-        accent-color: ${oe};
+        accent-color: ${ie};
       }
 
       /* Result column status indicator */
@@ -3074,27 +3074,27 @@ function ro(e) {
         outline: 2px solid ${G};
         outline-offset: 2px;
       }
-    `, Fe.current || (Fe.current = C.current.createDecorationsCollection([])), Fe.current.set(Z), Ue.current || (Ue.current = ee.current.createDecorationsCollection([])), Ue.current.set(H), ie.current && (Ve.current || (Ve.current = ie.current.createDecorationsCollection([])), Ve.current.set(J));
+    `, Fe.current || (Fe.current = C.current.createDecorationsCollection([])), Fe.current.set(Z), Ue.current || (Ue.current = K.current.createDecorationsCollection([])), Ue.current.set(H), re.current && (Ve.current || (Ve.current = re.current.createDecorationsCollection([])), Ve.current.set(J));
   }, [T, o, f, be]), Bt = Ee(() => {
     if (!De.current && Ie.current && fe.current && !b) {
       const k = fe.current;
       Ie.current.innerHTML = "";
       const O = document.createElement("div");
       O.style.display = "flex", O.style.height = "100%", O.style.width = "100%";
-      const I = o === "vs-dark" || typeof o == "string" && o.includes("dark"), $ = I ? "#444" : "#ddd", P = I ? "#fff" : "#333", U = (K, ve) => {
+      const I = o === "vs-dark" || typeof o == "string" && o.includes("dark"), B = I ? "#444" : "#ddd", P = I ? "#fff" : "#333", U = (ee, ve) => {
         var Ae, Oe, ge;
         try {
           const pe = (Oe = (Ae = k.editor).getTheme) == null ? void 0 : Oe.call(Ae);
-          if ((ge = pe == null ? void 0 : pe.colors) != null && ge[K])
-            return pe.colors[K];
+          if ((ge = pe == null ? void 0 : pe.colors) != null && ge[ee])
+            return pe.colors[ee];
         } catch {
         }
         return ve;
-      }, Q = U("mergeEditor.conflict.input1.header.background", I ? "#4B1818" : "#FFE6E6"), Y = U("editorGutter.background", I ? "#333" : "#f0f0f0"), _ = U("mergeEditor.conflict.input2.header.background", I ? "#1B4B18" : "#E6FFE6"), ue = U("mergeEditor.result.header.background", I ? "#7F5F00" : "#FFECB3"), Z = (K, ve, Ae = !1) => {
+      }, Q = U("mergeEditor.conflict.input1.header.background", I ? "#4B1818" : "#FFE6E6"), Y = U("editorGutter.background", I ? "#333" : "#f0f0f0"), _ = U("mergeEditor.conflict.input2.header.background", I ? "#1B4B18" : "#E6FFE6"), ue = U("mergeEditor.result.header.background", I ? "#7F5F00" : "#FFECB3"), Z = (ee, ve, Ae = !1) => {
         const Oe = document.createElement("div");
-        Oe.style.flex = "1", Oe.style.display = "flex", Oe.style.flexDirection = "column", Oe.style.borderRight = `1px solid ${$}`;
+        Oe.style.flex = "1", Oe.style.display = "flex", Oe.style.flexDirection = "column", Oe.style.borderRight = `1px solid ${B}`;
         const ge = document.createElement("div");
-        ge.textContent = K, ge.style.padding = "4px 8px", ge.style.fontSize = "11px", ge.style.fontWeight = "500", ge.style.backgroundColor = ve, ge.style.color = P, ge.style.borderBottom = `1px solid ${$}`, Oe.appendChild(ge);
+        ge.textContent = ee, ge.style.padding = "4px 8px", ge.style.fontSize = "11px", ge.style.fontWeight = "500", ge.style.backgroundColor = ve, ge.style.color = P, ge.style.borderBottom = `1px solid ${B}`, Oe.appendChild(ge);
         const pe = document.createElement("div");
         pe.style.flex = "1", pe.style.position = "relative", pe.style.overflow = "hidden";
         const ye = document.createElement("div");
@@ -3104,27 +3104,27 @@ function ro(e) {
       }, H = Z((h == null ? void 0 : h.input1) || "Theirs", Q, m), J = Z((h == null ? void 0 : h.input2) || "Ours", _, m);
       H.gutterDiv && ($e.current = H.gutterDiv), J.gutterDiv && (Ye.current = J.gutterDiv);
       const se = !!n;
-      let re = null;
+      let oe = null;
       if (se) {
-        re = Z((h == null ? void 0 : h.base) || "Base", Y, !1);
-        const K = [];
-        d === 0 ? K.push(re.container, H.container, J.container) : d === 1 ? K.push(H.container, re.container, J.container) : d === 2 && K.push(H.container, J.container, re.container), K.forEach((ve) => {
+        oe = Z((h == null ? void 0 : h.base) || "Base", Y, !1);
+        const ee = [];
+        d === 0 ? ee.push(oe.container, H.container, J.container) : d === 1 ? ee.push(H.container, oe.container, J.container) : d === 2 && ee.push(H.container, J.container, oe.container), ee.forEach((ve) => {
           O.appendChild(ve);
         });
       } else
         O.appendChild(H.container), O.appendChild(J.container);
       let G = null;
       m && se && (G = Z((h == null ? void 0 : h.result) || "Result", ue, !0), Le.current = G.container.querySelector("div"), G.gutterDiv && (ke.current = G.gutterDiv), O.appendChild(G.container)), Ie.current.appendChild(O);
-      const oe = k.editor.createModel(t || "", E), z = se ? k.editor.createModel(n || "", E) : null, q = k.editor.createModel(r || "", E);
+      const ie = k.editor.createModel(t || "", E), z = se ? k.editor.createModel(n || "", E) : null, q = k.editor.createModel(r || "", E);
       if (C.current = k.editor.create(H.editorDiv, {
-        model: oe,
+        model: ie,
         readOnly: !0,
         automaticLayout: !0,
         folding: !m,
         glyphMargin: !1,
         ...i,
         lineDecorationsWidth: m ? 26 : 10
-      }), se && re && (ie.current = k.editor.create(re.editorDiv, {
+      }), se && oe && (re.current = k.editor.create(oe.editorDiv, {
         model: z,
         readOnly: !0,
         automaticLayout: !0,
@@ -3132,7 +3132,7 @@ function ro(e) {
         glyphMargin: !1,
         ...i,
         lineDecorationsWidth: 10
-      })), ee.current = k.editor.create(J.editorDiv, {
+      })), K.current = k.editor.create(J.editorDiv, {
         model: q,
         readOnly: !0,
         automaticLayout: !0,
@@ -3141,42 +3141,50 @@ function ro(e) {
         ...i,
         lineDecorationsWidth: m ? 26 : 10
       }), m && G) {
-        const K = k.editor.createModel(r || "", E);
-        F.current = k.editor.create(G.editorDiv, {
-          model: K,
+        const ee = k.editor.createModel(r || "", E);
+        $.current = k.editor.create(G.editorDiv, {
+          model: ee,
           automaticLayout: !0,
           folding: !m,
           glyphMargin: !1,
           ...i,
           readOnly: !1,
           lineDecorationsWidth: 26
-        }), K.onDidChangeContent(() => {
+        }), ee.onDidChangeContent(() => {
           gt.current || ne(!0);
         });
       }
       k.editor.setTheme(o);
-      const he = xt(z, oe, q);
-      B(he), De.current = !0, l && C.current && l(C.current, k);
+      const he = xt(z, ie, q);
+      F(he), De.current = !0, l && C.current && K.current && l(
+        {
+          input1: C.current,
+          input2: K.current,
+          base: re.current,
+          result: $.current
+        },
+        k
+      );
     }
   }, [i, o, t, r, n, m, d, b, xt, l, h]), Ft = le(m), Ut = le(d), Vt = le(L), Jt = le(n);
   return Se(() => {
-    var P, U, Q, Y, _, ue, Z, H, J, se, re;
-    const k = Ft.current !== m, O = Ut.current !== d, I = Vt.current !== L, $ = Jt.current !== n;
-    if ((k || O || I || $) && De.current) {
+    var P, U, Q, Y, _, ue, Z, H, J, se, oe;
+    const k = Ft.current !== m, O = Ut.current !== d, I = Vt.current !== L, B = Jt.current !== n;
+    if ((k || O || I || B) && De.current) {
       Ft.current = m, Ut.current = d, Vt.current = L, Jt.current = n, Be.current.forEach((he) => {
         he.remove();
       }), Be.current.clear(), (P = Fe.current) == null || P.set([]), (U = Ue.current) == null || U.set([]), (Q = Ve.current) == null || Q.set([]), Fe.current = null, Ue.current = null, Ve.current = null;
-      const G = (Y = C.current) == null ? void 0 : Y.getModel(), oe = (_ = ie.current) == null ? void 0 : _.getModel(), z = (ue = ee.current) == null ? void 0 : ue.getModel(), q = (Z = F.current) == null ? void 0 : Z.getModel();
-      (H = C.current) == null || H.dispose(), (J = ie.current) == null || J.dispose(), (se = ee.current) == null || se.dispose(), (re = F.current) == null || re.dispose(), G == null || G.dispose(), oe == null || oe.dispose(), z == null || z.dispose(), q == null || q.dispose(), De.current = !1, Te((he) => he + 1);
+      const G = (Y = C.current) == null ? void 0 : Y.getModel(), ie = (_ = re.current) == null ? void 0 : _.getModel(), z = (ue = K.current) == null ? void 0 : ue.getModel(), q = (Z = $.current) == null ? void 0 : Z.getModel();
+      (H = C.current) == null || H.dispose(), (J = re.current) == null || J.dispose(), (se = K.current) == null || se.dispose(), (oe = $.current) == null || oe.dispose(), G == null || G.dispose(), ie == null || ie.dispose(), z == null || z.dispose(), q == null || q.dispose(), De.current = !1, Te((he) => he + 1);
     }
   }, [m, d, L, n]), Se(() => {
     !b && fe.current && Ie.current && !De.current && Bt();
   }, [b, Bt]), Se(() => {
-    !S || !i || (C.current && C.current.updateOptions(i), ee.current && ee.current.updateOptions(i), ie.current && ie.current.updateOptions(i), F.current && F.current.updateOptions(i));
+    !S || !i || (C.current && C.current.updateOptions(i), K.current && K.current.updateOptions(i), re.current && re.current.updateOptions(i), $.current && $.current.updateOptions(i));
   }, [i, S]), Se(() => {
     S && T.length > 0 && ($t(), m && ot());
   }, [S, T, $t, ot, m]), Se(() => {
-    S && T.length > 0 && m && F.current && rt(T);
+    S && T.length > 0 && m && $.current && rt(T);
   }, [S, T, m, rt]), Se(() => {
     if (!S) return;
     const k = () => {
@@ -3184,18 +3192,18 @@ function ro(e) {
     }, O = [], I = () => {
       ot();
     };
-    return C.current && O.push(C.current.onDidScrollChange(I)), ee.current && O.push(ee.current.onDidScrollChange(I)), F.current && m && (O.push(F.current.onDidScrollChange(k)), O.push(F.current.onDidLayoutChange(k))), C.current && O.push(C.current.onDidLayoutChange(I)), ee.current && O.push(ee.current.onDidLayoutChange(I)), () => {
-      O.forEach(($) => {
-        $ == null || $.dispose();
+    return C.current && O.push(C.current.onDidScrollChange(I)), K.current && O.push(K.current.onDidScrollChange(I)), $.current && m && (O.push($.current.onDidScrollChange(k)), O.push($.current.onDidLayoutChange(k))), C.current && O.push(C.current.onDidLayoutChange(I)), K.current && O.push(K.current.onDidLayoutChange(I)), () => {
+      O.forEach((B) => {
+        B == null || B.dispose();
       });
     };
   }, [S, ot, nt, m, w]), Se(() => {
     if (!S) return;
-    const k = [C.current, ie.current, ee.current];
-    m && F.current && k.push(F.current);
+    const k = [C.current, re.current, K.current];
+    m && $.current && k.push($.current);
     const O = [];
     let I = !1;
-    const $ = (P) => {
+    const B = (P) => {
       if (I) return;
       I = !0;
       const U = P.getScrollTop(), Q = P.getScrollLeft();
@@ -3208,7 +3216,7 @@ function ro(e) {
     return k.forEach((P) => {
       P && O.push(
         P.onDidScrollChange(() => {
-          $(P);
+          B(P);
         })
       );
     }), () => {
@@ -3217,10 +3225,10 @@ function ro(e) {
       });
     };
   }, [S, m]), Se(() => () => {
-    var P, U, Q, Y, _, ue, Z, H, J, se, re;
+    var P, U, Q, Y, _, ue, Z, H, J, se, oe;
     (P = Fe.current) == null || P.set([]), (U = Ue.current) == null || U.set([]), (Q = Ve.current) == null || Q.set([]);
-    const k = (Y = C.current) == null ? void 0 : Y.getModel(), O = (_ = ie.current) == null ? void 0 : _.getModel(), I = (ue = ee.current) == null ? void 0 : ue.getModel(), $ = (Z = F.current) == null ? void 0 : Z.getModel();
-    (H = C.current) == null || H.dispose(), (J = ie.current) == null || J.dispose(), (se = ee.current) == null || se.dispose(), (re = F.current) == null || re.dispose(), k == null || k.dispose(), O == null || O.dispose(), I == null || I.dispose(), $ == null || $.dispose(), De.current = !1, g(!1);
+    const k = (Y = C.current) == null ? void 0 : Y.getModel(), O = (_ = re.current) == null ? void 0 : _.getModel(), I = (ue = K.current) == null ? void 0 : ue.getModel(), B = (Z = $.current) == null ? void 0 : Z.getModel();
+    (H = C.current) == null || H.dispose(), (J = re.current) == null || J.dispose(), (se = K.current) == null || se.dispose(), (oe = $.current) == null || oe.dispose(), k == null || k.dispose(), O == null || O.dispose(), I == null || I.dispose(), B == null || B.dispose(), De.current = !1, g(!1);
   }, []), b || !S ? /* @__PURE__ */ st(On, { children: u ?? /* @__PURE__ */ st(Kr, {}) }) : /* @__PURE__ */ st("div", { ref: Ie, style: { width: s, height: c }, className: a });
 }
 export {