form-imagining 0.0.7 → 0.0.8

package/dist/{index-dfad4f82.js → index-a3197e12.js}

@@ -867,8 +867,8 @@ Sortable.prototype = /** @lends Sortable.prototype */
           return ce(), W.insertBefore(dragEl, he), parentEl = W, de(), le(!0);
       } else if (H.parentNode === W) {
         G = getRect(H);
-        var fe = 0, ge, pe = dragEl.parentNode !== W, me = !_dragElInRowColumn(dragEl.animated && dragEl.toRect || U, H.animated && H.toRect || G, oe), ve = oe ? "top" : "left", we = isScrolledPast(H, "top", "top") || isScrolledPast(dragEl, "top", "top"), be = we ? we.scrollTop : void 0;
-        lastTarget !== H && (ge = G[ve], pastFirstInvertThresh = !1, isCircumstantialInvert = !me && Q.invertSwap || pe), fe = _getSwapDirection(C, H, G, oe, me ? 1 : Q.swapThreshold, Q.invertedSwapThreshold == null ? Q.swapThreshold : Q.invertedSwapThreshold, isCircumstantialInvert, lastTarget === H);
+        var fe = 0, ge, me = dragEl.parentNode !== W, pe = !_dragElInRowColumn(dragEl.animated && dragEl.toRect || U, H.animated && H.toRect || G, oe), ve = oe ? "top" : "left", we = isScrolledPast(H, "top", "top") || isScrolledPast(dragEl, "top", "top"), be = we ? we.scrollTop : void 0;
+        lastTarget !== H && (ge = G[ve], pastFirstInvertThresh = !1, isCircumstantialInvert = !pe && Q.invertSwap || me), fe = _getSwapDirection(C, H, G, oe, pe ? 1 : Q.swapThreshold, Q.invertedSwapThreshold == null ? Q.swapThreshold : Q.invertedSwapThreshold, isCircumstantialInvert, lastTarget === H);
         var Ee;
         if (fe !== 0) {
           var ye = index$1(dragEl);
@@ -1215,9 +1215,9 @@ var autoScroll = throttle(function(K, C, W, H) {
     scrollRootEl !== W && (scrollRootEl = W, clearAutoScrolls(), scrollEl = C.scroll, te = C.scrollFn, scrollEl === !0 && (scrollEl = getParentAutoScrollElement(W, !0)));
     var ie = 0, ne = scrollEl;
     do {
-      var oe = ne, re = getRect(oe), se = re.top, ae = re.bottom, ce = re.left, le = re.right, de = re.width, ue = re.height, he = void 0, fe = void 0, ge = oe.scrollWidth, pe = oe.scrollHeight, me = css(oe), ve = oe.scrollLeft, we = oe.scrollTop;
-      oe === X ? (he = de < ge && (me.overflowX === "auto" || me.overflowX === "scroll" || me.overflowX === "visible"), fe = ue < pe && (me.overflowY === "auto" || me.overflowY === "scroll" || me.overflowY === "visible")) : (he = de < ge && (me.overflowX === "auto" || me.overflowX === "scroll"), fe = ue < pe && (me.overflowY === "auto" || me.overflowY === "scroll"));
-      var be = he && (Math.abs(le - U) <= Z && ve + de < ge) - (Math.abs(ce - U) <= Z && !!ve), Ee = fe && (Math.abs(ae - G) <= Z && we + ue < pe) - (Math.abs(se - G) <= Z && !!we);
+      var oe = ne, re = getRect(oe), se = re.top, ae = re.bottom, ce = re.left, le = re.right, de = re.width, ue = re.height, he = void 0, fe = void 0, ge = oe.scrollWidth, me = oe.scrollHeight, pe = css(oe), ve = oe.scrollLeft, we = oe.scrollTop;
+      oe === X ? (he = de < ge && (pe.overflowX === "auto" || pe.overflowX === "scroll" || pe.overflowX === "visible"), fe = ue < me && (pe.overflowY === "auto" || pe.overflowY === "scroll" || pe.overflowY === "visible")) : (he = de < ge && (pe.overflowX === "auto" || pe.overflowX === "scroll"), fe = ue < me && (pe.overflowY === "auto" || pe.overflowY === "scroll"));
+      var be = he && (Math.abs(le - U) <= Z && ve + de < ge) - (Math.abs(ce - U) <= Z && !!ve), Ee = fe && (Math.abs(ae - G) <= Z && we + ue < me) - (Math.abs(se - G) <= Z && !!we);
       if (!autoScrolls[ie])
         for (var ye = 0; ye <= ie; ye++)
           autoScrolls[ye] || (autoScrolls[ye] = {});
@@ -2619,22 +2619,22 @@ function createSetupStore(K, C, W = {}, H, U, G) {
     // setupStore
   ) : fe);
   H._s.set(K, ge);
-  const pe = H._a && H._a.runWithContext || fallbackRunWithContext, me = H._e.run(() => (Z = effectScope(), pe(() => Z.run(C))));
-  for (const ve in me) {
-    const we = me[ve];
+  const me = H._a && H._a.runWithContext || fallbackRunWithContext, pe = H._e.run(() => (Z = effectScope(), me(() => Z.run(C))));
+  for (const ve in pe) {
+    const we = pe[ve];
     if (isRef(we) && !isComputed(we) || isReactive(we))
-      process.env.NODE_ENV !== "production" && U ? set(se.value, ve, toRef(me, ve)) : G || (re && shouldHydrate(we) && (isRef(we) ? we.value = re[ve] : mergeReactiveObjects(we, re[ve])), H.state.value[K][ve] = we), process.env.NODE_ENV !== "production" && he.state.push(ve);
+      process.env.NODE_ENV !== "production" && U ? set(se.value, ve, toRef(pe, ve)) : G || (re && shouldHydrate(we) && (isRef(we) ? we.value = re[ve] : mergeReactiveObjects(we, re[ve])), H.state.value[K][ve] = we), process.env.NODE_ENV !== "production" && he.state.push(ve);
     else if (typeof we == "function") {
       const be = process.env.NODE_ENV !== "production" && U ? we : ue(ve, we);
-      me[ve] = be, process.env.NODE_ENV !== "production" && (he.actions[ve] = we), Q.actions[ve] = we;
+      pe[ve] = be, process.env.NODE_ENV !== "production" && (he.actions[ve] = we), Q.actions[ve] = we;
     } else
       process.env.NODE_ENV !== "production" && isComputed(we) && (he.getters[ve] = G ? (
         // @ts-expect-error
         W.getters[ve]
-      ) : we, IS_CLIENT && (me._getters || // @ts-expect-error: same
-      (me._getters = markRaw([]))).push(ve));
+      ) : we, IS_CLIENT && (pe._getters || // @ts-expect-error: same
+      (pe._getters = markRaw([]))).push(ve));
   }
-  if (assign(ge, me), assign(toRaw(ge), me), Object.defineProperty(ge, "$state", {
+  if (assign(ge, pe), assign(toRaw(ge), pe), Object.defineProperty(ge, "$state", {
     get: () => process.env.NODE_ENV !== "production" && U ? se.value : H.state.value[K],
     set: (ve) => {
       if (process.env.NODE_ENV !== "production" && U)
@@ -4570,7 +4570,7 @@ const SaveOutlined$1 = SaveOutlined, _hoisted_1$e = { style: { "text-align": "le
       ]);
     };
   }
-}), FormInput_vue_vue_type_style_index_0_scoped_f9a6d0f0_lang = "", FormInput = /* @__PURE__ */ _export_sfc(_sfc_main$l, [["__scopeId", "data-v-f9a6d0f0"]]), _hoisted_1$d = { class: "move" }, _hoisted_2$9 = {
+}), FormInput_vue_vue_type_style_index_0_scoped_a1672db9_lang = "", FormInput = /* @__PURE__ */ _export_sfc(_sfc_main$l, [["__scopeId", "data-v-a1672db9"]]), _hoisted_1$d = { class: "move" }, _hoisted_2$9 = {
   key: 0,
   class: "widget-view-drag"
 }, _hoisted_3$7 = ["onMousedown"], _hoisted_4$5 = {
@@ -4909,7 +4909,7 @@ const SaveOutlined$1 = SaveOutlined, _hoisted_1$e = { style: { "text-align": "le
       });
     };
   }
-}), index_vue_vue_type_style_index_0_scoped_17141f3d_lang = "", FormDesign = /* @__PURE__ */ _export_sfc(_sfc_main$h, [["__scopeId", "data-v-17141f3d"]]), _sfc_main$g = /* @__PURE__ */ defineComponent({
+}), index_vue_vue_type_style_index_0_scoped_aa78c39f_lang = "", FormDesign = /* @__PURE__ */ _export_sfc(_sfc_main$h, [["__scopeId", "data-v-aa78c39f"]]), _sfc_main$g = /* @__PURE__ */ defineComponent({
   __name: "Grid",
   props: {
     configData: {
@@ -5006,12 +5006,16 @@ const SaveOutlined$1 = SaveOutlined, _hoisted_1$e = { style: { "text-align": "le
   state: () => ({
     selectList: [],
     updateList: [],
-    delList: []
+    delList: [],
+    selectTables: []
   }),
   getters: {
     getSelectData(K) {
       return K.selectList;
     },
+    getSelectTables(K) {
+      return K.selectTables;
+    },
     getUpdateData(K) {
       return K.updateList;
     }
@@ -5028,6 +5032,12 @@ const SaveOutlined$1 = SaveOutlined, _hoisted_1$e = { style: { "text-align": "le
     },
     addUpdateData(K) {
       this.updateList.push(...K);
+    },
+    addSelectTable(K) {
+      this.selectTables.push(K);
+    },
+    setSelectTables(K) {
+      this.selectTables = K;
     }
   }
 });
@@ -6030,16 +6040,16 @@ var _excluded$2 = ["image", "description", "imageStyle", "class"], defaultEmptyI
   return createVNode(LocaleReceiver, {
     componentName: "Empty",
     children: function(he) {
-      var fe, ge = typeof se < "u" ? se : he.description, pe = typeof ge == "string" ? ge : "empty", me = null;
-      return typeof oe == "string" ? me = createVNode("img", {
-        alt: pe,
+      var fe, ge = typeof se < "u" ? se : he.description, me = typeof ge == "string" ? ge : "empty", pe = null;
+      return typeof oe == "string" ? pe = createVNode("img", {
+        alt: me,
         src: oe
-      }, null) : me = oe, createVNode("div", _objectSpread2({
+      }, null) : pe = oe, createVNode("div", _objectSpread2({
         class: classNames(te, le, (fe = {}, _defineProperty(fe, "".concat(te, "-normal"), oe === simpleEmptyImg), _defineProperty(fe, "".concat(te, "-rtl"), X.value === "rtl"), fe))
       }, de), [createVNode("div", {
         class: "".concat(te, "-image"),
         style: ae
-      }, [me]), ge && createVNode("p", {
+      }, [pe]), ge && createVNode("p", {
         class: "".concat(te, "-description")
       }, [ge]), G.default && createVNode("div", {
         class: "".concat(te, "-footer")
@@ -6213,9 +6223,9 @@ const Notice = defineComponent({
     }, {
       flush: "post"
     }), function() {
-      var ne, oe, re = C.prefixCls, se = C.closable, ae = C.closeIcon, ce = ae === void 0 ? (ne = U.closeIcon) === null || ne === void 0 ? void 0 : ne.call(U) : ae, le = C.onClick, de = C.holder, ue = H.class, he = H.style, fe = "".concat(re, "-notice"), ge = Object.keys(H).reduce(function(me, ve) {
-        return (ve.substr(0, 5) === "data-" || ve.substr(0, 5) === "aria-" || ve === "role") && (me[ve] = H[ve]), me;
-      }, {}), pe = createVNode("div", _objectSpread2({
+      var ne, oe, re = C.prefixCls, se = C.closable, ae = C.closeIcon, ce = ae === void 0 ? (ne = U.closeIcon) === null || ne === void 0 ? void 0 : ne.call(U) : ae, le = C.onClick, de = C.holder, ue = H.class, he = H.style, fe = "".concat(re, "-notice"), ge = Object.keys(H).reduce(function(pe, ve) {
+        return (ve.substr(0, 5) === "data-" || ve.substr(0, 5) === "aria-" || ve === "role") && (pe[ve] = H[ve]), pe;
+      }, {}), me = createVNode("div", _objectSpread2({
         class: classNames(fe, ue, _defineProperty({}, "".concat(fe, "-closable"), se)),
         style: he,
         onMouseenter: ee,
@@ -6234,9 +6244,9 @@ const Notice = defineComponent({
         to: de
       }, {
         default: function() {
-          return pe;
+          return me;
         }
-      }) : pe;
+      }) : me;
     };
   }
 });
@@ -6280,14 +6290,14 @@ var Notification = defineComponent({
       var ie, ne, oe = C.prefixCls, re = C.closeIcon, se = re === void 0 ? (ie = G.closeIcon) === null || ie === void 0 ? void 0 : ie.call(G, {
         prefixCls: oe
       }) : re, ae = Q.value.map(function(le, de) {
-        var ue = le.notice, he = le.holderCallback, fe = de === Q.value.length - 1 ? ue.updateMark : void 0, ge = ue.key, pe = ue.userPassKey, me = ue.content, ve = _objectSpread2(_objectSpread2(_objectSpread2({
+        var ue = le.notice, he = le.holderCallback, fe = de === Q.value.length - 1 ? ue.updateMark : void 0, ge = ue.key, me = ue.userPassKey, pe = ue.content, ve = _objectSpread2(_objectSpread2(_objectSpread2({
           prefixCls: oe,
           closeIcon: typeof se == "function" ? se({
             prefixCls: oe
           }) : se
         }, ue), ue.props), {}, {
           key: ge,
-          noticeKey: pe || ge,
+          noticeKey: me || ge,
           updateMark: fe,
           onClose: function(be) {
             var Ee;
@@ -6303,9 +6313,9 @@ var Notification = defineComponent({
           }
         }, null) : createVNode(Notice, ve, {
           default: function() {
-            return [typeof me == "function" ? me({
+            return [typeof pe == "function" ? pe({
               prefixCls: oe
-            }) : me];
+            }) : pe];
           }
         });
       }), ce = (ne = {}, _defineProperty(ne, oe, 1), _defineProperty(ne, H.class, !!H.class), ne);
@@ -6342,12 +6352,12 @@ Notification.newInstance = function(C, W) {
       return onMounted(function() {
         W({
           notice: function(ge) {
-            var pe;
-            (pe = he.value) === null || pe === void 0 || pe.add(ge);
+            var me;
+            (me = he.value) === null || me === void 0 || me.add(ge);
           },
           removeNotice: function(ge) {
-            var pe;
-            (pe = he.value) === null || pe === void 0 || pe.remove(ge);
+            var me;
+            (me = he.value) === null || me === void 0 || me.remove(ge);
           },
           destroy: function() {
             render(null, oe), oe.parentNode && oe.parentNode.removeChild(oe);
@@ -6355,17 +6365,17 @@ Notification.newInstance = function(C, W) {
           component: he
         });
       }), function() {
-        var fe = globalConfigForApi, ge = fe.getPrefixCls(G, X), pe = fe.getRootPrefixCls(ee, ge), me = ie ? te : "".concat(pe, "-").concat(te);
+        var fe = globalConfigForApi, ge = fe.getPrefixCls(G, X), me = fe.getRootPrefixCls(ee, ge), pe = ie ? te : "".concat(me, "-").concat(te);
         return createVNode(ConfigProvider, _objectSpread2(_objectSpread2({}, fe), {}, {
           notUpdateGlobalConfig: !0,
-          prefixCls: pe
+          prefixCls: me
         }), {
           default: function() {
             return [createVNode(Notification, _objectSpread2(_objectSpread2({
               ref: he
             }, ue), {}, {
               prefixCls: ge,
-              transitionName: me
+              transitionName: pe
             }), null)];
           }
         });
@@ -6546,8 +6556,8 @@ var _typeofExports = _typeof.exports;
     ne(ge, ee, function() {
       return this;
     });
-    var pe = Object.getPrototypeOf, me = pe && pe(pe(We([])));
-    me && me !== G && Z.call(me, ee) && (ge = me);
+    var me = Object.getPrototypeOf, pe = me && me(me(We([])));
+    pe && pe !== G && Z.call(pe, ee) && (ge = pe);
     var ve = fe.prototype = ue.prototype = Object.create(ge);
     function we(ke) {
       ["next", "throw", "return"].forEach(function(Ne) {
@@ -8356,8 +8366,8 @@ const Wave = defineComponent({
       var fe = C.insertExtraNode;
       return fe ? "".concat(X.value, "-click-animating") : "".concat(X.value, "-click-animating-without-extra-node");
     }, le = function(fe, ge) {
-      var pe = C.insertExtraNode, me = C.disabled;
-      if (!(me || !fe || isHidden(fe) || fe.className.indexOf("-leave") >= 0)) {
+      var me = C.insertExtraNode, pe = C.disabled;
+      if (!(pe || !fe || isHidden(fe) || fe.className.indexOf("-leave") >= 0)) {
         oe = document.createElement("div"), oe.className = "".concat(X.value, "-click-animating-node");
         var ve = ce();
         if (fe.removeAttribute(ve), fe.setAttribute(ve, "true"), styleForPesudo = styleForPesudo || document.createElement("style"), ge && ge !== "#ffffff" && ge !== "rgb(255, 255, 255)" && isNotGrey(ge) && !/rgba\(\d*, \d*, \d*, 0\)/.test(ge) && // any transparent rgba color
@@ -8368,17 +8378,17 @@ const Wave = defineComponent({
           --antd-wave-shadow-color: `).concat(ge, `;
         }`), document.body.contains(styleForPesudo) || document.body.appendChild(styleForPesudo);
         }
-        pe && fe.appendChild(oe), TransitionEvents$1.addStartEventListener(fe, se), TransitionEvents$1.addEndEventListener(fe, ae);
+        me && fe.appendChild(oe), TransitionEvents$1.addStartEventListener(fe, se), TransitionEvents$1.addEndEventListener(fe, ae);
       }
     }, de = function(fe) {
       if (!(!fe || fe === oe || !(fe instanceof Element))) {
-        var ge = C.insertExtraNode, pe = ce();
-        fe.setAttribute(pe, "false"), styleForPesudo && (styleForPesudo.innerHTML = ""), ge && oe && fe.contains(oe) && fe.removeChild(oe), TransitionEvents$1.removeStartEventListener(fe, se), TransitionEvents$1.removeEndEventListener(fe, ae);
+        var ge = C.insertExtraNode, me = ce();
+        fe.setAttribute(me, "false"), styleForPesudo && (styleForPesudo.innerHTML = ""), ge && oe && fe.contains(oe) && fe.removeChild(oe), TransitionEvents$1.removeStartEventListener(fe, se), TransitionEvents$1.removeEndEventListener(fe, ae);
       }
     }, ue = function(fe) {
       if (!(!fe || !fe.getAttribute || fe.getAttribute("disabled") || fe.className.indexOf("disabled") >= 0)) {
-        var ge = function(me) {
-          if (!(me.target.tagName === "INPUT" || isHidden(me.target))) {
+        var ge = function(pe) {
+          if (!(pe.target.tagName === "INPUT" || isHidden(pe.target))) {
             de(fe);
             var ve = getComputedStyle(fe).getPropertyValue("border-top-color") || // Firefox Compatible
             getComputedStyle(fe).getPropertyValue("border-color") || getComputedStyle(fe).getPropertyValue("background-color");
@@ -8536,20 +8546,20 @@ const Button$1 = defineComponent({
     }), le = computed(function() {
       return _typeof$1(C.loading) === "object" && C.loading.delay ? C.loading.delay || !0 : !!C.loading;
     });
-    watch(le, function(me) {
+    watch(le, function(pe) {
       clearTimeout(oe.value), typeof le.value == "number" ? oe.value = setTimeout(function() {
-        se.value = me;
-      }, le.value) : se.value = me;
+        se.value = pe;
+      }, le.value) : se.value = pe;
     }, {
       immediate: !0
     });
     var de = computed(function() {
-      var me, ve = C.type, we = C.shape, be = we === void 0 ? "default" : we, Ee = C.ghost, ye = C.block, De = C.danger, Le = X.value, Oe = {
+      var pe, ve = C.type, we = C.shape, be = we === void 0 ? "default" : we, Ee = C.ghost, ye = C.block, De = C.danger, Le = X.value, Oe = {
         large: "lg",
         small: "sm",
         middle: void 0
       }, We = ie.value, ke = We && Oe[We] || "";
-      return me = {}, _defineProperty(me, "".concat(Le), !0), _defineProperty(me, "".concat(Le, "-").concat(ve), ve), _defineProperty(me, "".concat(Le, "-").concat(be), be !== "default" && be), _defineProperty(me, "".concat(Le, "-").concat(ke), ke), _defineProperty(me, "".concat(Le, "-loading"), se.value), _defineProperty(me, "".concat(Le, "-background-ghost"), Ee && !isUnborderedButtonType(ve)), _defineProperty(me, "".concat(Le, "-two-chinese-chars"), ae.value && ce.value), _defineProperty(me, "".concat(Le, "-block"), ye), _defineProperty(me, "".concat(Le, "-dangerous"), !!De), _defineProperty(me, "".concat(Le, "-rtl"), te.value === "rtl"), me;
+      return pe = {}, _defineProperty(pe, "".concat(Le), !0), _defineProperty(pe, "".concat(Le, "-").concat(ve), ve), _defineProperty(pe, "".concat(Le, "-").concat(be), be !== "default" && be), _defineProperty(pe, "".concat(Le, "-").concat(ke), ke), _defineProperty(pe, "".concat(Le, "-loading"), se.value), _defineProperty(pe, "".concat(Le, "-background-ghost"), Ee && !isUnborderedButtonType(ve)), _defineProperty(pe, "".concat(Le, "-two-chinese-chars"), ae.value && ce.value), _defineProperty(pe, "".concat(Le, "-block"), ye), _defineProperty(pe, "".concat(Le, "-dangerous"), !!De), _defineProperty(pe, "".concat(Le, "-rtl"), te.value === "rtl"), pe;
     }), ue = function() {
       var ve = ne.value;
       if (!(!ve || ee.value === !1)) {
@@ -8578,15 +8588,15 @@ const Button$1 = defineComponent({
     var ge = function() {
       var ve;
       (ve = ne.value) === null || ve === void 0 || ve.focus();
-    }, pe = function() {
+    }, me = function() {
       var ve;
       (ve = ne.value) === null || ve === void 0 || ve.blur();
     };
     return Z({
       focus: ge,
-      blur: pe
+      blur: me
     }), function() {
-      var me, ve, we = C.icon, be = we === void 0 ? (me = H.icon) === null || me === void 0 ? void 0 : me.call(H) : we, Ee = flattenChildren((ve = H.default) === null || ve === void 0 ? void 0 : ve.call(H));
+      var pe, ve, we = C.icon, be = we === void 0 ? (pe = H.icon) === null || pe === void 0 ? void 0 : pe.call(H) : we, Ee = flattenChildren((ve = H.default) === null || ve === void 0 ? void 0 : ve.call(H));
       re = Ee.length === 1 && !be && !isUnborderedButtonType(C.type);
       var ye = C.type, De = C.htmlType, Le = C.disabled, Oe = C.href, We = C.title, ke = C.target, Ne = C.onMousedown, Pe = se.value ? "loading" : be, Fe = _objectSpread2(_objectSpread2({}, U), {}, {
         title: We,
@@ -9278,7 +9288,7 @@ const Content = defineComponent({
       C.onVisibleChanged(re);
     };
     return function() {
-      var oe, re, se, ae, ce = C.prefixCls, le = C.footer, de = le === void 0 ? (oe = U.footer) === null || oe === void 0 ? void 0 : oe.call(U) : le, ue = C.title, he = ue === void 0 ? (re = U.title) === null || re === void 0 ? void 0 : re.call(U) : ue, fe = C.ariaId, ge = C.closable, pe = C.closeIcon, me = pe === void 0 ? (se = U.closeIcon) === null || se === void 0 ? void 0 : se.call(U) : pe, ve = C.onClose, we = C.bodyStyle, be = C.bodyProps, Ee = C.onMousedown, ye = C.onMouseup, De = C.visible, Le = C.modalRender, Oe = Le === void 0 ? U.modalRender : Le, We = C.destroyOnClose, ke = C.motionName, Ne;
+      var oe, re, se, ae, ce = C.prefixCls, le = C.footer, de = le === void 0 ? (oe = U.footer) === null || oe === void 0 ? void 0 : oe.call(U) : le, ue = C.title, he = ue === void 0 ? (re = U.title) === null || re === void 0 ? void 0 : re.call(U) : ue, fe = C.ariaId, ge = C.closable, me = C.closeIcon, pe = me === void 0 ? (se = U.closeIcon) === null || se === void 0 ? void 0 : se.call(U) : me, ve = C.onClose, we = C.bodyStyle, be = C.bodyProps, Ee = C.onMousedown, ye = C.onMouseup, De = C.visible, Le = C.modalRender, Oe = Le === void 0 ? U.modalRender : Le, We = C.destroyOnClose, ke = C.motionName, Ne;
       de && (Ne = createVNode("div", {
         class: "".concat(ce, "-footer")
       }, [de]));
@@ -9295,7 +9305,7 @@ const Content = defineComponent({
         onClick: ve,
         "aria-label": "Close",
         class: "".concat(ce, "-close")
-      }, [me || createVNode("span", {
+      }, [pe || createVNode("span", {
         class: "".concat(ce, "-close-x")
       }, null)]));
       var Ae = createVNode("div", {
@@ -9448,9 +9458,9 @@ const Mask = defineComponent({
         (de = C.scrollLocker) === null || de === void 0 || de.lock();
       }
     }), function() {
-      var le = C.prefixCls, de = C.mask, ue = C.visible, he = C.maskTransitionName, fe = C.maskAnimation, ge = C.zIndex, pe = C.wrapClassName, me = C.rootClassName, ve = C.wrapStyle, we = C.closable, be = C.maskProps, Ee = C.maskStyle, ye = C.transitionName, De = C.animation, Le = C.wrapProps, Oe = C.title, We = Oe === void 0 ? U.title : Oe, ke = H.style, Ne = H.class;
+      var le = C.prefixCls, de = C.mask, ue = C.visible, he = C.maskTransitionName, fe = C.maskAnimation, ge = C.zIndex, me = C.wrapClassName, pe = C.rootClassName, ve = C.wrapStyle, we = C.closable, be = C.maskProps, Ee = C.maskStyle, ye = C.transitionName, De = C.animation, Le = C.wrapProps, Oe = C.title, We = Oe === void 0 ? U.title : Oe, ke = H.style, Ne = H.class;
       return createVNode("div", _objectSpread2({
-        class: ["".concat(le, "-root"), me]
+        class: ["".concat(le, "-root"), pe]
       }, pickAttrs(C, {
         data: !0
       })), [createVNode(Mask, {
@@ -9464,7 +9474,7 @@ const Mask = defineComponent({
       }, null), createVNode("div", _objectSpread2({
         tabIndex: -1,
         onKeydown: ce,
-        class: classNames("".concat(le, "-wrap"), pe),
+        class: classNames("".concat(le, "-wrap"), me),
         ref: Z,
         onClick: ae,
         role: "dialog",
@@ -9643,15 +9653,15 @@ const Modal = defineComponent({
     }, se = function(le) {
       H("ok", le);
     }, ae = function() {
-      var le, de, ue = C.okText, he = ue === void 0 ? (le = U.okText) === null || le === void 0 ? void 0 : le.call(U) : ue, fe = C.okType, ge = C.cancelText, pe = ge === void 0 ? (de = U.cancelText) === null || de === void 0 ? void 0 : de.call(U) : ge, me = C.confirmLoading;
+      var le, de, ue = C.okText, he = ue === void 0 ? (le = U.okText) === null || le === void 0 ? void 0 : le.call(U) : ue, fe = C.okType, ge = C.cancelText, me = ge === void 0 ? (de = U.cancelText) === null || de === void 0 ? void 0 : de.call(U) : ge, pe = C.confirmLoading;
       return createVNode(Fragment, null, [createVNode(Button$1, _objectSpread2({
         onClick: re
       }, C.cancelButtonProps), {
         default: function() {
-          return [pe || X.value.cancelText];
+          return [me || X.value.cancelText];
         }
       }), createVNode(Button$1, _objectSpread2(_objectSpread2({}, convertLegacyProps(fe)), {}, {
-        loading: me,
+        loading: pe,
         onClick: se
       }, C.okButtonProps), {
         default: function() {
@@ -9662,7 +9672,7 @@ const Modal = defineComponent({
     return function() {
       var ce, le;
       C.prefixCls;
-      var de = C.visible, ue = C.wrapClassName, he = C.centered, fe = C.getContainer, ge = C.closeIcon, pe = ge === void 0 ? (ce = U.closeIcon) === null || ce === void 0 ? void 0 : ce.call(U) : ge, me = C.focusTriggerAfterClose, ve = me === void 0 ? !0 : me, we = _objectWithoutProperties(C, _excluded), be = classNames(ue, (le = {}, _defineProperty(le, "".concat(te.value, "-centered"), !!he), _defineProperty(le, "".concat(te.value, "-wrap-rtl"), ne.value === "rtl"), le));
+      var de = C.visible, ue = C.wrapClassName, he = C.centered, fe = C.getContainer, ge = C.closeIcon, me = ge === void 0 ? (ce = U.closeIcon) === null || ce === void 0 ? void 0 : ce.call(U) : ge, pe = C.focusTriggerAfterClose, ve = pe === void 0 ? !0 : pe, we = _objectWithoutProperties(C, _excluded), be = classNames(ue, (le = {}, _defineProperty(le, "".concat(te.value, "-centered"), !!he), _defineProperty(le, "".concat(te.value, "-wrap-rtl"), ne.value === "rtl"), le));
       return createVNode(DialogWrap$1, _objectSpread2(_objectSpread2(_objectSpread2({}, we), G), {}, {
         getContainer: fe || oe.value,
         prefixCls: te.value,
@@ -9678,7 +9688,7 @@ const Modal = defineComponent({
         closeIcon: function() {
           return createVNode("span", {
             class: "".concat(te.value, "-close-x")
-          }, [pe || createVNode(CloseOutlined$1, {
+          }, [me || createVNode(CloseOutlined$1, {
             class: "".concat(te.value, "-close-icon")
           }, null)]);
         }
@@ -9776,7 +9786,7 @@ const ConfirmDialog = defineComponent({
   setup: function(C, W) {
     var H = W.attrs, U = useLocaleReceiver("Modal"), G = _slicedToArray(U, 1), Z = G[0];
     return function() {
-      var Q = C.icon, X = C.onCancel, ee = C.onOk, te = C.close, ie = C.closable, ne = ie === void 0 ? !1 : ie, oe = C.zIndex, re = C.afterClose, se = C.visible, ae = C.keyboard, ce = C.centered, le = C.getContainer, de = C.maskStyle, ue = C.okButtonProps, he = C.cancelButtonProps, fe = C.okCancel, ge = fe === void 0 ? !0 : fe, pe = C.width, me = pe === void 0 ? 416 : pe, ve = C.mask, we = ve === void 0 ? !0 : ve, be = C.maskClosable, Ee = be === void 0 ? !1 : be, ye = C.type, De = C.title, Le = C.content, Oe = C.direction, We = C.closeIcon, ke = C.modalRender, Ne = C.focusTriggerAfterClose, Pe = C.rootPrefixCls, Fe = C.bodyStyle, Ae = C.wrapClassName, ze = C.okType || "primary", Xe = C.prefixCls || "ant-modal", Ke = "".concat(Xe, "-confirm"), Ye = H.style || {}, ot = renderSomeContent(C.okText) || (ge ? Z.value.okText : Z.value.justOkText), ut = renderSomeContent(C.cancelText) || Z.value.cancelText, rt = C.autoFocusButton === null ? !1 : C.autoFocusButton || "ok", Ze = classNames(Ke, "".concat(Ke, "-").concat(ye), "".concat(Xe, "-").concat(ye), _defineProperty({}, "".concat(Ke, "-rtl"), Oe === "rtl"), H.class), mt = ge && createVNode(ActionButton, {
+      var Q = C.icon, X = C.onCancel, ee = C.onOk, te = C.close, ie = C.closable, ne = ie === void 0 ? !1 : ie, oe = C.zIndex, re = C.afterClose, se = C.visible, ae = C.keyboard, ce = C.centered, le = C.getContainer, de = C.maskStyle, ue = C.okButtonProps, he = C.cancelButtonProps, fe = C.okCancel, ge = fe === void 0 ? !0 : fe, me = C.width, pe = me === void 0 ? 416 : me, ve = C.mask, we = ve === void 0 ? !0 : ve, be = C.maskClosable, Ee = be === void 0 ? !1 : be, ye = C.type, De = C.title, Le = C.content, Oe = C.direction, We = C.closeIcon, ke = C.modalRender, Ne = C.focusTriggerAfterClose, Pe = C.rootPrefixCls, Fe = C.bodyStyle, Ae = C.wrapClassName, ze = C.okType || "primary", Xe = C.prefixCls || "ant-modal", Ke = "".concat(Xe, "-confirm"), Ye = H.style || {}, ot = renderSomeContent(C.okText) || (ge ? Z.value.okText : Z.value.justOkText), ut = renderSomeContent(C.cancelText) || Z.value.cancelText, rt = C.autoFocusButton === null ? !1 : C.autoFocusButton || "ok", Ze = classNames(Ke, "".concat(Ke, "-").concat(ye), "".concat(Xe, "-").concat(ye), _defineProperty({}, "".concat(Ke, "-rtl"), Oe === "rtl"), H.class), mt = ge && createVNode(ActionButton, {
         actionFn: X,
         close: te,
         autofocus: rt === "cancel",
@@ -9806,7 +9816,7 @@ const ConfirmDialog = defineComponent({
         maskStyle: de,
         style: Ye,
         bodyStyle: Fe,
-        width: me,
+        width: pe,
         zIndex: oe,
         afterClose: re,
         keyboard: ae,
@@ -10123,10 +10133,10 @@ const _hoisted_1$9 = { class: "table-column-setting" }, _hoisted_2$5 = { class:
         Z.value.push(De);
       re.value = De, te.value = [De.id], ie.value = te.value;
     }
-    function pe(ye) {
+    function me(ye) {
       fe(Z.value, ye.id);
     }
-    function me() {
+    function pe() {
       re.value && ee.value.validate().then(() => {
         W("update:tableColumns", ve(Z.value)), W("ok"), G.value = !1;
       }).catch((ye) => {
@@ -10163,7 +10173,7 @@ const _hoisted_1$9 = { class: "table-column-setting" }, _hoisted_2$5 = { class:
         "onUpdate:visible": De[7] || (De[7] = (Ke) => isRef(G) ? G.value = Ke : G = Ke),
         title: "列配置",
         width: "850px",
-        onOk: me
+        onOk: pe
       }, {
         default: withCtx(() => [
           createElementVNode("div", _hoisted_1$9, [
@@ -10198,7 +10208,7 @@ const _hoisted_1$9 = { class: "table-column-setting" }, _hoisted_2$5 = { class:
                         "cancel-text": "否",
                         "ok-text": "是",
                         title: "确定要删除吗?这将会删除所有子节点",
-                        onConfirm: (Ye) => pe(Ke)
+                        onConfirm: (Ye) => me(Ke)
                       }, {
                         default: withCtx(() => [
                           unref(re) && Ke.id == unref(re).id ? (openBlock(), createElementBlock("div", {
@@ -10315,67 +10325,64 @@ const _hoisted_1$9 = { class: "table-column-setting" }, _hoisted_2$5 = { class:
     }
   },
   setup(K) {
-    const C = K, W = useFormStore(), H = useDataStore(), U = computed(() => {
-      let oe = H.getSelectData;
-      return Array.from(new Set(oe.map((se) => se.value.split(".")[0]))).map((se) => ({ value: se }));
-    });
-    let G = ref(), Z = ref([]), Q = ref(C.configData.action);
-    const X = () => {
-      Q.value.push({
+    const C = K, W = useFormStore(), H = useDataStore();
+    let U = ref(), G = ref([]), Z = ref(C.configData.action);
+    const Q = () => {
+      Z.value.push({
         title: "",
         oper: ""
       });
     };
-    function ee(oe) {
-      let re = Q.value.indexOf(oe);
-      re !== -1 && Q.value.splice(re, 1);
+    function X(ne) {
+      let oe = Z.value.indexOf(ne);
+      oe !== -1 && Z.value.splice(oe, 1);
     }
-    function te(oe) {
-      let ae = H.getSelectData.filter((ce) => ce.value.split(".")[0] == oe).map((ce) => ce.value.split(".")[1]).map((ce) => ({
+    function ee(ne) {
+      let se = H.getSelectData.filter((ae) => ae.value.split(".")[0] == ne).map((ae) => ae.value.split(".")[1]).map((ae) => ({
         id: "column-" + guid(),
-        title: ce,
-        dataIndex: ce,
+        title: ae,
+        dataIndex: ae,
         width: "auto",
         options: {
           hidden: !1
         }
       }));
-      C.configData.tableColumns = ae;
+      C.configData.tableColumns = se;
     }
-    function ie() {
-      Z.value = JSON.parse(JSON.stringify(C.configData.tableColumns, null, "	")), G.value.show();
+    function te() {
+      G.value = JSON.parse(JSON.stringify(C.configData.tableColumns, null, "	")), U.value.show();
     }
-    function ne() {
-      const oe = W.formData.list.indexOf(C.configData);
-      W.formData.list[oe].tableColumns = Z.value;
+    function ie() {
+      const ne = W.formData.list.indexOf(C.configData);
+      W.formData.list[ne].tableColumns = G.value;
     }
-    return (oe, re) => {
-      const se = resolveComponent("a-select"), ae = resolveComponent("a-form-item"), ce = resolveComponent("a-button"), le = resolveComponent("a-switch"), de = resolveComponent("a-input"), ue = resolveComponent("a-col"), he = resolveComponent("a-row"), fe = resolveComponent("a-input-number"), ge = resolveComponent("a-form");
+    return (ne, oe) => {
+      const re = resolveComponent("a-select"), se = resolveComponent("a-form-item"), ae = resolveComponent("a-button"), ce = resolveComponent("a-switch"), le = resolveComponent("a-input"), de = resolveComponent("a-col"), ue = resolveComponent("a-row"), he = resolveComponent("a-input-number"), fe = resolveComponent("a-form");
       return openBlock(), createElementBlock(Fragment, null, [
-        createVNode(ge, {
+        createVNode(fe, {
           layout: "vertical",
           model: K.configData,
           autocomplete: "off"
         }, {
           default: withCtx(() => [
-            createVNode(ae, {
+            createVNode(se, {
               label: "数据源",
               rules: [{ required: !0 }]
             }, {
               default: withCtx(() => [
-                createVNode(se, {
+                createVNode(re, {
                   value: K.configData.model,
-                  "onUpdate:value": re[0] || (re[0] = (pe) => K.configData.model = pe),
-                  options: U.value,
-                  onChange: te
+                  "onUpdate:value": oe[0] || (oe[0] = (ge) => K.configData.model = ge),
+                  options: unref(H).getSelectTables,
+                  onChange: ee
                 }, null, 8, ["value", "options"])
               ]),
               _: 1
             }),
-            createVNode(ae, { label: "列配置" }, {
+            createVNode(se, { label: "列配置" }, {
               default: withCtx(() => [
-                createVNode(ce, {
-                  onClick: ie,
+                createVNode(ae, {
+                  onClick: te,
                   block: ""
                 }, {
                   default: withCtx(() => [
@@ -10386,49 +10393,49 @@ const _hoisted_1$9 = { class: "table-column-setting" }, _hoisted_2$5 = { class:
               ]),
               _: 1
             }),
-            createVNode(ae, { label: "显示操作列" }, {
+            createVNode(se, { label: "显示操作列" }, {
               default: withCtx(() => [
-                createVNode(le, {
+                createVNode(ce, {
                   checked: K.configData.options.showAction,
-                  "onUpdate:checked": re[1] || (re[1] = (pe) => K.configData.options.showAction = pe)
+                  "onUpdate:checked": oe[1] || (oe[1] = (ge) => K.configData.options.showAction = ge)
                 }, null, 8, ["checked"])
               ]),
               _: 1
             }),
             K.configData.options.showAction ? (openBlock(), createElementBlock("div", _hoisted_1$8, [
-              (openBlock(!0), createElementBlock(Fragment, null, renderList(K.configData.action, (pe, me) => (openBlock(), createBlock(he, { style: { "padding-bottom": "5px" } }, {
+              (openBlock(!0), createElementBlock(Fragment, null, renderList(K.configData.action, (ge, me) => (openBlock(), createBlock(ue, { style: { "padding-bottom": "5px" } }, {
                 default: withCtx(() => [
-                  createVNode(ue, { span: 9 }, {
+                  createVNode(de, { span: 9 }, {
                     default: withCtx(() => [
-                      createVNode(de, {
-                        value: pe.title,
-                        "onUpdate:value": (ve) => pe.title = ve,
+                      createVNode(le, {
+                        value: ge.title,
+                        "onUpdate:value": (pe) => ge.title = pe,
                         placeholder: "按钮名称"
                       }, null, 8, ["value", "onUpdate:value"])
                     ]),
                     _: 2
                   }, 1024),
-                  createVNode(ue, {
+                  createVNode(de, {
                     span: 9,
                     offset: 1
                   }, {
                     default: withCtx(() => [
-                      createVNode(de, {
-                        value: pe.oper,
-                        "onUpdate:value": (ve) => pe.oper = ve,
+                      createVNode(le, {
+                        value: ge.oper,
+                        "onUpdate:value": (pe) => ge.oper = pe,
                         placeholder: "事件"
                       }, null, 8, ["value", "onUpdate:value"])
                     ]),
                     _: 2
                   }, 1024),
-                  createVNode(ue, {
+                  createVNode(de, {
                     span: 3,
                     offset: 1,
                     style: { "line-height": "30px" }
                   }, {
                     default: withCtx(() => [
                       createVNode(unref(MinusCircleFilled$1), {
-                        onClick: (ve) => ee(pe),
+                        onClick: (pe) => X(ge),
                         style: { "font-size": "16px", color: "#f56c6c", "border-color": "#fbc4c4" }
                       }, null, 8, ["onClick"])
                     ]),
@@ -10437,12 +10444,12 @@ const _hoisted_1$9 = { class: "table-column-setting" }, _hoisted_2$5 = { class:
                 ]),
                 _: 2
               }, 1024))), 256)),
-              createVNode(ae, null, {
+              createVNode(se, null, {
                 default: withCtx(() => [
-                  createVNode(ce, {
+                  createVNode(ae, {
                     type: "dashed",
                     style: { width: "100%" },
-                    onClick: X
+                    onClick: Q
                   }, {
                     default: withCtx(() => [
                       createVNode(unref(PlusOutlined$1)),
@@ -10454,21 +10461,21 @@ const _hoisted_1$9 = { class: "table-column-setting" }, _hoisted_2$5 = { class:
                 _: 1
               })
             ])) : createCommentVNode("", !0),
-            createVNode(ae, { label: "是否分页" }, {
+            createVNode(se, { label: "是否分页" }, {
               default: withCtx(() => [
-                createVNode(le, {
+                createVNode(ce, {
                   checked: K.configData.options.pagination,
-                  "onUpdate:checked": re[2] || (re[2] = (pe) => K.configData.options.pagination = pe)
+                  "onUpdate:checked": oe[2] || (oe[2] = (ge) => K.configData.options.pagination = ge)
                 }, null, 8, ["checked"])
               ]),
               _: 1
             }),
             K.configData.options.pagination ? (openBlock(), createElementBlock("div", _hoisted_2$4, [
-              createVNode(ae, { label: "每页显示数目" }, {
+              createVNode(se, { label: "每页显示数目" }, {
                 default: withCtx(() => [
-                  createVNode(fe, {
+                  createVNode(he, {
                     value: K.configData.options.pageSize,
-                    "onUpdate:value": re[3] || (re[3] = (pe) => K.configData.options.pageSize = pe),
+                    "onUpdate:value": oe[3] || (oe[3] = (ge) => K.configData.options.pageSize = ge),
                     min: 5,
                     max: 100,
                     defaultValue: 5,
@@ -10483,10 +10490,10 @@ const _hoisted_1$9 = { class: "table-column-setting" }, _hoisted_2$5 = { class:
         }, 8, ["model"]),
         createVNode(TableColumn, {
           ref_key: "settingRef",
-          ref: G,
-          tableColumns: unref(Z),
-          "onUpdate:tableColumns": re[4] || (re[4] = (pe) => isRef(Z) ? Z.value = pe : Z = pe),
-          onOk: ne
+          ref: U,
+          tableColumns: unref(G),
+          "onUpdate:tableColumns": oe[4] || (oe[4] = (ge) => isRef(G) ? G.value = ge : G = ge),
+          onOk: ie
         }, null, 8, ["tableColumns"])
       ], 64);
     };
@@ -12135,7 +12142,7 @@ class EditorLayoutInfoComputer extends ComputedEditorOption {
     const oe = C.minimap.maxColumn, re = C.minimap.size, se = C.minimap.side, ae = C.verticalScrollbarWidth, ce = C.viewLineCount, le = C.remainingWidth, de = C.isViewportWrapping, ue = ie ? 2 : 3;
     let he = Math.floor(G * U);
     const fe = he / G;
-    let ge = !1, pe = !1, me = ue * ne, ve = ne / G, we = 1;
+    let ge = !1, me = !1, pe = ue * ne, ve = ne / G, we = 1;
     if (re === "fill" || re === "fit") {
       const { typicalViewportLineCount: We, extraLinesBeforeFirstLine: ke, extraLinesBeyondLastLine: Ne, desiredRatio: Pe, minimapLineCount: Fe } = EditorLayoutInfoComputer.computeContainedMinimapLineCount({
         viewLineCount: ce,
@@ -12147,17 +12154,17 @@ class EditorLayoutInfoComputer extends ComputedEditorOption {
         pixelRatio: G
       });
       if (ce / Fe > 1)
-        ge = !0, pe = !0, ne = 1, me = 1, ve = ne / G;
+        ge = !0, me = !0, ne = 1, pe = 1, ve = ne / G;
       else {
         let ze = !1, Xe = ne + 1;
         if (re === "fit") {
-          const Ke = Math.ceil((ke + ce + Ne) * me);
+          const Ke = Math.ceil((ke + ce + Ne) * pe);
           de && Q && le <= W.stableFitRemainingWidth ? (ze = !0, Xe = W.stableFitMaxMinimapScale) : ze = Ke > he;
         }
         if (re === "fill" || ze) {
           ge = !0;
           const Ke = ne;
-          me = Math.min(X * G, Math.max(1, Math.floor(1 / Pe))), de && Q && le <= W.stableFitRemainingWidth && (Xe = W.stableFitMaxMinimapScale), ne = Math.min(Xe, Math.max(1, Math.floor(me / ue))), ne > Ke && (we = Math.min(2, ne / Ke)), ve = ne / G / we, he = Math.ceil(Math.max(We, ke + ce + Ne) * me), de ? (W.stableMinimapLayoutInput = C, W.stableFitRemainingWidth = le, W.stableFitMaxMinimapScale = ne) : (W.stableMinimapLayoutInput = null, W.stableFitRemainingWidth = 0);
+          pe = Math.min(X * G, Math.max(1, Math.floor(1 / Pe))), de && Q && le <= W.stableFitRemainingWidth && (Xe = W.stableFitMaxMinimapScale), ne = Math.min(Xe, Math.max(1, Math.floor(pe / ue))), ne > Ke && (we = Math.min(2, ne / Ke)), ve = ne / G / we, he = Math.ceil(Math.max(We, ke + ce + Ne) * pe), de ? (W.stableMinimapLayoutInput = C, W.stableFitRemainingWidth = le, W.stableFitMaxMinimapScale = ne) : (W.stableMinimapLayoutInput = null, W.stableFitRemainingWidth = 0);
         }
       }
     }
@@ -12171,9 +12178,9 @@ class EditorLayoutInfoComputer extends ComputedEditorOption {
       minimapLeft: Oe,
       minimapWidth: Ee,
       minimapHeightIsEditorHeight: ge,
-      minimapIsSampling: pe,
+      minimapIsSampling: me,
       minimapScale: ne,
-      minimapLineHeight: me,
+      minimapLineHeight: pe,
       minimapCanvasInnerWidth: ye,
       minimapCanvasInnerHeight: he,
       minimapCanvasOuterWidth: De,
@@ -12214,7 +12221,7 @@ class EditorLayoutInfoComputer extends ComputedEditorOption {
     ), fe = C.get(
       102
       /* EditorOption.scrollbar */
-    ), ge = fe.verticalScrollbarSize, pe = fe.verticalHasArrows, me = fe.arrowSize, ve = fe.horizontalScrollbarSize, we = C.get(
+    ), ge = fe.verticalScrollbarSize, me = fe.verticalHasArrows, pe = fe.arrowSize, ve = fe.horizontalScrollbarSize, we = C.get(
       43
       /* EditorOption.folding */
     ), be = C.get(
@@ -12253,7 +12260,7 @@ class EditorLayoutInfoComputer extends ComputedEditorOption {
       isViewportWrapping: Fe
     }, W.memory || new ComputeOptionsMemory());
     ze.renderMinimap !== 0 && ze.minimapLeft === 0 && (Le += ze.minimapWidth, Oe += ze.minimapWidth, We += ze.minimapWidth, ke += ze.minimapWidth);
-    const Xe = Ne - ze.minimapWidth, Ke = Math.max(1, Math.floor((Xe - ge - 2) / Q)), Ye = pe ? me : 0;
+    const Xe = Ne - ze.minimapWidth, Ke = Math.max(1, Math.floor((Xe - ge - 2) / Q)), Ye = me ? pe : 0;
     return Fe && (Ae = Math.max(1, Ke), oe === "bounded" && (Ae = Math.min(Ae, re))), {
       width: H,
       height: U,
@@ -14447,7 +14454,7 @@ var Event;
     return Ee(void 0), be((ye) => Ee(ye));
   }
   K.runAndSubscribe = ge;
-  function pe(be, Ee) {
+  function me(be, Ee) {
     let ye = null;
     function De(Oe) {
       ye == null || ye.dispose(), ye = new DisposableStore(), Ee(Oe, ye);
@@ -14458,8 +14465,8 @@ var Event;
       Le.dispose(), ye == null || ye.dispose();
     });
   }
-  K.runAndSubscribeWithStore = pe;
-  class me {
+  K.runAndSubscribeWithStore = me;
+  class pe {
     constructor(Ee, ye) {
       this._observable = Ee, this._counter = 0, this._hasChanged = !1;
       const De = {
@@ -14485,7 +14492,7 @@ var Event;
     }
   }
   function ve(be, Ee) {
-    return new me(be, Ee).emitter.event;
+    return new pe(be, Ee).emitter.event;
   }
   K.fromObservable = ve;
   function we(be) {
@@ -18463,16 +18470,16 @@ class FontMeasurementsImpl extends Disposable {
     readCharWidths(C, W);
     const fe = Math.max(Q.width, X.width, ee.width, te.width, ie.width, ne.width, oe.width, re.width, se.width, ae.width);
     let ge = C.fontFeatureSettings === EditorFontLigatures.OFF;
-    const pe = H[0].width;
+    const me = H[0].width;
     for (let ve = 1, we = H.length; ge && ve < we; ve++) {
-      const be = pe - H[ve].width;
+      const be = me - H[ve].width;
       if (be < -1e-3 || be > 1e-3) {
         ge = !1;
         break;
       }
     }
-    let me = !0;
-    return ge && le.width !== pe && (me = !1), le.width > ce.width && (me = !1), new FontInfo({
+    let pe = !0;
+    return ge && le.width !== me && (pe = !1), le.width > ce.width && (pe = !1), new FontInfo({
       pixelRatio: PixelRatio.value,
       fontFamily: C.fontFamily,
       fontWeight: C.fontWeight,
@@ -18484,7 +18491,7 @@ class FontMeasurementsImpl extends Disposable {
       isMonospace: ge,
       typicalHalfwidthCharacterWidth: U.width,
       typicalFullwidthCharacterWidth: G.width,
-      canUseHalfwidthRightwardsArrow: me,
+      canUseHalfwidthRightwardsArrow: pe,
       spaceWidth: Z.width,
       middotWidth: de.width,
       wsmiddotWidth: ue.width,
@@ -21021,9 +21028,9 @@ function createDOMPurify() {
     implementation: he,
     createNodeIterator: fe,
     createDocumentFragment: ge,
-    getElementsByTagName: pe
+    getElementsByTagName: me
   } = U, {
-    importNode: me
+    importNode: pe
   } = W;
   let ve = {};
   C.isSupported = typeof entries == "function" && typeof le == "function" && he && he.createHTMLDocument !== void 0;
@@ -21170,7 +21177,7 @@ function createDOMPurify() {
       }
     }
     const pt = He.body || He.documentElement;
-    return Me && Ge && pt.insertBefore(U.createTextNode(Ge), pt.childNodes[0] || null), Qe === Je ? pe.call(He, Ze ? "html" : "body")[0] : Ze ? He.documentElement : pt;
+    return Me && Ge && pt.insertBefore(U.createTextNode(Ge), pt.childNodes[0] || null), Qe === Je ? me.call(He, Ze ? "html" : "body")[0] : Ze ? He.documentElement : pt;
   }, Ht = function(Me) {
     return fe.call(
       Me.ownerDocument || Me,
@@ -21335,7 +21342,7 @@ function createDOMPurify() {
           pt.appendChild(He.firstChild);
       else
         pt = He;
-      return (Pe.shadowroot || Pe.shadowrootmode) && (pt = me.call(W, pt, !0)), pt;
+      return (Pe.shadowroot || Pe.shadowrootmode) && (pt = pe.call(W, pt, !0)), pt;
     }
     let ht = Ze ? He.outerHTML : He.innerHTML;
     return Ze && ke["!doctype"] && He.ownerDocument && He.ownerDocument.doctype && He.ownerDocument.doctype.name && regExpTest(DOCTYPE_NAME, He.ownerDocument.doctype.name) && (ht = "<!DOCTYPE " + He.ownerDocument.doctype.name + `>
@@ -24894,10 +24901,10 @@ class LcsDiff {
     ];
   }
   WALKTRACE(C, W, H, U, G, Z, Q, X, ee, te, ie, ne, oe, re, se, ae, ce, le) {
-    let de = null, ue = null, he = new DiffChangeHelper(), fe = W, ge = H, pe = oe[0] - ae[0] - U, me = -1073741824, ve = this.m_forwardHistory.length - 1;
+    let de = null, ue = null, he = new DiffChangeHelper(), fe = W, ge = H, me = oe[0] - ae[0] - U, pe = -1073741824, ve = this.m_forwardHistory.length - 1;
     do {
-      const we = pe + C;
-      we === fe || we < ge && ee[we - 1] < ee[we + 1] ? (ie = ee[we + 1], re = ie - pe - U, ie < me && he.MarkNextChange(), me = ie, he.AddModifiedElement(ie + 1, re), pe = we + 1 - C) : (ie = ee[we - 1] + 1, re = ie - pe - U, ie < me && he.MarkNextChange(), me = ie - 1, he.AddOriginalElement(ie, re + 1), pe = we - 1 - C), ve >= 0 && (ee = this.m_forwardHistory[ve], C = ee[0], fe = 1, ge = ee.length - 1);
+      const we = me + C;
+      we === fe || we < ge && ee[we - 1] < ee[we + 1] ? (ie = ee[we + 1], re = ie - me - U, ie < pe && he.MarkNextChange(), pe = ie, he.AddModifiedElement(ie + 1, re), me = we + 1 - C) : (ie = ee[we - 1] + 1, re = ie - me - U, ie < pe && he.MarkNextChange(), pe = ie - 1, he.AddOriginalElement(ie, re + 1), me = we - 1 - C), ve >= 0 && (ee = this.m_forwardHistory[ve], C = ee[0], fe = 1, ge = ee.length - 1);
     } while (--ve >= -1);
     if (de = he.getReverseChanges(), le[0]) {
       let we = oe[0] + 1, be = ae[0] + 1;
@@ -24909,10 +24916,10 @@ class LcsDiff {
         new DiffChange(we, ne - we + 1, be, se - be + 1)
       ];
     } else {
-      he = new DiffChangeHelper(), fe = Z, ge = Q, pe = oe[0] - ae[0] - X, me = 1073741824, ve = ce ? this.m_reverseHistory.length - 1 : this.m_reverseHistory.length - 2;
+      he = new DiffChangeHelper(), fe = Z, ge = Q, me = oe[0] - ae[0] - X, pe = 1073741824, ve = ce ? this.m_reverseHistory.length - 1 : this.m_reverseHistory.length - 2;
       do {
-        const we = pe + G;
-        we === fe || we < ge && te[we - 1] >= te[we + 1] ? (ie = te[we + 1] - 1, re = ie - pe - X, ie > me && he.MarkNextChange(), me = ie + 1, he.AddOriginalElement(ie + 1, re + 1), pe = we + 1 - G) : (ie = te[we - 1], re = ie - pe - X, ie > me && he.MarkNextChange(), me = ie, he.AddModifiedElement(ie + 1, re + 1), pe = we - 1 - G), ve >= 0 && (te = this.m_reverseHistory[ve], G = te[0], fe = 1, ge = te.length - 1);
+        const we = me + G;
+        we === fe || we < ge && te[we - 1] >= te[we + 1] ? (ie = te[we + 1] - 1, re = ie - me - X, ie > pe && he.MarkNextChange(), pe = ie + 1, he.AddOriginalElement(ie + 1, re + 1), me = we + 1 - G) : (ie = te[we - 1], re = ie - me - X, ie > pe && he.MarkNextChange(), pe = ie, he.AddModifiedElement(ie + 1, re + 1), me = we - 1 - G), ve >= 0 && (te = this.m_reverseHistory[ve], G = te[0], fe = 1, ge = te.length - 1);
       } while (--ve >= -1);
       ue = he.getChanges();
     }
@@ -24939,32 +24946,32 @@ class LcsDiff {
     C--, H--, G[0] = 0, Z[0] = 0, this.m_forwardHistory = [], this.m_reverseHistory = [];
     const re = W - C + (U - H), se = re + 1, ae = new Int32Array(se), ce = new Int32Array(se), le = U - H, de = W - C, ue = C - H, he = W - U, ge = (de - le) % 2 === 0;
     ae[le] = C, ce[de] = W, Q[0] = !1;
-    for (let pe = 1; pe <= re / 2 + 1; pe++) {
-      let me = 0, ve = 0;
-      te = this.ClipDiagonalBound(le - pe, pe, le, se), ie = this.ClipDiagonalBound(le + pe, pe, le, se);
+    for (let me = 1; me <= re / 2 + 1; me++) {
+      let pe = 0, ve = 0;
+      te = this.ClipDiagonalBound(le - me, me, le, se), ie = this.ClipDiagonalBound(le + me, me, le, se);
       for (let be = te; be <= ie; be += 2) {
         be === te || be < ie && ae[be - 1] < ae[be + 1] ? X = ae[be + 1] : X = ae[be - 1] + 1, ee = X - (be - le) - ue;
         const Ee = X;
         for (; X < W && ee < U && this.ElementsAreEqual(X + 1, ee + 1); )
           X++, ee++;
-        if (ae[be] = X, X + ee > me + ve && (me = X, ve = ee), !ge && Math.abs(be - de) <= pe - 1 && X >= ce[be])
-          return G[0] = X, Z[0] = ee, Ee <= ce[be] && 1447 > 0 && pe <= 1447 + 1 ? this.WALKTRACE(le, te, ie, ue, de, ne, oe, he, ae, ce, X, W, G, ee, U, Z, ge, Q) : null;
+        if (ae[be] = X, X + ee > pe + ve && (pe = X, ve = ee), !ge && Math.abs(be - de) <= me - 1 && X >= ce[be])
+          return G[0] = X, Z[0] = ee, Ee <= ce[be] && 1447 > 0 && me <= 1447 + 1 ? this.WALKTRACE(le, te, ie, ue, de, ne, oe, he, ae, ce, X, W, G, ee, U, Z, ge, Q) : null;
       }
-      const we = (me - C + (ve - H) - pe) / 2;
-      if (this.ContinueProcessingPredicate !== null && !this.ContinueProcessingPredicate(me, we))
-        return Q[0] = !0, G[0] = me, Z[0] = ve, we > 0 && 1447 > 0 && pe <= 1447 + 1 ? this.WALKTRACE(le, te, ie, ue, de, ne, oe, he, ae, ce, X, W, G, ee, U, Z, ge, Q) : (C++, H++, [
+      const we = (pe - C + (ve - H) - me) / 2;
+      if (this.ContinueProcessingPredicate !== null && !this.ContinueProcessingPredicate(pe, we))
+        return Q[0] = !0, G[0] = pe, Z[0] = ve, we > 0 && 1447 > 0 && me <= 1447 + 1 ? this.WALKTRACE(le, te, ie, ue, de, ne, oe, he, ae, ce, X, W, G, ee, U, Z, ge, Q) : (C++, H++, [
           new DiffChange(C, W - C + 1, H, U - H + 1)
         ]);
-      ne = this.ClipDiagonalBound(de - pe, pe, de, se), oe = this.ClipDiagonalBound(de + pe, pe, de, se);
+      ne = this.ClipDiagonalBound(de - me, me, de, se), oe = this.ClipDiagonalBound(de + me, me, de, se);
       for (let be = ne; be <= oe; be += 2) {
         be === ne || be < oe && ce[be - 1] >= ce[be + 1] ? X = ce[be + 1] - 1 : X = ce[be - 1], ee = X - (be - de) - he;
         const Ee = X;
         for (; X > C && ee > H && this.ElementsAreEqual(X, ee); )
           X--, ee--;
-        if (ce[be] = X, ge && Math.abs(be - le) <= pe && X <= ae[be])
-          return G[0] = X, Z[0] = ee, Ee >= ae[be] && 1447 > 0 && pe <= 1447 + 1 ? this.WALKTRACE(le, te, ie, ue, de, ne, oe, he, ae, ce, X, W, G, ee, U, Z, ge, Q) : null;
+        if (ce[be] = X, ge && Math.abs(be - le) <= me && X <= ae[be])
+          return G[0] = X, Z[0] = ee, Ee >= ae[be] && 1447 > 0 && me <= 1447 + 1 ? this.WALKTRACE(le, te, ie, ue, de, ne, oe, he, ae, ce, X, W, G, ee, U, Z, ge, Q) : null;
       }
-      if (pe <= 1447) {
+      if (me <= 1447) {
         let be = new Int32Array(ie - te + 2);
         be[0] = le - te + 1, MyArray.Copy2(ae, te, be, 1, ie - te + 1), this.m_forwardHistory.push(be), be = new Int32Array(oe - ne + 2), be[0] = de - ne + 1, MyArray.Copy2(ce, ne, be, 1, oe - ne + 1), this.m_reverseHistory.push(be);
       }
@@ -26073,21 +26080,21 @@ class UnicodeTextModelHighlighter {
           if (ne = ee.next(le), ne) {
             let ue = ne.index, he = ne.index + ne[0].length;
             if (ue > 0) {
-              const me = le.charCodeAt(ue - 1);
-              isHighSurrogate(me) && ue--;
+              const pe = le.charCodeAt(ue - 1);
+              isHighSurrogate(pe) && ue--;
             }
             if (he + 1 < de) {
-              const me = le.charCodeAt(he - 1);
-              isHighSurrogate(me) && he++;
+              const pe = le.charCodeAt(he - 1);
+              isHighSurrogate(pe) && he++;
             }
             const fe = le.substring(ue, he);
             let ge = getWordAtText(ue + 1, DEFAULT_WORD_REGEXP, le, 0);
             ge && ge.endColumn <= ue + 1 && (ge = null);
-            const pe = Z.shouldHighlightNonBasicASCII(fe, ge ? ge.word : null);
-            if (pe !== 0) {
-              pe === 3 ? oe++ : pe === 2 ? re++ : pe === 1 ? se++ : assertNever();
-              const me = 1e3;
-              if (te.length >= me) {
+            const me = Z.shouldHighlightNonBasicASCII(fe, ge ? ge.word : null);
+            if (me !== 0) {
+              me === 3 ? oe++ : me === 2 ? re++ : me === 1 ? se++ : assertNever();
+              const pe = 1e3;
+              if (te.length >= pe) {
                 ie = !0;
                 break e;
               }
@@ -27871,11 +27878,11 @@ function removeVeryShortMatchingTextBetweenLongDiffs(K, C, W) {
         const ce = K.getText(se).trim();
         if (ce.length > 20 || ce.split(/\r\n|\r|\n/).length > 1)
           return !1;
-        const le = K.countLinesIn(oe.seq1Range), de = oe.seq1Range.length, ue = C.countLinesIn(oe.seq2Range), he = oe.seq2Range.length, fe = K.countLinesIn(re.seq1Range), ge = re.seq1Range.length, pe = C.countLinesIn(re.seq2Range), me = re.seq2Range.length, ve = 2 * 40 + 50;
+        const le = K.countLinesIn(oe.seq1Range), de = oe.seq1Range.length, ue = C.countLinesIn(oe.seq2Range), he = oe.seq2Range.length, fe = K.countLinesIn(re.seq1Range), ge = re.seq1Range.length, me = C.countLinesIn(re.seq2Range), pe = re.seq2Range.length, ve = 2 * 40 + 50;
         function we(be) {
           return Math.min(be, ve);
         }
-        return Math.pow(Math.pow(we(le * 40 + de), 1.5) + Math.pow(we(ue * 40 + he), 1.5), 1.5) + Math.pow(Math.pow(we(fe * 40 + ge), 1.5) + Math.pow(we(pe * 40 + me), 1.5), 1.5) > Math.pow(Math.pow(ve, 1.5), 1.5) * 1.3;
+        return Math.pow(Math.pow(we(le * 40 + de), 1.5) + Math.pow(we(ue * 40 + he), 1.5), 1.5) + Math.pow(Math.pow(we(fe * 40 + ge), 1.5) + Math.pow(we(me * 40 + pe), 1.5), 1.5) > Math.pow(Math.pow(ve, 1.5), 1.5) * 1.3;
       };
       const ee = H[X], te = Q[Q.length - 1];
       ie(te, ee) ? (G = !0, Q[Q.length - 1] = Q[Q.length - 1].join(ee)) : Q.push(ee);
@@ -27948,12 +27955,12 @@ class DefaultLinesDiffComputer {
     const se = [], ae = (he) => {
       if (G)
         for (let fe = 0; fe < he; fe++) {
-          const ge = ce + fe, pe = le + fe;
-          if (C[ge] !== W[pe]) {
-            const me = this.refineDiff(C, W, new SequenceDiff(new OffsetRange(ge, ge + 1), new OffsetRange(pe, pe + 1)), U, G);
-            for (const ve of me.mappings)
+          const ge = ce + fe, me = le + fe;
+          if (C[ge] !== W[me]) {
+            const pe = this.refineDiff(C, W, new SequenceDiff(new OffsetRange(ge, ge + 1), new OffsetRange(me, me + 1)), U, G);
+            for (const ve of pe.mappings)
               se.push(ve);
-            me.hitTimeout && (re = !0);
+            pe.hitTimeout && (re = !0);
           }
         }
     };
@@ -27964,27 +27971,27 @@ class DefaultLinesDiffComputer {
       ae(fe), ce = he.seq1Range.endExclusive, le = he.seq2Range.endExclusive;
       const ge = this.refineDiff(C, W, he, U, G);
       ge.hitTimeout && (re = !0);
-      for (const pe of ge.mappings)
-        se.push(pe);
+      for (const me of ge.mappings)
+        se.push(me);
     }
     ae(C.length - ce);
     const de = lineRangeMappingFromRangeMappings(se, C, W);
     let ue = [];
     return H.computeMoves && (ue = this.computeMoves(de, C, W, X, ee, U, G)), assertFn(() => {
-      function he(ge, pe) {
-        if (ge.lineNumber < 1 || ge.lineNumber > pe.length)
+      function he(ge, me) {
+        if (ge.lineNumber < 1 || ge.lineNumber > me.length)
           return !1;
-        const me = pe[ge.lineNumber - 1];
-        return !(ge.column < 1 || ge.column > me.length + 1);
+        const pe = me[ge.lineNumber - 1];
+        return !(ge.column < 1 || ge.column > pe.length + 1);
       }
-      function fe(ge, pe) {
-        return !(ge.startLineNumber < 1 || ge.startLineNumber > pe.length + 1 || ge.endLineNumberExclusive < 1 || ge.endLineNumberExclusive > pe.length + 1);
+      function fe(ge, me) {
+        return !(ge.startLineNumber < 1 || ge.startLineNumber > me.length + 1 || ge.endLineNumberExclusive < 1 || ge.endLineNumberExclusive > me.length + 1);
       }
       for (const ge of de) {
         if (!ge.innerChanges)
           return !1;
-        for (const pe of ge.innerChanges)
-          if (!(he(pe.modifiedRange.getStartPosition(), W) && he(pe.modifiedRange.getEndPosition(), W) && he(pe.originalRange.getStartPosition(), C) && he(pe.originalRange.getEndPosition(), C)))
+        for (const me of ge.innerChanges)
+          if (!(he(me.modifiedRange.getStartPosition(), W) && he(me.modifiedRange.getEndPosition(), W) && he(me.originalRange.getStartPosition(), C) && he(me.originalRange.getEndPosition(), C)))
             return !1;
         if (!fe(ge.modified, W) || !fe(ge.original, C))
           return !1;
@@ -29683,10 +29690,10 @@ function _applyRenderWhitespace(K, C, W, H) {
   const de = H.length;
   let ue = !1, he = firstNonWhitespaceIndex(C), fe;
   he === -1 ? (ue = !0, he = W, fe = W) : fe = lastNonWhitespaceIndex(C);
-  let ge = !1, pe = 0, me = ee && ee[pe], ve = Q % Z;
+  let ge = !1, me = 0, pe = ee && ee[me], ve = Q % Z;
   for (let be = G; be < W; be++) {
     const Ee = C.charCodeAt(be);
-    me && be >= me.endOffset && (pe++, me = ee && ee[pe]);
+    pe && be >= pe.endOffset && (me++, pe = ee && ee[me]);
     let ye;
     if (be < he || be > fe)
       ye = !0;
@@ -29704,7 +29711,7 @@ function _applyRenderWhitespace(K, C, W, H) {
         ye = !0;
     else
       ye = !1;
-    if (ye && ee && (ye = !!me && me.startOffset <= be && me.endOffset > be), ye && ie && (ye = ue || be > fe), ye && ce && be >= he && be <= fe && (ye = !1), ge) {
+    if (ye && ee && (ye = !!pe && pe.startOffset <= be && pe.endOffset > be), ye && ie && (ye = ue || be > fe), ye && ce && be >= he && be <= fe && (ye = !1), ge) {
       if (!ye || !X && ve >= Z) {
         if (ne) {
           const De = re > 0 ? oe[re - 1].endIndex : G;
@@ -29766,10 +29773,10 @@ function _applyInlineDecorations(K, C, W, H) {
 }
 function _renderLine(K, C) {
   const W = K.fontIsMonospace, H = K.canUseHalfwidthRightwardsArrow, U = K.containsForeignElements, G = K.lineContent, Z = K.len, Q = K.isOverflowing, X = K.overflowingCharCount, ee = K.parts, te = K.fauxIndentLength, ie = K.tabSize, ne = K.startVisibleColumn, oe = K.containsRTL, re = K.spaceWidth, se = K.renderSpaceCharCode, ae = K.renderWhitespace, ce = K.renderControlCharacters, le = new CharacterMapping(Z + 1, ee.length);
-  let de = !1, ue = 0, he = ne, fe = 0, ge = 0, pe = 0;
+  let de = !1, ue = 0, he = ne, fe = 0, ge = 0, me = 0;
   oe ? C.appendString('<span dir="ltr">') : C.appendString("<span>");
-  for (let me = 0, ve = ee.length; me < ve; me++) {
-    const we = ee[me], be = we.endIndex, Ee = we.type, ye = we.containsRTL, De = ae !== 0 && we.isWhitespace(), Le = De && !W && (Ee === "mtkw" || !U), Oe = ue === be && we.isPseudoAfter();
+  for (let pe = 0, ve = ee.length; pe < ve; pe++) {
+    const we = ee[pe], be = we.endIndex, Ee = we.type, ye = we.containsRTL, De = ae !== 0 && we.isWhitespace(), Le = De && !W && (Ee === "mtkw" || !U), Oe = ue === be && we.isPseudoAfter();
     if (fe = 0, C.appendString("<span "), ye && C.appendString('style="unicode-bidi:isolate" '), C.appendString('class="'), C.appendString(Le ? "mtkz" : Ee), C.appendASCIICharCode(
       34
       /* CharCode.DoubleQuote */
@@ -29786,7 +29793,7 @@ function _renderLine(K, C) {
         62
         /* CharCode.GreaterThan */
       ); ue < be; ue++) {
-        le.setColumnInfo(ue + 1, me - pe, fe, ge), pe = 0;
+        le.setColumnInfo(ue + 1, pe - me, fe, ge), me = 0;
         const ke = G.charCodeAt(ue);
         let Ne, Pe;
         if (ke === 9) {
@@ -29802,7 +29809,7 @@ function _renderLine(K, C) {
         62
         /* CharCode.GreaterThan */
       ); ue < be; ue++) {
-        le.setColumnInfo(ue + 1, me - pe, fe, ge), pe = 0;
+        le.setColumnInfo(ue + 1, pe - me, fe, ge), me = 0;
         const We = G.charCodeAt(ue);
         let ke = 1, Ne = 1;
         switch (We) {
@@ -29837,7 +29844,7 @@ function _renderLine(K, C) {
         }
         fe += ke, ge += Ne, ue >= te && (he += Ne);
       }
-    Oe ? pe++ : pe = 0, ue >= Z && !de && we.isPseudoAfter() && (de = !0, le.setColumnInfo(ue + 1, me, fe, ge)), C.appendString("</span>");
+    Oe ? me++ : me = 0, ue >= Z && !de && we.isPseudoAfter() && (de = !0, le.setColumnInfo(ue + 1, pe, fe, ge)), C.appendString("</span>");
   }
   return de || le.setColumnInfo(Z + 1, ee.length - 1, fe, ge), Q && (C.appendString('<span class="mtkoverflow">'), C.appendString(localize("showMore", "Show more ({0})", renderOverflowingCharCount(X))), C.appendString("</span>")), C.appendString("</span>"), new RenderLineOutput(le, oe, U);
 }
@@ -30250,17 +30257,17 @@ let MonarchTokenizer = MonarchTokenizer_1 = class extends Disposable {
       let le = null, de = null, ue = null, he = null, fe = null;
       if (ne) {
         le = ne.matches;
-        const me = ne.groups.shift();
-        de = me.matched, ue = me.action, he = ne.rule, ne.groups.length === 0 && (ne = null);
+        const pe = ne.groups.shift();
+        de = pe.matched, ue = pe.action, he = ne.rule, ne.groups.length === 0 && (ne = null);
       } else {
         if (!oe && ie >= X)
           break;
         oe = !1;
-        let me = this._lexer.tokenizer[ce];
-        if (!me && (me = findRules(this._lexer, ce), !me))
+        let pe = this._lexer.tokenizer[ce];
+        if (!pe && (pe = findRules(this._lexer, ce), !pe))
           throw createError(this._lexer, "tokenizer state is not defined: " + ce);
         const ve = Q.substr(ie);
-        for (const we of me)
+        for (const we of pe)
           if ((ie === 0 || !we.matchOnlyAtLineStart) && (le = ve.match(we.regex), le)) {
             de = le[0], ue = we.action;
             break;
@@ -30287,11 +30294,11 @@ let MonarchTokenizer = MonarchTokenizer_1 = class extends Disposable {
             fe = substituteMatches(this._lexer, ue.nextEmbedded, de, le, ce);
           }
         if (ue.goBack && (ie = Math.max(0, ie - ue.goBack)), ue.switchTo && typeof ue.switchTo == "string") {
-          let me = substituteMatches(this._lexer, ue.switchTo, de, le, ce);
-          if (me[0] === "@" && (me = me.substr(1)), findRules(this._lexer, me))
-            te = te.switchTo(me);
+          let pe = substituteMatches(this._lexer, ue.switchTo, de, le, ce);
+          if (pe[0] === "@" && (pe = pe.substr(1)), findRules(this._lexer, pe))
+            te = te.switchTo(pe);
           else
-            throw createError(this._lexer, "trying to switch to a state '" + me + "' that is undefined in rule: " + this._safeRuleName(he));
+            throw createError(this._lexer, "trying to switch to a state '" + pe + "' that is undefined in rule: " + this._safeRuleName(he));
         } else {
           if (ue.transform && typeof ue.transform == "function")
             throw createError(this._lexer, "action.transform not supported");
@@ -30307,19 +30314,19 @@ let MonarchTokenizer = MonarchTokenizer_1 = class extends Disposable {
             } else if (ue.next === "@popall")
               te = te.popall();
             else {
-              let me = substituteMatches(this._lexer, ue.next, de, le, ce);
-              if (me[0] === "@" && (me = me.substr(1)), findRules(this._lexer, me))
-                te = te.push(me);
+              let pe = substituteMatches(this._lexer, ue.next, de, le, ce);
+              if (pe[0] === "@" && (pe = pe.substr(1)), findRules(this._lexer, pe))
+                te = te.push(pe);
               else
-                throw createError(this._lexer, "trying to set a next state '" + me + "' that is undefined in rule: " + this._safeRuleName(he));
+                throw createError(this._lexer, "trying to set a next state '" + pe + "' that is undefined in rule: " + this._safeRuleName(he));
             }
         }
         ue.log && typeof ue.log == "string" && log(this._lexer, this._lexer.languageId + ": " + substituteMatches(this._lexer, ue.log, de, le, ce));
       }
       if (ge === null)
         throw createError(this._lexer, "lexer rule has no well-defined action in rule: " + this._safeRuleName(he));
-      const pe = (me) => {
-        const ve = this._languageService.getLanguageIdByLanguageName(me) || this._languageService.getLanguageIdByMimeType(me) || me, we = this._getNestedEmbeddedLanguageData(ve);
+      const me = (pe) => {
+        const ve = this._languageService.getLanguageIdByLanguageName(pe) || this._languageService.getLanguageIdByMimeType(pe) || pe, we = this._getNestedEmbeddedLanguageData(ve);
         if (ie < X) {
           const be = C.substr(ie);
           return this._nestedTokenize(be, W, MonarchLineStateFactory.create(te, we), U + ie, G);
@@ -30331,10 +30338,10 @@ let MonarchTokenizer = MonarchTokenizer_1 = class extends Disposable {
           throw createError(this._lexer, "groups cannot be nested: " + this._safeRuleName(he));
         if (le.length !== ge.length + 1)
           throw createError(this._lexer, "matched number of groups does not match the number of actions in rule: " + this._safeRuleName(he));
-        let me = 0;
+        let pe = 0;
         for (let ve = 1; ve < le.length; ve++)
-          me += le[ve].length;
-        if (me !== de.length)
+          pe += le[ve].length;
+        if (pe !== de.length)
           throw createError(this._lexer, "with groups, all characters should be matched in consecutive groups in rule: " + this._safeRuleName(he));
         ne = {
           rule: he,
@@ -30350,26 +30357,26 @@ let MonarchTokenizer = MonarchTokenizer_1 = class extends Disposable {
         continue;
       } else {
         if (ge === "@rematch" && (ie -= de.length, de = "", le = null, ge = "", fe !== null))
-          return pe(fe);
+          return me(fe);
         if (de.length === 0) {
           if (X === 0 || se !== te.depth || ce !== te.state || (ne ? ne.groups.length : 0) !== ae)
             continue;
           throw createError(this._lexer, "no progress in tokenizer in rule: " + this._safeRuleName(he));
         }
-        let me = null;
+        let pe = null;
         if (isString$2(ge) && ge.indexOf("@brackets") === 0) {
           const ve = ge.substr(9), we = findBracket(this._lexer, de);
           if (!we)
             throw createError(this._lexer, "@brackets token returned but no bracket defined as: " + de);
-          me = sanitize(we.token + ve);
+          pe = sanitize(we.token + ve);
         } else {
           const ve = ge === "" ? "" : ge + this._lexer.tokenPostfix;
-          me = sanitize(ve);
+          pe = sanitize(ve);
         }
-        re < Z && G.emit(re + U, me);
+        re < Z && G.emit(re + U, pe);
       }
       if (fe !== null)
-        return pe(fe);
+        return me(fe);
     }
     return MonarchLineStateFactory.create(te, ee);
   }
@@ -34188,9 +34195,9 @@ var inputLatency;
   function ce() {
     Z.keydown === 2 && Z.input === 2 && Z.render === 2 && (performance.mark("inputlatency/end"), performance.measure("keydown", "keydown/start", "keydown/end"), performance.measure("input", "input/start", "input/end"), performance.measure("render", "render/start", "render/end"), performance.measure("inputlatency", "inputlatency/start", "inputlatency/end"), le("keydown", C), le("input", W), le("render", H), le("inputlatency", U), G++, de());
   }
-  function le(ge, pe) {
-    const me = performance.getEntriesByName(ge)[0].duration;
-    pe.total += me, pe.min = Math.min(pe.min, me), pe.max = Math.max(pe.max, me);
+  function le(ge, me) {
+    const pe = performance.getEntriesByName(ge)[0].duration;
+    me.total += pe, me.min = Math.min(me.min, pe), me.max = Math.max(me.max, pe);
   }
   function de() {
     performance.clearMarks("keydown/start"), performance.clearMarks("keydown/end"), performance.clearMarks("input/start"), performance.clearMarks("input/end"), performance.clearMarks("render/start"), performance.clearMarks("render/end"), performance.clearMarks("inputlatency/start"), performance.clearMarks("inputlatency/end"), performance.clearMeasures("keydown"), performance.clearMeasures("input"), performance.clearMeasures("render"), performance.clearMeasures("inputlatency"), Z.keydown = 0, Z.input = 0, Z.render = 0;
@@ -35108,8 +35115,8 @@ let TextAreaHandler = class extends ViewPart {
     })), this._register(this._textAreaInput.onCompositionStart((ie) => {
       const ne = this.textArea.domNode, oe = this._modelSelections[0], { distanceToModelLineStart: re, widthOfHiddenTextBefore: se } = (() => {
         const ce = ne.value.substring(0, Math.min(ne.selectionStart, ne.selectionEnd)), le = ce.lastIndexOf(`
-`), de = ce.substring(le + 1), ue = de.lastIndexOf("	"), he = de.length - ue - 1, fe = oe.getStartPosition(), ge = Math.min(fe.column - 1, he), pe = fe.column - 1 - ge, me = de.substring(0, de.length - ge), { tabSize: ve } = this._context.viewModel.model.getOptions(), we = measureText(this.textArea.domNode.ownerDocument, me, this._fontInfo, ve);
-        return { distanceToModelLineStart: pe, widthOfHiddenTextBefore: we };
+`), de = ce.substring(le + 1), ue = de.lastIndexOf("	"), he = de.length - ue - 1, fe = oe.getStartPosition(), ge = Math.min(fe.column - 1, he), me = fe.column - 1 - ge, pe = de.substring(0, de.length - ge), { tabSize: ve } = this._context.viewModel.model.getOptions(), we = measureText(this.textArea.domNode.ownerDocument, pe, this._fontInfo, ve);
+        return { distanceToModelLineStart: me, widthOfHiddenTextBefore: we };
       })(), { distanceToModelLineEnd: ae } = (() => {
         const ce = ne.value.substring(Math.max(ne.selectionStart, ne.selectionEnd)), le = ce.indexOf(`
 `), de = le === -1 ? ce : ce.substring(0, le), ue = de.indexOf("	"), he = ue === -1 ? de.length : de.length - ue - 1, fe = oe.getEndPosition(), ge = Math.min(this._context.viewModel.model.getLineMaxColumn(fe.lineNumber) - fe.column, he);
@@ -37636,15 +37643,15 @@ class TypeOperations {
     for (const re of Z) {
       const { lineNumber: se, beforeColumn: ae, afterColumn: ce } = re, le = W.getLineContent(se), de = le.substring(0, ae - 1), ue = le.substring(ce - 1);
       if (ue.startsWith(ne) || (oe = !1), ue.length > 0) {
-        const pe = ue.charAt(0);
-        if (!TypeOperations._isBeforeClosingBrace(C, ue) && !ee(pe))
+        const me = ue.charAt(0);
+        if (!TypeOperations._isBeforeClosingBrace(C, ue) && !ee(me))
           return null;
       }
       if (Q.open.length === 1 && (U === "'" || U === '"') && X !== "always") {
-        const pe = getMapForWordSeparators(C.wordSeparators);
+        const me = getMapForWordSeparators(C.wordSeparators);
         if (de.length > 0) {
-          const me = de.charCodeAt(de.length - 1);
-          if (pe.get(me) === 0)
+          const pe = de.charCodeAt(de.length - 1);
+          if (me.get(pe) === 0)
             return null;
         }
       }
@@ -37656,8 +37663,8 @@ class TypeOperations {
         return null;
       const ge = Q.findNeutralCharacter();
       if (ge) {
-        const pe = W.tokenization.getTokenTypeIfInsertingCharacter(se, ae, ge);
-        if (!Q.isOK(pe))
+        const me = W.tokenization.getTokenTypeIfInsertingCharacter(se, ae, ge);
+        if (!Q.isOK(me))
           return null;
       }
     }
@@ -38138,8 +38145,8 @@ var CoreNavigationCommands;
     _getColumnSelectResult(ce, le, de, ue) {
       if (typeof ue.position > "u" || typeof ue.viewPosition > "u" || typeof ue.mouseColumn > "u")
         return null;
-      const he = ce.model.validatePosition(ue.position), fe = ce.coordinatesConverter.validateViewPosition(new Position$1(ue.viewPosition.lineNumber, ue.viewPosition.column), he), ge = ue.doColumnSelect ? de.fromViewLineNumber : fe.lineNumber, pe = ue.doColumnSelect ? de.fromViewVisualColumn : ue.mouseColumn - 1;
-      return ColumnSelection.columnSelect(ce.cursorConfig, ce, ge, pe, fe.lineNumber, ue.mouseColumn - 1);
+      const he = ce.model.validatePosition(ue.position), fe = ce.coordinatesConverter.validateViewPosition(new Position$1(ue.viewPosition.lineNumber, ue.viewPosition.column), he), ge = ue.doColumnSelect ? de.fromViewLineNumber : fe.lineNumber, me = ue.doColumnSelect ? de.fromViewVisualColumn : ue.mouseColumn - 1;
+      return ColumnSelection.columnSelect(ce.cursorConfig, ce, ge, me, fe.lineNumber, ue.mouseColumn - 1);
     }
   }()), K.CursorColumnSelectLeft = registerEditorCommand(new class extends W {
     constructor() {
@@ -38520,9 +38527,9 @@ var CoreNavigationCommands;
       const ue = ce.getCursorStates();
       if (ue.length > 1) {
         const he = de.modelState ? de.modelState.position : null, fe = de.viewState ? de.viewState.position : null;
-        for (let ge = 0, pe = ue.length; ge < pe; ge++) {
-          const me = ue[ge];
-          if (!(he && !me.modelState.selection.containsPosition(he)) && !(fe && !me.viewState.selection.containsPosition(fe))) {
+        for (let ge = 0, me = ue.length; ge < me; ge++) {
+          const pe = ue[ge];
+          if (!(he && !pe.modelState.selection.containsPosition(he)) && !(fe && !pe.viewState.selection.containsPosition(fe))) {
             ue.splice(ge, 1), ce.model.pushStackElement(), ce.setCursorStates(le.source, 3, ue);
             return;
           }
@@ -38701,8 +38708,8 @@ var CoreNavigationCommands;
     _exec(le, de) {
       const ue = [];
       for (let he = 0, fe = de.length; he < fe; he++) {
-        const ge = de[he], pe = ge.modelState.position.lineNumber, me = le.model.getLineMaxColumn(pe);
-        ue[he] = CursorState$1.fromModelState(ge.modelState.move(this._inSelectionMode, pe, me, 0));
+        const ge = de[he], me = ge.modelState.position.lineNumber, pe = le.model.getLineMaxColumn(me);
+        ue[he] = CursorState$1.fromModelState(ge.modelState.move(this._inSelectionMode, me, pe, 0));
       }
       return ue;
     }
@@ -38858,10 +38865,10 @@ var CoreNavigationCommands;
     }
     _computeDesiredScrollTop(le, de) {
       if (de.unit === 1) {
-        const fe = le.viewLayout.getFutureViewport(), ge = le.getCompletelyVisibleViewRangeAtScrollTop(fe.top), pe = le.coordinatesConverter.convertViewRangeToModelRange(ge);
-        let me;
-        de.direction === 1 ? me = Math.max(1, pe.startLineNumber - de.value) : me = Math.min(le.model.getLineCount(), pe.startLineNumber + de.value);
-        const ve = le.coordinatesConverter.convertModelPositionToViewPosition(new Position$1(me, 1));
+        const fe = le.viewLayout.getFutureViewport(), ge = le.getCompletelyVisibleViewRangeAtScrollTop(fe.top), me = le.coordinatesConverter.convertViewRangeToModelRange(ge);
+        let pe;
+        de.direction === 1 ? pe = Math.max(1, me.startLineNumber - de.value) : pe = Math.min(le.model.getLineCount(), me.startLineNumber + de.value);
+        const ve = le.coordinatesConverter.convertModelPositionToViewPosition(new Position$1(pe, 1));
         return le.viewLayout.getVerticalOffsetForLineNumber(ve.lineNumber);
       }
       if (de.unit === 5) {
@@ -39210,25 +39217,25 @@ var CoreNavigationCommands;
       const fe = ce.model.getLineCount();
       he > fe && (he = fe);
       const ge = new Range$2(he, 1, he, ce.model.getLineMaxColumn(he));
-      let pe = 0;
+      let me = 0;
       if (de.at)
         switch (de.at) {
           case RevealLine_.RawAtArgument.Top:
-            pe = 3;
+            me = 3;
             break;
           case RevealLine_.RawAtArgument.Center:
-            pe = 1;
+            me = 1;
             break;
           case RevealLine_.RawAtArgument.Bottom:
-            pe = 4;
+            me = 4;
             break;
         }
-      const me = ce.coordinatesConverter.convertModelRangeToViewRange(ge);
+      const pe = ce.coordinatesConverter.convertModelRangeToViewRange(ge);
       ce.revealRange(
         le.source,
         !1,
-        me,
         pe,
+        me,
         0
         /* ScrollType.Smooth */
       );
@@ -40962,20 +40969,20 @@ class GuidesTextModelPart extends TextModelPart {
     const ie = (ge) => {
       if (Q !== -1 && (Q === -2 || Q > ge - 1)) {
         Q = -1, X = -1;
-        for (let pe = ge - 2; pe >= 0; pe--) {
-          const me = this._computeIndentLevel(pe);
-          if (me >= 0) {
-            Q = pe, X = me;
+        for (let me = ge - 2; me >= 0; me--) {
+          const pe = this._computeIndentLevel(me);
+          if (pe >= 0) {
+            Q = me, X = pe;
             break;
           }
         }
       }
       if (ee === -2) {
         ee = -1, te = -1;
-        for (let pe = ge; pe < U; pe++) {
-          const me = this._computeIndentLevel(pe);
-          if (me >= 0) {
-            ee = pe, te = me;
+        for (let me = ge; me < U; me++) {
+          const pe = this._computeIndentLevel(me);
+          if (pe >= 0) {
+            ee = me, te = pe;
             break;
           }
         }
@@ -40985,20 +40992,20 @@ class GuidesTextModelPart extends TextModelPart {
     const ae = (ge) => {
       if (ne === -2) {
         ne = -1, oe = -1;
-        for (let pe = ge - 2; pe >= 0; pe--) {
-          const me = this._computeIndentLevel(pe);
-          if (me >= 0) {
-            ne = pe, oe = me;
+        for (let me = ge - 2; me >= 0; me--) {
+          const pe = this._computeIndentLevel(me);
+          if (pe >= 0) {
+            ne = me, oe = pe;
             break;
           }
         }
       }
       if (re !== -1 && (re === -2 || re < ge - 1)) {
         re = -1, se = -1;
-        for (let pe = ge; pe < U; pe++) {
-          const me = this._computeIndentLevel(pe);
-          if (me >= 0) {
-            re = pe, se = me;
+        for (let me = ge; me < U; me++) {
+          const pe = this._computeIndentLevel(me);
+          if (pe >= 0) {
+            re = me, se = pe;
             break;
           }
         }
@@ -41006,35 +41013,35 @@ class GuidesTextModelPart extends TextModelPart {
     };
     let ce = 0, le = !0, de = 0, ue = !0, he = 0, fe = 0;
     for (let ge = 0; le || ue; ge++) {
-      const pe = C - ge, me = C + ge;
-      ge > 1 && (pe < 1 || pe < W) && (le = !1), ge > 1 && (me > U || me > H) && (ue = !1), ge > 5e4 && (le = !1, ue = !1);
+      const me = C - ge, pe = C + ge;
+      ge > 1 && (me < 1 || me < W) && (le = !1), ge > 1 && (pe > U || pe > H) && (ue = !1), ge > 5e4 && (le = !1, ue = !1);
       let ve = -1;
-      if (le && pe >= 1) {
-        const be = this._computeIndentLevel(pe - 1);
-        be >= 0 ? (ee = pe - 1, te = be, ve = Math.ceil(be / this.textModel.getOptions().indentSize)) : (ie(pe), ve = this._getIndentLevelForWhitespaceLine(Z, X, te));
+      if (le && me >= 1) {
+        const be = this._computeIndentLevel(me - 1);
+        be >= 0 ? (ee = me - 1, te = be, ve = Math.ceil(be / this.textModel.getOptions().indentSize)) : (ie(me), ve = this._getIndentLevelForWhitespaceLine(Z, X, te));
       }
       let we = -1;
-      if (ue && me <= U) {
-        const be = this._computeIndentLevel(me - 1);
-        be >= 0 ? (ne = me - 1, oe = be, we = Math.ceil(be / this.textModel.getOptions().indentSize)) : (ae(me), we = this._getIndentLevelForWhitespaceLine(Z, oe, se));
+      if (ue && pe <= U) {
+        const be = this._computeIndentLevel(pe - 1);
+        be >= 0 ? (ne = pe - 1, oe = be, we = Math.ceil(be / this.textModel.getOptions().indentSize)) : (ae(pe), we = this._getIndentLevelForWhitespaceLine(Z, oe, se));
       }
       if (ge === 0) {
         fe = ve;
         continue;
       }
       if (ge === 1) {
-        if (me <= U && we >= 0 && fe + 1 === we) {
-          le = !1, ce = me, de = me, he = we;
+        if (pe <= U && we >= 0 && fe + 1 === we) {
+          le = !1, ce = pe, de = pe, he = we;
           continue;
         }
-        if (pe >= 1 && ve >= 0 && ve - 1 === fe) {
-          ue = !1, ce = pe, de = pe, he = ve;
+        if (me >= 1 && ve >= 0 && ve - 1 === fe) {
+          ue = !1, ce = me, de = me, he = ve;
           continue;
         }
         if (ce = C, de = C, he = fe, he === 0)
           return { startLineNumber: ce, endLineNumber: de, indent: he };
       }
-      le && (ve >= he ? ce = pe : le = !1), ue && (we >= he ? de = me : ue = !1);
+      le && (ve >= he ? ce = me : le = !1), ue && (we >= he ? de = pe : ue = !1);
     }
     return { startLineNumber: ce, endLineNumber: de, indent: he };
   }
@@ -41064,8 +41071,8 @@ class GuidesTextModelPart extends TextModelPart {
       const le = this.getVisibleColumnFromPosition(ae), de = this.getVisibleColumnFromPosition(ne.openingBracketRange.getStartPosition()), ue = Math.min(de, le, ne.minVisibleColumnIndentation + 1);
       let he = !1;
       firstNonWhitespaceIndex(this.textModel.getLineContent(ne.closingBracketRange.startLineNumber)) < ne.closingBracketRange.startColumn - 1 && (he = !0);
-      const pe = Math.max(se.lineNumber, C), me = Math.min(ae.lineNumber, W), ve = he ? 1 : 0;
-      for (let we = pe; we < me + ve; we++)
+      const me = Math.max(se.lineNumber, C), pe = Math.min(ae.lineNumber, W), ve = he ? 1 : 0;
+      for (let we = me; we < pe + ve; we++)
         Z[we - C].push(new IndentGuide(ue, -1, re, null, we === se.lineNumber ? se.column : -1, we === ae.lineNumber ? ae.column : -1));
       ce && (se.lineNumber >= C && de > ue && Z[se.lineNumber - C].push(new IndentGuide(ue, -1, re, new IndentGuideHorizontalLine(!1, se.column), -1, -1)), ae.lineNumber <= W && le > ue && Z[ae.lineNumber - C].push(new IndentGuide(ue, -1, re, new IndentGuideHorizontalLine(!he, ae.column), -1, -1)));
     }
@@ -42209,13 +42216,13 @@ class MinimapCharRenderer {
       console.warn("bad render request outside image data");
       return;
     }
-    const se = te ? this.charDataLight : this.charDataNormal, ae = getCharIndex(U, ee), ce = C.width * 4, le = Q.r, de = Q.g, ue = Q.b, he = G.r - le, fe = G.g - de, ge = G.b - ue, pe = Math.max(Z, X), me = C.data;
+    const se = te ? this.charDataLight : this.charDataNormal, ae = getCharIndex(U, ee), ce = C.width * 4, le = Q.r, de = Q.g, ue = Q.b, he = G.r - le, fe = G.g - de, ge = G.b - ue, me = Math.max(Z, X), pe = C.data;
     let ve = ae * ne * oe, we = H * ce + W * 4;
     for (let be = 0; be < re; be++) {
       let Ee = we;
       for (let ye = 0; ye < ne; ye++) {
         const De = se[ve++] / 255 * (Z / 255);
-        me[Ee++] = le + he * De, me[Ee++] = de + fe * De, me[Ee++] = ue + ge * De, me[Ee++] = pe;
+        pe[Ee++] = le + he * De, pe[Ee++] = de + fe * De, pe[Ee++] = ue + ge * De, pe[Ee++] = me;
       }
       we += ce;
     }
@@ -42226,13 +42233,13 @@ class MinimapCharRenderer {
       console.warn("bad render request outside image data");
       return;
     }
-    const ne = C.width * 4, oe = 0.5 * (G / 255), re = Z.r, se = Z.g, ae = Z.b, ce = U.r - re, le = U.g - se, de = U.b - ae, ue = re + ce * oe, he = se + le * oe, fe = ae + de * oe, ge = Math.max(G, Q), pe = C.data;
-    let me = H * ne + W * 4;
+    const ne = C.width * 4, oe = 0.5 * (G / 255), re = Z.r, se = Z.g, ae = Z.b, ce = U.r - re, le = U.g - se, de = U.b - ae, ue = re + ce * oe, he = se + le * oe, fe = ae + de * oe, ge = Math.max(G, Q), me = C.data;
+    let pe = H * ne + W * 4;
     for (let ve = 0; ve < ie; ve++) {
-      let we = me;
+      let we = pe;
       for (let be = 0; be < ee; be++)
-        pe[we++] = ue, pe[we++] = he, pe[we++] = fe, pe[we++] = ge;
-      me += ne;
+        me[we++] = ue, me[we++] = he, me[we++] = fe, me[we++] = ge;
+      pe += ne;
     }
   }
 }
@@ -42309,8 +42316,8 @@ class MinimapCharRendererFactory {
         for (let de = ie; de < ne; de++) {
           const ue = W + Math.floor(de) * 3840, he = 1 - (de - Math.floor(de));
           for (let fe = re; fe < se; fe++) {
-            const ge = 1 - (fe - Math.floor(fe)), pe = ue + Math.floor(fe) * 4, me = ge * he;
-            ce += me, ae += C[pe] * C[pe + 3] / 255 * me;
+            const ge = 1 - (fe - Math.floor(fe)), me = ue + Math.floor(fe) * 4, pe = ge * he;
+            ce += pe, ae += C[me] * C[me + 3] / 255 * pe;
           }
         }
         const le = ae / ce;
@@ -42408,8 +42415,8 @@ class MinimapLayout {
     if (C.minimapHeightIsEditorHeight) {
       let fe = X * C.lineHeight + C.paddingTop + C.paddingBottom;
       C.scrollBeyondLastLine && (fe += Math.max(0, G - C.lineHeight - C.paddingBottom));
-      const ge = Math.max(1, Math.floor(G * G / fe)), pe = Math.max(0, C.minimapHeight - ge), me = pe / (te - G), ve = ee * me, we = pe > 0, be = Math.floor(C.canvasInnerHeight / C.minimapLineHeight), Ee = Math.floor(C.paddingTop / C.lineHeight);
-      return new MinimapLayout(ee, te, we, me, ve, ge, Ee, 1, Math.min(Q, be));
+      const ge = Math.max(1, Math.floor(G * G / fe)), me = Math.max(0, C.minimapHeight - ge), pe = me / (te - G), ve = ee * pe, we = me > 0, be = Math.floor(C.canvasInnerHeight / C.minimapLineHeight), Ee = Math.floor(C.paddingTop / C.lineHeight);
+      return new MinimapLayout(ee, te, we, pe, ve, ge, Ee, 1, Math.min(Q, be));
     }
     let ae;
     if (Z && H !== Q) {
@@ -42439,11 +42446,11 @@ class MinimapLayout {
     } else {
       let fe;
       W > 1 ? fe = W + ce : fe = Math.max(1, ee / se);
-      let ge, pe = Math.max(1, Math.floor(fe - he * ne / oe));
-      pe < ce ? (ge = ce - pe + 1, pe = 1) : (ge = 0, pe = Math.max(1, pe - ce)), ie && ie.scrollHeight === te && (ie.scrollTop > ee && (pe = Math.min(pe, ie.startLineNumber), ge = Math.max(ge, ie.topPaddingLineCount)), ie.scrollTop < ee && (pe = Math.max(pe, ie.startLineNumber), ge = Math.min(ge, ie.topPaddingLineCount)));
-      const me = Math.min(Q, pe - ge + re - 1), ve = (ee - U) / se;
+      let ge, me = Math.max(1, Math.floor(fe - he * ne / oe));
+      me < ce ? (ge = ce - me + 1, me = 1) : (ge = 0, me = Math.max(1, me - ce)), ie && ie.scrollHeight === te && (ie.scrollTop > ee && (me = Math.min(me, ie.startLineNumber), ge = Math.max(ge, ie.topPaddingLineCount)), ie.scrollTop < ee && (me = Math.max(me, ie.startLineNumber), ge = Math.min(ge, ie.topPaddingLineCount)));
+      const pe = Math.min(Q, me - ge + re - 1), ve = (ee - U) / se;
       let we;
-      return ee >= C.paddingTop ? we = (W - pe + ge + ve) * oe / ne : we = ee / C.paddingTop * (ge + ve) * oe / ne, new MinimapLayout(ee, te, !0, ue, we, ae, ge, pe, me);
+      return ee >= C.paddingTop ? we = (W - me + ge + ve) * oe / ne : we = ee / C.paddingTop * (ge + ve) * oe / ne, new MinimapLayout(ee, te, !0, ue, we, ae, ge, me, pe);
     }
   }
 }
@@ -43049,25 +43056,25 @@ class InnerMinimap extends Disposable {
     const G = this._getBuffer();
     if (!G)
       return null;
-    const [Z, Q, X] = InnerMinimap._renderUntouchedLines(G, C.topPaddingLineCount, W, H, U, this._lastRenderData), ee = this._model.getMinimapLinesRenderingData(W, H, X), te = this._model.getOptions().tabSize, ie = this._model.options.defaultBackgroundColor, ne = this._model.options.backgroundColor, oe = this._model.options.foregroundAlpha, re = this._model.tokensColorTracker, se = re.backgroundIsLight(), ae = this._model.options.renderMinimap, ce = this._model.options.charRenderer(), le = this._model.options.fontScale, de = this._model.options.minimapCharWidth, he = (ae === 1 ? 2 : 2 + 1) * le, fe = U > he ? Math.floor((U - he) / 2) : 0, ge = ne.a / 255, pe = new RGBA8(Math.round((ne.r - ie.r) * ge + ie.r), Math.round((ne.g - ie.g) * ge + ie.g), Math.round((ne.b - ie.b) * ge + ie.b), 255);
-    let me = C.topPaddingLineCount * U;
+    const [Z, Q, X] = InnerMinimap._renderUntouchedLines(G, C.topPaddingLineCount, W, H, U, this._lastRenderData), ee = this._model.getMinimapLinesRenderingData(W, H, X), te = this._model.getOptions().tabSize, ie = this._model.options.defaultBackgroundColor, ne = this._model.options.backgroundColor, oe = this._model.options.foregroundAlpha, re = this._model.tokensColorTracker, se = re.backgroundIsLight(), ae = this._model.options.renderMinimap, ce = this._model.options.charRenderer(), le = this._model.options.fontScale, de = this._model.options.minimapCharWidth, he = (ae === 1 ? 2 : 2 + 1) * le, fe = U > he ? Math.floor((U - he) / 2) : 0, ge = ne.a / 255, me = new RGBA8(Math.round((ne.r - ie.r) * ge + ie.r), Math.round((ne.g - ie.g) * ge + ie.g), Math.round((ne.b - ie.b) * ge + ie.b), 255);
+    let pe = C.topPaddingLineCount * U;
     const ve = [];
     for (let De = 0, Le = H - W + 1; De < Le; De++)
-      X[De] && InnerMinimap._renderLine(G, pe, ne.a, se, ae, de, re, oe, ce, me, fe, te, ee[De], le, U), ve[De] = new MinimapLine(me), me += U;
+      X[De] && InnerMinimap._renderLine(G, me, ne.a, se, ae, de, re, oe, ce, pe, fe, te, ee[De], le, U), ve[De] = new MinimapLine(pe), pe += U;
     const we = Z === -1 ? 0 : Z, Ee = (Q === -1 ? G.height : Q) - we;
     return this._canvas.domNode.getContext("2d").putImageData(G, 0, 0, 0, we, G.width, Ee), new RenderData(C, G, ve);
   }
   static _renderUntouchedLines(C, W, H, U, G, Z) {
     const Q = [];
     if (!Z) {
-      for (let me = 0, ve = U - H + 1; me < ve; me++)
-        Q[me] = !0;
+      for (let pe = 0, ve = U - H + 1; pe < ve; pe++)
+        Q[pe] = !0;
       return [-1, -1, Q];
     }
     const X = Z._get(), ee = X.imageData.data, te = X.rendLineNumberStart, ie = X.lines, ne = ie.length, oe = C.width, re = C.data, se = (U - H + 1) * G * oe * 4;
     let ae = -1, ce = -1, le = -1, de = -1, ue = -1, he = -1, fe = W * G;
-    for (let me = H; me <= U; me++) {
-      const ve = me - H, we = me - te, be = we >= 0 && we < ne ? ie[we].dy : -1;
+    for (let pe = H; pe <= U; pe++) {
+      const ve = pe - H, we = pe - te, be = we >= 0 && we < ne ? ie[we].dy : -1;
       if (be === -1) {
         Q[ve] = !0, fe += G;
         continue;
@@ -43076,15 +43083,15 @@ class InnerMinimap extends Disposable {
       de === Ee && he === De ? (de = ye, he = Le) : (le !== -1 && (re.set(ee.subarray(le, de), ue), ae === -1 && le === 0 && le === ue && (ae = de), ce === -1 && de === se && le === ue && (ce = le)), le = Ee, de = ye, ue = De, he = Le), Q[ve] = !1, fe += G;
     }
     le !== -1 && (re.set(ee.subarray(le, de), ue), ae === -1 && le === 0 && le === ue && (ae = de), ce === -1 && de === se && le === ue && (ce = le));
-    const ge = ae === -1 ? -1 : ae / (oe * 4), pe = ce === -1 ? -1 : ce / (oe * 4);
-    return [ge, pe, Q];
+    const ge = ae === -1 ? -1 : ae / (oe * 4), me = ce === -1 ? -1 : ce / (oe * 4);
+    return [ge, me, Q];
   }
   static _renderLine(C, W, H, U, G, Z, Q, X, ee, te, ie, ne, oe, re, se) {
     const ae = oe.content, ce = oe.tokens, le = C.width - Z, de = se === 1;
     let ue = MINIMAP_GUTTER_WIDTH, he = 0, fe = 0;
-    for (let ge = 0, pe = ce.getCount(); ge < pe; ge++) {
-      const me = ce.getEndOffset(ge), ve = ce.getForeground(ge), we = Q.getColor(ve);
-      for (; he < me; he++) {
+    for (let ge = 0, me = ce.getCount(); ge < me; ge++) {
+      const pe = ce.getEndOffset(ge), ve = ce.getForeground(ge), we = Q.getColor(ve);
+      for (; he < pe; he++) {
         if (ue > le)
           return;
         const be = ae.charCodeAt(he);
@@ -43431,13 +43438,13 @@ class DecorationsOverviewRuler extends ViewPart {
       ie.fillStyle = se;
       let ce = 0, le = 0, de = 0;
       for (let ue = 0, he = ae.length / 3; ue < he; ue++) {
-        const fe = ae[3 * ue], ge = ae[3 * ue + 1], pe = ae[3 * ue + 2];
-        let me = Z.getVerticalOffsetForLineNumber(ge) * X | 0, ve = (Z.getVerticalOffsetForLineNumber(pe) + G) * X | 0;
-        if (ve - me < ee) {
-          let be = (me + ve) / 2 | 0;
-          be < te ? be = te : be + te > U && (be = U - te), me = be - te, ve = be + te;
+        const fe = ae[3 * ue], ge = ae[3 * ue + 1], me = ae[3 * ue + 2];
+        let pe = Z.getVerticalOffsetForLineNumber(ge) * X | 0, ve = (Z.getVerticalOffsetForLineNumber(me) + G) * X | 0;
+        if (ve - pe < ee) {
+          let be = (pe + ve) / 2 | 0;
+          be < te ? be = te : be + te > U && (be = U - te), pe = be - te, ve = be + te;
         }
-        me > de + 1 || fe !== ce ? (ue !== 0 && ie.fillRect(ne[ce], le, oe[ce], de - le), ce = fe, le = me, de = ve) : ve > de && (de = ve);
+        pe > de + 1 || fe !== ce ? (ue !== 0 && ie.fillRect(ne[ce], le, oe[ce], de - le), ce = fe, le = pe, de = ve) : ve > de && (de = ve);
       }
       ie.fillRect(ne[ce], le, oe[ce], de - le);
     }
@@ -43455,8 +43462,8 @@ class DecorationsOverviewRuler extends ViewPart {
         const fe = this._cursorPositions[ue];
         let ge = Z.getVerticalOffsetForLineNumber(fe.lineNumber) * X | 0;
         ge < se ? ge = se : ge + se > U && (ge = U - se);
-        const pe = ge - se, me = pe + re;
-        pe > de + 1 ? (ue !== 0 && ie.fillRect(ae, le, ce, de - le), le = pe, de = me) : me > de && (de = me);
+        const me = ge - se, pe = me + re;
+        me > de + 1 ? (ue !== 0 && ie.fillRect(ae, le, ce, de - le), le = me, de = pe) : pe > de && (de = pe);
       }
       ie.fillRect(ae, le, ce, de - le);
     }
@@ -43855,22 +43862,22 @@ class SelectionsOverlay extends DynamicViewOverlay {
       for (let de = 0, ue = ne.ranges.length; de < ue; de++) {
         const he = ne.ranges[de];
         if (G) {
-          const ge = he.startStyle, pe = he.endStyle;
+          const ge = he.startStyle, me = he.endStyle;
           if (ge.top === 1 || ge.bottom === 1) {
             ce += this._createSelectionPiece(ae, se, SelectionsOverlay.SELECTION_CLASS_NAME, he.left - SelectionsOverlay.ROUNDED_PIECE_WIDTH, SelectionsOverlay.ROUNDED_PIECE_WIDTH);
-            let me = SelectionsOverlay.EDITOR_BACKGROUND_CLASS_NAME;
-            ge.top === 1 && (me += " " + SelectionsOverlay.SELECTION_TOP_RIGHT), ge.bottom === 1 && (me += " " + SelectionsOverlay.SELECTION_BOTTOM_RIGHT), ce += this._createSelectionPiece(ae, se, me, he.left - SelectionsOverlay.ROUNDED_PIECE_WIDTH, SelectionsOverlay.ROUNDED_PIECE_WIDTH);
+            let pe = SelectionsOverlay.EDITOR_BACKGROUND_CLASS_NAME;
+            ge.top === 1 && (pe += " " + SelectionsOverlay.SELECTION_TOP_RIGHT), ge.bottom === 1 && (pe += " " + SelectionsOverlay.SELECTION_BOTTOM_RIGHT), ce += this._createSelectionPiece(ae, se, pe, he.left - SelectionsOverlay.ROUNDED_PIECE_WIDTH, SelectionsOverlay.ROUNDED_PIECE_WIDTH);
           }
-          if (pe.top === 1 || pe.bottom === 1) {
+          if (me.top === 1 || me.bottom === 1) {
             ce += this._createSelectionPiece(ae, se, SelectionsOverlay.SELECTION_CLASS_NAME, he.left + he.width, SelectionsOverlay.ROUNDED_PIECE_WIDTH);
-            let me = SelectionsOverlay.EDITOR_BACKGROUND_CLASS_NAME;
-            pe.top === 1 && (me += " " + SelectionsOverlay.SELECTION_TOP_LEFT), pe.bottom === 1 && (me += " " + SelectionsOverlay.SELECTION_BOTTOM_LEFT), ce += this._createSelectionPiece(ae, se, me, he.left + he.width, SelectionsOverlay.ROUNDED_PIECE_WIDTH);
+            let pe = SelectionsOverlay.EDITOR_BACKGROUND_CLASS_NAME;
+            me.top === 1 && (pe += " " + SelectionsOverlay.SELECTION_TOP_LEFT), me.bottom === 1 && (pe += " " + SelectionsOverlay.SELECTION_BOTTOM_LEFT), ce += this._createSelectionPiece(ae, se, pe, he.left + he.width, SelectionsOverlay.ROUNDED_PIECE_WIDTH);
           }
         }
         let fe = SelectionsOverlay.SELECTION_CLASS_NAME;
         if (G) {
-          const ge = he.startStyle, pe = he.endStyle;
-          ge.top === 0 && (fe += " " + SelectionsOverlay.SELECTION_TOP_LEFT), ge.bottom === 0 && (fe += " " + SelectionsOverlay.SELECTION_BOTTOM_LEFT), pe.top === 0 && (fe += " " + SelectionsOverlay.SELECTION_TOP_RIGHT), pe.bottom === 0 && (fe += " " + SelectionsOverlay.SELECTION_BOTTOM_RIGHT);
+          const ge = he.startStyle, me = he.endStyle;
+          ge.top === 0 && (fe += " " + SelectionsOverlay.SELECTION_TOP_LEFT), ge.bottom === 0 && (fe += " " + SelectionsOverlay.SELECTION_BOTTOM_LEFT), me.top === 0 && (fe += " " + SelectionsOverlay.SELECTION_TOP_RIGHT), me.bottom === 0 && (fe += " " + SelectionsOverlay.SELECTION_BOTTOM_RIGHT);
         }
         le += this._createSelectionPiece(ae, se, fe, he.left, he.width);
       }
@@ -44594,14 +44601,14 @@ class WhitespaceOverlay extends DynamicViewOverlay {
     if (this._options.renderWhitespace === "selection" && !H || this._options.renderWhitespace === "trailing" && U.continuesWithWrappedLine)
       return "";
     const G = this._context.theme.getColor(editorWhitespaces), Z = this._options.renderWithSVG, Q = U.content, X = this._options.stopRenderingLineAfter === -1 ? Q.length : Math.min(this._options.stopRenderingLineAfter, Q.length), ee = U.continuesWithWrappedLine, te = U.minColumn - 1, ie = this._options.renderWhitespace === "boundary", ne = this._options.renderWhitespace === "trailing", oe = this._options.lineHeight, re = this._options.middotWidth, se = this._options.wsmiddotWidth, ae = this._options.spaceWidth, ce = Math.abs(se - ae), le = Math.abs(re - ae), de = ce < le ? 11825 : 183, ue = this._options.canUseHalfwidthRightwardsArrow;
-    let he = "", fe = !1, ge = firstNonWhitespaceIndex(Q), pe;
-    ge === -1 ? (fe = !0, ge = X, pe = X) : pe = lastNonWhitespaceIndex(Q);
-    let me = 0, ve = H && H[me], we = 0;
+    let he = "", fe = !1, ge = firstNonWhitespaceIndex(Q), me;
+    ge === -1 ? (fe = !0, ge = X, me = X) : me = lastNonWhitespaceIndex(Q);
+    let pe = 0, ve = H && H[pe], we = 0;
     for (let be = te; be < X; be++) {
       const Ee = Q.charCodeAt(be);
-      if (ve && be >= ve.endOffset && (me++, ve = H && H[me]), Ee !== 9 && Ee !== 32 || ne && !fe && be <= pe)
+      if (ve && be >= ve.endOffset && (pe++, ve = H && H[pe]), Ee !== 9 && Ee !== 32 || ne && !fe && be <= me)
         continue;
-      if (ie && be >= ge && be <= pe && Ee === 32) {
+      if (ie && be >= ge && be <= me && Ee === 32) {
         const De = be - 1 >= 0 ? Q.charCodeAt(be - 1) : 0, Le = be + 1 < X ? Q.charCodeAt(be + 1) : 0;
         if (De !== 32 && Le !== 32)
           continue;
@@ -47305,11 +47312,11 @@ function guessIndentation(K, C, W) {
   for (let re = 1; re <= H; re++) {
     const se = K.getLineLength(re), ae = K.getLineContent(re), ce = se <= 65536;
     let le = !1, de = 0, ue = 0, he = 0;
-    for (let ge = 0, pe = se; ge < pe; ge++) {
-      const me = ce ? ae.charCodeAt(ge) : K.getLineCharCode(re, ge);
-      if (me === 9)
+    for (let ge = 0, me = se; ge < me; ge++) {
+      const pe = ce ? ae.charCodeAt(ge) : K.getLineCharCode(re, ge);
+      if (pe === 9)
         he++;
-      else if (me === 32)
+      else if (pe === 32)
         ue++;
       else {
         le = !0, de = ge;
@@ -50822,22 +50829,22 @@ let TextModel = TextModel_1 = class extends Disposable {
       for (let ee = 0, te = Z.length; ee < te; ee++) {
         const ie = Z[ee], [ne] = countEOL(ie.text);
         this._onDidChangeDecorations.fire();
-        const oe = ie.range.startLineNumber, re = ie.range.endLineNumber, se = re - oe, ae = ne, ce = Math.min(se, ae), le = ae - se, de = G - X - le + oe, ue = de, he = de + ae, fe = this._decorationsTree.getInjectedTextInInterval(this, this.getOffsetAt(new Position$1(ue, 1)), this.getOffsetAt(new Position$1(he, this.getLineMaxColumn(he))), 0), ge = LineInjectedText.fromDecorations(fe), pe = new ArrayQueue(ge);
-        for (let me = ce; me >= 0; me--) {
-          const ve = oe + me, we = de + me;
-          pe.takeFromEndWhile((Ee) => Ee.lineNumber > we);
-          const be = pe.takeFromEndWhile((Ee) => Ee.lineNumber === we);
+        const oe = ie.range.startLineNumber, re = ie.range.endLineNumber, se = re - oe, ae = ne, ce = Math.min(se, ae), le = ae - se, de = G - X - le + oe, ue = de, he = de + ae, fe = this._decorationsTree.getInjectedTextInInterval(this, this.getOffsetAt(new Position$1(ue, 1)), this.getOffsetAt(new Position$1(he, this.getLineMaxColumn(he))), 0), ge = LineInjectedText.fromDecorations(fe), me = new ArrayQueue(ge);
+        for (let pe = ce; pe >= 0; pe--) {
+          const ve = oe + pe, we = de + pe;
+          me.takeFromEndWhile((Ee) => Ee.lineNumber > we);
+          const be = me.takeFromEndWhile((Ee) => Ee.lineNumber === we);
           Q.push(new ModelRawLineChanged(ve, this.getLineContent(we), be));
         }
         if (ce < se) {
-          const me = oe + ce;
-          Q.push(new ModelRawLinesDeleted(me + 1, re));
+          const pe = oe + ce;
+          Q.push(new ModelRawLinesDeleted(pe + 1, re));
         }
         if (ce < ae) {
-          const me = new ArrayQueue(ge), ve = oe + ce, we = ae - ce, be = G - X - we + ve + 1, Ee = [], ye = [];
+          const pe = new ArrayQueue(ge), ve = oe + ce, we = ae - ce, be = G - X - we + ve + 1, Ee = [], ye = [];
           for (let De = 0; De < we; De++) {
             const Le = be + De;
-            ye[De] = this.getLineContent(Le), me.takeWhile((Oe) => Oe.lineNumber < Le), Ee[De] = me.takeWhile((Oe) => Oe.lineNumber === Le);
+            ye[De] = this.getLineContent(Le), pe.takeWhile((Oe) => Oe.lineNumber < Le), Ee[De] = pe.takeWhile((Oe) => Oe.lineNumber === Le);
           }
           Q.push(new ModelRawLinesInserted(ve + 1, oe + ae, ye, Ee));
         }
@@ -53546,8 +53553,8 @@ class ModelLineProjection {
           if (ce < he) {
             const fe = te[re];
             if (fe.inlineClassName) {
-              const ge = se > 0 ? X.wrappedTextIndentLength : 0, pe = ge + Math.max(ue - ce, 0), me = ge + Math.min(he - ce, le - ce);
-              pe !== me && ae.push(new SingleLineInlineDecoration(pe, me, fe.inlineClassName, fe.inlineClassNameAffectsLetterSpacing));
+              const ge = se > 0 ? X.wrappedTextIndentLength : 0, me = ge + Math.max(ue - ce, 0), pe = ge + Math.min(he - ce, le - ce);
+              me !== pe && ae.push(new SingleLineInlineDecoration(me, pe, fe.inlineClassName, fe.inlineClassNameAffectsLetterSpacing));
             }
           }
           if (he <= le)
@@ -55328,14 +55335,14 @@ function createLineBreaksFromPreviousLineBreaks(K, C, W, H, U, G, Z, Q) {
   for (; he < ue; ) {
     let fe = he < 0 ? 0 : te[he], ge = he < 0 ? 0 : ie[he];
     ce > fe && (fe = ce, ge = le);
-    let pe = 0, me = 0, ve = 0, we = 0;
+    let me = 0, pe = 0, ve = 0, we = 0;
     if (ge <= de) {
       let Ee = ge, ye = fe === 0 ? 0 : W.charCodeAt(fe - 1), De = fe === 0 ? 0 : K.get(ye), Le = !0;
       for (let Oe = fe; Oe < X; Oe++) {
         const We = Oe, ke = W.charCodeAt(Oe);
         let Ne, Pe;
-        if (isHighSurrogate(ke) ? (Oe++, Ne = 0, Pe = 2) : (Ne = K.get(ke), Pe = computeCharWidth(ke, Ee, H, G)), We > ce && canBreak(ye, De, ke, Ne, ee) && (pe = We, me = Ee), Ee += Pe, Ee > de) {
-          We > ce ? (ve = We, we = Ee - Pe) : (ve = Oe + 1, we = Ee), Ee - me > oe && (pe = 0), Le = !1;
+        if (isHighSurrogate(ke) ? (Oe++, Ne = 0, Pe = 2) : (Ne = K.get(ke), Pe = computeCharWidth(ke, Ee, H, G)), We > ce && canBreak(ye, De, ke, Ne, ee) && (me = We, pe = Ee), Ee += Pe, Ee > de) {
+          We > ce ? (ve = We, we = Ee - Pe) : (ve = Oe + 1, we = Ee), Ee - pe > oe && (me = 0), Le = !1;
           break;
         }
         ye = ke, De = Ne;
@@ -55345,7 +55352,7 @@ function createLineBreaksFromPreviousLineBreaks(K, C, W, H, U, G, Z, Q) {
         break;
       }
     }
-    if (pe === 0) {
+    if (me === 0) {
       let Ee = ge, ye = W.charCodeAt(fe), De = K.get(ye), Le = !1;
       for (let Oe = fe - 1; Oe >= ce; Oe--) {
         const We = Oe + 1, ke = W.charCodeAt(Oe);
@@ -55358,18 +55365,18 @@ function createLineBreaksFromPreviousLineBreaks(K, C, W, H, U, G, Z, Q) {
           if (ve === 0 && (ve = We, we = Ee), Ee <= de - oe)
             break;
           if (canBreak(ke, Ne, ye, De, ee)) {
-            pe = We, me = Ee;
+            me = We, pe = Ee;
             break;
           }
         }
         Ee -= Pe, ye = ke, De = Ne;
       }
-      if (pe !== 0) {
-        const Oe = oe - (we - me);
+      if (me !== 0) {
+        const Oe = oe - (we - pe);
         if (Oe <= H) {
           const We = W.charCodeAt(ve);
           let ke;
-          isHighSurrogate(We) ? ke = 2 : ke = computeCharWidth(We, we, H, G), Oe - ke < 0 && (pe = 0);
+          isHighSurrogate(We) ? ke = 2 : ke = computeCharWidth(We, we, H, G), Oe - ke < 0 && (me = 0);
         }
       }
       if (Le) {
@@ -55377,11 +55384,11 @@ function createLineBreaksFromPreviousLineBreaks(K, C, W, H, U, G, Z, Q) {
         continue;
       }
     }
-    if (pe === 0 && (pe = ve, me = we), pe <= ce) {
+    if (me === 0 && (me = ve, pe = we), me <= ce) {
       const Ee = W.charCodeAt(ce);
-      isHighSurrogate(Ee) ? (pe = ce + 2, me = le + 2) : (pe = ce + 1, me = le + computeCharWidth(Ee, le, H, G));
+      isHighSurrogate(Ee) ? (me = ce + 2, pe = le + 2) : (me = ce + 1, pe = le + computeCharWidth(Ee, le, H, G));
     }
-    for (ce = pe, re[ae] = pe, le = me, se[ae] = me, ae++, de = me + oe; he < 0 || he < ue && ie[he] < me; )
+    for (ce = me, re[ae] = me, le = pe, se[ae] = pe, ae++, de = pe + oe; he < 0 || he < ue && ie[he] < pe; )
       he++;
     let be = Math.abs(ie[he] - de);
     for (; he + 1 < ue; ) {
@@ -55396,18 +55403,18 @@ function createLineBreaksFromPreviousLineBreaks(K, C, W, H, U, G, Z, Q) {
 function createLineBreaks$1(K, C, W, H, U, G, Z, Q) {
   const X = LineInjectedText.applyInjectedText(C, W);
   let ee, te;
-  if (W && W.length > 0 ? (ee = W.map((me) => me.options), te = W.map((me) => me.column - 1)) : (ee = null, te = null), U === -1)
+  if (W && W.length > 0 ? (ee = W.map((pe) => pe.options), te = W.map((pe) => pe.column - 1)) : (ee = null, te = null), U === -1)
     return ee ? new ModelLineProjectionData(te, ee, [X.length], [], 0) : null;
   const ie = X.length;
   if (ie <= 1)
     return ee ? new ModelLineProjectionData(te, ee, [X.length], [], 0) : null;
   const ne = Q === "keepAll", oe = computeWrappedTextIndentLength(X, H, U, G, Z), re = U - oe, se = [], ae = [];
-  let ce = 0, le = 0, de = 0, ue = U, he = X.charCodeAt(0), fe = K.get(he), ge = computeCharWidth(he, 0, H, G), pe = 1;
-  isHighSurrogate(he) && (ge += 1, he = X.charCodeAt(1), fe = K.get(he), pe++);
-  for (let me = pe; me < ie; me++) {
-    const ve = me, we = X.charCodeAt(me);
+  let ce = 0, le = 0, de = 0, ue = U, he = X.charCodeAt(0), fe = K.get(he), ge = computeCharWidth(he, 0, H, G), me = 1;
+  isHighSurrogate(he) && (ge += 1, he = X.charCodeAt(1), fe = K.get(he), me++);
+  for (let pe = me; pe < ie; pe++) {
+    const ve = pe, we = X.charCodeAt(pe);
     let be, Ee;
-    isHighSurrogate(we) ? (me++, be = 0, Ee = 2) : (be = K.get(we), Ee = computeCharWidth(we, ge, H, G)), canBreak(he, fe, we, be, ne) && (le = ve, de = ge), ge += Ee, ge > ue && ((le === 0 || ge - de > re) && (le = ve, de = ge - Ee), se[ce] = le, ae[ce] = de, ce++, ue = de + re, le = 0), he = we, fe = be;
+    isHighSurrogate(we) ? (pe++, be = 0, Ee = 2) : (be = K.get(we), Ee = computeCharWidth(we, ge, H, G)), canBreak(he, fe, we, be, ne) && (le = ve, de = ge), ge += Ee, ge > ue && ((le === 0 || ge - de > re) && (le = ve, de = ge - Ee), se[ce] = le, ae[ce] = de, ce++, ue = de + re, le = 0), he = we, fe = be;
   }
   return ce === 0 && (!W || W.length === 0) ? null : (se[ce] = ie, ae[ce] = ge, new ModelLineProjectionData(te, ee, se, ae, oe));
 }
@@ -55458,25 +55465,25 @@ class DOMLineBreaksComputerFactory {
 }
 function createLineBreaks(K, C, W, H, U, G, Z) {
   var Q;
-  function X(me) {
-    const ve = Z[me];
+  function X(pe) {
+    const ve = Z[pe];
     if (ve) {
-      const we = LineInjectedText.applyInjectedText(K[me], ve), be = ve.map((ye) => ye.options), Ee = ve.map((ye) => ye.column - 1);
+      const we = LineInjectedText.applyInjectedText(K[pe], ve), be = ve.map((ye) => ye.options), Ee = ve.map((ye) => ye.column - 1);
       return new ModelLineProjectionData(Ee, be, [we.length], [], 0);
     } else
       return null;
   }
   if (H === -1) {
-    const me = [];
+    const pe = [];
     for (let ve = 0, we = K.length; ve < we; ve++)
-      me[ve] = X(ve);
-    return me;
+      pe[ve] = X(ve);
+    return pe;
   }
   const ee = Math.round(H * C.typicalHalfwidthCharacterWidth), ie = Math.round(W * (U === 3 ? 2 : U === 2 ? 1 : 0)), ne = Math.ceil(C.spaceWidth * ie), oe = document.createElement("div");
   applyFontInfo(oe, C);
   const re = new StringBuilder(1e4), se = [], ae = [], ce = [], le = [], de = [];
-  for (let me = 0; me < K.length; me++) {
-    const ve = LineInjectedText.applyInjectedText(K[me], Z[me]);
+  for (let pe = 0; pe < K.length; pe++) {
+    const ve = LineInjectedText.applyInjectedText(K[pe], Z[pe]);
     let we = 0, be = 0, Ee = ee;
     if (U !== 0)
       if (we = firstNonWhitespaceIndex(ve), we === -1)
@@ -55490,28 +55497,28 @@ function createLineBreaks(K, C, W, H, U, G, Z) {
         Le + C.typicalFullwidthCharacterWidth > ee ? (we = 0, be = 0) : Ee = ee - Le;
       }
     const ye = ve.substr(we), De = renderLine(ye, be, W, Ee, re, ne);
-    se[me] = we, ae[me] = be, ce[me] = ye, le[me] = De[0], de[me] = De[1];
+    se[pe] = we, ae[pe] = be, ce[pe] = ye, le[pe] = De[0], de[pe] = De[1];
   }
   const ue = re.build(), he = (Q = ttPolicy$2 == null ? void 0 : ttPolicy$2.createHTML(ue)) !== null && Q !== void 0 ? Q : ue;
   oe.innerHTML = he, oe.style.position = "absolute", oe.style.top = "10000", G === "keepAll" ? (oe.style.wordBreak = "keep-all", oe.style.overflowWrap = "anywhere") : (oe.style.wordBreak = "inherit", oe.style.overflowWrap = "break-word"), document.body.appendChild(oe);
-  const fe = document.createRange(), ge = Array.prototype.slice.call(oe.children, 0), pe = [];
-  for (let me = 0; me < K.length; me++) {
-    const ve = ge[me], we = readLineBreaks(fe, ve, ce[me], le[me]);
+  const fe = document.createRange(), ge = Array.prototype.slice.call(oe.children, 0), me = [];
+  for (let pe = 0; pe < K.length; pe++) {
+    const ve = ge[pe], we = readLineBreaks(fe, ve, ce[pe], le[pe]);
     if (we === null) {
-      pe[me] = X(me);
+      me[pe] = X(pe);
       continue;
     }
-    const be = se[me], Ee = ae[me] + ie, ye = de[me], De = [];
+    const be = se[pe], Ee = ae[pe] + ie, ye = de[pe], De = [];
     for (let ke = 0, Ne = we.length; ke < Ne; ke++)
       De[ke] = ye[we[ke]];
     if (be !== 0)
       for (let ke = 0, Ne = we.length; ke < Ne; ke++)
         we[ke] += be;
     let Le, Oe;
-    const We = Z[me];
-    We ? (Le = We.map((ke) => ke.options), Oe = We.map((ke) => ke.column - 1)) : (Le = null, Oe = null), pe[me] = new ModelLineProjectionData(Oe, Le, we, De, Ee);
+    const We = Z[pe];
+    We ? (Le = We.map((ke) => ke.options), Oe = We.map((ke) => ke.column - 1)) : (Le = null, Oe = null), me[pe] = new ModelLineProjectionData(Oe, Le, we, De, Ee);
   }
-  return document.body.removeChild(oe), pe;
+  return document.body.removeChild(oe), me;
 }
 function renderLine(K, C, W, H, U, G) {
   if (G !== 0) {
@@ -58284,14 +58291,14 @@ function toMultilineTokens2(K, C, W) {
     }
     let ne = new Uint32Array((ie - te) * 4), oe = 0, re = 0, se = 0, ae = 0;
     for (; Q < ie; ) {
-      const le = 5 * Q, de = H[le], ue = H[le + 1], he = X + de | 0, fe = de === 0 ? ee + ue | 0 : ue, ge = H[le + 2], pe = fe + ge | 0, me = H[le + 3], ve = H[le + 4];
-      if (pe <= fe)
+      const le = 5 * Q, de = H[le], ue = H[le + 1], he = X + de | 0, fe = de === 0 ? ee + ue | 0 : ue, ge = H[le + 2], me = fe + ge | 0, pe = H[le + 3], ve = H[le + 4];
+      if (me <= fe)
         C.warnInvalidLengthSemanticTokens(he, fe + 1);
       else if (se === he && ae > fe)
         C.warnOverlappingSemanticTokens(he, fe + 1);
       else {
-        const we = C.getMetadata(me, ve, W);
-        we !== 2147483647 && (re === 0 && (re = he), ne[oe] = he - re, ne[oe + 1] = fe, ne[oe + 2] = pe, ne[oe + 3] = we, oe += 4, se = he, ae = pe);
+        const we = C.getMetadata(pe, ve, W);
+        we !== 2147483647 && (re === 0 && (re = he), ne[oe] = he - re, ne[oe + 1] = fe, ne[oe + 2] = me, ne[oe + 3] = we, oe += 4, se = he, ae = me);
       }
       X = he, ee = fe, Q++;
     }
@@ -61527,11 +61534,11 @@ function fuzzyScore(K, C, W, H, U, G, Z = FuzzyScoreOptions.default) {
       ne <= de && (he = _doScore(K, C, ie, W, H, U, ne, X, G, _diag[ee - 1][te - 1] === 0, oe));
       let ge = 0;
       he !== Number.MAX_SAFE_INTEGER && (fe = !0, ge = he + _table[ee - 1][te - 1]);
-      const pe = ne > le, me = pe ? _table[ee][te - 1] + (_diag[ee][te - 1] > 0 ? -5 : 0) : 0, ve = ne > le + 1 && _diag[ee][te - 1] > 0, we = ve ? _table[ee][te - 2] + (_diag[ee][te - 2] > 0 ? -5 : 0) : 0;
-      if (ve && (!pe || we >= me) && (!fe || we >= ge))
+      const me = ne > le, pe = me ? _table[ee][te - 1] + (_diag[ee][te - 1] > 0 ? -5 : 0) : 0, ve = ne > le + 1 && _diag[ee][te - 1] > 0, we = ve ? _table[ee][te - 2] + (_diag[ee][te - 2] > 0 ? -5 : 0) : 0;
+      if (ve && (!me || we >= pe) && (!fe || we >= ge))
         _table[ee][te] = we, _arrows[ee][te] = 3, _diag[ee][te] = 0;
-      else if (pe && (!fe || me >= ge))
-        _table[ee][te] = me, _arrows[ee][te] = 2, _diag[ee][te] = 0;
+      else if (me && (!fe || pe >= ge))
+        _table[ee][te] = pe, _arrows[ee][te] = 2, _diag[ee][te] = 0;
       else if (fe)
         _table[ee][te] = ge, _arrows[ee][te] = 1, _diag[ee][te] = _diag[ee - 1][te - 1] + 1;
       else
@@ -62087,11 +62094,11 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
       }
       return Te;
     }
-    var ge = {}, pe = /^[^:]+:\/*[^/]*$/, me = /^([^:]+:)[\s\S]*$/, ve = /^([^:]+:\/*[^/]*)[\s\S]*$/;
+    var ge = {}, me = /^[^:]+:\/*[^/]*$/, pe = /^([^:]+:)[\s\S]*$/, ve = /^([^:]+:\/*[^/]*)[\s\S]*$/;
     function we($e, Re) {
-      ge[" " + $e] || (pe.test($e) ? ge[" " + $e] = $e + "/" : ge[" " + $e] = De($e, "/", !0)), $e = ge[" " + $e];
+      ge[" " + $e] || (me.test($e) ? ge[" " + $e] = $e + "/" : ge[" " + $e] = De($e, "/", !0)), $e = ge[" " + $e];
       var Te = $e.indexOf(":") === -1;
-      return Re.substring(0, 2) === "//" ? Te ? Re : $e.replace(me, "$1") + Re : Re.charAt(0) === "/" ? Te ? Re : $e.replace(ve, "$1") + Re : $e + Re;
+      return Re.substring(0, 2) === "//" ? Te ? Re : $e.replace(pe, "$1") + Re : Re.charAt(0) === "/" ? Te ? Re : $e.replace(ve, "$1") + Re : $e + Re;
     }
     var be = {
       exec: function() {
@@ -64076,10 +64083,10 @@ class ListView {
     for (let fe = Z.end - 1; fe >= Z.start; fe--) {
       const ge = this.items[fe];
       if (ge.dragStartDisposable.dispose(), ge.checkedDisposable.dispose(), ge.row) {
-        let pe = Q.get(ge.templateId);
-        pe || (pe = [], Q.set(ge.templateId, pe));
-        const me = this.renderers.get(ge.templateId);
-        me && me.disposeElement && me.disposeElement(ge.element, fe, ge.row.templateData, ge.size), pe.push(ge.row);
+        let me = Q.get(ge.templateId);
+        me || (me = [], Q.set(ge.templateId, me));
+        const pe = this.renderers.get(ge.templateId);
+        pe && pe.disposeElement && pe.disposeElement(ge.element, fe, ge.row.templateData, ge.size), me.push(ge.row);
       }
       ge.row = null;
     }
@@ -64109,7 +64116,7 @@ class ListView {
     const le = te.map((fe) => shift(fe, oe)), ue = [{ start: C, end: C + H.length }, ...le].map((fe) => Range$1.intersect(re, fe)), he = this.getNextToLastElement(ue);
     for (const fe of ue)
       for (let ge = fe.start; ge < fe.end; ge++) {
-        const pe = this.items[ge], me = Q.get(pe.templateId), ve = me == null ? void 0 : me.pop();
+        const me = this.items[ge], pe = Q.get(me.templateId), ve = pe == null ? void 0 : pe.pop();
         this.insertItemInDOM(ge, he, ve);
       }
     for (const fe of Q.values())
@@ -69145,21 +69152,21 @@ class SplitView extends Disposable {
         }
       let ne, oe;
       if (!X) {
-        const re = range(U, -1), se = range(U + 1, this.viewItems.length), ae = re.reduce((pe, me) => pe + (this.viewItems[me].minimumSize - ee[me]), 0), ce = re.reduce((pe, me) => pe + (this.viewItems[me].viewMaximumSize - ee[me]), 0), le = se.length === 0 ? Number.POSITIVE_INFINITY : se.reduce((pe, me) => pe + (ee[me] - this.viewItems[me].minimumSize), 0), de = se.length === 0 ? Number.NEGATIVE_INFINITY : se.reduce((pe, me) => pe + (ee[me] - this.viewItems[me].viewMaximumSize), 0), ue = Math.max(ae, de), he = Math.min(le, ce), fe = this.findFirstSnapIndex(re), ge = this.findFirstSnapIndex(se);
+        const re = range(U, -1), se = range(U + 1, this.viewItems.length), ae = re.reduce((me, pe) => me + (this.viewItems[pe].minimumSize - ee[pe]), 0), ce = re.reduce((me, pe) => me + (this.viewItems[pe].viewMaximumSize - ee[pe]), 0), le = se.length === 0 ? Number.POSITIVE_INFINITY : se.reduce((me, pe) => me + (ee[pe] - this.viewItems[pe].minimumSize), 0), de = se.length === 0 ? Number.NEGATIVE_INFINITY : se.reduce((me, pe) => me + (ee[pe] - this.viewItems[pe].viewMaximumSize), 0), ue = Math.max(ae, de), he = Math.min(le, ce), fe = this.findFirstSnapIndex(re), ge = this.findFirstSnapIndex(se);
         if (typeof fe == "number") {
-          const pe = this.viewItems[fe], me = Math.floor(pe.viewMinimumSize / 2);
+          const me = this.viewItems[fe], pe = Math.floor(me.viewMinimumSize / 2);
           ne = {
             index: fe,
-            limitDelta: pe.visible ? ue - me : ue + me,
-            size: pe.size
+            limitDelta: me.visible ? ue - pe : ue + pe,
+            size: me.size
           };
         }
         if (typeof ge == "number") {
-          const pe = this.viewItems[ge], me = Math.floor(pe.viewMinimumSize / 2);
+          const me = this.viewItems[ge], pe = Math.floor(me.viewMinimumSize / 2);
           oe = {
             index: ge,
-            limitDelta: pe.visible ? he + me : he - me,
-            size: pe.size
+            limitDelta: me.visible ? he + pe : he - pe,
+            size: me.size
           };
         }
       }
@@ -69243,15 +69250,15 @@ class SplitView extends Disposable {
     typeof W == "number" ? ee = W : (W.type === "auto" && (this.areViewsDistributed() ? W = { type: "distribute" } : W = { type: "split", index: W.index }), W.type === "split" ? ee = this.getViewSize(W.index) / 2 : W.type === "invisible" ? ee = { cachedVisibleSize: W.cachedVisibleSize } : ee = C.minimumSize);
     const te = this.orientation === 0 ? new VerticalViewItem(G, C, ee, X) : new HorizontalViewItem(G, C, ee, X);
     if (this.viewItems.splice(H, 0, te), this.viewItems.length > 1) {
-      const ne = { orthogonalStartSash: this.orthogonalStartSash, orthogonalEndSash: this.orthogonalEndSash }, oe = this.orientation === 0 ? new Sash(this.sashContainer, { getHorizontalSashTop: (pe) => this.getSashPosition(pe), getHorizontalSashWidth: this.getSashOrthogonalSize }, Object.assign(Object.assign({}, ne), {
+      const ne = { orthogonalStartSash: this.orthogonalStartSash, orthogonalEndSash: this.orthogonalEndSash }, oe = this.orientation === 0 ? new Sash(this.sashContainer, { getHorizontalSashTop: (me) => this.getSashPosition(me), getHorizontalSashWidth: this.getSashOrthogonalSize }, Object.assign(Object.assign({}, ne), {
         orientation: 1
         /* Orientation.HORIZONTAL */
-      })) : new Sash(this.sashContainer, { getVerticalSashLeft: (pe) => this.getSashPosition(pe), getVerticalSashHeight: this.getSashOrthogonalSize }, Object.assign(Object.assign({}, ne), {
+      })) : new Sash(this.sashContainer, { getVerticalSashLeft: (me) => this.getSashPosition(me), getVerticalSashHeight: this.getSashOrthogonalSize }, Object.assign(Object.assign({}, ne), {
         orientation: 0
         /* Orientation.VERTICAL */
-      })), re = this.orientation === 0 ? (pe) => ({ sash: oe, start: pe.startY, current: pe.currentY, alt: pe.altKey }) : (pe) => ({ sash: oe, start: pe.startX, current: pe.currentX, alt: pe.altKey }), ae = Event.map(oe.onDidStart, re)(this.onSashStart, this), le = Event.map(oe.onDidChange, re)(this.onSashChange, this), ue = Event.map(oe.onDidEnd, () => this.sashItems.findIndex((pe) => pe.sash === oe))(this.onSashEnd, this), he = oe.onDidReset(() => {
-        const pe = this.sashItems.findIndex((Ee) => Ee.sash === oe), me = range(pe, -1), ve = range(pe + 1, this.viewItems.length), we = this.findFirstSnapIndex(me), be = this.findFirstSnapIndex(ve);
-        typeof we == "number" && !this.viewItems[we].visible || typeof be == "number" && !this.viewItems[be].visible || this._onDidSashReset.fire(pe);
+      })), re = this.orientation === 0 ? (me) => ({ sash: oe, start: me.startY, current: me.currentY, alt: me.altKey }) : (me) => ({ sash: oe, start: me.startX, current: me.currentX, alt: me.altKey }), ae = Event.map(oe.onDidStart, re)(this.onSashStart, this), le = Event.map(oe.onDidChange, re)(this.onSashChange, this), ue = Event.map(oe.onDidEnd, () => this.sashItems.findIndex((me) => me.sash === oe))(this.onSashEnd, this), he = oe.onDidReset(() => {
+        const me = this.sashItems.findIndex((Ee) => Ee.sash === oe), pe = range(me, -1), ve = range(me + 1, this.viewItems.length), we = this.findFirstSnapIndex(pe), be = this.findFirstSnapIndex(ve);
+        typeof we == "number" && !this.viewItems[we].visible || typeof be == "number" && !this.viewItems[be].visible || this._onDidSashReset.fire(me);
       }), fe = combinedDisposable(ae, le, ue, he, oe), ge = { sash: oe, disposable: fe };
       this.sashItems.splice(H - 1, 0, ge);
     }
@@ -69273,26 +69280,26 @@ class SplitView extends Disposable {
     if (U)
       for (const ge of U)
         pushToEnd(te, ge), pushToEnd(ie, ge);
-    const ne = te.map((ge) => this.viewItems[ge]), oe = te.map((ge) => H[ge]), re = ie.map((ge) => this.viewItems[ge]), se = ie.map((ge) => H[ge]), ae = te.reduce((ge, pe) => ge + (this.viewItems[pe].minimumSize - H[pe]), 0), ce = te.reduce((ge, pe) => ge + (this.viewItems[pe].maximumSize - H[pe]), 0), le = ie.length === 0 ? Number.POSITIVE_INFINITY : ie.reduce((ge, pe) => ge + (H[pe] - this.viewItems[pe].minimumSize), 0), de = ie.length === 0 ? Number.NEGATIVE_INFINITY : ie.reduce((ge, pe) => ge + (H[pe] - this.viewItems[pe].maximumSize), 0), ue = Math.max(ae, de, Z), he = Math.min(le, ce, Q);
+    const ne = te.map((ge) => this.viewItems[ge]), oe = te.map((ge) => H[ge]), re = ie.map((ge) => this.viewItems[ge]), se = ie.map((ge) => H[ge]), ae = te.reduce((ge, me) => ge + (this.viewItems[me].minimumSize - H[me]), 0), ce = te.reduce((ge, me) => ge + (this.viewItems[me].maximumSize - H[me]), 0), le = ie.length === 0 ? Number.POSITIVE_INFINITY : ie.reduce((ge, me) => ge + (H[me] - this.viewItems[me].minimumSize), 0), de = ie.length === 0 ? Number.NEGATIVE_INFINITY : ie.reduce((ge, me) => ge + (H[me] - this.viewItems[me].maximumSize), 0), ue = Math.max(ae, de, Z), he = Math.min(le, ce, Q);
     let fe = !1;
     if (X) {
-      const ge = this.viewItems[X.index], pe = W >= X.limitDelta;
-      fe = pe !== ge.visible, ge.setVisible(pe, X.size);
+      const ge = this.viewItems[X.index], me = W >= X.limitDelta;
+      fe = me !== ge.visible, ge.setVisible(me, X.size);
     }
     if (!fe && ee) {
-      const ge = this.viewItems[ee.index], pe = W < ee.limitDelta;
-      fe = pe !== ge.visible, ge.setVisible(pe, ee.size);
+      const ge = this.viewItems[ee.index], me = W < ee.limitDelta;
+      fe = me !== ge.visible, ge.setVisible(me, ee.size);
     }
     if (fe)
       return this.resize(C, W, H, U, G, Z, Q);
     W = clamp(W, ue, he);
-    for (let ge = 0, pe = W; ge < ne.length; ge++) {
-      const me = ne[ge], ve = clamp(oe[ge] + pe, me.minimumSize, me.maximumSize), we = ve - oe[ge];
-      pe -= we, me.size = ve;
+    for (let ge = 0, me = W; ge < ne.length; ge++) {
+      const pe = ne[ge], ve = clamp(oe[ge] + me, pe.minimumSize, pe.maximumSize), we = ve - oe[ge];
+      me -= we, pe.size = ve;
     }
-    for (let ge = 0, pe = W; ge < re.length; ge++) {
-      const me = re[ge], ve = clamp(se[ge] - pe, me.minimumSize, me.maximumSize), we = ve - se[ge];
-      pe += we, me.size = ve;
+    for (let ge = 0, me = W; ge < re.length; ge++) {
+      const pe = re[ge], ve = clamp(se[ge] - me, pe.minimumSize, pe.maximumSize), we = ve - se[ge];
+      me += we, pe.size = ve;
     }
     return W;
   }
@@ -70176,9 +70183,9 @@ class IndexTreeModel {
     const { parentNode: Q, listIndex: X, revealed: ee, visible: te } = this.getParentNodeWithListIndex(C), ie = [], ne = Iterable.map(H, (ge) => this.createTreeNode(ge, Q, Q.visible ? 1 : 0, ee, ie, U)), oe = C[C.length - 1], re = Q.children.length > 0;
     let se = 0;
     for (let ge = oe; ge >= 0 && ge < Q.children.length; ge--) {
-      const pe = Q.children[ge];
-      if (pe.visible) {
-        se = pe.visibleChildIndex;
+      const me = Q.children[ge];
+      if (me.visible) {
+        se = me.visibleChildIndex;
         break;
       }
     }
@@ -70193,16 +70200,16 @@ class IndexTreeModel {
       ge.visible && ue++;
     if (ue !== 0)
       for (let ge = oe + ae.length; ge < Q.children.length; ge++) {
-        const pe = Q.children[ge];
-        pe.visible && (pe.visibleChildIndex -= ue);
+        const me = Q.children[ge];
+        me.visible && (me.visibleChildIndex -= ue);
       }
     if (Q.visibleChildrenCount += ce - ue, ee && te) {
-      const ge = de.reduce((pe, me) => pe + (me.visible ? me.renderNodeCount : 0), 0);
+      const ge = de.reduce((me, pe) => me + (pe.visible ? pe.renderNodeCount : 0), 0);
       this._updateAncestorsRenderNodeCount(Q, le - ge), this.list.splice(X, ge, ie);
     }
     if (de.length > 0 && G) {
-      const ge = (pe) => {
-        G(pe), pe.children.forEach(ge);
+      const ge = (me) => {
+        G(me), me.children.forEach(ge);
       };
       de.forEach(ge);
     }
@@ -74590,9 +74597,9 @@ class QuickInputController extends Disposable {
     }));
     const fe = append$1(ie, $$7(`#${this.idPrefix}message.quick-input-message`)), ge = this._register(new ProgressBar(C, this.styles.progressBar));
     ge.getContainer().classList.add("quick-input-progress");
-    const pe = append$1(C, $$7(".quick-input-html-widget"));
-    pe.tabIndex = -1;
-    const me = append$1(C, $$7(".quick-input-description")), ve = this.idPrefix + "list", we = this._register(new QuickInputList(C, ve, this.options, this.themeService));
+    const me = append$1(C, $$7(".quick-input-html-widget"));
+    me.tabIndex = -1;
+    const pe = append$1(C, $$7(".quick-input-description")), ve = this.idPrefix + "list", we = this._register(new QuickInputList(C, ve, this.options, this.themeService));
     oe.setAttribute("aria-controls", ve), this._register(we.onDidChangeFocus(() => {
       var Ee;
       oe.setAttribute("aria-activedescendant", (Ee = we.getActiveDescendant()) !== null && Ee !== void 0 ? Ee : "");
@@ -74615,7 +74622,7 @@ class QuickInputController extends Disposable {
     })), this._register(addDisposableListener(C, EventType$1.FOCUS, (Ee) => {
       oe.setFocus();
     })), this._register(addStandardDisposableListener(C, EventType$1.KEY_DOWN, (Ee) => {
-      if (!isAncestor$1(Ee.target, pe))
+      if (!isAncestor$1(Ee.target, me))
         switch (Ee.keyCode) {
           case 3:
             EventHelper.stop(Ee, !0), this.enabled && this.onDidAcceptEmitter.fire();
@@ -74649,9 +74656,9 @@ class QuickInputController extends Disposable {
       leftActionBar: G,
       titleBar: H,
       title: Z,
-      description1: me,
+      description1: pe,
       description2: te,
-      widget: pe,
+      widget: me,
       rightActionBar: Q,
       checkAll: ee,
       inputContainer: ie,
@@ -78956,33 +78963,33 @@ let View = class extends Disposable {
     he.style.width = oe + "px", he.style.minWidth = oe + "px", he.style.paddingRight = "10px", he.className = "diff-review-line-number" + se, C.modifiedLineNumber !== void 0 ? he.appendChild(document.createTextNode(String(C.modifiedLineNumber))) : he.innerText = " ", de.appendChild(he);
     const fe = document.createElement("span");
     if (fe.className = ae, ce) {
-      const me = document.createElement("span");
-      me.className = ThemeIcon.asClassName(ce), me.innerText = "  ", fe.appendChild(me);
+      const pe = document.createElement("span");
+      pe.className = ThemeIcon.asClassName(ce), pe.innerText = "  ", fe.appendChild(pe);
     } else
       fe.innerText = "  ";
     de.appendChild(fe);
     let ge;
     if (C.modifiedLineNumber !== void 0) {
-      let me = this._getLineHtml(X, Q, ee.tabSize, C.modifiedLineNumber, this._languageService.languageIdCodec);
-      AccessibleDiffViewer._ttPolicy && (me = AccessibleDiffViewer._ttPolicy.createHTML(me)), de.insertAdjacentHTML("beforeend", me), ge = X.getLineContent(C.modifiedLineNumber);
+      let pe = this._getLineHtml(X, Q, ee.tabSize, C.modifiedLineNumber, this._languageService.languageIdCodec);
+      AccessibleDiffViewer._ttPolicy && (pe = AccessibleDiffViewer._ttPolicy.createHTML(pe)), de.insertAdjacentHTML("beforeend", pe), ge = X.getLineContent(C.modifiedLineNumber);
     } else {
-      let me = this._getLineHtml(G, U, Z.tabSize, C.originalLineNumber, this._languageService.languageIdCodec);
-      AccessibleDiffViewer._ttPolicy && (me = AccessibleDiffViewer._ttPolicy.createHTML(me)), de.insertAdjacentHTML("beforeend", me), ge = G.getLineContent(C.originalLineNumber);
+      let pe = this._getLineHtml(G, U, Z.tabSize, C.originalLineNumber, this._languageService.languageIdCodec);
+      AccessibleDiffViewer._ttPolicy && (pe = AccessibleDiffViewer._ttPolicy.createHTML(pe)), de.insertAdjacentHTML("beforeend", pe), ge = G.getLineContent(C.originalLineNumber);
     }
     ge.length === 0 && (ge = localize("blankLine", "blank"));
-    let pe = "";
+    let me = "";
     switch (C.type) {
       case LineType.Unchanged:
-        C.originalLineNumber === C.modifiedLineNumber ? pe = localize({ key: "unchangedLine", comment: ["The placeholders are contents of the line and should not be translated."] }, "{0} unchanged line {1}", ge, C.originalLineNumber) : pe = localize("equalLine", "{0} original line {1} modified line {2}", ge, C.originalLineNumber, C.modifiedLineNumber);
+        C.originalLineNumber === C.modifiedLineNumber ? me = localize({ key: "unchangedLine", comment: ["The placeholders are contents of the line and should not be translated."] }, "{0} unchanged line {1}", ge, C.originalLineNumber) : me = localize("equalLine", "{0} original line {1} modified line {2}", ge, C.originalLineNumber, C.modifiedLineNumber);
         break;
       case LineType.Added:
-        pe = localize("insertLine", "+ {0} modified line {1}", ge, C.modifiedLineNumber);
+        me = localize("insertLine", "+ {0} modified line {1}", ge, C.modifiedLineNumber);
         break;
       case LineType.Deleted:
-        pe = localize("deleteLine", "- {0} original line {1}", ge, C.originalLineNumber);
+        me = localize("deleteLine", "- {0} original line {1}", ge, C.originalLineNumber);
         break;
     }
-    return le.setAttribute("aria-label", pe), le;
+    return le.setAttribute("aria-label", me), le;
   }
   _getLineHtml(C, W, H, U, G) {
     const Z = C.getLineContent(U), Q = W.get(
@@ -79086,17 +79093,17 @@ class MovedBlocksLinesPart extends Disposable {
         return { range: new OffsetRange(We, ke), from: Le, to: Oe, fromWithoutScroll: be, toWithoutScroll: ye, move: ve };
       });
       de.sort(tieBreakComparators(compareBy((ve) => ve.fromWithoutScroll > ve.toWithoutScroll, booleanComparator), compareBy((ve) => ve.fromWithoutScroll > ve.toWithoutScroll ? ve.fromWithoutScroll : -ve.toWithoutScroll, numberComparator)));
-      const ue = LinesLayout.compute(de.map((ve) => ve.range)), he = 10, fe = ce.verticalScrollbarWidth, ge = (ue.getTrackCount() - 1) * 10 + he * 2, pe = fe + ge + (le.contentLeft - MovedBlocksLinesPart.movedCodeBlockPadding);
-      let me = 0;
+      const ue = LinesLayout.compute(de.map((ve) => ve.range)), he = 10, fe = ce.verticalScrollbarWidth, ge = (ue.getTrackCount() - 1) * 10 + he * 2, me = fe + ge + (le.contentLeft - MovedBlocksLinesPart.movedCodeBlockPadding);
+      let pe = 0;
       for (const ve of de) {
-        const we = ue.getTrack(me), be = fe + he + we * 10, Ee = 15, ye = 15, De = pe, Le = le.glyphMarginWidth + le.lineNumbersWidth, Oe = 18, We = document.createElementNS("http://www.w3.org/2000/svg", "rect");
+        const we = ue.getTrack(pe), be = fe + he + we * 10, Ee = 15, ye = 15, De = me, Le = le.glyphMarginWidth + le.lineNumbersWidth, Oe = 18, We = document.createElementNS("http://www.w3.org/2000/svg", "rect");
         We.classList.add("arrow-rectangle"), We.setAttribute("x", `${De - Le}`), We.setAttribute("y", `${ve.to - Oe / 2}`), We.setAttribute("width", `${Le}`), We.setAttribute("height", `${Oe}`), this._element.appendChild(We);
         const ke = document.createElementNS("http://www.w3.org/2000/svg", "g"), Ne = document.createElementNS("http://www.w3.org/2000/svg", "path");
         Ne.setAttribute("d", `M 0 ${ve.from} L ${be} ${ve.from} L ${be} ${ve.to} L ${De - ye} ${ve.to}`), Ne.setAttribute("fill", "none"), ke.appendChild(Ne);
         const Pe = document.createElementNS("http://www.w3.org/2000/svg", "polygon");
         Pe.classList.add("arrow"), oe.add(autorun((Fe) => {
           Ne.classList.toggle("currentMove", ve.move === se.activeMovedText.read(Fe)), Pe.classList.toggle("currentMove", ve.move === se.activeMovedText.read(Fe));
-        })), Pe.setAttribute("points", `${De - ye},${ve.to - Ee / 2} ${De},${ve.to} ${De - ye},${ve.to + Ee / 2}`), ke.appendChild(Pe), this._element.appendChild(ke), me++;
+        })), Pe.setAttribute("points", `${De - ye},${ve.to - Ee / 2} ${De},${ve.to} ${De - ye},${ve.to + Ee / 2}`), ke.appendChild(Pe), this._element.appendChild(ke), pe++;
       }
       this.width.set(ge, void 0);
     }), this._element = document.createElementNS("http://www.w3.org/2000/svg", "svg"), this._element.setAttribute("class", "moved-blocks-lines"), this._rootElement.appendChild(this._element), this._register(toDisposable(() => this._element.remove())), this._register(autorun((ne) => {
@@ -79585,8 +79592,8 @@ class CollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
           /* EditorOption.lineHeight */
         )), fe = Math.max(0, Math.min(se - he, this._unchangedRegion.getMaxVisibleLineCountBottom())), ge = ie.getTopForLineNumber(this._unchangedRegionRange.endLineNumberExclusive);
         this._unchangedRegion.visibleLineCountBottom.set(fe, void 0);
-        const pe = ie.getTopForLineNumber(this._unchangedRegionRange.endLineNumberExclusive);
-        ie.setScrollTop(ie.getScrollTop() + (pe - ge));
+        const me = ie.getTopForLineNumber(this._unchangedRegionRange.endLineNumberExclusive);
+        ie.setScrollTop(ie.getScrollTop() + (me - ge));
       }), ce = addDisposableListener(window, "mouseup", (le) => {
         if (this._unchangedRegion.isDragged.set(!1, void 0), !re) {
           const de = ie.getTopForLineNumber(this._unchangedRegionRange.endLineNumberExclusive);
@@ -80280,15 +80287,15 @@ let ViewZoneManager = class extends Disposable {
       if (!he || !fe)
         return null;
       ee.read(ue);
-      const pe = this._options.renderSideBySide.read(ue);
-      return computeRangeAlignment(this._editors.original, this._editors.modified, fe.mappings, ne, oe, pe);
+      const me = this._options.renderSideBySide.read(ue);
+      return computeRangeAlignment(this._editors.original, this._editors.modified, fe.mappings, ne, oe, me);
     }), se = derived((ue) => {
       var he;
       const fe = (he = this._diffModel.read(ue)) === null || he === void 0 ? void 0 : he.movedTextToCompare.read(ue);
       if (!fe)
         return null;
       ee.read(ue);
-      const ge = fe.changes.map((pe) => new DiffMapping(pe));
+      const ge = fe.changes.map((me) => new DiffMapping(me));
       return computeRangeAlignment(this._editors.original, this._editors.modified, ge, ne, oe, !0);
     });
     function ae() {
@@ -80296,7 +80303,7 @@ let ViewZoneManager = class extends Disposable {
       return ue.className = "diagonal-fill", ue;
     }
     const ce = this._register(new DisposableStore()), le = derived((ue) => {
-      var he, fe, ge, pe, me, ve, we, be;
+      var he, fe, ge, me, pe, ve, we, be;
       ce.clear();
       const Ee = re.read(ue) || [], ye = [], De = [], Le = this._modifiedTopPadding.read(ue);
       Le > 0 && De.push({
@@ -80326,7 +80333,7 @@ let ViewZoneManager = class extends Disposable {
       const Fe = this._editors.modified.getOption(
         66
         /* EditorOption.lineHeight */
-      ), Ae = (ge = this._diffModel.read(ue)) === null || ge === void 0 ? void 0 : ge.movedTextToCompare.read(ue), ze = (me = (pe = this._editors.original.getModel()) === null || pe === void 0 ? void 0 : pe.mightContainNonBasicASCII()) !== null && me !== void 0 ? me : !1, Xe = (we = (ve = this._editors.original.getModel()) === null || ve === void 0 ? void 0 : ve.mightContainRTL()) !== null && we !== void 0 ? we : !1, Ke = RenderOptions.fromEditor(this._editors.modified);
+      ), Ae = (ge = this._diffModel.read(ue)) === null || ge === void 0 ? void 0 : ge.movedTextToCompare.read(ue), ze = (pe = (me = this._editors.original.getModel()) === null || me === void 0 ? void 0 : me.mightContainNonBasicASCII()) !== null && pe !== void 0 ? pe : !1, Xe = (we = (ve = this._editors.original.getModel()) === null || ve === void 0 ? void 0 : ve.mightContainRTL()) !== null && we !== void 0 ? we : !1, Ke = RenderOptions.fromEditor(this._editors.modified);
       for (const Ye of Ee)
         if (Ye.diff && !We) {
           if (!Ye.originalRange.isEmpty) {
@@ -80434,20 +80441,20 @@ let ViewZoneManager = class extends Disposable {
     this._register(autorunWithStore((ue) => {
       const he = StableEditorScrollState.capture(this._editors.modified), fe = le.read(ue);
       X = !0, this._editors.original.changeViewZones((ge) => {
-        for (const pe of ne)
-          ge.removeZone(pe);
+        for (const me of ne)
+          ge.removeZone(me);
         ne.clear();
-        for (const pe of fe.orig) {
-          const me = ge.addZone(pe);
-          pe.setZoneId && pe.setZoneId(me), ne.add(me);
+        for (const me of fe.orig) {
+          const pe = ge.addZone(me);
+          me.setZoneId && me.setZoneId(pe), ne.add(pe);
         }
       }), this._editors.modified.changeViewZones((ge) => {
-        for (const pe of oe)
-          ge.removeZone(pe);
+        for (const me of oe)
+          ge.removeZone(me);
         oe.clear();
-        for (const pe of fe.mod) {
-          const me = ge.addZone(pe);
-          pe.setZoneId && pe.setZoneId(me), oe.add(me);
+        for (const me of fe.mod) {
+          const pe = ge.addZone(me);
+          me.setZoneId && me.setZoneId(pe), oe.add(pe);
         }
       }), X = !1, he.restore(this._editors.modified);
     })), this._register(toDisposable(() => {
@@ -80485,8 +80492,8 @@ let ViewZoneManager = class extends Disposable {
       const fe = (he = this._diffModel.read(ue)) === null || he === void 0 ? void 0 : he.movedTextToCompare.read(ue);
       let ge = 0;
       if (fe) {
-        const pe = this._editors.original.getTopForLineNumber(fe.lineRangeMapping.original.startLineNumber, !0) - this._originalTopPadding.get();
-        ge = this._editors.modified.getTopForLineNumber(fe.lineRangeMapping.modified.startLineNumber, !0) - this._modifiedTopPadding.get() - pe;
+        const me = this._editors.original.getTopForLineNumber(fe.lineRangeMapping.original.startLineNumber, !0) - this._originalTopPadding.get();
+        ge = this._editors.modified.getTopForLineNumber(fe.lineRangeMapping.modified.startLineNumber, !0) - this._modifiedTopPadding.get() - me;
       }
       ge > 0 ? (this._modifiedTopPadding.set(0, void 0), this._originalTopPadding.set(ge, void 0)) : ge < 0 ? (this._modifiedTopPadding.set(-ge, void 0), this._originalTopPadding.set(0, void 0)) : setTimeout(() => {
         this._modifiedTopPadding.set(0, void 0), this._originalTopPadding.set(0, void 0);
@@ -80530,7 +80537,7 @@ function computeRangeAlignment(K, C, W, H, U, G) {
   }
   for (const re of W) {
     let de = function(ue, he) {
-      var fe, ge, pe, me;
+      var fe, ge, me, pe;
       if (ue < le || he < ce)
         return;
       if (ae)
@@ -80540,7 +80547,7 @@ function computeRangeAlignment(K, C, W, H, U, G) {
       const ve = new LineRange$1(le, ue), we = new LineRange$1(ce, he);
       if (ve.isEmpty && we.isEmpty)
         return;
-      const be = (ge = (fe = Z.takeWhile((ye) => ye.lineNumber < ue)) === null || fe === void 0 ? void 0 : fe.reduce((ye, De) => ye + De.heightInPx, 0)) !== null && ge !== void 0 ? ge : 0, Ee = (me = (pe = Q.takeWhile((ye) => ye.lineNumber < he)) === null || pe === void 0 ? void 0 : pe.reduce((ye, De) => ye + De.heightInPx, 0)) !== null && me !== void 0 ? me : 0;
+      const be = (ge = (fe = Z.takeWhile((ye) => ye.lineNumber < ue)) === null || fe === void 0 ? void 0 : fe.reduce((ye, De) => ye + De.heightInPx, 0)) !== null && ge !== void 0 ? ge : 0, Ee = (pe = (me = Q.takeWhile((ye) => ye.lineNumber < he)) === null || me === void 0 ? void 0 : me.reduce((ye, De) => ye + De.heightInPx, 0)) !== null && pe !== void 0 ? pe : 0;
       te.push({
         originalRange: ve,
         modifiedRange: we,
@@ -80618,10 +80625,10 @@ let OverviewRulerPart = OverviewRulerPart_1 = class extends Disposable {
         const he = this._editors.modified.createOverviewRuler("modified diffOverviewRuler");
         if (he && (le.add(he), le.add(appendRemoveOnDispose(ae, he.getDomNode()))), !ue || !he)
           return;
-        const fe = observableSignalFromEvent("viewZoneChanged", this._editors.original.onDidChangeViewZones), ge = observableSignalFromEvent("viewZoneChanged", this._editors.modified.onDidChangeViewZones), pe = observableSignalFromEvent("hiddenRangesChanged", this._editors.original.onDidChangeHiddenAreas), me = observableSignalFromEvent("hiddenRangesChanged", this._editors.modified.onDidChangeHiddenAreas);
+        const fe = observableSignalFromEvent("viewZoneChanged", this._editors.original.onDidChangeViewZones), ge = observableSignalFromEvent("viewZoneChanged", this._editors.modified.onDidChangeViewZones), me = observableSignalFromEvent("hiddenRangesChanged", this._editors.original.onDidChangeHiddenAreas), pe = observableSignalFromEvent("hiddenRangesChanged", this._editors.modified.onDidChangeHiddenAreas);
         le.add(autorun((ve) => {
           var we;
-          fe.read(ve), ge.read(ve), pe.read(ve), me.read(ve);
+          fe.read(ve), ge.read(ve), me.read(ve), pe.read(ve);
           const be = te.read(ve), Ee = (we = de == null ? void 0 : de.diff.read(ve)) === null || we === void 0 ? void 0 : we.mappings;
           function ye(Oe, We, ke) {
             const Ne = ke._getViewModel();
@@ -80941,8 +80948,8 @@ let DiffEditorWidget = class extends DelegatingEditor {
       h("div.accessibleDiffViewer@accessibleDiffViewer", { style: { position: "absolute", height: "100%" } })
     ]), this._diffModel = this._register(disposableObservableValue("diffModel", void 0)), this.onDidChangeModel = Event.fromObservableLight(this._diffModel), this._contextKeyService = this._register(this._parentContextKeyService.createScoped(this._domElement)), this._instantiationService = this._parentInstantiationService.createChild(new ServiceCollection([IContextKeyService, this._contextKeyService])), this._boundarySashes = observableValue(this, void 0), this._accessibleDiffViewerShouldBeVisible = observableValue(this, !1), this._accessibleDiffViewerVisible = derived(this, (se) => this._options.onlyShowAccessibleDiffViewer.read(se) ? !0 : this._accessibleDiffViewerShouldBeVisible.read(se)), this.movedBlocksLinesPart = observableValue(this, void 0), this._layoutInfo = derived(this, (se) => {
       var ae, ce, le;
-      const de = this._rootSizeObserver.width.read(se), ue = this._rootSizeObserver.height.read(se), he = (ae = this._sash.read(se)) === null || ae === void 0 ? void 0 : ae.sashLeft.read(se), fe = he ?? Math.max(5, this._editors.original.getLayoutInfo().decorationsLeft), ge = de - fe - (this._options.renderOverviewRuler.read(se) ? OverviewRulerPart.ENTIRE_DIFF_OVERVIEW_WIDTH : 0), pe = (le = (ce = this.movedBlocksLinesPart.read(se)) === null || ce === void 0 ? void 0 : ce.width.read(se)) !== null && le !== void 0 ? le : 0, me = fe - pe;
-      return this.elements.original.style.width = me + "px", this.elements.original.style.left = "0px", this.elements.modified.style.width = ge + "px", this.elements.modified.style.left = fe + "px", this._editors.original.layout({ width: me, height: ue }), this._editors.modified.layout({ width: ge, height: ue }), {
+      const de = this._rootSizeObserver.width.read(se), ue = this._rootSizeObserver.height.read(se), he = (ae = this._sash.read(se)) === null || ae === void 0 ? void 0 : ae.sashLeft.read(se), fe = he ?? Math.max(5, this._editors.original.getLayoutInfo().decorationsLeft), ge = de - fe - (this._options.renderOverviewRuler.read(se) ? OverviewRulerPart.ENTIRE_DIFF_OVERVIEW_WIDTH : 0), me = (le = (ce = this.movedBlocksLinesPart.read(se)) === null || ce === void 0 ? void 0 : ce.width.read(se)) !== null && le !== void 0 ? le : 0, pe = fe - me;
+      return this.elements.original.style.width = pe + "px", this.elements.original.style.left = "0px", this.elements.modified.style.width = ge + "px", this.elements.modified.style.left = fe + "px", this._editors.original.layout({ width: pe, height: ue }), this._editors.modified.layout({ width: ge, height: ue }), {
         modifiedEditor: this._editors.modified.getLayoutInfo(),
         originalEditor: this._editors.original.getLayoutInfo()
       };
@@ -83009,37 +83016,37 @@ registerLanguage({
   id: "freemarker2",
   extensions: [".ftl", ".ftlh", ".ftlx"],
   aliases: ["FreeMarker2", "Apache FreeMarker2"],
-  loader: () => import("./freemarker2-0d5627bc.js").then((K) => K.TagAutoInterpolationDollar)
+  loader: () => import("./freemarker2-4d8e8e55.js").then((K) => K.TagAutoInterpolationDollar)
 });
 registerLanguage({
   id: "freemarker2.tag-angle.interpolation-dollar",
   aliases: ["FreeMarker2 (Angle/Dollar)", "Apache FreeMarker2 (Angle/Dollar)"],
-  loader: () => import("./freemarker2-0d5627bc.js").then((K) => K.TagAngleInterpolationDollar)
+  loader: () => import("./freemarker2-4d8e8e55.js").then((K) => K.TagAngleInterpolationDollar)
 });
 registerLanguage({
   id: "freemarker2.tag-bracket.interpolation-dollar",
   aliases: ["FreeMarker2 (Bracket/Dollar)", "Apache FreeMarker2 (Bracket/Dollar)"],
-  loader: () => import("./freemarker2-0d5627bc.js").then((K) => K.TagBracketInterpolationDollar)
+  loader: () => import("./freemarker2-4d8e8e55.js").then((K) => K.TagBracketInterpolationDollar)
 });
 registerLanguage({
   id: "freemarker2.tag-angle.interpolation-bracket",
   aliases: ["FreeMarker2 (Angle/Bracket)", "Apache FreeMarker2 (Angle/Bracket)"],
-  loader: () => import("./freemarker2-0d5627bc.js").then((K) => K.TagAngleInterpolationBracket)
+  loader: () => import("./freemarker2-4d8e8e55.js").then((K) => K.TagAngleInterpolationBracket)
 });
 registerLanguage({
   id: "freemarker2.tag-bracket.interpolation-bracket",
   aliases: ["FreeMarker2 (Bracket/Bracket)", "Apache FreeMarker2 (Bracket/Bracket)"],
-  loader: () => import("./freemarker2-0d5627bc.js").then((K) => K.TagBracketInterpolationBracket)
+  loader: () => import("./freemarker2-4d8e8e55.js").then((K) => K.TagBracketInterpolationBracket)
 });
 registerLanguage({
   id: "freemarker2.tag-auto.interpolation-dollar",
   aliases: ["FreeMarker2 (Auto/Dollar)", "Apache FreeMarker2 (Auto/Dollar)"],
-  loader: () => import("./freemarker2-0d5627bc.js").then((K) => K.TagAutoInterpolationDollar)
+  loader: () => import("./freemarker2-4d8e8e55.js").then((K) => K.TagAutoInterpolationDollar)
 });
 registerLanguage({
   id: "freemarker2.tag-auto.interpolation-bracket",
   aliases: ["FreeMarker2 (Auto/Bracket)", "Apache FreeMarker2 (Auto/Bracket)"],
-  loader: () => import("./freemarker2-0d5627bc.js").then((K) => K.TagAutoInterpolationBracket)
+  loader: () => import("./freemarker2-4d8e8e55.js").then((K) => K.TagAutoInterpolationBracket)
 });
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -83077,7 +83084,7 @@ registerLanguage({
   extensions: [".handlebars", ".hbs"],
   aliases: ["Handlebars", "handlebars", "hbs"],
   mimetypes: ["text/x-handlebars-template"],
-  loader: () => import("./handlebars-f4513b36.js")
+  loader: () => import("./handlebars-c43672f7.js")
 });
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -83102,7 +83109,7 @@ registerLanguage({
   extensions: [".html", ".htm", ".shtml", ".xhtml", ".mdoc", ".jsp", ".asp", ".aspx", ".jshtm"],
   aliases: ["HTML", "htm", "html", "xhtml"],
   mimetypes: ["text/html", "text/x-jshtm", "text/template", "text/ng-template"],
-  loader: () => import("./html-8bedbbe0.js")
+  loader: () => import("./html-c6099a2e.js")
 });
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -83143,7 +83150,7 @@ registerLanguage({
   filenames: ["jakefile"],
   aliases: ["JavaScript", "javascript", "js"],
   mimetypes: ["text/javascript"],
-  loader: () => import("./javascript-b0034508.js")
+  loader: () => import("./javascript-ac2b4ae2.js")
 });
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -83218,7 +83225,7 @@ registerLanguage({
   extensions: [".liquid", ".html.liquid"],
   aliases: ["Liquid", "liquid"],
   mimetypes: ["application/liquid"],
-  loader: () => import("./liquid-ce28d1ae.js")
+  loader: () => import("./liquid-b5021331.js")
 });
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -83254,7 +83261,7 @@ registerLanguage({
   id: "mdx",
   extensions: [".mdx"],
   aliases: ["MDX", "mdx"],
-  loader: () => import("./mdx-470c6c12.js")
+  loader: () => import("./mdx-bbae5f86.js")
 });
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -83449,7 +83456,7 @@ registerLanguage({
   extensions: [".py", ".rpy", ".pyw", ".cpy", ".gyp", ".gypi"],
   aliases: ["Python", "py"],
   firstLine: "^#!/.*\\bpython[0-9.-]*\\b",
-  loader: () => import("./python-8f0249df.js")
+  loader: () => import("./python-fc373d9f.js")
 });
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -83486,7 +83493,7 @@ registerLanguage({
   extensions: [".cshtml"],
   aliases: ["Razor", "razor"],
   mimetypes: ["text/x-cshtml"],
-  loader: () => import("./razor-e4b6515c.js")
+  loader: () => import("./razor-1e9d135a.js")
 });
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -83738,7 +83745,7 @@ registerLanguage({
   extensions: [".ts", ".tsx", ".cts", ".mts"],
   aliases: ["TypeScript", "ts", "typescript"],
   mimetypes: ["text/typescript"],
-  loader: () => import("./typescript-7135e9ac.js")
+  loader: () => import("./typescript-b2ef5e0f.js")
 });
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -83794,7 +83801,7 @@ registerLanguage({
   firstLine: "(\\<\\?xml.*)|(\\<svg)|(\\<\\!doctype\\s+svg)",
   aliases: ["XML", "xml"],
   mimetypes: ["text/xml", "application/xml", "application/xaml+xml", "application/xml-dtd"],
-  loader: () => import("./xml-1e98ce31.js")
+  loader: () => import("./xml-579a5775.js")
 });
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -83807,7 +83814,7 @@ registerLanguage({
   extensions: [".yaml", ".yml"],
   aliases: ["YAML", "yaml", "YML", "yml"],
   mimetypes: ["application/x-yaml", "text/x-yaml"],
-  loader: () => import("./yaml-ad99967d.js")
+  loader: () => import("./yaml-c31c56b7.js")
 });
 /*!-----------------------------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -83902,7 +83909,7 @@ var LanguageServiceDefaultsImpl$3 = class {
 }, cssDefaults = new LanguageServiceDefaultsImpl$3("css", optionsDefault$1, modeConfigurationDefault$2), scssDefaults = new LanguageServiceDefaultsImpl$3("scss", optionsDefault$1, modeConfigurationDefault$2), lessDefaults = new LanguageServiceDefaultsImpl$3("less", optionsDefault$1, modeConfigurationDefault$2);
 monaco_editor_core_exports$3.languages.css = { cssDefaults, lessDefaults, scssDefaults };
 function getMode$3() {
-  return import("./cssMode-8c659100.js");
+  return import("./cssMode-0bcb1554.js");
 }
 monaco_editor_core_exports$3.languages.onLanguage("less", () => {
   getMode$3().then((K) => K.setupMode(lessDefaults));
@@ -83997,7 +84004,7 @@ monaco_editor_core_exports$2.languages.html = {
   registerHTMLLanguageService
 };
 function getMode$2() {
-  return import("./htmlMode-659c9ca3.js");
+  return import("./htmlMode-31c10440.js");
 }
 function registerHTMLLanguageService(K, C = optionsDefault, W = getConfigurationDefault(K)) {
   const H = new LanguageServiceDefaultsImpl$2(K, C, W);
@@ -84074,7 +84081,7 @@ var LanguageServiceDefaultsImpl$1 = class {
 }, jsonDefaults = new LanguageServiceDefaultsImpl$1("json", diagnosticDefault, modeConfigurationDefault$1);
 monaco_editor_core_exports$1.languages.json = { jsonDefaults };
 function getMode$1() {
-  return import("./jsonMode-92a1ff9b.js");
+  return import("./jsonMode-36333022.js");
 }
 monaco_editor_core_exports$1.languages.register({
   id: "json",
@@ -84237,7 +84244,7 @@ monaco_editor_core_exports.languages.typescript = {
   getJavaScriptWorker
 };
 function getMode() {
-  return import("./tsMode-ddb992e8.js");
+  return import("./tsMode-ea3b05db.js");
 }
 monaco_editor_core_exports.languages.onLanguage("typescript", () => getMode().then((K) => K.setupTypeScript(typescriptDefaults)));
 monaco_editor_core_exports.languages.onLanguage("javascript", () => getMode().then((K) => K.setupJavaScript(javascriptDefaults)));
@@ -86716,8 +86723,8 @@ class CodeActionModel extends Disposable {
                 const ce = H.selection.getPosition();
                 let le = ce, de = Number.MAX_VALUE, ue = !1;
                 for (const he of ae) {
-                  const fe = he.endColumn, ge = he.endLineNumber, pe = he.startLineNumber;
-                  (ge === ce.lineNumber || pe === ce.lineNumber) && Math.abs(ce.column - fe) < de && (de = Math.abs(ce.column - fe), ue = !0, le = new Position$1(ge, fe));
+                  const fe = he.endColumn, ge = he.endLineNumber, me = he.startLineNumber;
+                  (ge === ce.lineNumber || me === ce.lineNumber) && Math.abs(ce.column - fe) < de && (de = Math.abs(ce.column - fe), ue = !0, le = new Position$1(ge, fe));
                 }
                 if (ue) {
                   const he = {
@@ -86726,10 +86733,10 @@ class CodeActionModel extends Disposable {
                     filter: { include: !((ie = H.trigger.filter) === null || ie === void 0) && ie.include ? (ne = H.trigger.filter) === null || ne === void 0 ? void 0 : ne.include : CodeActionKind.QuickFix },
                     autoApply: H.trigger.autoApply,
                     context: { notAvailableMessage: ((oe = H.trigger.context) === null || oe === void 0 ? void 0 : oe.notAvailableMessage) || "", position: le }
-                  }, fe = new Selection$1(le.lineNumber, le.column, le.lineNumber, le.column), ge = yield getCodeActions(this._registry, C, fe, he, Progress.None, Q), pe = [...re.validActions];
-                  return ge.validActions.length !== 0 && (ge.validActions.forEach((me) => {
-                    me.highlightRange = me.action.isPreferred;
-                  }), pe.push(...ge.validActions)), { validActions: pe, allActions: re.allActions, documentation: re.documentation, hasAutoFix: re.hasAutoFix, dispose: () => {
+                  }, fe = new Selection$1(le.lineNumber, le.column, le.lineNumber, le.column), ge = yield getCodeActions(this._registry, C, fe, he, Progress.None, Q), me = [...re.validActions];
+                  return ge.validActions.length !== 0 && (ge.validActions.forEach((pe) => {
+                    pe.highlightRange = pe.action.isPreferred;
+                  }), me.push(...ge.validActions)), { validActions: me, allActions: re.allActions, documentation: re.documentation, hasAutoFix: re.hasAutoFix, dispose: () => {
                     re.dispose();
                   } };
                 }
@@ -93110,9 +93117,9 @@ let WorkbenchToolBar = class extends ToolBar {
       let he = !1;
       if (te === 1 && ((re = this._options) === null || re === void 0 ? void 0 : re.hiddenItemStrategy) === 0) {
         he = !0;
-        for (let pe = 0; pe < ee.length; pe++)
-          if (ee[pe].checked) {
-            ee[pe] = toAction({
+        for (let me = 0; me < ee.length; me++)
+          if (ee[me].checked) {
+            ee[me] = toAction({
               id: ue.id,
               label: ue.label,
               checked: !0,
@@ -103329,8 +103336,8 @@ let SnippetSession = SnippetSession_1 = class {
     for (const { selection: ue, idx: he } of de) {
       let fe = SnippetSession_1.adjustSelection(ne, ue, H, 0), ge = SnippetSession_1.adjustSelection(ne, ue, 0, U);
       ae !== ne.getValueInRange(fe) && (fe = ue), ce !== ne.getValueInRange(ge) && (ge = ue);
-      const pe = ue.setStartPosition(fe.startLineNumber, fe.startColumn).setEndPosition(ge.endLineNumber, ge.endColumn), me = new SnippetParser().parse(W, !0, G), ve = pe.getStartPosition(), we = SnippetSession_1.adjustWhitespace(ne, ve, Z || he > 0 && le !== ne.getLineFirstNonWhitespaceColumn(ue.positionLineNumber), me);
-      me.resolveVariables(new CompositeSnippetVariableResolver([
+      const me = ue.setStartPosition(fe.startLineNumber, fe.startColumn).setEndPosition(ge.endLineNumber, ge.endColumn), pe = new SnippetParser().parse(W, !0, G), ve = me.getStartPosition(), we = SnippetSession_1.adjustWhitespace(ne, ve, Z || he > 0 && le !== ne.getLineFirstNonWhitespaceColumn(ue.positionLineNumber), pe);
+      pe.resolveVariables(new CompositeSnippetVariableResolver([
         re,
         new ClipboardBasedVariableResolver(se, he, de.length, C.getOption(
           78
@@ -103341,7 +103348,7 @@ let SnippetSession = SnippetSession_1 = class {
         new TimeBasedVariableResolver(),
         new WorkspaceBasedVariableResolver(oe),
         new RandomBasedVariableResolver()
-      ])), te[he] = EditOperation.replace(pe, me.toString()), te[he].identifier = { major: he, minor: 0 }, te[he]._isTracked = !0, ie[he] = new OneSnippet(C, me, we);
+      ])), te[he] = EditOperation.replace(me, pe.toString()), te[he].identifier = { major: he, minor: 0 }, te[he]._isTracked = !0, ie[he] = new OneSnippet(C, pe, we);
     }
     return { edits: te, snippets: ie };
   }
@@ -103752,8 +103759,8 @@ let InlineCompletionsModel = class extends Disposable {
       const ce = this.selectedInlineCompletion.get(), le = se.preserveCurrentCompletion || ce != null && ce.forwardStable ? ce : void 0, de = this._source.suggestWidgetInlineCompletions.get(), ue = this.selectedSuggestItem.read(re);
       if (de && !ue) {
         const ge = this._source.inlineCompletions.get();
-        transaction((pe) => {
-          ge && de.request.versionId > ge.request.versionId && this._source.inlineCompletions.set(de.clone(), pe), this._source.clearSuggestWidgetInlineCompletions(pe);
+        transaction((me) => {
+          ge && de.request.versionId > ge.request.versionId && this._source.inlineCompletions.set(de.clone(), me), this._source.clearSuggestWidgetInlineCompletions(me);
         });
       }
       const he = this.cursorPosition.read(re), fe = {
@@ -103789,8 +103796,8 @@ let InlineCompletionsModel = class extends Disposable {
         const le = ce.toSingleTextEdit().removeCommonPrefix(ae), de = this._computeAugmentedCompletion(le, re);
         if (!this._suggestPreviewEnabled.read(re) && !de)
           return;
-        const he = (se = de == null ? void 0 : de.edit) !== null && se !== void 0 ? se : le, fe = de ? de.edit.text.length - le.text.length : 0, ge = this._suggestPreviewMode.read(re), pe = this.cursorPosition.read(re), me = he.computeGhostText(ae, ge, pe, fe);
-        return { ghostText: me ?? new GhostText(he.range.endLineNumber, []), inlineCompletion: de == null ? void 0 : de.completion, suggestItem: ce };
+        const he = (se = de == null ? void 0 : de.edit) !== null && se !== void 0 ? se : le, fe = de ? de.edit.text.length - le.text.length : 0, ge = this._suggestPreviewMode.read(re), me = this.cursorPosition.read(re), pe = he.computeGhostText(ae, ge, me, fe);
+        return { ghostText: pe ?? new GhostText(he.range.endLineNumber, []), inlineCompletion: de == null ? void 0 : de.completion, suggestItem: ce };
       } else {
         if (!this._isActive.read(re))
           return;
@@ -104817,7 +104824,7 @@ let SuggestModel = SuggestModel_1 = class {
       let he = C == null ? void 0 : C.clipboardText;
       if (!he && le.needsClipboard && (he = yield this._clipboardService.readText()), this._triggerState === void 0)
         return;
-      const fe = this._editor.getModel(), ge = new LineContext(fe, this._editor.getPosition(), C), pe = Object.assign(Object.assign({}, FuzzyScoreOptions.default), { firstMatchCanBeWeak: !this._editor.getOption(
+      const fe = this._editor.getModel(), ge = new LineContext(fe, this._editor.getPosition(), C), me = Object.assign(Object.assign({}, FuzzyScoreOptions.default), { firstMatchCanBeWeak: !this._editor.getOption(
         117
         /* EditorOption.suggest */
       ).matchOnWordStartOnly });
@@ -104830,9 +104837,9 @@ let SuggestModel = SuggestModel_1 = class {
       ), this._editor.getOption(
         111
         /* EditorOption.snippetSuggestions */
-      ), pe, he), this._completionDisposables.add(le.disposable), this._onNewContext(ge), this._reportDurationsTelemetry(le.durations), !this._envService.isBuilt || this._envService.isExtensionDevelopment)
-        for (const me of le.items)
-          me.isInvalid && this._logService.warn(`[suggest] did IGNORE invalid completion item from ${me.provider._debugDisplayName}`, me.completion);
+      ), me, he), this._completionDisposables.add(le.disposable), this._onNewContext(ge), this._reportDurationsTelemetry(le.durations), !this._envService.isBuilt || this._envService.isExtensionDevelopment)
+        for (const pe of le.items)
+          pe.isInvalid && this._logService.warn(`[suggest] did IGNORE invalid completion item from ${pe.provider._debugDisplayName}`, pe.completion);
     })).catch(onUnexpectedError);
   }
   _reportDurationsTelemetry(C) {
@@ -105419,8 +105426,8 @@ let ItemRenderer = class {
       ) || le.fontSize, fe = ce.get(
         119
         /* EditorOption.suggestLineHeight */
-      ) || le.lineHeight, ge = le.fontWeight, pe = le.letterSpacing, me = `${he}px`, ve = `${fe}px`, we = `${pe}px`;
-      H.style.fontSize = me, H.style.fontWeight = ge, H.style.letterSpacing = we, Q.style.fontFamily = de, Q.style.fontFeatureSettings = ue, Q.style.lineHeight = ve, U.style.height = ve, U.style.width = ve, se.style.height = ve, se.style.width = ve;
+      ) || le.lineHeight, ge = le.fontWeight, me = le.letterSpacing, pe = `${he}px`, ve = `${fe}px`, we = `${me}px`;
+      H.style.fontSize = pe, H.style.fontWeight = ge, H.style.letterSpacing = we, Q.style.fontFamily = de, Q.style.fontFeatureSettings = ue, Q.style.lineHeight = ve, U.style.height = ve, U.style.width = ve, se.style.height = ve, se.style.width = ve;
     };
     return ae(), W.add(this._editor.onDidChangeConfiguration((ce) => {
       (ce.hasChanged(
@@ -109409,11 +109416,11 @@ class JoinLinesAction extends EditorAction {
         le = re.endLineNumber, de = Q.getLineMaxColumn(le);
       let he = Q.getLineContent(se);
       for (let ge = se + 1; ge <= le; ge++) {
-        const pe = Q.getLineContent(ge), me = Q.getLineFirstNonWhitespaceColumn(ge);
-        if (me >= 1) {
+        const me = Q.getLineContent(ge), pe = Q.getLineFirstNonWhitespaceColumn(ge);
+        if (pe >= 1) {
           let ve = !0;
           he === "" && (ve = !1), ve && (he.charAt(he.length - 1) === " " || he.charAt(he.length - 1) === "	") && (ve = !1, he = he.replace(/[\s\uFEFF\xA0]+$/g, " "));
-          const we = pe.substr(me - 1);
+          const we = me.substr(pe - 1);
           he += (ve ? " " : "") + we, ve ? ce = we.length + 1 : ce = we.length;
         } else
           ce = 0;
@@ -116651,18 +116658,18 @@ let AbstractGotoSymbolQuickAccessProvider = AbstractGotoSymbolQuickAccessProvide
         const le = Q[ce], de = trim$1(le.name), ue = `$(${SymbolKinds.toIcon(le.kind).id}) ${de}`, he = ue.length - de.length;
         let fe = le.containerName;
         H != null && H.extraContainerLabel && (fe ? fe = `${H.extraContainerLabel} • ${fe}` : fe = H.extraContainerLabel);
-        let ge, pe, me, ve;
+        let ge, me, pe, ve;
         if (W.original.length > ee) {
           let be = !1;
-          if (te !== W && ([ge, pe] = scoreFuzzy2(ue, Object.assign(Object.assign({}, W), {
+          if (te !== W && ([ge, me] = scoreFuzzy2(ue, Object.assign(Object.assign({}, W), {
             values: void 0
             /* disable multi-query support */
-          }), ee, he), typeof ge == "number" && (be = !0)), typeof ge != "number" && ([ge, pe] = scoreFuzzy2(ue, te, ee, he), typeof ge != "number"))
+          }), ee, he), typeof ge == "number" && (be = !0)), typeof ge != "number" && ([ge, me] = scoreFuzzy2(ue, te, ee, he), typeof ge != "number"))
             continue;
           if (!be && ie) {
-            if (fe && ie.original.length > 0 && ([me, ve] = scoreFuzzy2(fe, ie)), typeof me != "number")
+            if (fe && ie.original.length > 0 && ([pe, ve] = scoreFuzzy2(fe, ie)), typeof pe != "number")
               continue;
-            typeof ge == "number" && (ge += me);
+            typeof ge == "number" && (ge += pe);
           }
         }
         const we = le.tags && le.tags.indexOf(
@@ -116677,7 +116684,7 @@ let AbstractGotoSymbolQuickAccessProvider = AbstractGotoSymbolQuickAccessProvide
           ariaLabel: getAriaLabelForSymbol(le.name, le.kind),
           description: fe,
           highlights: we ? void 0 : {
-            label: pe,
+            label: me,
             description: ve
           },
           range: {
@@ -117053,8 +117060,8 @@ class PickerQuickAccessProvider extends Disposable {
               if (isPicksWithActive(le) ? (he = le.items, fe = le.active) : he = le, he.length > 0 || !ae) {
                 let ge;
                 if (!ue && !fe) {
-                  const pe = C.activeItems[0];
-                  pe && de.indexOf(pe) !== -1 && (ge = pe);
+                  const me = C.activeItems[0];
+                  me && de.indexOf(me) !== -1 && (ge = me);
                 }
                 oe({
                   items: [...de, ...he],
@@ -117932,7 +117939,7 @@ const _sfc_main$b = /* @__PURE__ */ defineComponent({
       C.configData.options[ae].label = se.value;
     }
     return (se, ae) => {
-      const ce = resolveComponent("a-input"), le = resolveComponent("a-form-item"), de = resolveComponent("a-select"), ue = resolveComponent("a-textarea"), he = resolveComponent("a-input-number"), fe = resolveComponent("a-radio-button"), ge = resolveComponent("a-radio-group"), pe = resolveComponent("a-switch"), me = resolveComponent("a-radio"), ve = resolveComponent("a-checkbox"), we = resolveComponent("a-checkbox-group"), be = resolveComponent("a-select-option"), Ee = resolveComponent("a-form");
+      const ce = resolveComponent("a-input"), le = resolveComponent("a-form-item"), de = resolveComponent("a-select"), ue = resolveComponent("a-textarea"), he = resolveComponent("a-input-number"), fe = resolveComponent("a-radio-button"), ge = resolveComponent("a-radio-group"), me = resolveComponent("a-switch"), pe = resolveComponent("a-radio"), ve = resolveComponent("a-checkbox"), we = resolveComponent("a-checkbox-group"), be = resolveComponent("a-select-option"), Ee = resolveComponent("a-form");
       return openBlock(), createBlock(Ee, {
         layout: "vertical",
         autocomplete: "off"
@@ -118013,7 +118020,7 @@ const _sfc_main$b = /* @__PURE__ */ defineComponent({
                   }, 1032, ["value"]))), 256))
                 ]),
                 _: 2
-              }, 1032, ["value"])) : ye.type == "switch" ? (openBlock(), createBlock(pe, {
+              }, 1032, ["value"])) : ye.type == "switch" ? (openBlock(), createBlock(me, {
                 key: 4,
                 checked: K.configData[ye.bind],
                 "onUpdate:checked": (Le) => K.configData[ye.bind] = Le
@@ -118027,7 +118034,7 @@ const _sfc_main$b = /* @__PURE__ */ defineComponent({
                   "onUpdate:value": (Le) => K.configData[ye.bind] = Le
                 }, {
                   default: withCtx(() => [
-                    (openBlock(!0), createElementBlock(Fragment, null, renderList(K.configData.options, (Le, Oe) => (openBlock(), createBlock(me, {
+                    (openBlock(!0), createElementBlock(Fragment, null, renderList(K.configData.options, (Le, Oe) => (openBlock(), createBlock(pe, {
                       value: Le.value,
                       style: { "padding-bottom": "8px" }
                     }, {
@@ -118299,18 +118306,21 @@ function generate() {
   let G = { body: U, script: C, style: W };
   return "<template>" + G.body + `</template>
 \r<script lang="ts" setup>` + G.script + generateData.value.pagScript + `<\/script>
-<style lang="less" scoped>` + G.style + "</style>";
+
+<style lang="less" scoped>
+@import url('/@/assets/less/form.less');
+        ` + G.style + "</style>";
 }
 function generateTs(K, C) {
-  let W = "", H = `
+  let W = getViewData(), H = "", U = `
 import { defHttp } from "/@/utils/http/axios";
 import { ref, onMounted } from "vue";
 import { getData, validateInfos, validateFun, onSubmitForm } from "/@/utils/form/wonder1.0.1";
 
 const columns =${JSON.stringify(C)}
 let datalist: any = ref([]);
-let viewData = ref(<any>{})
-viewData.value =await getData()
+let viewData = ref(${JSON.stringify(W)})
+getData(viewData)
 let formRef = ref()
 /**
  * 保存
@@ -118322,10 +118332,19 @@ defineExpose({
     onSubmit
 })
     `;
-  const U = generateDataSource(K), G = generateEventScript(K);
-  return W = H + U + G, W;
+  const G = generateDataSource(K), Z = generateEventScript(K);
+  return H = U + G + Z, H;
 }
 let generateData = ref({ html: "", columns: [], pagScript: "" });
+function getViewData() {
+  const C = useDataStore().getSelectTables;
+  let W = {};
+  for (let H = 0; H < C.length; H++) {
+    debugger;
+    Reflect.set(W, C[H].value, {});
+  }
+  return W;
+}
 function generateEventScript(K) {
   let C = "";
   const W = K.eventScript;
@@ -120124,8 +120143,11 @@ function validateReg(K, C, W) {
   return H && !W.match(H) && (U = !1), U ? "" : C;
 }
 let validateInfos = reactive({});
-function getData() {
-  return { bdc_djzb: { 业务号: "", age: 20 }, wonder_from: { id: "2", title: "我是yefw" } };
+async function getData(K) {
+  const C = "/imaginform/zrzy-form/generate/select";
+  await defHttp.post({ url: C, data: { formId: 14, param: { code: "ceshi_ws" } } }, { withToken: !1 }).then((W) => {
+    K.value = W.result;
+  });
 }
 function saveFormData(K) {
   let C = [];
@@ -120215,7 +120237,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
     const formStore = useFormStore();
     let list = ref(formStore.formData.config.eventScript);
     const generateData = generateHtml(formStore.formData.list), columns = [...generateData.columns];
-    let viewData = ref({}), demoRefs = [];
+    let _viewData = getViewData(), viewData = ref(_viewData), demoRefs = [];
     onBeforeUpdate(() => {
       demoRefs = [];
     });
@@ -120235,7 +120257,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
         function onSubmit() {
           return onSubmitForm(formRef.value);
         }
-        viewData.value = getData();
+        getData(viewData);
         const tableData = formStore.formData.list.filter((K) => K.type == "table"), ilength = tableData.length;
         let pagination;
         ilength > 0 && tableData[0].options.pagination && (pagination = ref({
@@ -121321,7 +121343,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
   props: {
     formId: {
       type: Number,
-      default: 12
+      default: 14
     }
   },
   setup(K) {
@@ -121443,12 +121465,12 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
       ], 64);
     };
   }
-}), Header_vue_vue_type_style_index_0_scoped_4fc6c234_lang = "", formHeader = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-4fc6c234"]]), _sfc_main$3 = /* @__PURE__ */ defineComponent({
+}), Header_vue_vue_type_style_index_0_scoped_02441d5c_lang = "", formHeader = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-02441d5c"]]), _sfc_main$3 = /* @__PURE__ */ defineComponent({
   __name: "SqlModule",
   props: {
     formId: {
       type: Number,
-      default: 12,
+      default: 14,
       required: !0
     },
     selectList: {
@@ -121507,13 +121529,20 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
           else {
             selectList.value = C, message.success("保存成功"), visible.value = !1, emit("update:selectList", selectList.value);
             let Z = [];
-            currentSelectObj.value.id ? (C.filter((X) => X.type == currentSelectObj.value.type).forEach((X) => {
-              X.fields.forEach((ee) => {
-                Z.push({ value: `${X.name}.${ee}` });
-              });
-            }), currentSelectObj.value.type == "select" ? dataStore.setSelectData(Z) : currentSelectObj.value.type == "update" && dataStore.setUpdateData(Z)) : (K.forEach((Q) => {
-              Z.push({ value: `${currentSelectObj.value.name}.${Q}` });
-            }), currentSelectObj.value.type == "select" ? dataStore.addSelectData(Z) : currentSelectObj.value.type == "update" && dataStore.addUpdateData(Z)), console.log(dataStore.$state);
+            if (!currentSelectObj.value.id)
+              K.forEach((Q) => {
+                Z.push({ value: `${currentSelectObj.value.name}.${Q}` });
+              }), currentSelectObj.value.type == "select" ? (dataStore.addSelectData(Z), dataStore.addSelectTable({ value: `${currentSelectObj.value.name}` })) : currentSelectObj.value.type == "update" && dataStore.addUpdateData(Z);
+            else {
+              let Q = C.filter((X) => X.type == currentSelectObj.value.type);
+              debugger;
+              Q.forEach((X) => {
+                X.fields.forEach((ee) => {
+                  Z.push({ value: `${X.name}.${ee}` });
+                });
+              }), currentSelectObj.value.type == "select" ? (dataStore.setSelectData(Z), dataStore.setSelectData({ value: `${currentSelectObj.value.name}` })) : currentSelectObj.value.type == "update" && dataStore.setUpdateData(Z);
+            }
+            console.log(dataStore.$state);
           }
         }).catch((G) => {
           message.error("保存失败" + G);
@@ -121665,7 +121694,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
   props: {
     formId: {
       type: Number,
-      default: 12
+      default: 14
     },
     data: {
       type: Object,
@@ -121690,20 +121719,21 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
       U.value.edit(ne);
     }
     function te(ne) {
+      let oe = [], re = [], se = [];
       if (ne != null) {
         Z.value = ne.data;
-        let oe = [], re = [], se = Z.value.filter((ce) => ce.type == "select"), ae = Z.value.filter((ce) => ce.type == "update");
-        se.forEach((ce) => {
-          ce.fields.forEach((le) => {
-            oe.push({ value: `${ce.name}.${le}` });
+        let ae = Z.value.filter((le) => le.type == "select"), ce = Z.value.filter((le) => le.type == "update");
+        ae.forEach((le) => {
+          se.push({ value: `${le.name}` }), le.fields.forEach((de) => {
+            oe.push({ value: `${le.name}.${de}` });
           });
-        }), ae.forEach((ce) => {
-          ce.fields.forEach((le) => {
-            re.push({ value: `${ce.name}.${le}` });
+        }), ce.forEach((le) => {
+          le.fields.forEach((de) => {
+            re.push({ value: `${le.name}.${de}` });
           });
-        }), W.setSelectData(oe), W.setUpdateData(re);
-      } else
-        Z.value = [], W.setSelectData([]), W.setUpdateData([]);
+        });
+      }
+      W.setSelectData(oe), W.setUpdateData(re), W.setSelectTables(se);
     }
     function ie(ne) {
       let oe = Z.value.filter((se) => se.id !== ne.id), re = {
@@ -121815,17 +121845,17 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
           ref: U,
           selectList: unref(Z),
           "onUpdate:selectList": oe[1] || (oe[1] = (ue) => isRef(Z) ? Z.value = ue : Z = ue),
-          formId: 12
-        }, null, 8, ["selectList"])
+          formId: K.formId
+        }, null, 8, ["selectList", "formId"])
       ], 64);
     };
   }
-}), index_vue_vue_type_style_index_0_scoped_03215196_lang = "", CDataIndex = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-03215196"]]), _hoisted_1 = { style: { background: "#fff", textAlign: "center", height: "99%" } }, _sfc_main$1 = /* @__PURE__ */ defineComponent({
+}), index_vue_vue_type_style_index_0_scoped_897842f3_lang = "", CDataIndex = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-897842f3"]]), _hoisted_1 = { style: { background: "#fff", textAlign: "center", height: "99%" } }, _sfc_main$1 = /* @__PURE__ */ defineComponent({
   __name: "index",
   props: {
     id: {
       type: Number,
-      default: 12
+      default: 14
     }
   },
   setup(K) {
@@ -121923,7 +121953,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
       });
     };
   }
-}), index_vue_vue_type_style_index_0_scoped_af53060f_lang = "", CImaginForm = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-af53060f"]]), _sfc_main = /* @__PURE__ */ defineComponent({
+}), index_vue_vue_type_style_index_0_scoped_a59f6200_lang = "", CImaginForm = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-a59f6200"]]), _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "FormPublic",
   props: {
     data: {