@dao42/d42paas-front 0.7.7 → 0.7.11

package/dist/DaoPaaS.es.js

@@ -16815,8 +16815,8 @@ var formatDistance$1 = formatDistance;
 function buildFormatLongFn(args) {
   return function() {
     var options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
-    var width2 = options.width ? String(options.width) : args.defaultWidth;
-    var format2 = args.formats[width2] || args.formats[args.defaultWidth];
+    var width = options.width ? String(options.width) : args.defaultWidth;
+    var format2 = args.formats[width] || args.formats[args.defaultWidth];
     return format2;
   };
 }
@@ -16872,8 +16872,8 @@ function buildLocalizeFn(args) {
     var valuesArray;
     if (context === "formatting" && args.formattingValues) {
       var defaultWidth = args.defaultFormattingWidth || args.defaultWidth;
-      var width2 = options.width ? String(options.width) : defaultWidth;
-      valuesArray = args.formattingValues[width2] || args.formattingValues[defaultWidth];
+      var width = options.width ? String(options.width) : defaultWidth;
+      valuesArray = args.formattingValues[width] || args.formattingValues[defaultWidth];
     } else {
       var _defaultWidth = args.defaultWidth;
       var _width = options.width ? String(options.width) : args.defaultWidth;
@@ -17015,14 +17015,14 @@ var localize$2 = localize$1;
 function buildMatchFn(args) {
   return function(string3) {
     var options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
-    var width2 = options.width;
-    var matchPattern = width2 && args.matchPatterns[width2] || args.matchPatterns[args.defaultMatchWidth];
+    var width = options.width;
+    var matchPattern = width && args.matchPatterns[width] || args.matchPatterns[args.defaultMatchWidth];
     var matchResult = string3.match(matchPattern);
     if (!matchResult) {
       return null;
     }
     var matchedString = matchResult[0];
-    var parsePatterns = width2 && args.parsePatterns[width2] || args.parsePatterns[args.defaultParseWidth];
+    var parsePatterns = width && args.parsePatterns[width] || args.parsePatterns[args.defaultParseWidth];
     var key = Array.isArray(parsePatterns) ? findIndex(parsePatterns, function(pattern2) {
       return pattern2.test(matchedString);
     }) : findKey(parsePatterns, function(pattern2) {
@@ -20365,7 +20365,7 @@ insertCss$1.exports.insertCss = insertCss;
   }
   var Icon3 = /* @__PURE__ */ _react["default"].forwardRef(function(props2, ref) {
     var _classNames;
-    var Component = props2.as, spin = props2.spin, pulse = props2.pulse, flip = props2.flip, fill2 = props2.fill, className = props2.className, rotate = props2.rotate, children = props2.children, viewBox = props2.viewBox, width2 = props2.width, height2 = props2.height, style = props2.style, rest2 = (0, _objectWithoutPropertiesLoose2["default"])(props2, ["as", "spin", "pulse", "flip", "fill", "className", "rotate", "children", "viewBox", "width", "height", "style"]);
+    var Component = props2.as, spin = props2.spin, pulse = props2.pulse, flip = props2.flip, fill2 = props2.fill, className = props2.className, rotate = props2.rotate, children = props2.children, viewBox = props2.viewBox, width = props2.width, height = props2.height, style = props2.style, rest2 = (0, _objectWithoutPropertiesLoose2["default"])(props2, ["as", "spin", "pulse", "flip", "fill", "className", "rotate", "children", "viewBox", "width", "height", "style"]);
     var _useClassNames = (0, _utils.useClassNames)(), componentClassName = _useClassNames[0], addPrefix = _useClassNames[1];
     var classes = (0, _classnames2["default"])(className, componentClassName, (_classNames = {}, _classNames[addPrefix("spin")] = spin, _classNames[addPrefix("pulse")] = pulse, _classNames[addPrefix("flip-" + flip)] = !!flip, _classNames));
     var rotateStyles = {
@@ -20374,8 +20374,8 @@ insertCss$1.exports.insertCss = insertCss;
     };
     (0, _utils.useInsertStyles)();
     var svgProps = filterProps({
-      width: width2,
-      height: height2,
+      width,
+      height,
       fill: fill2,
       viewBox,
       className: classes,
@@ -21709,11 +21709,11 @@ var ResizeObserverSize = function() {
   return ResizeObserverSize2;
 }();
 var DOMRectReadOnly = function() {
-  function DOMRectReadOnly2(x2, y2, width2, height2) {
+  function DOMRectReadOnly2(x2, y2, width, height) {
     this.x = x2;
     this.y = y2;
-    this.width = width2;
-    this.height = height2;
+    this.width = width;
+    this.height = height;
     this.top = this.y;
     this.left = this.x;
     this.bottom = this.top + this.height;
@@ -21721,8 +21721,8 @@ var DOMRectReadOnly = function() {
     return freeze$1(this);
   }
   DOMRectReadOnly2.prototype.toJSON = function() {
-    var _a2 = this, x2 = _a2.x, y2 = _a2.y, top = _a2.top, right = _a2.right, bottom = _a2.bottom, left = _a2.left, width2 = _a2.width, height2 = _a2.height;
-    return { x: x2, y: y2, top, right, bottom, left, width: width2, height: height2 };
+    var _a2 = this, x2 = _a2.x, y2 = _a2.y, top = _a2.top, right = _a2.right, bottom = _a2.bottom, left = _a2.left, width = _a2.width, height = _a2.height;
+    return { x: x2, y: y2, top, right, bottom, left, width, height };
   };
   DOMRectReadOnly2.fromRect = function(rectangle) {
     return new DOMRectReadOnly2(rectangle.x, rectangle.y, rectangle.width, rectangle.height);
@@ -21734,8 +21734,8 @@ var isSVG = function(target) {
 };
 var isHidden = function(target) {
   if (isSVG(target)) {
-    var _a2 = target.getBBox(), width2 = _a2.width, height2 = _a2.height;
-    return !width2 && !height2;
+    var _a2 = target.getBBox(), width = _a2.width, height = _a2.height;
+    return !width && !height;
   }
   var _b2 = target, offsetWidth = _b2.offsetWidth, offsetHeight = _b2.offsetHeight;
   return !(offsetWidth || offsetHeight || target.getClientRects().length);
@@ -22637,25 +22637,25 @@ var AutoPlacement = {
   bottom: "End"
 };
 function getContainerDimensions(containerNode) {
-  var width2;
-  var height2;
+  var width;
+  var height;
   var scrollX;
   var scrollY;
   if (containerNode.tagName === "BODY") {
-    width2 = window.innerWidth;
-    height2 = window.innerHeight;
+    width = window.innerWidth;
+    height = window.innerHeight;
     scrollY = scrollTop(ownerDocument(containerNode).documentElement) || scrollTop(containerNode);
     scrollX = scrollLeft(ownerDocument(containerNode).documentElement) || scrollLeft(containerNode);
   } else {
     var _ref2 = getOffset(containerNode);
-    width2 = _ref2.width;
-    height2 = _ref2.height;
+    width = _ref2.width;
+    height = _ref2.height;
     scrollY = scrollTop(containerNode);
     scrollX = scrollLeft(containerNode);
   }
   return {
-    width: width2,
-    height: height2,
+    width,
+    height,
     scrollX,
     scrollY
   };
@@ -22718,11 +22718,11 @@ var positionUtils = function(props2) {
       return offset;
     },
     calcAutoPlacement: function calcAutoPlacement(targetOffset, container, overlay) {
-      var _getContainerDimensio3 = getContainerDimensions(container), width2 = _getContainerDimensio3.width, height2 = _getContainerDimensio3.height, scrollX = _getContainerDimensio3.scrollX, scrollY = _getContainerDimensio3.scrollY;
+      var _getContainerDimensio3 = getContainerDimensions(container), width = _getContainerDimensio3.width, height = _getContainerDimensio3.height, scrollX = _getContainerDimensio3.scrollX, scrollY = _getContainerDimensio3.scrollY;
       var left = targetOffset.left - scrollX - overlay.width;
       var top = targetOffset.top - scrollY - overlay.height;
-      var right = width2 - targetOffset.left - targetOffset.width + scrollX - overlay.width;
-      var bottom = height2 - targetOffset.top - targetOffset.height + scrollY - overlay.height;
+      var right = width - targetOffset.left - targetOffset.width + scrollX - overlay.width;
+      var bottom = height - targetOffset.top - targetOffset.height + scrollY - overlay.height;
       var horizontal = [{
         key: "left",
         value: left
@@ -25744,14 +25744,14 @@ Drawer.propTypes = {
 };
 var Drawer$1 = Drawer;
 var PlaceholderGraph = /* @__PURE__ */ React.forwardRef(function(props2, ref) {
-  var _props$as = props2.as, Component = _props$as === void 0 ? "div" : _props$as, className = props2.className, width2 = props2.width, _props$height = props2.height, height2 = _props$height === void 0 ? 200 : _props$height, style = props2.style, active = props2.active, _props$classPrefix = props2.classPrefix, classPrefix = _props$classPrefix === void 0 ? "placeholder" : _props$classPrefix, rest2 = _objectWithoutPropertiesLoose$4(props2, ["as", "className", "width", "height", "style", "active", "classPrefix"]);
+  var _props$as = props2.as, Component = _props$as === void 0 ? "div" : _props$as, className = props2.className, width = props2.width, _props$height = props2.height, height = _props$height === void 0 ? 200 : _props$height, style = props2.style, active = props2.active, _props$classPrefix = props2.classPrefix, classPrefix = _props$classPrefix === void 0 ? "placeholder" : _props$classPrefix, rest2 = _objectWithoutPropertiesLoose$4(props2, ["as", "className", "width", "height", "style", "active", "classPrefix"]);
   var _useClassNames = useClassNames(classPrefix), merge2 = _useClassNames.merge, withClassPrefix = _useClassNames.withClassPrefix;
   var classes = merge2(className, withClassPrefix("graph", {
     active
   }));
   var styles2 = _extends$1({
-    width: width2 || "100%",
-    height: height2
+    width: width || "100%",
+    height
   }, style);
   return /* @__PURE__ */ React.createElement(Component, _extends$1({}, rest2, {
     ref,
@@ -28482,14 +28482,6 @@ const PlaygroundInit = (arg) => {
         }
       }
     });
-    io.on("terminal", (d2) => {
-      const _d2 = JSON.parse(d2);
-      setCRDTInfo2(_d2);
-      setAsyncType("terminal");
-      setReplaySource(__spreadProps(__spreadValues({}, _d2), {
-        event: "terminal"
-      }));
-    });
     io.on("saveFile", (d2) => {
       JSON.parse(d2);
     });
@@ -36768,12 +36760,12 @@ function RangeSlider({
   }) => {
     if (first3) {
       const {
-        width: width2,
+        width,
         left
       } = ref.current.getBoundingClientRect();
-      rangeWidth.current = width2 - parseFloat(scrubberWidth);
+      rangeWidth.current = width - parseFloat(scrubberWidth);
       const targetIsScrub = (event === null || event === void 0 ? void 0 : event.target) === scrubberRef.current;
-      memo = targetIsScrub ? value : invertedRange((x2 - left) / width2, min, max);
+      memo = targetIsScrub ? value : invertedRange((x2 - left) / width, min, max);
     }
     const newValue = memo + invertedRange(mx / rangeWidth.current, 0, max - min);
     onDrag(sanitizeStep$1(newValue, {
@@ -39451,9 +39443,9 @@ function useToggle(toggled) {
       once: true
     });
     const {
-      height: height2
+      height
     } = contentRef.current.getBoundingClientRect();
-    ref.style.height = height2 + "px";
+    ref.style.height = height + "px";
     if (!toggled) {
       ref.style.overflow = "hidden";
       timeout2 = window.setTimeout(() => ref.style.height = "0px", 50);
@@ -39500,9 +39492,9 @@ function usePopin(margin = 3) {
         left
       } = popinRef.current.getBoundingClientRect();
       const {
-        height: height2
+        height
       } = wrapperRef.current.getBoundingClientRect();
-      const direction = bottom + height2 > window.innerHeight - 40 ? "up" : "down";
+      const direction = bottom + height > window.innerHeight - 40 ? "up" : "down";
       wrapperRef.current.style.position = "fixed";
       wrapperRef.current.style.zIndex = "10000";
       wrapperRef.current.style.left = left + "px";
@@ -39849,11 +39841,11 @@ function Joystick({
       const {
         top,
         left,
-        width: width2,
-        height: height2
+        width,
+        height
       } = joystickeRef.current.getBoundingClientRect();
-      playgroundRef.current.style.left = left + width2 / 2 + "px";
-      playgroundRef.current.style.top = top + height2 / 2 + "px";
+      playgroundRef.current.style.left = left + width / 2 + "px";
+      playgroundRef.current.style.top = top + height / 2 + "px";
     }
   }, [joystickShown]);
   const {
@@ -40309,12 +40301,12 @@ function IntervalSlider(_ref2) {
   }) => {
     if (first3) {
       const {
-        width: width2,
+        width,
         left
       } = ref.current.getBoundingClientRect();
-      rangeWidth.current = width2 - parseFloat(scrubberWidth);
+      rangeWidth.current = width - parseFloat(scrubberWidth);
       const targetIsScrub = (event === null || event === void 0 ? void 0 : event.target) === minScrubberRef.current || (event === null || event === void 0 ? void 0 : event.target) === maxScrubberRef.current;
-      _memo.pos = invertedRange((x2 - left) / width2, min, max);
+      _memo.pos = invertedRange((x2 - left) / width, min, max);
       const delta = Math.abs(_memo.pos - value.min) - Math.abs(_memo.pos - value.max);
       _memo.key = delta < 0 || delta === 0 && _memo.pos <= value.min ? "min" : "max";
       if (targetIsScrub)
@@ -40829,24 +40821,24 @@ const MonitorCanvas = react.exports.forwardRef(function({
     if (!_canvas)
       return;
     const {
-      width: width2,
-      height: height2
+      width,
+      height
     } = _canvas;
     const path = new Path2D();
-    const interval2 = width2 / POINTS;
-    const verticalPadding = height2 * 0.05;
+    const interval2 = width / POINTS;
+    const verticalPadding = height * 0.05;
     for (let i2 = 0; i2 < points.current.length; i2++) {
       const p2 = range$1(points.current[i2], min.current, max.current);
       const x2 = interval2 * i2;
-      const y2 = height2 - p2 * (height2 - verticalPadding * 2) - verticalPadding;
+      const y2 = height - p2 * (height - verticalPadding * 2) - verticalPadding;
       path.lineTo(x2, y2);
     }
-    _ctx.clearRect(0, 0, width2, height2);
+    _ctx.clearRect(0, 0, width, height);
     const gradientPath = new Path2D(path);
-    gradientPath.lineTo(interval2 * (points.current.length + 1), height2);
-    gradientPath.lineTo(0, height2);
+    gradientPath.lineTo(interval2 * (points.current.length + 1), height);
+    gradientPath.lineTo(0, height);
     gradientPath.lineTo(0, 0);
-    const gradient = _ctx.createLinearGradient(0, 0, 0, height2);
+    const gradient = _ctx.createLinearGradient(0, 0, 0, height);
     gradient.addColorStop(0, gradientTop);
     gradient.addColorStop(1, gradientBottom);
     _ctx.fillStyle = gradient;
@@ -44098,9 +44090,9 @@ const CmdKey = () => {
       (_b2 = (_a2 = useOT.getState()) == null ? void 0 : _a2.socket) == null ? void 0 : _b2.emit("active");
     }
   }, {
-    id: "active",
+    id: "containerStop",
     title: "\u505C\u6B62\u5BB9\u5668",
-    hotkey: "a",
+    hotkey: "cs",
     mdIcon: "input",
     handler: () => {
       var _a2, _b2;
@@ -44325,7 +44317,7 @@ class DaoPaaS {
   get otstore() {
     return oTStore.getState();
   }
-  get io() {
+  get socketIO() {
     return useOT.getState().socket;
   }
   get playgroundStatus() {
@@ -44344,8 +44336,7 @@ class DaoPaaS {
     if (this.mode === "tsdoc")
       return;
     const {
-      setSocket,
-      socket: socket2
+      setSocket
     } = useOT.getState();
     const initClassDIV = document.createElement("div");
     initClassDIV.className = "init-class";
@@ -44385,7 +44376,7 @@ class DaoPaaS {
       userId: args.userId
     }));
     PlaygroundInit(__spreadProps(__spreadValues(__spreadValues({}, this.userInfo), args), {
-      io: this.io,
+      io: useOT.getState().socket,
       callback: () => {
         if (this.components) {
           this.mapRender(this.components);
@@ -44422,19 +44413,19 @@ class DaoPaaS {
   }
   activePlayground() {
     var _a2;
-    (_a2 = this.io) == null ? void 0 : _a2.emit("active");
+    (_a2 = useOT.getState().socket) == null ? void 0 : _a2.emit("active");
   }
   runPlayground() {
     var _a2;
-    (_a2 = this.io) == null ? void 0 : _a2.emit("run");
+    (_a2 = useOT.getState().socket) == null ? void 0 : _a2.emit("run");
   }
   stopPlayground() {
     var _a2;
-    (_a2 = this.io) == null ? void 0 : _a2.emit("stop");
+    (_a2 = useOT.getState().socket) == null ? void 0 : _a2.emit("stop");
   }
   onUploadFile(payload) {
     var _a2;
-    (_a2 = this.io) == null ? void 0 : _a2.emit("upload", payload);
+    (_a2 = useOT.getState().socket) == null ? void 0 : _a2.emit("upload", payload);
   }
   switchLspServer(arg) {
     this.otstore.setGlobalData({
@@ -44442,12 +44433,14 @@ class DaoPaaS {
     });
   }
   record(setBoolean) {
-    var _a2, _b2;
+    const {
+      socket: socket2
+    } = useOT.getState();
     if (setBoolean === "undefined") {
       this.otstore.setGlobalData({
         isRecording: !!setBoolean
       });
-      (_a2 = this.io) == null ? void 0 : _a2.emit("globalData", {
+      socket2 == null ? void 0 : socket2.emit("globalData", {
         isRecording: !!setBoolean
       });
       return;
@@ -44455,7 +44448,7 @@ class DaoPaaS {
     this.otstore.setGlobalData({
       isRecording: !!setBoolean
     });
-    (_b2 = this.io) == null ? void 0 : _b2.emit("globalData", {
+    socket2 == null ? void 0 : socket2.emit("globalData", {
       isRecording: !!setBoolean
     });
   }
@@ -45184,8 +45177,8 @@ var DragAndDropProvider = function(props2) {
       var treeViableDragPositions = buildMapForTrees(environment.treeIds, function(treeId2) {
         return getViableDragPositions(treeId2, items, treeLinearItems[treeId2]);
       });
-      var height2 = (_b3 = (_a3 = document.querySelector('[data-rct-tree="' + treeId + '"] [data-rct-item-container="true"]')) === null || _a3 === void 0 ? void 0 : _a3.offsetHeight) !== null && _b3 !== void 0 ? _b3 : 5;
-      setItemHeight(height2);
+      var height = (_b3 = (_a3 = document.querySelector('[data-rct-tree="' + treeId + '"] [data-rct-item-container="true"]')) === null || _a3 === void 0 ? void 0 : _a3.offsetHeight) !== null && _b3 !== void 0 ? _b3 : 5;
+      setItemHeight(height);
       setDraggingItems(items);
       setLinearItems(treeLinearItems);
       setViableDragPositions(treeViableDragPositions);
@@ -57097,13 +57090,13 @@ class SizeUtils {
   }
 }
 class Dimension {
-  constructor(width2, height2) {
-    this.width = width2;
-    this.height = height2;
+  constructor(width, height) {
+    this.width = width;
+    this.height = height;
   }
-  with(width2 = this.width, height2 = this.height) {
-    if (width2 !== this.width || height2 !== this.height) {
-      return new Dimension(width2, height2);
+  with(width = this.width, height = this.height) {
+    if (width !== this.width || height !== this.height) {
+      return new Dimension(width, height);
     } else {
       return this;
     }
@@ -57151,12 +57144,12 @@ function getTopLeftOffset(element) {
     top
   };
 }
-function size(element, width2, height2) {
-  if (typeof width2 === "number") {
-    element.style.width = `${width2}px`;
+function size(element, width, height) {
+  if (typeof width === "number") {
+    element.style.width = `${width}px`;
   }
-  if (typeof height2 === "number") {
-    element.style.height = `${height2}px`;
+  if (typeof height === "number") {
+    element.style.height = `${height}px`;
   }
 }
 function getDomNodePagePosition(domNode) {
@@ -67898,12 +67891,12 @@ function to4CharHex(n2) {
   return n2.toString(16).toUpperCase().padStart(4, "0");
 }
 class Viewport {
-  constructor(top, left, width2, height2) {
+  constructor(top, left, width, height) {
     this._viewportBrand = void 0;
     this.top = top | 0;
     this.left = left | 0;
-    this.width = width2 | 0;
-    this.height = height2 | 0;
+    this.width = width | 0;
+    this.height = height | 0;
   }
 }
 class MinimapLinesRenderingData {
@@ -69670,8 +69663,8 @@ class CommonEditorConfiguration extends Disposable {
     }
     return r2 ? r2 : 1;
   }
-  reserveHeight(height2) {
-    this._reservedHeight = height2;
+  reserveHeight(height) {
+    this._reservedHeight = height;
     this._recomputeOptions();
   }
 }
@@ -73804,8 +73797,8 @@ class CharWidthRequest {
     this.type = type;
     this.width = 0;
   }
-  fulfill(width2) {
-    this.width = width2;
+  fulfill(width) {
+    this.width = width;
   }
 }
 class DomCharWidthReader {
@@ -74242,18 +74235,18 @@ class FastDomNode {
     this._maxWidth = maxWidth;
     this.domNode.style.maxWidth = this._maxWidth + "px";
   }
-  setWidth(width2) {
-    if (this._width === width2) {
+  setWidth(width) {
+    if (this._width === width) {
       return;
     }
-    this._width = width2;
+    this._width = width;
     this.domNode.style.width = this._width + "px";
   }
-  setHeight(height2) {
-    if (this._height === height2) {
+  setHeight(height) {
+    if (this._height === height) {
       return;
     }
-    this._height = height2;
+    this._height = height;
     this.domNode.style.height = this._height + "px";
   }
   setTop(top) {
@@ -75512,11 +75505,11 @@ class ClientCoordinates {
   }
 }
 class EditorPagePosition {
-  constructor(x2, y2, width2, height2) {
+  constructor(x2, y2, width, height) {
     this.x = x2;
     this.y = y2;
-    this.width = width2;
-    this.height = height2;
+    this.width = width;
+    this.height = height;
     this._editorPagePositionBrand = void 0;
   }
 }
@@ -75971,10 +75964,10 @@ class LineVisibleRanges {
   }
 }
 class HorizontalRange {
-  constructor(left, width2) {
+  constructor(left, width) {
     this._horizontalRangeBrand = void 0;
     this.left = Math.round(left);
-    this.width = Math.round(width2);
+    this.width = Math.round(width);
   }
   static from(ranges) {
     const result = new Array(ranges.length);
@@ -75989,10 +75982,10 @@ class HorizontalRange {
   }
 }
 class FloatHorizontalRange {
-  constructor(left, width2) {
+  constructor(left, width) {
     this._floatHorizontalRangeBrand = void 0;
     this.left = left;
-    this.width = width2;
+    this.width = width;
   }
   toString() {
     return `[${this.left},${this.width}]`;
@@ -82676,9 +82669,9 @@ function concat23Trees(items) {
       return null;
     }
     const start = i2;
-    const height2 = items[start].listHeight;
+    const height = items[start].listHeight;
     i2++;
-    while (i2 < items.length && items[i2].listHeight === height2) {
+    while (i2 < items.length && items[i2].listHeight === height) {
       i2++;
     }
     if (i2 - start >= 2) {
@@ -87072,9 +87065,9 @@ class CharWidthReader {
     const context = this._canvas.getContext("2d");
     context.font = font;
     const metrics = context.measureText(char2);
-    const width2 = metrics.width;
-    this._cache[cacheKey] = width2;
-    return width2;
+    const width = metrics.width;
+    this._cache[cacheKey] = width;
+    return width;
   }
 }
 CharWidthReader._INSTANCE = null;
@@ -87130,9 +87123,9 @@ class MouseHandler extends ViewEventHandler {
   }
   onConfigurationChanged(e2) {
     if (e2.hasChanged(130)) {
-      const height2 = this._context.configuration.options.get(130).height;
-      if (this._height !== height2) {
-        this._height = height2;
+      const height = this._context.configuration.options.get(130).height;
+      if (this._height !== height) {
+        this._height = height;
         this._mouseDownOperation.onHeightChanged();
       }
     }
@@ -88619,12 +88612,12 @@ class Margin extends ViewPart {
     this._domNode.setContain("strict");
     const adjustedScrollTop = ctx.scrollTop - ctx.bigNumbersDelta;
     this._domNode.setTop(-adjustedScrollTop);
-    const height2 = Math.min(ctx.scrollHeight, 1e6);
-    this._domNode.setHeight(height2);
+    const height = Math.min(ctx.scrollHeight, 1e6);
+    this._domNode.setHeight(height);
     this._domNode.setWidth(this._contentLeft);
     this._glyphMarginBackgroundDomNode.setLeft(this._glyphMarginLeft);
     this._glyphMarginBackgroundDomNode.setWidth(this._glyphMarginWidth);
-    this._glyphMarginBackgroundDomNode.setHeight(height2);
+    this._glyphMarginBackgroundDomNode.setHeight(height);
   }
 }
 Margin.CLASS_NAME = "glyph-margin";
@@ -88632,14 +88625,14 @@ Margin.OUTER_CLASS_NAME = "margin";
 var mouseCursor = "";
 const MOUSE_CURSOR_TEXT_CSS_CLASS_NAME = `monaco-mouse-cursor-text`;
 class VisibleTextAreaData {
-  constructor(top, left, width2) {
+  constructor(top, left, width) {
     this._visibleTextAreaBrand = void 0;
     this.top = top;
     this.left = left;
-    this.width = width2;
+    this.width = width;
   }
-  setWidth(width2) {
-    return new VisibleTextAreaData(this.top, this.left, width2);
+  setWidth(width) {
+    return new VisibleTextAreaData(this.top, this.left, width);
   }
 }
 const canUseZeroSizeTextarea = isFirefox;
@@ -89033,15 +89026,15 @@ class TextAreaHandler extends ViewPart {
     } while (true);
     return result;
   }
-  _renderInsideEditor(renderedPosition, top, left, width2, height2) {
+  _renderInsideEditor(renderedPosition, top, left, width, height) {
     this._lastRenderPosition = renderedPosition;
     const ta2 = this.textArea;
     const tac = this.textAreaCover;
     Configuration.applyFontInfo(ta2, this._fontInfo);
     ta2.setTop(top);
     ta2.setLeft(left);
-    ta2.setWidth(width2);
-    ta2.setHeight(height2);
+    ta2.setWidth(width);
+    ta2.setHeight(height);
     tac.setTop(0);
     tac.setLeft(0);
     tac.setWidth(0);
@@ -94275,8 +94268,8 @@ class MarginViewOverlays extends ViewOverlays {
   }
   _viewOverlaysRender(ctx) {
     super._viewOverlaysRender(ctx);
-    const height2 = Math.min(ctx.scrollHeight, 1e6);
-    this.domNode.setHeight(height2);
+    const height = Math.min(ctx.scrollHeight, 1e6);
+    this.domNode.setHeight(height);
     this.domNode.setWidth(this._contentLeft);
   }
 }
@@ -94457,22 +94450,22 @@ class Widget$1 {
     this._cachedDomNodeClientWidth = -1;
     this._cachedDomNodeClientHeight = -1;
   }
-  _layoutBoxInViewport(topLeft, bottomLeft, width2, height2, ctx) {
+  _layoutBoxInViewport(topLeft, bottomLeft, width, height, ctx) {
     const aboveLineTop = topLeft.top;
     const heightAboveLine = aboveLineTop;
     const underLineTop = bottomLeft.top + this._lineHeight;
     const heightUnderLine = ctx.viewportHeight - underLineTop;
-    const aboveTop = aboveLineTop - height2;
-    const fitsAbove = heightAboveLine >= height2;
+    const aboveTop = aboveLineTop - height;
+    const fitsAbove = heightAboveLine >= height;
     const belowTop = underLineTop;
-    const fitsBelow = heightUnderLine >= height2;
+    const fitsBelow = heightUnderLine >= height;
     let actualAboveLeft = topLeft.left;
     let actualBelowLeft = bottomLeft.left;
-    if (actualAboveLeft + width2 > ctx.scrollLeft + ctx.viewportWidth) {
-      actualAboveLeft = ctx.scrollLeft + ctx.viewportWidth - width2;
+    if (actualAboveLeft + width > ctx.scrollLeft + ctx.viewportWidth) {
+      actualAboveLeft = ctx.scrollLeft + ctx.viewportWidth - width;
     }
-    if (actualBelowLeft + width2 > ctx.scrollLeft + ctx.viewportWidth) {
-      actualBelowLeft = ctx.scrollLeft + ctx.viewportWidth - width2;
+    if (actualBelowLeft + width > ctx.scrollLeft + ctx.viewportWidth) {
+      actualBelowLeft = ctx.scrollLeft + ctx.viewportWidth - width;
     }
     if (actualAboveLeft < ctx.scrollLeft) {
       actualAboveLeft = ctx.scrollLeft;
@@ -94489,12 +94482,12 @@ class Widget$1 {
       belowLeft: actualBelowLeft
     };
   }
-  _layoutHorizontalSegmentInPage(windowSize, domNodePosition, left, width2) {
-    const MIN_LIMIT = Math.max(0, domNodePosition.left - width2);
-    const MAX_LIMIT = Math.min(domNodePosition.left + domNodePosition.width + width2, windowSize.width);
+  _layoutHorizontalSegmentInPage(windowSize, domNodePosition, left, width) {
+    const MIN_LIMIT = Math.max(0, domNodePosition.left - width);
+    const MAX_LIMIT = Math.min(domNodePosition.left + domNodePosition.width + width, windowSize.width);
     let absoluteLeft = domNodePosition.left + left - StandardWindow.scrollX;
-    if (absoluteLeft + width2 > MAX_LIMIT) {
-      const delta = absoluteLeft - (MAX_LIMIT - width2);
+    if (absoluteLeft + width > MAX_LIMIT) {
+      const delta = absoluteLeft - (MAX_LIMIT - width);
       absoluteLeft -= delta;
       left -= delta;
     }
@@ -94505,19 +94498,19 @@ class Widget$1 {
     }
     return [left, absoluteLeft];
   }
-  _layoutBoxInPage(topLeft, bottomLeft, width2, height2, ctx) {
-    const aboveTop = topLeft.top - height2;
+  _layoutBoxInPage(topLeft, bottomLeft, width, height, ctx) {
+    const aboveTop = topLeft.top - height;
     const belowTop = bottomLeft.top + this._lineHeight;
     const domNodePosition = getDomNodePagePosition(this._viewDomNode.domNode);
     const absoluteAboveTop = domNodePosition.top + aboveTop - StandardWindow.scrollY;
     const absoluteBelowTop = domNodePosition.top + belowTop - StandardWindow.scrollY;
     const windowSize = getClientArea(document.body);
-    const [aboveLeft, absoluteAboveLeft] = this._layoutHorizontalSegmentInPage(windowSize, domNodePosition, topLeft.left - ctx.scrollLeft + this._contentLeft, width2);
-    const [belowLeft, absoluteBelowLeft] = this._layoutHorizontalSegmentInPage(windowSize, domNodePosition, bottomLeft.left - ctx.scrollLeft + this._contentLeft, width2);
+    const [aboveLeft, absoluteAboveLeft] = this._layoutHorizontalSegmentInPage(windowSize, domNodePosition, topLeft.left - ctx.scrollLeft + this._contentLeft, width);
+    const [belowLeft, absoluteBelowLeft] = this._layoutHorizontalSegmentInPage(windowSize, domNodePosition, bottomLeft.left - ctx.scrollLeft + this._contentLeft, width);
     const TOP_PADDING = 22;
     const BOTTOM_PADDING = 22;
     const fitsAbove = absoluteAboveTop >= TOP_PADDING;
-    const fitsBelow = absoluteBelowTop + height2 <= windowSize.height - BOTTOM_PADDING;
+    const fitsBelow = absoluteBelowTop + height <= windowSize.height - BOTTOM_PADDING;
     if (this._fixedOverflowWidgets) {
       return {
         fitsAbove,
@@ -95208,17 +95201,17 @@ class AbstractScrollbar extends Widget {
     this.domNode.domNode.appendChild(arrow.bgDomNode);
     this.domNode.domNode.appendChild(arrow.domNode);
   }
-  _createSlider(top, left, width2, height2) {
+  _createSlider(top, left, width, height) {
     this.slider = createFastDomNode(document.createElement("div"));
     this.slider.setClassName("slider");
     this.slider.setPosition("absolute");
     this.slider.setTop(top);
     this.slider.setLeft(left);
-    if (typeof width2 === "number") {
-      this.slider.setWidth(width2);
+    if (typeof width === "number") {
+      this.slider.setWidth(width);
     }
-    if (typeof height2 === "number") {
-      this.slider.setHeight(height2);
+    if (typeof height === "number") {
+      this.slider.setHeight(height);
     }
     this.slider.setLayerHinting(true);
     this.slider.setContain("strict");
@@ -95651,38 +95644,38 @@ class VerticalScrollbar extends AbstractScrollbar {
   }
 }
 class ScrollState {
-  constructor(width2, scrollWidth, scrollLeft2, height2, scrollHeight, scrollTop2) {
+  constructor(width, scrollWidth, scrollLeft2, height, scrollHeight, scrollTop2) {
     this._scrollStateBrand = void 0;
-    width2 = width2 | 0;
+    width = width | 0;
     scrollWidth = scrollWidth | 0;
     scrollLeft2 = scrollLeft2 | 0;
-    height2 = height2 | 0;
+    height = height | 0;
     scrollHeight = scrollHeight | 0;
     scrollTop2 = scrollTop2 | 0;
     this.rawScrollLeft = scrollLeft2;
     this.rawScrollTop = scrollTop2;
-    if (width2 < 0) {
-      width2 = 0;
+    if (width < 0) {
+      width = 0;
     }
-    if (scrollLeft2 + width2 > scrollWidth) {
-      scrollLeft2 = scrollWidth - width2;
+    if (scrollLeft2 + width > scrollWidth) {
+      scrollLeft2 = scrollWidth - width;
     }
     if (scrollLeft2 < 0) {
       scrollLeft2 = 0;
     }
-    if (height2 < 0) {
-      height2 = 0;
+    if (height < 0) {
+      height = 0;
     }
-    if (scrollTop2 + height2 > scrollHeight) {
-      scrollTop2 = scrollHeight - height2;
+    if (scrollTop2 + height > scrollHeight) {
+      scrollTop2 = scrollHeight - height;
     }
     if (scrollTop2 < 0) {
       scrollTop2 = 0;
     }
-    this.width = width2;
+    this.width = width;
     this.scrollWidth = scrollWidth;
     this.scrollLeft = scrollLeft2;
-    this.height = height2;
+    this.height = height;
     this.scrollHeight = scrollHeight;
     this.scrollTop = scrollTop2;
   }
@@ -96639,8 +96632,8 @@ class GlyphMarginOverlay extends DedupOverlay {
     const toRender = this._render(visibleStartLineNumber, visibleEndLineNumber, this._getDecorations(ctx));
     const lineHeight = this._lineHeight.toString();
     const left = this._glyphMarginLeft.toString();
-    const width2 = this._glyphMarginWidth.toString();
-    const common = '" style="left:' + left + "px;width:" + width2 + "px;height:" + lineHeight + 'px;"></div>';
+    const width = this._glyphMarginWidth.toString();
+    const common = '" style="left:' + left + "px;width:" + width + "px;height:" + lineHeight + 'px;"></div>';
     const output = [];
     for (let lineNumber = visibleStartLineNumber; lineNumber <= visibleEndLineNumber; lineNumber++) {
       const lineIndex = lineNumber - visibleStartLineNumber;
@@ -96753,8 +96746,8 @@ class IndentGuidesOverlay extends DynamicViewOverlay {
           break;
         }
         const className = guide.horizontalLine ? guide.horizontalLine.top ? "horizontal-top" : "horizontal-bottom" : "vertical";
-        const width2 = guide.horizontalLine ? ((_d2 = (_c2 = ctx.visibleRangeForPosition(new Position$5(lineNumber, guide.horizontalLine.endColumn))) === null || _c2 === void 0 ? void 0 : _c2.left) !== null && _d2 !== void 0 ? _d2 : left + this._spaceWidth) - left : this._spaceWidth;
-        result += `<div class="core-guide ${guide.className} ${className}" style="left:${left}px;height:${lineHeight}px;width:${width2}px"></div>`;
+        const width = guide.horizontalLine ? ((_d2 = (_c2 = ctx.visibleRangeForPosition(new Position$5(lineNumber, guide.horizontalLine.endColumn))) === null || _c2 === void 0 ? void 0 : _c2.left) !== null && _d2 !== void 0 ? _d2 : left + this._spaceWidth) - left : this._spaceWidth;
+        result += `<div class="core-guide ${guide.className} ${className}" style="left:${left}px;height:${lineHeight}px;width:${width}px"></div>`;
       }
       output[lineIndex] = result;
     }
@@ -97480,8 +97473,8 @@ class LinesDecorationsOverlay extends DedupOverlay {
     const visibleEndLineNumber = ctx.visibleRange.endLineNumber;
     const toRender = this._render(visibleStartLineNumber, visibleEndLineNumber, this._getDecorations(ctx));
     const left = this._decorationsLeft.toString();
-    const width2 = this._decorationsWidth.toString();
-    const common = '" style="left:' + left + "px;width:" + width2 + 'px;"></div>';
+    const width = this._decorationsWidth.toString();
+    const common = '" style="left:' + left + "px;width:" + width + 'px;"></div>';
     const output = [];
     for (let lineNumber = visibleStartLineNumber; lineNumber <= visibleEndLineNumber; lineNumber++) {
       const lineIndex = lineNumber - visibleStartLineNumber;
@@ -97810,16 +97803,16 @@ class MinimapCharRendererFactory {
     return new MinimapCharRenderer(charData, scale);
   }
   static _downsampleChar(source, sourceOffset, dest, destOffset, scale) {
-    const width2 = 1 * scale;
-    const height2 = 2 * scale;
+    const width = 1 * scale;
+    const height = 2 * scale;
     let targetIndex = destOffset;
     let brightest = 0;
-    for (let y2 = 0; y2 < height2; y2++) {
-      const sourceY1 = y2 / height2 * 16;
-      const sourceY2 = (y2 + 1) / height2 * 16;
-      for (let x2 = 0; x2 < width2; x2++) {
-        const sourceX1 = x2 / width2 * 10;
-        const sourceX2 = (x2 + 1) / width2 * 10;
+    for (let y2 = 0; y2 < height; y2++) {
+      const sourceY1 = y2 / height * 16;
+      const sourceY2 = (y2 + 1) / height * 16;
+      for (let x2 = 0; x2 < width; x2++) {
+        const sourceX1 = x2 / width * 10;
+        const sourceX2 = (x2 + 1) / width * 10;
         let value = 0;
         let samples = 0;
         for (let sy = sourceY1; sy < sourceY2; sy++) {
@@ -98869,9 +98862,9 @@ class InnerMinimap extends Disposable {
       }
     }
   }
-  renderDecorationOnLine(canvasContext, lineOffsetMap, decorationRange, decorationColor, layout2, lineNumber, height2, lineHeight, tabSize, charWidth, canvasInnerWidth) {
+  renderDecorationOnLine(canvasContext, lineOffsetMap, decorationRange, decorationColor, layout2, lineNumber, height, lineHeight, tabSize, charWidth, canvasInnerWidth) {
     const y2 = (lineNumber - layout2.startLineNumber) * lineHeight;
-    if (y2 + height2 < 0 || y2 > this._model.options.canvasInnerHeight) {
+    if (y2 + height < 0 || y2 > this._model.options.canvasInnerHeight) {
       return;
     }
     const { startLineNumber, endLineNumber } = decorationRange;
@@ -98879,7 +98872,7 @@ class InnerMinimap extends Disposable {
     const endColumn = endLineNumber === lineNumber ? decorationRange.endColumn : this._model.getLineMaxColumn(lineNumber);
     const x1 = this.getXOffsetForPosition(lineOffsetMap, lineNumber, startColumn, tabSize, charWidth, canvasInnerWidth);
     const x2 = this.getXOffsetForPosition(lineOffsetMap, lineNumber, endColumn, tabSize, charWidth, canvasInnerWidth);
-    this.renderDecoration(canvasContext, decorationColor, x1, y2, x2 - x1, height2);
+    this.renderDecoration(canvasContext, decorationColor, x1, y2, x2 - x1, height);
   }
   getXOffsetForPosition(lineOffsetMap, lineNumber, column2, tabSize, charWidth, canvasInnerWidth) {
     if (column2 === 1) {
@@ -98912,9 +98905,9 @@ class InnerMinimap extends Disposable {
     }
     return canvasInnerWidth;
   }
-  renderDecoration(canvasContext, decorationColor, x2, y2, width2, height2) {
+  renderDecoration(canvasContext, decorationColor, x2, y2, width, height) {
     canvasContext.fillStyle = decorationColor && decorationColor.toString() || "";
-    canvasContext.fillRect(x2, y2, width2, height2);
+    canvasContext.fillRect(x2, y2, width, height);
   }
   renderLines(layout2) {
     const startLineNumber = layout2.startLineNumber;
@@ -99308,7 +99301,7 @@ class Settings {
       ];
     } else {
       const offset = canvasLeftOffset;
-      const width2 = remainingWidth;
+      const width = remainingWidth;
       return [
         [
           0,
@@ -99322,13 +99315,13 @@ class Settings {
         ],
         [
           0,
-          width2,
-          width2,
-          width2,
-          width2,
-          width2,
-          width2,
-          width2
+          width,
+          width,
+          width,
+          width,
+          width,
+          width,
+          width
         ]
       ];
     }
@@ -99450,8 +99443,8 @@ class DecorationsOverviewRuler extends ViewPart {
         const endLineNumber = decorationGroupData[3 * i2 + 2];
         let y1 = viewLayout.getVerticalOffsetForLineNumber(startLineNumber) * heightRatio | 0;
         let y2 = (viewLayout.getVerticalOffsetForLineNumber(endLineNumber) + lineHeight) * heightRatio | 0;
-        const height2 = y2 - y1;
-        if (height2 < minDecorationHeight) {
+        const height = y2 - y1;
+        if (height < minDecorationHeight) {
           let yCenter = (y1 + y2) / 2 | 0;
           if (yCenter < halfMinDecorationHeight) {
             yCenter = halfMinDecorationHeight;
@@ -99601,11 +99594,11 @@ class OverviewZoneManager {
   getCanvasWidth() {
     return this._domWidth * this._pixelRatio;
   }
-  setDOMWidth(width2) {
-    if (this._domWidth === width2) {
+  setDOMWidth(width) {
+    if (this._domWidth === width) {
       return false;
     }
-    this._domWidth = width2;
+    this._domWidth = width;
     this._colorZonesInvalid = true;
     return true;
   }
@@ -99615,11 +99608,11 @@ class OverviewZoneManager {
   getCanvasHeight() {
     return this._domHeight * this._pixelRatio;
   }
-  setDOMHeight(height2) {
-    if (this._domHeight === height2) {
+  setDOMHeight(height) {
+    if (this._domHeight === height) {
       return false;
     }
-    this._domHeight = height2;
+    this._domHeight = height;
     this._colorZonesInvalid = true;
     return true;
   }
@@ -99758,18 +99751,18 @@ class OverviewRuler extends ViewEventHandler {
     if (this._zoneManager.getOuterHeight() === 0) {
       return false;
     }
-    const width2 = this._zoneManager.getCanvasWidth();
-    const height2 = this._zoneManager.getCanvasHeight();
+    const width = this._zoneManager.getCanvasWidth();
+    const height = this._zoneManager.getCanvasHeight();
     const colorZones = this._zoneManager.resolveColorZones();
     const id2Color = this._zoneManager.getId2Color();
     const ctx = this._domNode.domNode.getContext("2d");
-    ctx.clearRect(0, 0, width2, height2);
+    ctx.clearRect(0, 0, width, height);
     if (colorZones.length > 0) {
-      this._renderOneLane(ctx, colorZones, id2Color, width2);
+      this._renderOneLane(ctx, colorZones, id2Color, width);
     }
     return true;
   }
-  _renderOneLane(ctx, colorZones, id2Color, width2) {
+  _renderOneLane(ctx, colorZones, id2Color, width) {
     let currentColorId = 0;
     let currentFrom = 0;
     let currentTo = 0;
@@ -99778,7 +99771,7 @@ class OverviewRuler extends ViewEventHandler {
       const zoneFrom = zone.from;
       const zoneTo = zone.to;
       if (zoneColorId !== currentColorId) {
-        ctx.fillRect(0, currentFrom, width2, currentTo - currentFrom);
+        ctx.fillRect(0, currentFrom, width, currentTo - currentFrom);
         currentColorId = zoneColorId;
         ctx.fillStyle = id2Color[currentColorId];
         currentFrom = zoneFrom;
@@ -99787,13 +99780,13 @@ class OverviewRuler extends ViewEventHandler {
         if (currentTo >= zoneFrom) {
           currentTo = Math.max(currentTo, zoneTo);
         } else {
-          ctx.fillRect(0, currentFrom, width2, currentTo - currentFrom);
+          ctx.fillRect(0, currentFrom, width, currentTo - currentFrom);
           currentFrom = zoneFrom;
           currentTo = zoneTo;
         }
       }
     }
-    ctx.fillRect(0, currentFrom, width2, currentTo - currentFrom);
+    ctx.fillRect(0, currentFrom, width, currentTo - currentFrom);
   }
 }
 var rulers = "";
@@ -100097,8 +100090,8 @@ class SelectionsOverlay extends DynamicViewOverlay {
     }
     return linesVisibleRanges;
   }
-  _createSelectionPiece(top, height2, className, left, width2) {
-    return '<div class="cslr ' + className + '" style="top:' + top.toString() + "px;left:" + left.toString() + "px;width:" + width2.toString() + "px;height:" + height2 + 'px;"></div>';
+  _createSelectionPiece(top, height, className, left, width) {
+    return '<div class="cslr ' + className + '" style="top:' + top.toString() + "px;left:" + left.toString() + "px;width:" + width.toString() + "px;height:" + height + 'px;"></div>';
   }
   _actualRenderOneSelection(output2, visibleStartLineNumber, hasMultipleSelections, visibleRanges) {
     if (visibleRanges.length === 0) {
@@ -100227,11 +100220,11 @@ function abs(n2) {
 }
 var viewCursors = "";
 class ViewCursorRenderData {
-  constructor(top, left, width2, height2, textContent, textContentClassName) {
+  constructor(top, left, width, height, textContent, textContentClassName) {
     this.top = top;
     this.left = left;
-    this.width = width2;
-    this.height = height2;
+    this.width = width;
+    this.height = height;
     this.textContent = textContent;
     this.textContentClassName = textContentClassName;
   }
@@ -100296,23 +100289,23 @@ class ViewCursor {
       if (!visibleRange || visibleRange.outsideRenderedLine) {
         return null;
       }
-      let width3;
+      let width2;
       if (this._cursorStyle === TextEditorCursorStyle$1.Line) {
-        width3 = computeScreenAwareSize(this._lineCursorWidth > 0 ? this._lineCursorWidth : 2);
-        if (width3 > 2) {
+        width2 = computeScreenAwareSize(this._lineCursorWidth > 0 ? this._lineCursorWidth : 2);
+        if (width2 > 2) {
           const lineContent2 = this._context.model.getLineContent(this._position.lineNumber);
           const nextCharLength$12 = nextCharLength(lineContent2, this._position.column - 1);
           textContent = lineContent2.substr(this._position.column - 1, nextCharLength$12);
         }
       } else {
-        width3 = computeScreenAwareSize(1);
+        width2 = computeScreenAwareSize(1);
       }
       let left = visibleRange.left;
-      if (width3 >= 2 && left >= 1) {
+      if (width2 >= 2 && left >= 1) {
         left -= 1;
       }
       const top2 = ctx.getVerticalOffsetForLineNumber(this._position.lineNumber) - ctx.bigNumbersDelta;
-      return new ViewCursorRenderData(top2, left, width3, this._lineHeight, textContent, "");
+      return new ViewCursorRenderData(top2, left, width2, this._lineHeight, textContent, "");
     }
     const lineContent = this._context.model.getLineContent(this._position.lineNumber);
     const nextCharLength$1 = nextCharLength(lineContent, this._position.column - 1);
@@ -100325,7 +100318,7 @@ class ViewCursor {
       return null;
     }
     const range3 = firstVisibleRangeForCharacter.ranges[0];
-    const width2 = range3.width < 1 ? this._typicalHalfwidthCharacterWidth : range3.width;
+    const width = range3.width < 1 ? this._typicalHalfwidthCharacterWidth : range3.width;
     let textContentClassName = "";
     if (this._cursorStyle === TextEditorCursorStyle$1.Block) {
       const lineData = this._context.model.getViewLineData(this._position.lineNumber);
@@ -100334,12 +100327,12 @@ class ViewCursor {
       textContentClassName = lineData.tokens.getClassName(tokenIndex);
     }
     let top = ctx.getVerticalOffsetForLineNumber(this._position.lineNumber) - ctx.bigNumbersDelta;
-    let height2 = this._lineHeight;
+    let height = this._lineHeight;
     if (this._cursorStyle === TextEditorCursorStyle$1.Underline || this._cursorStyle === TextEditorCursorStyle$1.UnderlineThin) {
       top += this._lineHeight - 2;
-      height2 = 2;
+      height = 2;
     }
-    return new ViewCursorRenderData(top, range3.left, width2, height2, textContent, textContentClassName);
+    return new ViewCursorRenderData(top, range3.left, width, height, textContent, textContentClassName);
   }
   prepareRender(ctx) {
     this._renderData = this._prepareRender(ctx);
@@ -100891,10 +100884,10 @@ class ViewZones extends ViewPart {
     }
     return 0;
   }
-  _safeCallOnComputedHeight(zone, height2) {
+  _safeCallOnComputedHeight(zone, height) {
     if (typeof zone.onComputedHeight === "function") {
       try {
-        zone.onComputedHeight(height2);
+        zone.onComputedHeight(height);
       } catch (e2) {
         onUnexpectedError(e2);
       }
@@ -102952,11 +102945,11 @@ class PendingChanges {
   }
 }
 class EditorWhitespace {
-  constructor(id2, afterLineNumber, ordinal, height2, minWidth) {
+  constructor(id2, afterLineNumber, ordinal, height, minWidth) {
     this.id = id2;
     this.afterLineNumber = afterLineNumber;
     this.ordinal = ordinal;
-    this.height = height2;
+    this.height = height;
     this.minWidth = minWidth;
     this.prefixSum = 0;
   }
@@ -103460,7 +103453,7 @@ class LinesLayout {
     let result = [];
     for (let i2 = startIndex; i2 <= endIndex; i2++) {
       const top = this.getVerticalOffsetForWhitespaceIndex(i2);
-      const height2 = this.getHeightForWhitespaceIndex(i2);
+      const height = this.getHeightForWhitespaceIndex(i2);
       if (top >= verticalOffset2) {
         break;
       }
@@ -103468,7 +103461,7 @@ class LinesLayout {
         id: this.getIdForWhitespaceIndex(i2),
         afterLineNumber: this.getAfterLineNumberForWhitespaceIndex(i2),
         verticalOffset: top,
-        height: height2
+        height
       });
     }
     return result;
@@ -103500,29 +103493,29 @@ class LinesLayout {
 LinesLayout.INSTANCE_COUNT = 0;
 const SMOOTH_SCROLLING_TIME = 125;
 class EditorScrollDimensions {
-  constructor(width2, contentWidth, height2, contentHeight) {
-    width2 = width2 | 0;
+  constructor(width, contentWidth, height, contentHeight) {
+    width = width | 0;
     contentWidth = contentWidth | 0;
-    height2 = height2 | 0;
+    height = height | 0;
     contentHeight = contentHeight | 0;
-    if (width2 < 0) {
-      width2 = 0;
+    if (width < 0) {
+      width = 0;
     }
     if (contentWidth < 0) {
       contentWidth = 0;
     }
-    if (height2 < 0) {
-      height2 = 0;
+    if (height < 0) {
+      height = 0;
     }
     if (contentHeight < 0) {
       contentHeight = 0;
     }
-    this.width = width2;
+    this.width = width;
     this.contentWidth = contentWidth;
-    this.scrollWidth = Math.max(width2, contentWidth);
-    this.height = height2;
+    this.scrollWidth = Math.max(width, contentWidth);
+    this.height = height;
     this.contentHeight = contentHeight;
-    this.scrollHeight = Math.max(height2, contentHeight);
+    this.scrollHeight = Math.max(height, contentHeight);
   }
   equals(other) {
     return this.width === other.width && this.contentWidth === other.contentWidth && this.height === other.height && this.contentHeight === other.contentHeight;
@@ -103618,11 +103611,11 @@ class ViewLayout extends Disposable {
     }
     if (e2.hasChanged(130)) {
       const layoutInfo = options.get(130);
-      const width2 = layoutInfo.contentWidth;
-      const height2 = layoutInfo.height;
+      const width = layoutInfo.contentWidth;
+      const height = layoutInfo.height;
       const scrollDimensions = this._scrollable.getScrollDimensions();
       const contentWidth = scrollDimensions.contentWidth;
-      this._scrollable.setScrollDimensions(new EditorScrollDimensions(width2, scrollDimensions.contentWidth, height2, this._getContentHeight(width2, height2, contentWidth)));
+      this._scrollable.setScrollDimensions(new EditorScrollDimensions(width, scrollDimensions.contentWidth, height, this._getContentHeight(width, height, contentWidth)));
     } else {
       this._updateHeight();
     }
@@ -103639,33 +103632,33 @@ class ViewLayout extends Disposable {
   onLinesInserted(fromLineNumber, toLineNumber) {
     this._linesLayout.onLinesInserted(fromLineNumber, toLineNumber);
   }
-  _getHorizontalScrollbarHeight(width2, scrollWidth) {
+  _getHorizontalScrollbarHeight(width, scrollWidth) {
     const options = this._configuration.options;
     const scrollbar = options.get(91);
     if (scrollbar.horizontal === 2) {
       return 0;
     }
-    if (width2 >= scrollWidth) {
+    if (width >= scrollWidth) {
       return 0;
     }
     return scrollbar.horizontalScrollbarSize;
   }
-  _getContentHeight(width2, height2, contentWidth) {
+  _getContentHeight(width, height, contentWidth) {
     const options = this._configuration.options;
     let result = this._linesLayout.getLinesTotalHeight();
     if (options.get(93)) {
-      result += Math.max(0, height2 - options.get(58) - options.get(74).bottom);
+      result += Math.max(0, height - options.get(58) - options.get(74).bottom);
     } else {
-      result += this._getHorizontalScrollbarHeight(width2, contentWidth);
+      result += this._getHorizontalScrollbarHeight(width, contentWidth);
     }
     return result;
   }
   _updateHeight() {
     const scrollDimensions = this._scrollable.getScrollDimensions();
-    const width2 = scrollDimensions.width;
-    const height2 = scrollDimensions.height;
+    const width = scrollDimensions.width;
+    const height = scrollDimensions.height;
     const contentWidth = scrollDimensions.contentWidth;
-    this._scrollable.setScrollDimensions(new EditorScrollDimensions(width2, scrollDimensions.contentWidth, height2, this._getContentHeight(width2, height2, contentWidth)));
+    this._scrollable.setScrollDimensions(new EditorScrollDimensions(width, scrollDimensions.contentWidth, height, this._getContentHeight(width, height, contentWidth)));
   }
   getCurrentViewport() {
     const scrollDimensions = this._scrollable.getScrollDimensions();
@@ -106609,7 +106602,7 @@ function createLineBreaks(requests, fontInfo, tabSize, firstLineBreakColumn, wra
     const lineContent = LineInjectedText.applyInjectedText(requests[i2], injectedTextsPerLine[i2]);
     let firstNonWhitespaceIndex$1 = 0;
     let wrappedTextIndentLength = 0;
-    let width2 = overallWidth;
+    let width = overallWidth;
     if (wrappingIndent !== 0) {
       firstNonWhitespaceIndex$1 = firstNonWhitespaceIndex(lineContent);
       if (firstNonWhitespaceIndex$1 === -1) {
@@ -106624,12 +106617,12 @@ function createLineBreaks(requests, fontInfo, tabSize, firstLineBreakColumn, wra
           firstNonWhitespaceIndex$1 = 0;
           wrappedTextIndentLength = 0;
         } else {
-          width2 = overallWidth - indentWidth;
+          width = overallWidth - indentWidth;
         }
       }
     }
     const renderLineContent = lineContent.substr(firstNonWhitespaceIndex$1);
-    const tmp = renderLine(renderLineContent, wrappedTextIndentLength, tabSize, width2, sb2, additionalIndentLength);
+    const tmp = renderLine(renderLineContent, wrappedTextIndentLength, tabSize, width, sb2, additionalIndentLength);
     firstNonWhitespaceIndices[i2] = firstNonWhitespaceIndex$1;
     wrappedTextIndentLengths[i2] = wrappedTextIndentLength;
     renderLineContents[i2] = renderLineContent;
@@ -106680,7 +106673,7 @@ function createLineBreaks(requests, fontInfo, tabSize, firstLineBreakColumn, wra
   document.body.removeChild(containerDomNode);
   return result;
 }
-function renderLine(lineContent, initialVisibleColumn, tabSize, width2, sb2, wrappingIndentLength) {
+function renderLine(lineContent, initialVisibleColumn, tabSize, width, sb2, wrappingIndentLength) {
   if (wrappingIndentLength !== 0) {
     let hangingOffset = String(wrappingIndentLength);
     sb2.appendASCIIString('<div style="text-indent: -');
@@ -106691,7 +106684,7 @@ function renderLine(lineContent, initialVisibleColumn, tabSize, width2, sb2, wra
   } else {
     sb2.appendASCIIString('<div style="width:');
   }
-  sb2.appendASCIIString(String(width2));
+  sb2.appendASCIIString(String(width));
   sb2.appendASCIIString('px;">');
   const len = lineContent.length;
   let visibleColumn = initialVisibleColumn;
@@ -109845,16 +109838,16 @@ let DiffReview = class DiffReview2 extends Disposable {
   isVisible() {
     return this._isVisible;
   }
-  layout(top, width2, height2) {
-    this._width = width2;
+  layout(top, width, height) {
+    this._width = width;
     this.shadow.setTop(top - 6);
-    this.shadow.setWidth(width2);
+    this.shadow.setWidth(width);
     this.shadow.setHeight(this._isVisible ? 6 : 0);
     this.domNode.setTop(top);
-    this.domNode.setWidth(width2);
-    this.domNode.setHeight(height2);
-    this._content.setHeight(height2);
-    this._content.setWidth(width2);
+    this.domNode.setWidth(width);
+    this.domNode.setHeight(height);
+    this._content.setHeight(height);
+    this._content.setWidth(width);
     if (this._isVisible) {
       this.actionBarContainer.setAttribute("aria-hidden", "false");
       this.actionBarContainer.setDisplay("block");
@@ -110085,7 +110078,7 @@ let DiffReview = class DiffReview2 extends Disposable {
     this._content.domNode.appendChild(container);
     this.scrollbar.scanDomNode();
   }
-  static _renderSection(dest, diffEntry, modLine, lineHeight, width2, originalOptions, originalModel, originalModelOpts, modifiedOptions, modifiedModel, modifiedModelOpts, languageIdCodec) {
+  static _renderSection(dest, diffEntry, modLine, lineHeight, width, originalOptions, originalModel, originalModelOpts, modifiedOptions, modifiedModel, modifiedModelOpts, languageIdCodec) {
     const type = diffEntry.getType();
     let rowClassName = "diff-review-row";
     let lineNumbersExtraClassName = "";
@@ -110116,7 +110109,7 @@ let DiffReview = class DiffReview2 extends Disposable {
       const originalLine = originalLineStart === 0 ? 0 : originalLineStart + i2;
       const modifiedLine = modifiedLineStart === 0 ? 0 : modifiedLineStart + i2;
       const row = document.createElement("div");
-      row.style.minWidth = width2 + "px";
+      row.style.minWidth = width + "px";
       row.className = rowClassName;
       row.setAttribute("role", "listitem");
       if (modifiedLine !== 0) {
@@ -110394,10 +110387,10 @@ class InlineDiffMargin extends Disposable {
       });
     };
     this._register(addStandardDisposableListener(this._diffActions, "mousedown", (e2) => {
-      const { top, height: height2 } = getDomNodePagePosition(this._diffActions);
+      const { top, height } = getDomNodePagePosition(this._diffActions);
       let pad = Math.floor(lineHeight / 3);
       e2.preventDefault();
-      showContextMenu(e2.posx, top + height2 + pad);
+      showContextMenu(e2.posx, top + height + pad);
     }));
     this._register(editor2.onMouseMove((e2) => {
       if (e2.target.type === 8 || e2.target.type === 5) {
@@ -110762,11 +110755,11 @@ let DiffEditorWidget = class DiffEditorWidget2 extends Disposable {
     this._register(editor2.onDidFocusEditorWidget(() => isInDiffLeftEditorKey.set(true)));
     this._register(editor2.onDidBlurEditorWidget(() => isInDiffLeftEditorKey.set(false)));
     this._register(editor2.onDidContentSizeChange((e2) => {
-      const width2 = this._originalEditor.getContentWidth() + this._modifiedEditor.getContentWidth() + DiffEditorWidget2.ONE_OVERVIEW_WIDTH;
-      const height2 = Math.max(this._modifiedEditor.getContentHeight(), this._originalEditor.getContentHeight());
+      const width = this._originalEditor.getContentWidth() + this._modifiedEditor.getContentWidth() + DiffEditorWidget2.ONE_OVERVIEW_WIDTH;
+      const height = Math.max(this._modifiedEditor.getContentHeight(), this._originalEditor.getContentHeight());
       this._onDidContentSizeChange.fire({
-        contentHeight: height2,
-        contentWidth: width2,
+        contentHeight: height,
+        contentWidth: width,
         contentHeightChanged: e2.contentHeightChanged,
         contentWidthChanged: e2.contentWidthChanged
       });
@@ -110823,11 +110816,11 @@ let DiffEditorWidget = class DiffEditorWidget2 extends Disposable {
     this._register(editor2.onDidFocusEditorWidget(() => isInDiffRightEditorKey.set(true)));
     this._register(editor2.onDidBlurEditorWidget(() => isInDiffRightEditorKey.set(false)));
     this._register(editor2.onDidContentSizeChange((e2) => {
-      const width2 = this._originalEditor.getContentWidth() + this._modifiedEditor.getContentWidth() + DiffEditorWidget2.ONE_OVERVIEW_WIDTH;
-      const height2 = Math.max(this._modifiedEditor.getContentHeight(), this._originalEditor.getContentHeight());
+      const width = this._originalEditor.getContentWidth() + this._modifiedEditor.getContentWidth() + DiffEditorWidget2.ONE_OVERVIEW_WIDTH;
+      const height = Math.max(this._modifiedEditor.getContentHeight(), this._originalEditor.getContentHeight());
       this._onDidContentSizeChange.fire({
-        contentHeight: height2,
-        contentWidth: width2,
+        contentHeight: height,
+        contentWidth: width,
         contentHeightChanged: e2.contentHeightChanged,
         contentWidthChanged: e2.contentWidthChanged
       });
@@ -111068,7 +111061,7 @@ let DiffEditorWidget = class DiffEditorWidget2 extends Disposable {
     if (!this._originalOverviewRuler || !this._modifiedOverviewRuler) {
       return;
     }
-    const height2 = this._elementSizeObserver.getHeight();
+    const height = this._elementSizeObserver.getHeight();
     const reviewHeight = this._getReviewHeight();
     const freeSpace = DiffEditorWidget2.ENTIRE_DIFF_OVERVIEW_WIDTH - 2 * DiffEditorWidget2.ONE_OVERVIEW_WIDTH;
     const layoutInfo = this._modifiedEditor.getLayoutInfo();
@@ -111077,13 +111070,13 @@ let DiffEditorWidget = class DiffEditorWidget2 extends Disposable {
         top: 0,
         width: DiffEditorWidget2.ONE_OVERVIEW_WIDTH,
         right: freeSpace + DiffEditorWidget2.ONE_OVERVIEW_WIDTH,
-        height: height2 - reviewHeight
+        height: height - reviewHeight
       });
       this._modifiedOverviewRuler.setLayout({
         top: 0,
         right: 0,
         width: DiffEditorWidget2.ONE_OVERVIEW_WIDTH,
-        height: height2 - reviewHeight
+        height: height - reviewHeight
       });
     }
   }
@@ -111216,26 +111209,26 @@ let DiffEditorWidget = class DiffEditorWidget2 extends Disposable {
     this._doLayout();
   }
   _doLayout() {
-    const width2 = this._elementSizeObserver.getWidth();
-    const height2 = this._elementSizeObserver.getHeight();
+    const width = this._elementSizeObserver.getWidth();
+    const height = this._elementSizeObserver.getHeight();
     const reviewHeight = this._getReviewHeight();
     const splitPoint = this._strategy.layout();
     this._originalDomNode.style.width = splitPoint + "px";
     this._originalDomNode.style.left = "0px";
-    this._modifiedDomNode.style.width = width2 - splitPoint + "px";
+    this._modifiedDomNode.style.width = width - splitPoint + "px";
     this._modifiedDomNode.style.left = splitPoint + "px";
     this._overviewDomElement.style.top = "0px";
-    this._overviewDomElement.style.height = height2 - reviewHeight + "px";
+    this._overviewDomElement.style.height = height - reviewHeight + "px";
     this._overviewDomElement.style.width = DiffEditorWidget2.ENTIRE_DIFF_OVERVIEW_WIDTH + "px";
-    this._overviewDomElement.style.left = width2 - DiffEditorWidget2.ENTIRE_DIFF_OVERVIEW_WIDTH + "px";
+    this._overviewDomElement.style.left = width - DiffEditorWidget2.ENTIRE_DIFF_OVERVIEW_WIDTH + "px";
     this._overviewViewportDomElement.setWidth(DiffEditorWidget2.ENTIRE_DIFF_OVERVIEW_WIDTH);
     this._overviewViewportDomElement.setHeight(30);
-    this._originalEditor.layout({ width: splitPoint, height: height2 - reviewHeight });
-    this._modifiedEditor.layout({ width: width2 - splitPoint - (this._options.renderOverviewRuler ? DiffEditorWidget2.ENTIRE_DIFF_OVERVIEW_WIDTH : 0), height: height2 - reviewHeight });
+    this._originalEditor.layout({ width: splitPoint, height: height - reviewHeight });
+    this._modifiedEditor.layout({ width: width - splitPoint - (this._options.renderOverviewRuler ? DiffEditorWidget2.ENTIRE_DIFF_OVERVIEW_WIDTH : 0), height: height - reviewHeight });
     if (this._originalOverviewRuler || this._modifiedOverviewRuler) {
       this._layoutOverviewRulers();
     }
-    this._reviewPane.layout(height2 - reviewHeight, width2, reviewHeight);
+    this._reviewPane.layout(height - reviewHeight, width, reviewHeight);
     this._layoutOverviewViewport();
   }
   _layoutOverviewViewport() {
@@ -118561,9 +118554,9 @@ class ListView {
   indexAfter(position2) {
     return this.rangeMap.indexAfter(position2);
   }
-  layout(height2, width2) {
+  layout(height, width) {
     let scrollDimensions = {
-      height: typeof height2 === "number" ? height2 : getContentHeight(this.domNode)
+      height: typeof height === "number" ? height : getContentHeight(this.domNode)
     };
     if (this.scrollableElementUpdateDisposable) {
       this.scrollableElementUpdateDisposable.dispose();
@@ -118571,15 +118564,15 @@ class ListView {
       scrollDimensions.scrollHeight = this.scrollHeight;
     }
     this.scrollableElement.setScrollDimensions(scrollDimensions);
-    if (typeof width2 !== "undefined") {
-      this.renderWidth = width2;
+    if (typeof width !== "undefined") {
+      this.renderWidth = width;
       if (this.supportDynamicHeights) {
         this._rerender(this.scrollTop, this.renderHeight);
       }
     }
     if (this.horizontalScrolling) {
       this.scrollableElement.setScrollDimensions({
-        width: typeof width2 === "number" ? width2 : getContentWidth(this.domNode)
+        width: typeof width === "number" ? width : getContentWidth(this.domNode)
       });
     }
   }
@@ -119928,17 +119921,17 @@ class PipelineRenderer {
   renderTemplate(container) {
     return this.renderers.map((r2) => r2.renderTemplate(container));
   }
-  renderElement(element, index2, templateData, height2) {
+  renderElement(element, index2, templateData, height) {
     let i2 = 0;
     for (const renderer of this.renderers) {
-      renderer.renderElement(element, index2, templateData[i2++], height2);
+      renderer.renderElement(element, index2, templateData[i2++], height);
     }
   }
-  disposeElement(element, index2, templateData, height2) {
+  disposeElement(element, index2, templateData, height) {
     let i2 = 0;
     for (const renderer of this.renderers) {
       if (renderer.disposeElement) {
-        renderer.disposeElement(element, index2, templateData[i2], height2);
+        renderer.disposeElement(element, index2, templateData[i2], height);
       }
       i2 += 1;
     }
@@ -120192,8 +120185,8 @@ class List {
   domFocus() {
     this.view.domNode.focus({ preventScroll: true });
   }
-  layout(height2, width2) {
-    this.view.layout(height2, width2);
+  layout(height, width) {
+    this.view.layout(height, width);
   }
   setSelection(indexes, browserEvent) {
     for (const index2 of indexes) {
@@ -120461,7 +120454,7 @@ class PagedRenderer {
     const data = this.renderer.renderTemplate(container);
     return { data, disposable: Disposable.None };
   }
-  renderElement(index2, _2, data, height2) {
+  renderElement(index2, _2, data, height) {
     if (data.disposable) {
       data.disposable.dispose();
     }
@@ -120470,13 +120463,13 @@ class PagedRenderer {
     }
     const model = this.modelProvider();
     if (model.isResolved(index2)) {
-      return this.renderer.renderElement(model.get(index2), index2, data.data, height2);
+      return this.renderer.renderElement(model.get(index2), index2, data.data, height);
     }
     const cts = new CancellationTokenSource$1();
     const promise = model.resolve(index2, cts.token);
     data.disposable = { dispose: () => cts.cancel() };
     this.renderer.renderPlaceholder(index2, data.data);
-    promise.then((entry) => this.renderer.renderElement(entry, index2, data.data, height2));
+    promise.then((entry) => this.renderer.renderElement(entry, index2, data.data, height));
   }
   disposeTemplate(data) {
     if (data.disposable) {
@@ -121221,21 +121214,21 @@ class TableListRenderer {
     this.renderedTemplates.add(result);
     return result;
   }
-  renderElement(element, index2, templateData, height2) {
+  renderElement(element, index2, templateData, height) {
     for (let i2 = 0; i2 < this.columns.length; i2++) {
       const column2 = this.columns[i2];
       const cell = column2.project(element);
       const renderer = this.renderers[i2];
-      renderer.renderElement(cell, index2, templateData.cellTemplateData[i2], height2);
+      renderer.renderElement(cell, index2, templateData.cellTemplateData[i2], height);
     }
   }
-  disposeElement(element, index2, templateData, height2) {
+  disposeElement(element, index2, templateData, height) {
     for (let i2 = 0; i2 < this.columns.length; i2++) {
       const renderer = this.renderers[i2];
       if (renderer.disposeElement) {
         const column2 = this.columns[i2];
         const cell = column2.project(element);
-        renderer.disposeElement(cell, index2, templateData.cellTemplateData[i2], height2);
+        renderer.disposeElement(cell, index2, templateData.cellTemplateData[i2], height);
       }
     }
   }
@@ -122048,9 +122041,9 @@ class ComposedTreeDelegate {
   hasDynamicHeight(element) {
     return !!this.delegate.hasDynamicHeight && this.delegate.hasDynamicHeight(element.element);
   }
-  setDynamicHeight(element, height2) {
+  setDynamicHeight(element, height) {
     if (this.delegate.setDynamicHeight) {
-      this.delegate.setDynamicHeight(element.element, height2);
+      this.delegate.setDynamicHeight(element.element, height);
     }
   }
 }
@@ -122119,26 +122112,26 @@ class TreeRenderer {
     const templateData = this.renderer.renderTemplate(contents);
     return { container, indent, twistie, indentGuidesDisposable: Disposable.None, templateData };
   }
-  renderElement(node2, index2, templateData, height2) {
-    if (typeof height2 === "number") {
-      this.renderedNodes.set(node2, { templateData, height: height2 });
+  renderElement(node2, index2, templateData, height) {
+    if (typeof height === "number") {
+      this.renderedNodes.set(node2, { templateData, height });
       this.renderedElements.set(node2.element, node2);
     }
     const indent = TreeRenderer.DefaultIndent + (node2.depth - 1) * this.indent;
     templateData.twistie.style.paddingLeft = `${indent}px`;
     templateData.indent.style.width = `${indent + this.indent - 16}px`;
     this.renderTwistie(node2, templateData);
-    if (typeof height2 === "number") {
+    if (typeof height === "number") {
       this.renderIndentGuides(node2, templateData);
     }
-    this.renderer.renderElement(node2, index2, templateData.templateData, height2);
+    this.renderer.renderElement(node2, index2, templateData.templateData, height);
   }
-  disposeElement(node2, index2, templateData, height2) {
+  disposeElement(node2, index2, templateData, height) {
     templateData.indentGuidesDisposable.dispose();
     if (this.renderer.disposeElement) {
-      this.renderer.disposeElement(node2, index2, templateData.templateData, height2);
+      this.renderer.disposeElement(node2, index2, templateData.templateData, height);
     }
-    if (typeof height2 === "number") {
+    if (typeof height === "number") {
       this.renderedNodes.delete(node2);
       this.renderedElements.delete(node2.element);
     }
@@ -122460,7 +122453,7 @@ class TypeFilterController {
     const { left } = getDomNodePagePosition(container);
     const containerWidth = container.clientWidth;
     const midContainerWidth = containerWidth / 2;
-    const width2 = this.domNode.clientWidth;
+    const width = this.domNode.clientWidth;
     const disposables2 = new DisposableStore();
     let positionClassName = this.positionClassName;
     const updatePosition = () => {
@@ -122471,7 +122464,7 @@ class TypeFilterController {
           break;
         case "ne":
           this.domNode.style.top = `4px`;
-          this.domNode.style.left = `${containerWidth - width2 - 6}px`;
+          this.domNode.style.left = `${containerWidth - width - 6}px`;
           break;
       }
     };
@@ -122896,8 +122889,8 @@ class AbstractTree {
   domFocus() {
     this.view.domFocus();
   }
-  layout(height2, width2) {
-    this.view.layout(height2, width2);
+  layout(height, width) {
+    this.view.layout(height, width);
   }
   style(styles2) {
     const suffix = `.${this.view.domId}`;
@@ -123449,8 +123442,8 @@ function mapList(nodeMapper, list2) {
     splice(start, deleteCount, toInsert) {
       list2.splice(start, deleteCount, toInsert.map((node2) => nodeMapper.map(node2)));
     },
-    updateElementHeight(index2, height2) {
-      list2.updateElementHeight(index2, height2);
+    updateElementHeight(index2, height) {
+      list2.updateElementHeight(index2, height);
     }
   };
 }
@@ -123598,24 +123591,24 @@ class CompressibleRenderer {
     const data = this.renderer.renderTemplate(container);
     return { compressedTreeNode: void 0, data };
   }
-  renderElement(node2, index2, templateData, height2) {
+  renderElement(node2, index2, templateData, height) {
     const compressedTreeNode = this.compressedTreeNodeProvider.getCompressedTreeNode(node2.element);
     if (compressedTreeNode.element.elements.length === 1) {
       templateData.compressedTreeNode = void 0;
-      this.renderer.renderElement(node2, index2, templateData.data, height2);
+      this.renderer.renderElement(node2, index2, templateData.data, height);
     } else {
       templateData.compressedTreeNode = compressedTreeNode;
-      this.renderer.renderCompressedElements(compressedTreeNode, index2, templateData.data, height2);
+      this.renderer.renderCompressedElements(compressedTreeNode, index2, templateData.data, height);
     }
   }
-  disposeElement(node2, index2, templateData, height2) {
+  disposeElement(node2, index2, templateData, height) {
     if (templateData.compressedTreeNode) {
       if (this.renderer.disposeCompressedElements) {
-        this.renderer.disposeCompressedElements(templateData.compressedTreeNode, index2, templateData.data, height2);
+        this.renderer.disposeCompressedElements(templateData.compressedTreeNode, index2, templateData.data, height);
       }
     } else {
       if (this.renderer.disposeElement) {
-        this.renderer.disposeElement(node2, index2, templateData.data, height2);
+        this.renderer.disposeElement(node2, index2, templateData.data, height);
       }
     }
   }
@@ -123757,8 +123750,8 @@ class AsyncDataTreeRenderer {
     const templateData = this.renderer.renderTemplate(container);
     return { templateData };
   }
-  renderElement(node2, index2, templateData, height2) {
-    this.renderer.renderElement(this.nodeMapper.map(node2), index2, templateData.templateData, height2);
+  renderElement(node2, index2, templateData, height) {
+    this.renderer.renderElement(this.nodeMapper.map(node2), index2, templateData.templateData, height);
   }
   renderTwistie(element, twistieElement) {
     if (element.slow) {
@@ -123769,9 +123762,9 @@ class AsyncDataTreeRenderer {
       return false;
     }
   }
-  disposeElement(node2, index2, templateData, height2) {
+  disposeElement(node2, index2, templateData, height) {
     if (this.renderer.disposeElement) {
-      this.renderer.disposeElement(this.nodeMapper.map(node2), index2, templateData.templateData, height2);
+      this.renderer.disposeElement(this.nodeMapper.map(node2), index2, templateData.templateData, height);
     }
   }
   disposeTemplate(templateData) {
@@ -123955,8 +123948,8 @@ class AsyncDataTree {
   domFocus() {
     this.tree.domFocus();
   }
-  layout(height2, width2) {
-    this.tree.layout(height2, width2);
+  layout(height, width) {
+    this.tree.layout(height, width);
   }
   style(styles2) {
     this.tree.style(styles2);
@@ -124346,11 +124339,11 @@ class CompressibleAsyncDataTreeRenderer {
     const templateData = this.renderer.renderTemplate(container);
     return { templateData };
   }
-  renderElement(node2, index2, templateData, height2) {
-    this.renderer.renderElement(this.nodeMapper.map(node2), index2, templateData.templateData, height2);
+  renderElement(node2, index2, templateData, height) {
+    this.renderer.renderElement(this.nodeMapper.map(node2), index2, templateData.templateData, height);
   }
-  renderCompressedElements(node2, index2, templateData, height2) {
-    this.renderer.renderCompressedElements(this.compressibleNodeMapperProvider().map(node2), index2, templateData.templateData, height2);
+  renderCompressedElements(node2, index2, templateData, height) {
+    this.renderer.renderCompressedElements(this.compressibleNodeMapperProvider().map(node2), index2, templateData.templateData, height);
   }
   renderTwistie(element, twistieElement) {
     if (element.slow) {
@@ -124361,14 +124354,14 @@ class CompressibleAsyncDataTreeRenderer {
       return false;
     }
   }
-  disposeElement(node2, index2, templateData, height2) {
+  disposeElement(node2, index2, templateData, height) {
     if (this.renderer.disposeElement) {
-      this.renderer.disposeElement(this.nodeMapper.map(node2), index2, templateData.templateData, height2);
+      this.renderer.disposeElement(this.nodeMapper.map(node2), index2, templateData.templateData, height);
     }
   }
-  disposeCompressedElements(node2, index2, templateData, height2) {
+  disposeCompressedElements(node2, index2, templateData, height) {
     if (this.renderer.disposeCompressedElements) {
-      this.renderer.disposeCompressedElements(this.compressibleNodeMapperProvider().map(node2), index2, templateData.templateData, height2);
+      this.renderer.disposeCompressedElements(this.compressibleNodeMapperProvider().map(node2), index2, templateData.templateData, height);
     }
   }
   disposeTemplate(templateData) {
@@ -128238,7 +128231,7 @@ class InputBox extends Widget {
   get width() {
     return getTotalWidth(this.input);
   }
-  set width(width2) {
+  set width(width) {
     if (this.options.flexibleHeight && this.options.flexibleWidth) {
       let horizontalPadding = 0;
       if (this.mirror) {
@@ -128246,12 +128239,12 @@ class InputBox extends Widget {
         const paddingRight = parseFloat(this.mirror.style.paddingRight || "") || 0;
         horizontalPadding = paddingLeft + paddingRight;
       }
-      this.input.style.width = width2 - horizontalPadding + "px";
+      this.input.style.width = width - horizontalPadding + "px";
     } else {
-      this.input.style.width = width2 + "px";
+      this.input.style.width = width + "px";
     }
     if (this.mirror) {
-      this.mirror.style.width = width2 + "px";
+      this.mirror.style.width = width + "px";
     }
   }
   set paddingRight(paddingRight) {
@@ -128265,9 +128258,9 @@ class InputBox extends Widget {
       return;
     }
     const scrollHeight = this.cachedContentHeight;
-    const height2 = this.cachedHeight;
+    const height = this.cachedHeight;
     const scrollTop2 = this.input.scrollTop;
-    this.scrollableElement.setScrollDimensions({ scrollHeight, height: height2 });
+    this.scrollableElement.setScrollDimensions({ scrollHeight, height });
     this.scrollableElement.setScrollPosition({ scrollTop: scrollTop2 });
   }
   showMessage(message, force) {
@@ -128788,15 +128781,15 @@ function parseHrefAndDimensions(href) {
   if (parameters) {
     const heightFromParams = /height=(\d+)/.exec(parameters);
     const widthFromParams = /width=(\d+)/.exec(parameters);
-    const height2 = heightFromParams ? heightFromParams[1] : "";
-    const width2 = widthFromParams ? widthFromParams[1] : "";
-    const widthIsFinite = isFinite(parseInt(width2));
-    const heightIsFinite = isFinite(parseInt(height2));
+    const height = heightFromParams ? heightFromParams[1] : "";
+    const width = widthFromParams ? widthFromParams[1] : "";
+    const widthIsFinite = isFinite(parseInt(width));
+    const heightIsFinite = isFinite(parseInt(height));
     if (widthIsFinite) {
-      dimensions.push(`width="${width2}"`);
+      dimensions.push(`width="${width}"`);
     }
     if (heightIsFinite) {
-      dimensions.push(`height="${height2}"`);
+      dimensions.push(`height="${height}"`);
     }
   }
   return { href, dimensions };
@@ -131109,9 +131102,9 @@ class QuickInputController extends Disposable {
     if (this.ui) {
       this.ui.container.style.top = `${this.titleBarOffset}px`;
       const style = this.ui.container.style;
-      const width2 = Math.min(this.dimension.width * 0.62, QuickInputController.MAX_WIDTH);
-      style.width = width2 + "px";
-      style.marginLeft = "-" + width2 / 2 + "px";
+      const width = Math.min(this.dimension.width * 0.62, QuickInputController.MAX_WIDTH);
+      style.width = width + "px";
+      style.marginLeft = "-" + width / 2 + "px";
       this.ui.inputBox.layout();
       this.ui.list.layout(this.dimension && this.dimension.height * 0.4);
     }
@@ -136762,7 +136755,7 @@ let LightBulbWidget = class LightBulbWidget2 extends Disposable {
       }
       this._editor.focus();
       e2.preventDefault();
-      const { top, height: height2 } = getDomNodePagePosition(this._domNode);
+      const { top, height } = getDomNodePagePosition(this._domNode);
       const lineHeight = this._editor.getOption(58);
       let pad = Math.floor(lineHeight / 3);
       if (this.state.widgetPosition.position !== null && this.state.widgetPosition.position.lineNumber < this.state.editorPosition.lineNumber) {
@@ -136770,7 +136763,7 @@ let LightBulbWidget = class LightBulbWidget2 extends Disposable {
       }
       this._onClick.fire({
         x: e2.posx,
-        y: top + height2 + pad,
+        y: top + height + pad,
         actions: this.state.actions,
         trigger: this.state.trigger
       });
@@ -137834,11 +137827,11 @@ class CodeLensViewZone {
     this.suppressMouseDown = true;
     this.domNode = document.createElement("div");
   }
-  onComputedHeight(height2) {
+  onComputedHeight(height) {
     if (this._lastHeight === void 0) {
-      this._lastHeight = height2;
-    } else if (this._lastHeight !== height2) {
-      this._lastHeight = height2;
+      this._lastHeight = height;
+    } else if (this._lastHeight !== height) {
+      this._lastHeight = height;
       this._onHeight();
     }
   }
@@ -138003,8 +137996,8 @@ class CodeLensWidget {
       }, (id2) => this._decorationIds[i2] = id2);
     });
   }
-  updateHeight(height2, viewZoneChangeAccessor) {
-    this._viewZone.heightInPx = height2;
+  updateHeight(height, viewZoneChangeAccessor) {
+    this._viewZone.heightInPx = height;
     viewZoneChangeAccessor.layoutZone(this._viewZoneId);
     if (this._contentWidget) {
       this._editor.layoutContentWidget(this._contentWidget);
@@ -138924,8 +138917,8 @@ class ViewZoneDelegate {
   onDomNodeTop(top) {
     this._onDomNodeTop(top);
   }
-  onComputedHeight(height2) {
-    this._onComputedHeight(height2);
+  onComputedHeight(height) {
+    this._onComputedHeight(height);
   }
 }
 class OverlayWidgetDelegate {
@@ -139001,10 +138994,10 @@ class ZoneWidget {
       this.domNode.setAttribute("role", "presentation");
     }
     this._disposables.add(this.editor.onDidLayoutChange((info) => {
-      const width2 = this._getWidth(info);
-      this.domNode.style.width = width2 + "px";
+      const width = this._getWidth(info);
+      this.domNode.style.width = width + "px";
       this.domNode.style.left = this._getLeft(info) + "px";
-      this._onWidth(width2);
+      this._onWidth(width);
     }));
   }
   dispose() {
@@ -139072,10 +139065,10 @@ class ZoneWidget {
   _onViewZoneTop(top) {
     this.domNode.style.top = top + "px";
   }
-  _onViewZoneHeight(height2) {
-    this.domNode.style.height = `${height2}px`;
+  _onViewZoneHeight(height) {
+    this.domNode.style.height = `${height}px`;
     if (this.container) {
-      let containerHeight = height2 - this._decoratingElementsHeight();
+      let containerHeight = height - this._decoratingElementsHeight();
       this.container.style.height = `${containerHeight}px`;
       const layoutInfo = this.editor.getLayoutInfo();
       this._doLayout(containerHeight, this._getWidth(layoutInfo));
@@ -139139,8 +139132,8 @@ class ZoneWidget {
   _showImpl(where, heightInLines) {
     const position2 = where.getStartPosition();
     const layoutInfo = this.editor.getLayoutInfo();
-    const width2 = this._getWidth(layoutInfo);
-    this.domNode.style.width = `${width2}px`;
+    const width = this._getWidth(layoutInfo);
+    this.domNode.style.width = `${width}px`;
     this.domNode.style.left = this._getLeft(layoutInfo) + "px";
     const viewZoneDomNode = document.createElement("div");
     viewZoneDomNode.style.overflow = "hidden";
@@ -139166,15 +139159,15 @@ class ZoneWidget {
         this._overlayWidget = null;
       }
       this.domNode.style.top = "-1000px";
-      this._viewZone = new ViewZoneDelegate(viewZoneDomNode, position2.lineNumber, position2.column, heightInLines, (top) => this._onViewZoneTop(top), (height2) => this._onViewZoneHeight(height2));
+      this._viewZone = new ViewZoneDelegate(viewZoneDomNode, position2.lineNumber, position2.column, heightInLines, (top) => this._onViewZoneTop(top), (height) => this._onViewZoneHeight(height));
       this._viewZone.id = accessor.addZone(this._viewZone);
       this._overlayWidget = new OverlayWidgetDelegate(WIDGET_ID + this._viewZone.id, this.domNode);
       this.editor.addOverlayWidget(this._overlayWidget);
     });
     if (this.container && this.options.showFrame) {
-      const width3 = this.options.frameWidth ? this.options.frameWidth : frameThickness;
-      this.container.style.borderTopWidth = width3 + "px";
-      this.container.style.borderBottomWidth = width3 + "px";
+      const width2 = this.options.frameWidth ? this.options.frameWidth : frameThickness;
+      this.container.style.borderTopWidth = width2 + "px";
+      this.container.style.borderBottomWidth = width2 + "px";
     }
     let containerHeight = heightInLines * lineHeight - this._decoratingElementsHeight();
     if (this.container) {
@@ -139182,7 +139175,7 @@ class ZoneWidget {
       this.container.style.height = containerHeight + "px";
       this.container.style.overflow = "hidden";
     }
-    this._doLayout(containerHeight, width2);
+    this._doLayout(containerHeight, width);
     if (!this.options.keepEditorSelection) {
       this.editor.setSelection(where);
     }
@@ -140788,8 +140781,8 @@ let ReferenceWidget = class ReferenceWidget2 extends PeekViewWidget {
       element: this._previewContainer,
       minimumSize: 200,
       maximumSize: Number.MAX_VALUE,
-      layout: (width2) => {
-        this._preview.layout({ height: this._dim.height, width: width2 });
+      layout: (width) => {
+        this._preview.layout({ height: this._dim.height, width });
       }
     }, Sizing.Distribute);
     this._splitView.addView({
@@ -140797,10 +140790,10 @@ let ReferenceWidget = class ReferenceWidget2 extends PeekViewWidget {
       element: this._treeContainer,
       minimumSize: 100,
       maximumSize: Number.MAX_VALUE,
-      layout: (width2) => {
+      layout: (width) => {
         this._treeContainer.style.height = `${this._dim.height}px`;
-        this._treeContainer.style.width = `${width2}px`;
-        this._tree.layout(this._dim.height, width2);
+        this._treeContainer.style.width = `${width}px`;
+        this._tree.layout(this._dim.height, width);
       }
     }, Sizing.Distribute);
     this._disposables.add(this._splitView.onDidSashChange(() => {
@@ -140827,9 +140820,9 @@ let ReferenceWidget = class ReferenceWidget2 extends PeekViewWidget {
     });
     hide(this._treeContainer);
   }
-  _onWidth(width2) {
+  _onWidth(width) {
     if (this._dim) {
-      this._doLayoutBody(this._dim.height, width2);
+      this._doLayoutBody(this._dim.height, width);
     }
   }
   _doLayoutBody(heightInPixel, widthInPixel) {
@@ -147054,10 +147047,10 @@ class MessageWidget {
     const scrollHeight = fontInfo.lineHeight * this._lines;
     this._scrollable.setScrollDimensions({ scrollWidth, scrollHeight });
   }
-  layout(height2, width2) {
-    this._scrollable.getDomNode().style.height = `${height2}px`;
-    this._scrollable.getDomNode().style.width = `${width2}px`;
-    this._scrollable.setScrollDimensions({ width: width2, height: height2 });
+  layout(height, width) {
+    this._scrollable.getDomNode().style.height = `${height}px`;
+    this._scrollable.getDomNode().style.width = `${width}px`;
+    this._scrollable.setScrollDimensions({ width, height });
   }
   getHeightInLines() {
     return Math.min(17, this._lines);
@@ -152260,15 +152253,15 @@ class ResizableHTMLElement {
     this._southSash.state = south ? 3 : 0;
     this._westSash.state = west ? 3 : 0;
   }
-  layout(height2 = this.size.height, width2 = this.size.width) {
+  layout(height = this.size.height, width = this.size.width) {
     const { height: minHeight, width: minWidth } = this._minSize;
     const { height: maxHeight, width: maxWidth } = this._maxSize;
-    height2 = Math.max(minHeight, Math.min(maxHeight, height2));
-    width2 = Math.max(minWidth, Math.min(maxWidth, width2));
-    const newSize = new Dimension(width2, height2);
+    height = Math.max(minHeight, Math.min(maxHeight, height));
+    width = Math.max(minWidth, Math.min(maxWidth, width));
+    const newSize = new Dimension(width, height);
     if (!Dimension.equals(newSize, this._size)) {
-      this.domNode.style.height = height2 + "px";
-      this.domNode.style.width = width2 + "px";
+      this.domNode.style.height = height + "px";
+      this.domNode.style.width = width + "px";
       this._size = newSize;
       this._northSash.layout();
       this._eastSash.layout();
@@ -152468,11 +152461,11 @@ let SuggestDetailsWidget = class SuggestDetailsWidget2 {
   get size() {
     return this._size;
   }
-  layout(width2, height2) {
-    const newSize = new Dimension(width2, height2);
+  layout(width, height) {
+    const newSize = new Dimension(width, height);
     if (!Dimension.equals(newSize, this._size)) {
       this._size = newSize;
-      size(this.domNode, width2, height2);
+      size(this.domNode, width, height);
     }
     this._scrollbar.scanDomNode();
   }
@@ -152494,8 +152487,8 @@ let SuggestDetailsWidget = class SuggestDetailsWidget2 {
   pageUp() {
     this.scrollUp(80);
   }
-  set borderWidth(width2) {
-    this._borderWidth = width2;
+  set borderWidth(width) {
+    this._borderWidth = width;
   }
   get borderWidth() {
     return this._borderWidth;
@@ -152605,18 +152598,18 @@ class SuggestDetailsOverlay {
     const defaultMinSize = new Dimension(220, 2 * info.lineHeight);
     const defaultTop = anchorBox.top;
     const eastPlacement = function() {
-      const width2 = bodyBox.width - (anchorBox.left + anchorBox.width + info.borderWidth + info.horizontalPadding);
+      const width = bodyBox.width - (anchorBox.left + anchorBox.width + info.borderWidth + info.horizontalPadding);
       const left = -info.borderWidth + anchorBox.left + anchorBox.width;
-      const maxSizeTop = new Dimension(width2, bodyBox.height - anchorBox.top - info.borderHeight - info.verticalPadding);
+      const maxSizeTop = new Dimension(width, bodyBox.height - anchorBox.top - info.borderHeight - info.verticalPadding);
       const maxSizeBottom = maxSizeTop.with(void 0, anchorBox.top + anchorBox.height - info.borderHeight - info.verticalPadding);
-      return { top: defaultTop, left, fit: width2 - size2.width, maxSizeTop, maxSizeBottom, minSize: defaultMinSize.with(Math.min(width2, defaultMinSize.width)) };
+      return { top: defaultTop, left, fit: width - size2.width, maxSizeTop, maxSizeBottom, minSize: defaultMinSize.with(Math.min(width, defaultMinSize.width)) };
     }();
     const westPlacement = function() {
-      const width2 = anchorBox.left - info.borderWidth - info.horizontalPadding;
+      const width = anchorBox.left - info.borderWidth - info.horizontalPadding;
       const left = Math.max(info.horizontalPadding, anchorBox.left - size2.width - info.borderWidth);
-      const maxSizeTop = new Dimension(width2, bodyBox.height - anchorBox.top - info.borderHeight - info.verticalPadding);
+      const maxSizeTop = new Dimension(width, bodyBox.height - anchorBox.top - info.borderHeight - info.verticalPadding);
       const maxSizeBottom = maxSizeTop.with(void 0, anchorBox.top + anchorBox.height - info.borderHeight - info.verticalPadding);
-      return { top: defaultTop, left, fit: width2 - size2.width, maxSizeTop, maxSizeBottom, minSize: defaultMinSize.with(Math.min(width2, defaultMinSize.width)) };
+      return { top: defaultTop, left, fit: width - size2.width, maxSizeTop, maxSizeBottom, minSize: defaultMinSize.with(Math.min(width, defaultMinSize.width)) };
     }();
     const southPacement = function() {
       const left = anchorBox.left;
@@ -152628,14 +152621,14 @@ class SuggestDetailsOverlay {
     const placement = (_a2 = placements.find((p2) => p2.fit >= 0)) !== null && _a2 !== void 0 ? _a2 : placements.sort((a, b2) => b2.fit - a.fit)[0];
     const bottom = anchorBox.top + anchorBox.height - info.borderHeight;
     let alignAtTop;
-    let height2 = size2.height;
+    let height = size2.height;
     const maxHeight = Math.max(placement.maxSizeTop.height, placement.maxSizeBottom.height);
-    if (height2 > maxHeight) {
-      height2 = maxHeight;
+    if (height > maxHeight) {
+      height = maxHeight;
     }
     let maxSize;
     if (preferAlignAtTop) {
-      if (height2 <= placement.maxSizeTop.height) {
+      if (height <= placement.maxSizeTop.height) {
         alignAtTop = true;
         maxSize = placement.maxSizeTop;
       } else {
@@ -152643,7 +152636,7 @@ class SuggestDetailsOverlay {
         maxSize = placement.maxSizeBottom;
       }
     } else {
-      if (height2 <= placement.maxSizeBottom.height) {
+      if (height <= placement.maxSizeBottom.height) {
         alignAtTop = false;
         maxSize = placement.maxSizeBottom;
       } else {
@@ -152651,12 +152644,12 @@ class SuggestDetailsOverlay {
         maxSize = placement.maxSizeTop;
       }
     }
-    this._applyTopLeft({ left: placement.left, top: alignAtTop ? placement.top : bottom - height2 });
+    this._applyTopLeft({ left: placement.left, top: alignAtTop ? placement.top : bottom - height });
     this.getDomNode().style.position = "fixed";
     this._resizable.enableSashes(!alignAtTop, placement === eastPlacement, alignAtTop, placement !== eastPlacement);
     this._resizable.minSize = placement.minSize;
     this._resizable.maxSize = maxSize;
-    this._resizable.layout(height2, Math.min(maxSize.width, size2.width));
+    this._resizable.layout(height, Math.min(maxSize.width, size2.width));
     this.widget.layout(this._resizable.size.width, this._resizable.size.height);
   }
   _applyTopLeft(topLeft) {
@@ -153034,14 +153027,14 @@ let SuggestWidget = class SuggestWidget2 {
       if (state2) {
         const { itemHeight, defaultSize } = this.getLayoutInfo();
         const threshold = Math.round(itemHeight / 2);
-        let { width: width2, height: height2 } = this.element.size;
-        if (!state2.persistHeight || Math.abs(state2.currentSize.height - height2) <= threshold) {
-          height2 = (_b2 = (_a2 = state2.persistedSize) === null || _a2 === void 0 ? void 0 : _a2.height) !== null && _b2 !== void 0 ? _b2 : defaultSize.height;
+        let { width, height } = this.element.size;
+        if (!state2.persistHeight || Math.abs(state2.currentSize.height - height) <= threshold) {
+          height = (_b2 = (_a2 = state2.persistedSize) === null || _a2 === void 0 ? void 0 : _a2.height) !== null && _b2 !== void 0 ? _b2 : defaultSize.height;
         }
-        if (!state2.persistWidth || Math.abs(state2.currentSize.width - width2) <= threshold) {
-          width2 = (_d2 = (_c2 = state2.persistedSize) === null || _c2 === void 0 ? void 0 : _c2.width) !== null && _d2 !== void 0 ? _d2 : defaultSize.width;
+        if (!state2.persistWidth || Math.abs(state2.currentSize.width - width) <= threshold) {
+          width = (_d2 = (_c2 = state2.persistedSize) === null || _c2 === void 0 ? void 0 : _c2.width) !== null && _d2 !== void 0 ? _d2 : defaultSize.width;
         }
-        this._persistedSize.store(new Dimension(width2, height2));
+        this._persistedSize.store(new Dimension(width, height));
       }
       this._contentWidget.unlockPreference();
       state2 = void 0;
@@ -153491,21 +153484,21 @@ let SuggestWidget = class SuggestWidget2 {
     if (!size2) {
       size2 = info.defaultSize;
     }
-    let height2 = size2.height;
-    let width2 = size2.width;
+    let height = size2.height;
+    let width = size2.width;
     this._status.element.style.lineHeight = `${info.itemHeight}px`;
     if (this._state === 2 || this._state === 1) {
-      height2 = info.itemHeight + info.borderHeight;
-      width2 = info.defaultSize.width / 2;
+      height = info.itemHeight + info.borderHeight;
+      width = info.defaultSize.width / 2;
       this.element.enableSashes(false, false, false, false);
-      this.element.minSize = this.element.maxSize = new Dimension(width2, height2);
+      this.element.minSize = this.element.maxSize = new Dimension(width, height);
       this._contentWidget.setPreference(2);
     } else {
       const maxWidth = bodyBox.width - info.borderHeight - 2 * info.horizontalPadding;
-      if (width2 > maxWidth) {
-        width2 = maxWidth;
+      if (width > maxWidth) {
+        width = maxWidth;
       }
-      const preferredWidth = this._completionModel ? this._completionModel.stats.pLabelLen * info.typicalHalfwidthCharacterWidth : width2;
+      const preferredWidth = this._completionModel ? this._completionModel.stats.pLabelLen * info.typicalHalfwidthCharacterWidth : width;
       const fullHeight = info.statusBarHeight + this._list.contentHeight + info.borderHeight;
       const minHeight = info.itemHeight + info.statusBarHeight;
       const editorBox = getDomNodePagePosition(this.editor.getDomNode());
@@ -153515,17 +153508,17 @@ let SuggestWidget = class SuggestWidget2 {
       const availableSpaceAbove = editorBox.top + cursorBox.top - info.verticalPadding;
       const maxHeightAbove = Math.min(availableSpaceAbove, fullHeight);
       let maxHeight = Math.min(Math.max(maxHeightAbove, maxHeightBelow) + info.borderHeight, fullHeight);
-      if (height2 === ((_a2 = this._cappedHeight) === null || _a2 === void 0 ? void 0 : _a2.capped)) {
-        height2 = this._cappedHeight.wanted;
+      if (height === ((_a2 = this._cappedHeight) === null || _a2 === void 0 ? void 0 : _a2.capped)) {
+        height = this._cappedHeight.wanted;
       }
-      if (height2 < minHeight) {
-        height2 = minHeight;
+      if (height < minHeight) {
+        height = minHeight;
       }
-      if (height2 > maxHeight) {
-        height2 = maxHeight;
+      if (height > maxHeight) {
+        height = maxHeight;
       }
       const forceRenderingAboveRequiredSpace = 150;
-      if (height2 > maxHeightBelow || this._forceRenderingAbove && availableSpaceAbove > forceRenderingAboveRequiredSpace) {
+      if (height > maxHeightBelow || this._forceRenderingAbove && availableSpaceAbove > forceRenderingAboveRequiredSpace) {
         this._contentWidget.setPreference(1);
         this.element.enableSashes(true, true, false, false);
         maxHeight = maxHeightAbove;
@@ -153537,18 +153530,18 @@ let SuggestWidget = class SuggestWidget2 {
       this.element.preferredSize = new Dimension(preferredWidth, info.defaultSize.height);
       this.element.maxSize = new Dimension(maxWidth, maxHeight);
       this.element.minSize = new Dimension(220, minHeight);
-      this._cappedHeight = height2 === fullHeight ? { wanted: (_c2 = (_b2 = this._cappedHeight) === null || _b2 === void 0 ? void 0 : _b2.wanted) !== null && _c2 !== void 0 ? _c2 : size2.height, capped: height2 } : void 0;
+      this._cappedHeight = height === fullHeight ? { wanted: (_c2 = (_b2 = this._cappedHeight) === null || _b2 === void 0 ? void 0 : _b2.wanted) !== null && _c2 !== void 0 ? _c2 : size2.height, capped: height } : void 0;
     }
-    this._resize(width2, height2);
+    this._resize(width, height);
   }
-  _resize(width2, height2) {
+  _resize(width, height) {
     const { width: maxWidth, height: maxHeight } = this.element.maxSize;
-    width2 = Math.min(maxWidth, width2);
-    height2 = Math.min(maxHeight, height2);
+    width = Math.min(maxWidth, width);
+    height = Math.min(maxHeight, height);
     const { statusBarHeight } = this.getLayoutInfo();
-    this._list.layout(height2 - statusBarHeight, width2);
-    this._listElement.style.height = `${height2 - statusBarHeight}px`;
-    this.element.layout(height2, width2);
+    this._list.layout(height - statusBarHeight, width);
+    this._listElement.style.height = `${height - statusBarHeight}px`;
+    this.element.layout(height, width);
     this._contentWidget.layout();
     this._positionDetails();
   }
@@ -153647,9 +153640,9 @@ class SuggestContentWidget {
     };
   }
   beforeRender() {
-    const { height: height2, width: width2 } = this._widget.element.size;
+    const { height, width } = this._widget.element.size;
     const { borderWidth, horizontalPadding } = this._widget.getLayoutInfo();
-    return new Dimension(width2 + 2 * borderWidth + horizontalPadding, height2 + 2 * borderWidth);
+    return new Dimension(width + 2 * borderWidth + horizontalPadding, height + 2 * borderWidth);
   }
   afterRender(position2) {
     this._widget._afterRender(position2);
@@ -156651,11 +156644,11 @@ let ModesContentHoverWidget = class ModesContentHoverWidget2 extends Widget {
     this._hover.onContentsChanged();
   }
   layout() {
-    const height2 = Math.max(this._editor.getLayoutInfo().height / 4, 250);
+    const height = Math.max(this._editor.getLayoutInfo().height / 4, 250);
     const { fontSize, lineHeight } = this._editor.getOption(43);
     this._hover.contentsDomNode.style.fontSize = `${fontSize}px`;
     this._hover.contentsDomNode.style.lineHeight = `${lineHeight / fontSize}`;
-    this._hover.contentsDomNode.style.maxHeight = `${height2}px`;
+    this._hover.contentsDomNode.style.maxHeight = `${height}px`;
     this._hover.contentsDomNode.style.maxWidth = `${Math.max(this._editor.getLayoutInfo().width * 0.66, 500)}px`;
   }
   onModelDecorationsChanged() {
@@ -158433,8 +158426,8 @@ class FindDecorations {
       if (findMatches.length > 1e3) {
         findMatchesOptions = FindDecorations._FIND_MATCH_NO_OVERVIEW_DECORATION;
         const lineCount = this._editor.getModel().getLineCount();
-        const height2 = this._editor.getLayoutInfo().height;
-        const approxPixelsPerLine = height2 / lineCount;
+        const height = this._editor.getLayoutInfo().height;
+        const approxPixelsPerLine = height / lineCount;
         const mergeLinesDelta = Math.max(2, Math.ceil(3 / approxPixelsPerLine));
         let prevStartLineNumber = findMatches[0].range.startLineNumber;
         let prevEndLineNumber = findMatches[0].range.endLineNumber;
@@ -161401,15 +161394,15 @@ class FindWidget extends Widget {
     }));
     this._register(this._resizeSash.onDidChange((evt) => {
       this._resized = true;
-      let width2 = originalWidth + evt.startX - evt.currentX;
-      if (width2 < FIND_WIDGET_INITIAL_WIDTH) {
+      let width = originalWidth + evt.startX - evt.currentX;
+      if (width < FIND_WIDGET_INITIAL_WIDTH) {
         return;
       }
       const maxWidth = parseFloat(getComputedStyle$1(this._domNode).maxWidth) || 0;
-      if (width2 > maxWidth) {
+      if (width > maxWidth) {
         return;
       }
-      this._domNode.style.width = `${width2}px`;
+      this._domNode.style.width = `${width}px`;
       if (this._isReplaceVisible) {
         this._replaceInput.width = getTotalWidth(this._findInput.domNode);
       }
@@ -161421,13 +161414,13 @@ class FindWidget extends Widget {
       if (currentWidth < FIND_WIDGET_INITIAL_WIDTH) {
         return;
       }
-      let width2 = FIND_WIDGET_INITIAL_WIDTH;
+      let width = FIND_WIDGET_INITIAL_WIDTH;
       if (!this._resized || currentWidth === FIND_WIDGET_INITIAL_WIDTH) {
         const layoutInfo = this._codeEditor.getLayoutInfo();
-        width2 = layoutInfo.width - 28 - layoutInfo.minimap.minimapWidth - 15;
+        width = layoutInfo.width - 28 - layoutInfo.minimap.minimapWidth - 15;
         this._resized = true;
       }
-      this._domNode.style.width = `${width2}px`;
+      this._domNode.style.width = `${width}px`;
       if (this._isReplaceVisible) {
         this._replaceInput.width = getTotalWidth(this._findInput.domNode);
       }
@@ -169753,8 +169746,8 @@ let ParameterHintsWidget = class ParameterHintsWidget2 extends Disposable {
     if (!this.domNodes) {
       return;
     }
-    const height2 = Math.max(this.editor.getLayoutInfo().height / 4, 250);
-    const maxHeight = `${height2}px`;
+    const height = Math.max(this.editor.getLayoutInfo().height / 4, 250);
+    const maxHeight = `${height}px`;
     this.domNodes.element.style.maxHeight = maxHeight;
     const wrapper = this.domNodes.element.getElementsByClassName("phwrapper");
     if (wrapper.length) {
@@ -174350,7 +174343,7 @@ const EditorLayout = newStyled.div`
     }
 
     .active {
-      background: #1e1e1e;
+      background: #005391;
       box-shadow: 0px 1px 0px 0 #333;
       /* border-left: 1px solid rgb(42 96 231);
     border-right: 1px solid rgb(42 96 231); */
@@ -190300,6 +190293,9 @@ const Editor = ({
   }, [userList]);
   react.exports.useEffect(() => {
     console.log(CRDTInfo2);
+    console.log(docFile);
+    if (/\/$/.test(docFile == null ? void 0 : docFile.path))
+      return;
     updateModel(file);
   }, [docFile]);
   return /* @__PURE__ */ jsx(FollowLayout, {
@@ -190315,7 +190311,7 @@ const Editor = ({
           onClick: () => {
             switchModel(f2.model);
           },
-          children: f2.label.substring(1)
+          children: f2.label.split("/").slice(-1)[0]
         }, index2))
       }) : null, /* @__PURE__ */ jsx(ContentLayout, {
         ref: divEl,
@@ -197704,6 +197700,7 @@ const TerminalComponent = (_h2) => {
   const {
     CRDTInfo: CRDTInfo2
   } = oTStore((state2) => state2);
+  const socket2 = useOT((state2) => state2.socket);
   const initTerminalText = (terminal2, text2) => {
     terminal2.write("\r\n");
     terminal2.clear();
@@ -197787,6 +197784,41 @@ const TerminalComponent = (_h2) => {
       }
     }
   }, [CRDTInfo2.terminal]);
+  react.exports.useEffect(() => {
+    socket2 == null ? void 0 : socket2.on("terminal", (d2) => {
+      var _a2, _b2, _c2, _d2;
+      const CRDTInfo22 = JSON.parse(d2);
+      const crdt = CRDTInfo22.terminal;
+      if (terminal && crdt) {
+        if (((_a2 = crdt == null ? void 0 : crdt.doc) == null ? void 0 : _a2.action) === "Get") {
+          initTerminalText(terminal, ((_b2 = crdt == null ? void 0 : crdt.doc) == null ? void 0 : _b2.value) || "");
+          return;
+        }
+        writeText(terminal, ((_c2 = crdt == null ? void 0 : crdt.doc) == null ? void 0 : _c2.value) || "");
+        const helperContainer = (_d2 = terminal == null ? void 0 : terminal._core) == null ? void 0 : _d2._helperContainer;
+        const childNode = helperContainer == null ? void 0 : helperContainer.firstChild;
+        userLabel.style.top = childNode.style.top;
+        userLabel.style.left = childNode.style.left;
+        helperContainer == null ? void 0 : helperContainer.appendChild(userLabel);
+        const timer = setTimeout(() => {
+          helperContainer == null ? void 0 : helperContainer.removeChild(userLabel);
+          terminal.setOption("theme", __spreadProps(__spreadValues({}, terminal.getOption("theme")), {
+            cursor: "#ffffff"
+          }));
+        }, 6e3);
+        return () => {
+          try {
+            helperContainer == null ? void 0 : helperContainer.removeChild(userLabel);
+          } catch (_2) {
+          }
+          terminal.setOption("theme", __spreadProps(__spreadValues({}, terminal.getOption("theme")), {
+            cursor: "#ffffff"
+          }));
+          clearTimeout(timer);
+        };
+      }
+    });
+  }, [socket2]);
   return /* @__PURE__ */ jsx(FollowLayout, {
     name: "terminal",
     children: /* @__PURE__ */ jsx("div", {
@@ -198147,7 +198179,7 @@ function SkeletonTheme(_n) {
   return React.createElement(SkeletonThemeContext.Provider, { value: styleOptions }, children);
 }
 const defaultEnableAnimation = true;
-function styleOptionsToCssProperties({ baseColor, highlightColor, width: width2, height: height2, borderRadius, circle, direction, duration, enableAnimation = defaultEnableAnimation }) {
+function styleOptionsToCssProperties({ baseColor, highlightColor, width, height, borderRadius, circle, direction, duration, enableAnimation = defaultEnableAnimation }) {
   const style = {};
   if (direction === "rtl")
     style["--animation-direction"] = "reverse";
@@ -198155,10 +198187,10 @@ function styleOptionsToCssProperties({ baseColor, highlightColor, width: width2,
     style["--animation-duration"] = `${duration}s`;
   if (!enableAnimation)
     style["--pseudo-element-display"] = "none";
-  if (typeof width2 === "string" || typeof width2 === "number")
-    style.width = width2;
-  if (typeof height2 === "string" || typeof height2 === "number")
-    style.height = height2;
+  if (typeof width === "string" || typeof width === "number")
+    style.width = width;
+  if (typeof height === "string" || typeof height === "number")
+    style.height = height;
   if (typeof borderRadius === "string" || typeof borderRadius === "number")
     style.borderRadius = borderRadius;
   if (circle)
@@ -198356,90 +198388,6 @@ const ToolBar = (_r) => {
     })]
   });
 };
-const width = "20";
-const height = "20";
-const MultiPlayerCursorLayout = newStyled.svg`
-  position: fixed;
-  left: 0;
-  top: 0;
-
-  width: ${(props2) => props2.width}px;
-  height: ${(props2) => props2.height}px;
-  z-index: 9;
-  transition: all 0.3s;
-`;
-const MultiPlayerCursor = () => {
-  const [users, setUsers] = react.exports.useState(null);
-  const CRDTInfo2 = oTStore((state2) => state2.CRDTInfo);
-  const throttled = lodash$2.exports.throttle((a) => {
-    var _a2, _b2;
-    (_b2 = (_a2 = useOT.getState()) == null ? void 0 : _a2.socket) == null ? void 0 : _b2.emit("extraSync", JSON.stringify(a));
-  }, 300);
-  react.exports.useEffect(() => {
-    const {
-      userList
-    } = userListStore.getState();
-    setUsers(userList.map((_user) => {
-      if (_user.uuid === CRDTInfo2.userInfo.uuid) {
-        _user.cursor = CRDTInfo2.extend;
-      }
-      return _user;
-    }));
-  }, [CRDTInfo2]);
-  react.exports.useEffect(() => {
-    const {
-      userInfo
-    } = userStore.getState();
-    window.addEventListener("mousemove", (evt) => {
-      const {
-        globalData
-      } = oTStore.getState();
-      if (!globalData.syncCursor)
-        return;
-      const crdt = {
-        timestamp: Date.now(),
-        userInfo: lodash$2.exports.pick(userInfo, "uuid", "role"),
-        extend: {
-          type: "mousemove",
-          left: evt.clientX.toFixed(3),
-          top: evt.clientY.toFixed(3),
-          width: window.innerWidth,
-          height: window.innerHeight
-        }
-      };
-      throttled(crdt);
-    }, false);
-  }, []);
-  return /* @__PURE__ */ jsx(Fragment, {
-    children: oTStore.getState().globalData.syncCursor && (users == null ? void 0 : users.map((item, index2) => {
-      var _a2, _b2, _c2, _d2, _e2, _f2, _g2;
-      return !IsMe(item) ? /* @__PURE__ */ jsxs(MultiPlayerCursorLayout, {
-        xmlns: "http://www.w3.org/2000/svg",
-        width,
-        height,
-        viewBox: "0 0 1024 1024",
-        className: `multi-player ${Number((_a2 = item.cursor) == null ? void 0 : _a2.top) * window.innerHeight / ((_b2 = item.cursor) == null ? void 0 : _b2.height)}///${(_c2 = item.cursor) == null ? void 0 : _c2.top}`,
-        version: "1.1",
-        "p-id": "4512",
-        xmlnsXlink: "http://www.w3.org/1999/xlink",
-        color: item.color,
-        style: {
-          left: `${Number((_d2 = item.cursor) == null ? void 0 : _d2.left) * window.innerWidth / ((_e2 = item.cursor) == null ? void 0 : _e2.width)}px`,
-          top: `${Number((_f2 = item.cursor) == null ? void 0 : _f2.top) * window.innerHeight / ((_g2 = item.cursor) == null ? void 0 : _g2.height)}px`
-        },
-        children: [/* @__PURE__ */ jsx("defs", {
-          children: /* @__PURE__ */ jsx("style", {
-            type: "text/css"
-          })
-        }), /* @__PURE__ */ jsx("path", {
-          d: "M370.048 97.706667L815.786667 403.285333c90.410667 61.994667 66.176 201.472-39.808 229.376l-167.893334 44.202667 123.648 214.101333a32 32 0 1 1-55.466666 32l-123.605334-214.101333-122.24 123.306667c-77.141333 77.824-210.048 29.013333-218.538666-80.213334l-41.813334-538.88C161.706667 105.941333 281.344 36.864 370.048 97.706667z m-36.181333 52.736C290.986667 121.088 233.813333 152.32 233.642667 202.709333l0.213333 5.461334 41.813333 538.88c4.138667 52.693333 66.048 77.226667 105.045334 44.032l4.266666-3.925334 121.002667-122.112a192 192 0 0 1 76.544-47.274666l10.922667-3.242667 166.272-43.733333c51.072-13.44 64.170667-78.762667 24.490666-111.232l-4.608-3.413334L333.866667 150.4z",
-          fill: item.color,
-          "p-id": "4513"
-        })]
-      }, index2) : null;
-    }))
-  });
-};
 var LanguageIcon;
 (function(LanguageIcon2) {
   LanguageIcon2["js"] = "javascript";
@@ -198569,7 +198517,7 @@ const Index = (props2) => {
   return /* @__PURE__ */ jsx(Fragment, {
     children: /* @__PURE__ */ jsxs(MainLayout, {
       className: "flex flex-col",
-      children: [/* @__PURE__ */ jsx(MultiPlayerCursor, {}), /* @__PURE__ */ jsx(HeaderComponent, {}), /* @__PURE__ */ jsxs(ContainerLayout, {
+      children: [/* @__PURE__ */ jsx(HeaderComponent, {}), /* @__PURE__ */ jsxs(ContainerLayout, {
         className: "flex flex-1 mt-2.5 flex-row",
         children: [/* @__PURE__ */ jsx("section", {
           className: "flex flex-row",