@codingame/monaco-vscode-api 5.2.0 → 6.0.0

package/vscode/src/vs/editor/browser/view/viewUserInputEvents.js

@@ -1,3 +1,4 @@
+import { MouseTargetType } from '../editorBrowser.js';
 import { Position } from '../../common/core/position.js';
 class ViewUserInputEvents {
     constructor(coordinatesConverter) {
@@ -67,7 +68,7 @@ class ViewUserInputEvents {
         if (result.range) {
             result.range = coordinatesConverter.convertViewRangeToModelRange(result.range);
         }
-        if (result.type === 5  || result.type === 8 ) {
+        if (result.type === MouseTargetType.GUTTER_VIEW_ZONE || result.type === MouseTargetType.CONTENT_VIEW_ZONE) {
             result.detail = this.convertViewToModelViewZoneData(result.detail, coordinatesConverter);
         }
         return result;

package/vscode/src/vs/editor/browser/view.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../external/tslib/tslib.es6.js';
-import { getWindow, runAtThisOrScheduleAtNextAnimationFrame } from '../../base/browser/dom.js';
+import { runAtThisOrScheduleAtNextAnimationFrame, getWindow } from '../../base/browser/dom.js';
 import { createFastDomNode } from '../../base/browser/fastDomNode.js';
 import { inputLatency } from '../../base/browser/performance.js';
 import { BugIndicatingError, onUnexpectedError } from '../../base/common/errors.js';
@@ -9,7 +9,7 @@ import { TextAreaHandler } from './controller/textAreaHandler.js';
 import { RenderingContext } from './view/renderingContext.js';
 import { ViewController } from './view/viewController.js';
 import { ContentViewOverlays, MarginViewOverlays } from './view/viewOverlays.js';
-import { PartFingerprints } from './view/viewPart.js';
+import { PartFingerprints, PartFingerprint } from './view/viewPart.js';
 import { ViewUserInputEvents } from './view/viewUserInputEvents.js';
 import { BlockDecorations } from './viewParts/blockDecorations/blockDecorations.js';
 import { ViewContentWidgets } from './viewParts/contentWidgets/contentWidgets.js';
@@ -33,9 +33,11 @@ import { SelectionsOverlay } from './viewParts/selections/selections.js';
 import { ViewCursors } from './viewParts/viewCursors/viewCursors.js';
 import { ViewZones } from './viewParts/viewZones/viewZones.js';
 import { WhitespaceOverlay } from './viewParts/whitespace/whitespace.js';
+import { EditorOption } from '../common/config/editorOptions.js';
 import { Position } from '../common/core/position.js';
 import { Range } from '../common/core/range.js';
 import { Selection } from '../common/core/selection.js';
+import { ScrollType } from '../common/editorCommon.js';
 import { GlyphMarginLane } from '../common/model.js';
 import { ViewEventHandler } from '../common/viewEventHandler.js';
 import { ViewportData } from '../common/viewLayout/viewLinesViewportData.js';
@@ -62,7 +64,7 @@ let View = class View extends ViewEventHandler {
         this.domNode.setClassName(this._getEditorClassName());
         this.domNode.setAttribute('role', 'code');
         this._overflowGuardContainer = createFastDomNode(document.createElement('div'));
-        PartFingerprints.write(this._overflowGuardContainer, 3 );
+        PartFingerprints.write(this._overflowGuardContainer, PartFingerprint.OverflowGuard);
         this._overflowGuardContainer.setClassName('overflow-guard');
         this._scrollbar = ( new EditorScrollbar(
             this._context,
@@ -211,7 +213,7 @@ let View = class View extends ViewEventHandler {
     }
     _applyLayout() {
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(145 );
+        const layoutInfo = options.get(EditorOption.layoutInfo);
         this.domNode.setWidth(layoutInfo.width);
         this.domNode.setHeight(layoutInfo.height);
         this._overflowGuardContainer.setWidth(layoutInfo.width);
@@ -221,7 +223,7 @@ let View = class View extends ViewEventHandler {
     }
     _getEditorClassName() {
         const focused = this._textAreaHandler.isFocused() ? ' focused' : '';
-        return this._context.configuration.options.get(142 ) + ' ' + getThemeTypeSelector(this._context.theme.type) + focused;
+        return this._context.configuration.options.get(EditorOption.editorClassName) + ' ' + getThemeTypeSelector(this._context.theme.type) + focused;
     }
     handleEvents(events) {
         super.handleEvents(events);
@@ -383,7 +385,7 @@ let View = class View extends ViewEventHandler {
         this._context.viewModel.viewLayout.setScrollPosition({
             scrollTop: scrollPosition.scrollTop,
             scrollLeft: scrollPosition.scrollLeft
-        }, 1 );
+        }, ScrollType.Immediate);
         this._context.viewModel.visibleLinesStabilized();
     }
     getOffsetForColumn(modelLineNumber, modelColumn) {
@@ -461,8 +463,7 @@ let View = class View extends ViewEventHandler {
         this._scheduleRender();
     }
     layoutOverlayWidget(widgetData) {
-        const newPreference = widgetData.position ? widgetData.position.preference : null;
-        const shouldRender = this._overlayWidgets.setWidgetPosition(widgetData.widget, newPreference);
+        const shouldRender = this._overlayWidgets.setWidgetPosition(widgetData.widget, widgetData.position);
         if (shouldRender) {
             this._scheduleRender();
         }

package/vscode/src/vs/editor/browser/viewParts/blockDecorations/blockDecorations.js

@@ -1,6 +1,7 @@
 import { createFastDomNode } from '../../../../base/browser/fastDomNode.js';
 import './blockDecorations.css.js';
 import { ViewPart } from '../../view/viewPart.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 class BlockDecorations extends ViewPart {
     constructor(context) {
         super(context);
@@ -16,7 +17,7 @@ class BlockDecorations extends ViewPart {
     update() {
         let didChange = false;
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(145 );
+        const layoutInfo = options.get(EditorOption.layoutInfo);
         const newContentWidth = layoutInfo.contentWidth - layoutInfo.verticalScrollbarWidth;
         if (this.contentWidth !== newContentWidth) {
             this.contentWidth = newContentWidth;

package/vscode/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.js

@@ -1,18 +1,21 @@
 import { getDomNodePagePosition, getClientArea } from '../../../../base/browser/dom.js';
 import { createFastDomNode } from '../../../../base/browser/fastDomNode.js';
-import { ViewPart, PartFingerprints } from '../../view/viewPart.js';
+import { ContentWidgetPositionPreference } from '../../editorBrowser.js';
+import { ViewPart, PartFingerprints, PartFingerprint } from '../../view/viewPart.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { PositionAffinity } from '../../../common/model.js';
 class ViewContentWidgets extends ViewPart {
     constructor(context, viewDomNode) {
         super(context);
         this._viewDomNode = viewDomNode;
         this._widgets = {};
         this.domNode = createFastDomNode(document.createElement('div'));
-        PartFingerprints.write(this.domNode, 1 );
+        PartFingerprints.write(this.domNode, PartFingerprint.ContentWidgets);
         this.domNode.setClassName('contentWidgets');
         this.domNode.setPosition('absolute');
         this.domNode.setTop(0);
         this.overflowingContentWidgetsDomNode = createFastDomNode(document.createElement('div'));
-        PartFingerprints.write(this.overflowingContentWidgetsDomNode, 2 );
+        PartFingerprints.write(this.overflowingContentWidgetsDomNode, PartFingerprint.OverflowingContentWidgets);
         this.overflowingContentWidgetsDomNode.setClassName('overflowingContentWidgets');
     }
     dispose() {
@@ -124,11 +127,11 @@ class Widget {
         this.allowEditorOverflow = this._actual.allowEditorOverflow || false;
         this.suppressMouseDown = this._actual.suppressMouseDown || false;
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(145 );
-        this._fixedOverflowWidgets = options.get(42 );
+        const layoutInfo = options.get(EditorOption.layoutInfo);
+        this._fixedOverflowWidgets = options.get(EditorOption.fixedOverflowWidgets);
         this._contentWidth = layoutInfo.contentWidth;
         this._contentLeft = layoutInfo.contentLeft;
-        this._lineHeight = options.get(67 );
+        this._lineHeight = options.get(EditorOption.lineHeight);
         this._affinity = null;
         this._preference = [];
         this._cachedDomNodeOffsetWidth = -1;
@@ -144,9 +147,9 @@ class Widget {
     }
     onConfigurationChanged(e) {
         const options = this._context.configuration.options;
-        this._lineHeight = options.get(67 );
-        if (e.hasChanged(145 )) {
-            const layoutInfo = options.get(145 );
+        this._lineHeight = options.get(EditorOption.lineHeight);
+        if (e.hasChanged(EditorOption.layoutInfo)) {
+            const layoutInfo = options.get(EditorOption.layoutInfo);
             this._contentLeft = layoutInfo.contentLeft;
             this._contentWidth = layoutInfo.contentWidth;
             this._maxWidth = this._getMaxWidth();
@@ -269,7 +272,7 @@ class Widget {
             if (!horizontalPosition) {
                 return null;
             }
-            const left = (position.column === 1 && affinity === 3  ? 0 : horizontalPosition.left);
+            const left = (position.column === 1 && affinity === PositionAffinity.LeftOfInjectedText ? 0 : horizontalPosition.left);
             const top = ctx.getVerticalOffsetForLineNumber(position.lineNumber) - ctx.scrollTop;
             return ( new AnchorCoordinate(top, left, lineHeight));
         }
@@ -278,7 +281,7 @@ class Widget {
         if (!secondary) {
             return primary;
         }
-        const fontInfo = this._context.configuration.options.get(50 );
+        const fontInfo = this._context.configuration.options.get(EditorOption.fontInfo);
         let left = secondary.left;
         if (left < primary.left) {
             left = Math.max(left, primary.left - width + fontInfo.typicalFullwidthCharacterWidth);
@@ -294,7 +297,10 @@ class Widget {
         }
         const { primary, secondary } = this._getAnchorsCoordinates(ctx);
         if (!primary) {
-            return null;
+            return {
+                kind: 'offViewport',
+                preserveFocus: this.domNode.domNode.contains(this.domNode.domNode.ownerDocument.activeElement)
+            };
         }
         if (this._cachedDomNodeOffsetWidth === -1 || this._cachedDomNodeOffsetHeight === -1) {
             let preferredDimensions = null;
@@ -322,28 +328,44 @@ class Widget {
         }
         for (let pass = 1; pass <= 2; pass++) {
             for (const pref of this._preference) {
-                if (pref === 1 ) {
+                if (pref === ContentWidgetPositionPreference.ABOVE) {
                     if (!placement) {
                         return null;
                     }
                     if (pass === 2 || placement.fitsAbove) {
-                        return { coordinate: ( new Coordinate(placement.aboveTop, placement.left)), position: 1  };
+                        return {
+                            kind: 'inViewport',
+                            coordinate: ( new Coordinate(placement.aboveTop, placement.left)),
+                            position: ContentWidgetPositionPreference.ABOVE
+                        };
                     }
                 }
-                else if (pref === 2 ) {
+                else if (pref === ContentWidgetPositionPreference.BELOW) {
                     if (!placement) {
                         return null;
                     }
                     if (pass === 2 || placement.fitsBelow) {
-                        return { coordinate: ( new Coordinate(placement.belowTop, placement.left)), position: 2  };
+                        return {
+                            kind: 'inViewport',
+                            coordinate: ( new Coordinate(placement.belowTop, placement.left)),
+                            position: ContentWidgetPositionPreference.BELOW
+                        };
                     }
                 }
                 else {
                     if (this.allowEditorOverflow) {
-                        return { coordinate: this._prepareRenderWidgetAtExactPositionOverflowing(( new Coordinate(anchor.top, anchor.left))), position: 0  };
+                        return {
+                            kind: 'inViewport',
+                            coordinate: this._prepareRenderWidgetAtExactPositionOverflowing(( new Coordinate(anchor.top, anchor.left))),
+                            position: ContentWidgetPositionPreference.EXACT
+                        };
                     }
                     else {
-                        return { coordinate: ( new Coordinate(anchor.top, anchor.left)), position: 0  };
+                        return {
+                            kind: 'inViewport',
+                            coordinate: ( new Coordinate(anchor.top, anchor.left)),
+                            position: ContentWidgetPositionPreference.EXACT
+                        };
                     }
                 }
             }
@@ -363,11 +385,16 @@ class Widget {
         this._renderData = this._prepareRenderWidget(ctx);
     }
     render(ctx) {
-        if (!this._renderData) {
+        if (!this._renderData || this._renderData.kind === 'offViewport') {
             if (this._isVisible) {
                 this.domNode.removeAttribute('monaco-visible-content-widget');
                 this._isVisible = false;
-                this.domNode.setVisibility('hidden');
+                if (this._renderData?.kind === 'offViewport' && this._renderData.preserveFocus) {
+                    this.domNode.setTop(-1000);
+                }
+                else {
+                    this.domNode.setVisibility('hidden');
+                }
             }
             if (typeof this._actual.afterRender === 'function') {
                 safeInvoke(this._actual.afterRender, this._actual, null);

package/vscode/src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.js

@@ -4,6 +4,7 @@ import { editorLineHighlight, editorLineHighlightBorder } from '../../../common/
 import { equals } from '../../../../base/common/arrays.js';
 import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
 import { Selection } from '../../../common/core/selection.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { isHighContrast } from '../../../../platform/theme/common/theme.js';
 import { Position } from '../../../common/core/position.js';
 class AbstractLineHighlightOverlay extends DynamicViewOverlay {
@@ -11,9 +12,9 @@ class AbstractLineHighlightOverlay extends DynamicViewOverlay {
         super();
         this._context = context;
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(145 );
-        this._renderLineHighlight = options.get(96 );
-        this._renderLineHighlightOnlyWhenFocus = options.get(97 );
+        const layoutInfo = options.get(EditorOption.layoutInfo);
+        this._renderLineHighlight = options.get(EditorOption.renderLineHighlight);
+        this._renderLineHighlightOnlyWhenFocus = options.get(EditorOption.renderLineHighlightOnlyWhenFocus);
         this._wordWrap = layoutInfo.isViewportWrapping;
         this._contentLeft = layoutInfo.contentLeft;
         this._contentWidth = layoutInfo.contentWidth;
@@ -52,9 +53,9 @@ class AbstractLineHighlightOverlay extends DynamicViewOverlay {
     }
     onConfigurationChanged(e) {
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(145 );
-        this._renderLineHighlight = options.get(96 );
-        this._renderLineHighlightOnlyWhenFocus = options.get(97 );
+        const layoutInfo = options.get(EditorOption.layoutInfo);
+        this._renderLineHighlight = options.get(EditorOption.renderLineHighlight);
+        this._renderLineHighlightOnlyWhenFocus = options.get(EditorOption.renderLineHighlightOnlyWhenFocus);
         this._wordWrap = layoutInfo.isViewportWrapping;
         this._contentLeft = layoutInfo.contentLeft;
         this._contentWidth = layoutInfo.contentWidth;

package/vscode/src/vs/editor/browser/viewParts/decorations/decorations.js

@@ -1,13 +1,14 @@
 import './decorations.css.js';
 import { DynamicViewOverlay } from '../../view/dynamicViewOverlay.js';
 import { HorizontalRange } from '../../view/renderingContext.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Range } from '../../../common/core/range.js';
 class DecorationsOverlay extends DynamicViewOverlay {
     constructor(context) {
         super();
         this._context = context;
         const options = this._context.configuration.options;
-        this._typicalHalfwidthCharacterWidth = options.get(50 ).typicalHalfwidthCharacterWidth;
+        this._typicalHalfwidthCharacterWidth = options.get(EditorOption.fontInfo).typicalHalfwidthCharacterWidth;
         this._renderResult = null;
         this._context.addEventHandler(this);
     }
@@ -18,7 +19,7 @@ class DecorationsOverlay extends DynamicViewOverlay {
     }
     onConfigurationChanged(e) {
         const options = this._context.configuration.options;
-        this._typicalHalfwidthCharacterWidth = options.get(50 ).typicalHalfwidthCharacterWidth;
+        this._typicalHalfwidthCharacterWidth = options.get(EditorOption.fontInfo).typicalHalfwidthCharacterWidth;
         return true;
     }
     onDecorationsChanged(e) {

package/vscode/src/vs/editor/browser/viewParts/editorScrollbar/editorScrollbar.js

@@ -1,16 +1,18 @@
 import { addDisposableListener } from '../../../../base/browser/dom.js';
 import { createFastDomNode } from '../../../../base/browser/fastDomNode.js';
 import { SmoothScrollableElement } from '../../../../base/browser/ui/scrollbar/scrollableElement.js';
-import { ViewPart, PartFingerprints } from '../../view/viewPart.js';
+import { ViewPart, PartFingerprints, PartFingerprint } from '../../view/viewPart.js';
+import { ScrollType } from '../../../common/editorCommon.js';
 import { getThemeTypeSelector } from '../../../../platform/theme/common/themeService.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 class EditorScrollbar extends ViewPart {
     constructor(context, linesContent, viewDomNode, overflowGuardDomNode) {
         super(context);
         const options = this._context.configuration.options;
-        const scrollbar = options.get(103 );
-        const mouseWheelScrollSensitivity = options.get(75 );
-        const fastScrollSensitivity = options.get(40 );
-        const scrollPredominantAxis = options.get(106 );
+        const scrollbar = options.get(EditorOption.scrollbar);
+        const mouseWheelScrollSensitivity = options.get(EditorOption.mouseWheelScrollSensitivity);
+        const fastScrollSensitivity = options.get(EditorOption.fastScrollSensitivity);
+        const scrollPredominantAxis = options.get(EditorOption.scrollPredominantAxis);
         const scrollbarOptions = {
             listenOnDomNode: viewDomNode.domNode,
             className: 'editor-scrollable' + ' ' + getThemeTypeSelector(context.theme.type),
@@ -37,7 +39,7 @@ class EditorScrollbar extends ViewPart {
             scrollbarOptions,
             this._context.viewLayout.getScrollable()
         )));
-        PartFingerprints.write(this.scrollbar.getDomNode(), 6 );
+        PartFingerprints.write(this.scrollbar.getDomNode(), PartFingerprint.ScrollableElement);
         this.scrollbarDomNode = createFastDomNode(this.scrollbar.getDomNode());
         this.scrollbarDomNode.setPosition('absolute');
         this._setLayout();
@@ -57,7 +59,7 @@ class EditorScrollbar extends ViewPart {
                     domNode.scrollLeft = 0;
                 }
             }
-            this._context.viewModel.viewLayout.setScrollPosition(newScrollPosition, 1 );
+            this._context.viewModel.viewLayout.setScrollPosition(newScrollPosition, ScrollType.Immediate);
         };
         this._register(addDisposableListener(viewDomNode.domNode, 'scroll', (e) => onBrowserDesperateReveal(viewDomNode.domNode, true, true)));
         this._register(addDisposableListener(linesContent.domNode, 'scroll', (e) => onBrowserDesperateReveal(linesContent.domNode, true, false)));
@@ -69,9 +71,9 @@ class EditorScrollbar extends ViewPart {
     }
     _setLayout() {
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(145 );
+        const layoutInfo = options.get(EditorOption.layoutInfo);
         this.scrollbarDomNode.setLeft(layoutInfo.contentLeft);
-        const minimap = options.get(73 );
+        const minimap = options.get(EditorOption.minimap);
         const side = minimap.side;
         if (side === 'right') {
             this.scrollbarDomNode.setWidth(layoutInfo.contentWidth + layoutInfo.minimap.minimapWidth);
@@ -94,14 +96,14 @@ class EditorScrollbar extends ViewPart {
         this.scrollbar.delegateScrollFromMouseWheelEvent(browserEvent);
     }
     onConfigurationChanged(e) {
-        if (e.hasChanged(103 )
-            || e.hasChanged(75 )
-            || e.hasChanged(40 )) {
+        if (e.hasChanged(EditorOption.scrollbar)
+            || e.hasChanged(EditorOption.mouseWheelScrollSensitivity)
+            || e.hasChanged(EditorOption.fastScrollSensitivity)) {
             const options = this._context.configuration.options;
-            const scrollbar = options.get(103 );
-            const mouseWheelScrollSensitivity = options.get(75 );
-            const fastScrollSensitivity = options.get(40 );
-            const scrollPredominantAxis = options.get(106 );
+            const scrollbar = options.get(EditorOption.scrollbar);
+            const mouseWheelScrollSensitivity = options.get(EditorOption.mouseWheelScrollSensitivity);
+            const fastScrollSensitivity = options.get(EditorOption.fastScrollSensitivity);
+            const scrollPredominantAxis = options.get(EditorOption.scrollPredominantAxis);
             const newOpts = {
                 vertical: scrollbar.vertical,
                 horizontal: scrollbar.horizontal,
@@ -115,7 +117,7 @@ class EditorScrollbar extends ViewPart {
             };
             this.scrollbar.updateOptions(newOpts);
         }
-        if (e.hasChanged(145 )) {
+        if (e.hasChanged(EditorOption.layoutInfo)) {
             this._setLayout();
         }
         return true;

package/vscode/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.js

@@ -3,6 +3,7 @@ import { ArrayQueue } from '../../../../base/common/arrays.js';
 import './glyphMargin.css.js';
 import { DynamicViewOverlay } from '../../view/dynamicViewOverlay.js';
 import { ViewPart } from '../../view/viewPart.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
 import { GlyphMarginLane } from '../../../common/model.js';
@@ -82,13 +83,13 @@ class GlyphMarginWidgets extends ViewPart {
         this._widgets = {};
         this._context = context;
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(145 );
+        const layoutInfo = options.get(EditorOption.layoutInfo);
         this.domNode = createFastDomNode(document.createElement('div'));
         this.domNode.setClassName('glyph-margin-widgets');
         this.domNode.setPosition('absolute');
         this.domNode.setTop(0);
-        this._lineHeight = options.get(67 );
-        this._glyphMargin = options.get(57 );
+        this._lineHeight = options.get(EditorOption.lineHeight);
+        this._glyphMargin = options.get(EditorOption.glyphMargin);
         this._glyphMarginLeft = layoutInfo.glyphMarginLeft;
         this._glyphMarginWidth = layoutInfo.glyphMarginWidth;
         this._glyphMarginDecorationLaneCount = layoutInfo.glyphMarginDecorationLaneCount;
@@ -106,9 +107,9 @@ class GlyphMarginWidgets extends ViewPart {
     }
     onConfigurationChanged(e) {
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(145 );
-        this._lineHeight = options.get(67 );
-        this._glyphMargin = options.get(57 );
+        const layoutInfo = options.get(EditorOption.layoutInfo);
+        this._lineHeight = options.get(EditorOption.lineHeight);
+        this._glyphMargin = options.get(EditorOption.glyphMargin);
         this._glyphMarginLeft = layoutInfo.glyphMarginLeft;
         this._glyphMarginWidth = layoutInfo.glyphMarginWidth;
         this._glyphMarginDecorationLaneCount = layoutInfo.glyphMarginDecorationLaneCount;
@@ -214,7 +215,7 @@ class GlyphMarginWidgets extends ViewPart {
                 if (a.laneIndex === b.laneIndex) {
                     if (a.zIndex === b.zIndex) {
                         if (b.type === a.type) {
-                            if (a.type === 0  && b.type === 0 ) {
+                            if (a.type === GlyphRenderRequestType.Decoration && b.type === GlyphRenderRequestType.Decoration) {
                                 return (a.className < b.className ? -1 : 1);
                             }
                             return 0;
@@ -249,7 +250,7 @@ class GlyphMarginWidgets extends ViewPart {
                 break;
             }
             const winner = requestsAtLocation[0];
-            if (winner.type === 0 ) {
+            if (winner.type === GlyphRenderRequestType.Decoration) {
                 const classNames = [];
                 for (const request of requestsAtLocation) {
                     if (request.zIndex !== winner.zIndex || request.type !== winner.type) {
@@ -322,13 +323,18 @@ class GlyphMarginWidgets extends ViewPart {
         }
     }
 }
+var GlyphRenderRequestType;
+( (function(GlyphRenderRequestType) {
+    GlyphRenderRequestType[GlyphRenderRequestType["Decoration"] = 0] = "Decoration";
+    GlyphRenderRequestType[GlyphRenderRequestType["Widget"] = 1] = "Widget";
+})(GlyphRenderRequestType || (GlyphRenderRequestType = {})));
 class DecorationBasedGlyphRenderRequest {
     constructor(lineNumber, laneIndex, zIndex, className) {
         this.lineNumber = lineNumber;
         this.laneIndex = laneIndex;
         this.zIndex = zIndex;
         this.className = className;
-        this.type = 0 ;
+        this.type = GlyphRenderRequestType.Decoration;
     }
     accept(combinedClassName) {
         return ( new DecorationBasedGlyph(this.lineNumber, this.laneIndex, combinedClassName));
@@ -340,7 +346,7 @@ class WidgetBasedGlyphRenderRequest {
         this.laneIndex = laneIndex;
         this.zIndex = zIndex;
         this.widget = widget;
-        this.type = 1 ;
+        this.type = GlyphRenderRequestType.Widget;
     }
 }
 class DecorationBasedGlyph {

package/vscode/src/vs/editor/browser/viewParts/indentGuides/indentGuides.js

@@ -2,6 +2,7 @@ import './indentGuides.css.js';
 import { DynamicViewOverlay } from '../../view/dynamicViewOverlay.js';
 import { editorBracketHighlightingForeground1, editorBracketPairGuideBackground1, editorBracketPairGuideActiveBackground1, editorBracketHighlightingForeground2, editorBracketPairGuideBackground2, editorBracketPairGuideActiveBackground2, editorBracketHighlightingForeground3, editorBracketPairGuideBackground3, editorBracketPairGuideActiveBackground3, editorBracketHighlightingForeground4, editorBracketPairGuideBackground4, editorBracketPairGuideActiveBackground4, editorBracketHighlightingForeground5, editorBracketPairGuideBackground5, editorBracketPairGuideActiveBackground5, editorBracketHighlightingForeground6, editorBracketPairGuideBackground6, editorBracketPairGuideActiveBackground6, editorIndentGuide1, editorActiveIndentGuide1, editorIndentGuide2, editorActiveIndentGuide2, editorIndentGuide3, editorActiveIndentGuide3, editorIndentGuide4, editorActiveIndentGuide4, editorIndentGuide5, editorActiveIndentGuide5, editorIndentGuide6, editorActiveIndentGuide6 } from '../../../common/core/editorColorRegistry.js';
 import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Position } from '../../../common/core/position.js';
 import { ArrayQueue } from '../../../../base/common/arrays.js';
 import { isDefined } from '../../../../base/common/types.js';
@@ -13,11 +14,11 @@ class IndentGuidesOverlay extends DynamicViewOverlay {
         this._context = context;
         this._primaryPosition = null;
         const options = this._context.configuration.options;
-        const wrappingInfo = options.get(146 );
-        const fontInfo = options.get(50 );
+        const wrappingInfo = options.get(EditorOption.wrappingInfo);
+        const fontInfo = options.get(EditorOption.fontInfo);
         this._spaceWidth = fontInfo.spaceWidth;
         this._maxIndentLeft = wrappingInfo.wrappingColumn === -1 ? -1 : (wrappingInfo.wrappingColumn * fontInfo.typicalHalfwidthCharacterWidth);
-        this._bracketPairGuideOptions = options.get(16 );
+        this._bracketPairGuideOptions = options.get(EditorOption.guides);
         this._renderResult = null;
         this._context.addEventHandler(this);
     }
@@ -28,11 +29,11 @@ class IndentGuidesOverlay extends DynamicViewOverlay {
     }
     onConfigurationChanged(e) {
         const options = this._context.configuration.options;
-        const wrappingInfo = options.get(146 );
-        const fontInfo = options.get(50 );
+        const wrappingInfo = options.get(EditorOption.wrappingInfo);
+        const fontInfo = options.get(EditorOption.fontInfo);
         this._spaceWidth = fontInfo.spaceWidth;
         this._maxIndentLeft = wrappingInfo.wrappingColumn === -1 ? -1 : (wrappingInfo.wrappingColumn * fontInfo.typicalHalfwidthCharacterWidth);
-        this._bracketPairGuideOptions = options.get(16 );
+        this._bracketPairGuideOptions = options.get(EditorOption.guides);
         return true;
     }
     onCursorStateChanged(e) {

package/vscode/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.js

@@ -1,6 +1,7 @@
 import './lineNumbers.css.js';
 import { isLinux } from '../../../../base/common/platform.js';
 import { DynamicViewOverlay } from '../../view/dynamicViewOverlay.js';
+import { EditorOption, RenderLineNumbersType } from '../../../common/config/editorOptions.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
 import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
@@ -18,12 +19,12 @@ class LineNumbersOverlay extends DynamicViewOverlay {
     }
     _readConfig() {
         const options = this._context.configuration.options;
-        this._lineHeight = options.get(67 );
-        const lineNumbers = options.get(68 );
+        this._lineHeight = options.get(EditorOption.lineHeight);
+        const lineNumbers = options.get(EditorOption.lineNumbers);
         this._renderLineNumbers = lineNumbers.renderType;
         this._renderCustomLineNumbers = lineNumbers.renderFn;
-        this._renderFinalNewline = options.get(95 );
-        const layoutInfo = options.get(145 );
+        this._renderFinalNewline = options.get(EditorOption.renderFinalNewline);
+        const layoutInfo = options.get(EditorOption.layoutInfo);
         this._lineNumbersLeft = layoutInfo.lineNumbersLeft;
         this._lineNumbersWidth = layoutInfo.lineNumbersWidth;
     }
@@ -44,7 +45,7 @@ class LineNumbersOverlay extends DynamicViewOverlay {
             this._activeLineNumber = primaryViewPosition.lineNumber;
             shouldRender = true;
         }
-        if (this._renderLineNumbers === 2  || this._renderLineNumbers === 3 ) {
+        if (this._renderLineNumbers === RenderLineNumbersType.Relative || this._renderLineNumbers === RenderLineNumbersType.Interval) {
             shouldRender = true;
         }
         return shouldRender;
@@ -79,14 +80,14 @@ class LineNumbersOverlay extends DynamicViewOverlay {
         if (this._renderCustomLineNumbers) {
             return this._renderCustomLineNumbers(modelLineNumber);
         }
-        if (this._renderLineNumbers === 2 ) {
+        if (this._renderLineNumbers === RenderLineNumbersType.Relative) {
             const diff = Math.abs(this._lastCursorModelPosition.lineNumber - modelLineNumber);
             if (diff === 0) {
                 return '<span class="relative-current-line-number">' + modelLineNumber + '</span>';
             }
             return String(diff);
         }
-        if (this._renderLineNumbers === 3 ) {
+        if (this._renderLineNumbers === RenderLineNumbersType.Interval) {
             if (this._lastCursorModelPosition.lineNumber === modelLineNumber) {
                 return String(modelLineNumber);
             }
@@ -102,7 +103,7 @@ class LineNumbersOverlay extends DynamicViewOverlay {
         return String(modelLineNumber);
     }
     prepareRender(ctx) {
-        if (this._renderLineNumbers === 0 ) {
+        if (this._renderLineNumbers === RenderLineNumbersType.Off) {
             this._renderResult = null;
             return;
         }

package/vscode/src/vs/editor/browser/viewParts/lines/rangeUtil.js

@@ -1,3 +1,4 @@
+import { Constants } from '../../../../base/common/uint.js';
 import { FloatHorizontalRange } from '../../view/renderingContext.js';
 class RangeUtil {
     static _createRange() {
@@ -74,7 +75,7 @@ class RangeUtil {
         if (startChildIndex !== endChildIndex) {
             if (endChildIndex > 0 && endOffset === 0) {
                 endChildIndex--;
-                endOffset = 1073741824 ;
+                endOffset = Constants.MAX_SAFE_SMALL_INTEGER;
             }
         }
         let startElement = domNode.children[startChildIndex].firstChild;
@@ -82,11 +83,11 @@ class RangeUtil {
         if (!startElement || !endElement) {
             if (!startElement && startOffset === 0 && startChildIndex > 0) {
                 startElement = domNode.children[startChildIndex - 1].firstChild;
-                startOffset = 1073741824 ;
+                startOffset = Constants.MAX_SAFE_SMALL_INTEGER;
             }
             if (!endElement && endOffset === 0 && endChildIndex > 0) {
                 endElement = domNode.children[endChildIndex - 1].firstChild;
-                endOffset = 1073741824 ;
+                endOffset = Constants.MAX_SAFE_SMALL_INTEGER;
             }
         }
         if (!startElement || !endElement) {