@codingame/monaco-vscode-api 5.3.0 → 6.0.1

package/vscode/src/vs/editor/browser/config/charWidthReader.js

@@ -1,4 +1,10 @@
 import { applyFontInfo } from './domFontInfo.js';
+var CharWidthRequestType;
+( (function(CharWidthRequestType) {
+    CharWidthRequestType[CharWidthRequestType["Regular"] = 0] = "Regular";
+    CharWidthRequestType[CharWidthRequestType["Italic"] = 1] = "Italic";
+    CharWidthRequestType[CharWidthRequestType["Bold"] = 2] = "Bold";
+})(CharWidthRequestType || (CharWidthRequestType = {})));
 class CharWidthRequest {
     constructor(chr, type) {
         this.chr = chr;
@@ -43,13 +49,13 @@ class DomCharWidthReader {
         const testElements = [];
         for (const request of this._requests) {
             let parent;
-            if (request.type === 0 ) {
+            if (request.type === CharWidthRequestType.Regular) {
                 parent = regularDomNode;
             }
-            if (request.type === 2 ) {
+            if (request.type === CharWidthRequestType.Bold) {
                 parent = boldDomNode;
             }
-            if (request.type === 1 ) {
+            if (request.type === CharWidthRequestType.Italic) {
                 parent = italicDomNode;
             }
             parent.appendChild(document.createElement('br'));
@@ -89,4 +95,4 @@ function readCharWidths(targetWindow, bareFontInfo, requests) {
     const reader = ( new DomCharWidthReader(bareFontInfo, requests));
     reader.read(targetWindow);
 }
-export { CharWidthRequest, readCharWidths };
+export { CharWidthRequest, CharWidthRequestType, readCharWidths };

package/vscode/src/vs/editor/browser/config/editorConfiguration.js

@@ -9,9 +9,10 @@ import { ElementSizeObserver } from './elementSizeObserver.js';
 import { FontMeasurements } from './fontMeasurements.js';
 import { migrateOptions } from './migrateOptions.js';
 import { TabFocus } from './tabFocus.js';
-import { ComputeOptionsMemory, editorOptionsRegistry, ConfigurationChangedEvent } from '../../common/config/editorOptions.js';
+import { ComputeOptionsMemory, EditorOption, editorOptionsRegistry, ConfigurationChangedEvent } from '../../common/config/editorOptions.js';
 import { EditorZoom } from '../../common/config/editorZoom.js';
 import { BareFontInfo } from '../../common/config/fontInfo.js';
+import { AccessibilitySupport } from '../../../platform/accessibility/common/accessibility.js';
 import { IAccessibilityService } from '../../../platform/accessibility/common/accessibility.service.js';
 import { getWindow, getWindowById } from '../../../base/browser/dom.js';
 import { PixelRatio } from '../../../base/browser/pixelRatio.js';
@@ -37,7 +38,7 @@ let EditorConfiguration = class EditorConfiguration extends Disposable {
         this._rawOptions = deepCloneAndMigrateOptions(options);
         this._validatedOptions = EditorOptionsUtil.validateOptions(this._rawOptions);
         this.options = this._computeOptions();
-        if (this.options.get(13 )) {
+        if (this.options.get(EditorOption.automaticLayout)) {
             this._containerObserver.startObserving();
         }
         this._register(EditorZoom.onDidChangeZoomLevel(() => this._recomputeOptions()));
@@ -86,7 +87,7 @@ let EditorConfiguration = class EditorConfiguration extends Disposable {
             emptySelectionClipboard: isWebKit || isFirefox,
             pixelRatio: PixelRatio.getInstance(getWindowById(this._targetWindowId, true).window).value,
             accessibilitySupport: (this._accessibilityService.isScreenReaderOptimized()
-                ? 2
+                ? AccessibilitySupport.Enabled
                 : this._accessibilityService.getAccessibilitySupport())
         };
     }

package/vscode/src/vs/editor/browser/config/fontMeasurements.js

@@ -2,7 +2,7 @@ import { getWindowId } from '../../../base/browser/dom.js';
 import { PixelRatio } from '../../../base/browser/pixelRatio.js';
 import { Emitter } from '../../../base/common/event.js';
 import { Disposable } from '../../../base/common/lifecycle.js';
-import { readCharWidths, CharWidthRequest } from './charWidthReader.js';
+import { CharWidthRequestType, readCharWidths, CharWidthRequest } from './charWidthReader.js';
 import { EditorFontLigatures } from '../../common/config/editorOptions.js';
 import { SERIALIZED_FONT_INFO_VERSION, FontInfo } from '../../common/config/fontInfo.js';
 class FontMeasurementsImpl extends Disposable {
@@ -107,28 +107,28 @@ class FontMeasurementsImpl extends Disposable {
     _actualReadFontInfo(targetWindow, bareFontInfo) {
         const all = [];
         const monospace = [];
-        const typicalHalfwidthCharacter = this._createRequest('n', 0 , all, monospace);
-        const typicalFullwidthCharacter = this._createRequest('\uff4d', 0 , all, null);
-        const space = this._createRequest(' ', 0 , all, monospace);
-        const digit0 = this._createRequest('0', 0 , all, monospace);
-        const digit1 = this._createRequest('1', 0 , all, monospace);
-        const digit2 = this._createRequest('2', 0 , all, monospace);
-        const digit3 = this._createRequest('3', 0 , all, monospace);
-        const digit4 = this._createRequest('4', 0 , all, monospace);
-        const digit5 = this._createRequest('5', 0 , all, monospace);
-        const digit6 = this._createRequest('6', 0 , all, monospace);
-        const digit7 = this._createRequest('7', 0 , all, monospace);
-        const digit8 = this._createRequest('8', 0 , all, monospace);
-        const digit9 = this._createRequest('9', 0 , all, monospace);
-        const rightwardsArrow = this._createRequest('→', 0 , all, monospace);
-        const halfwidthRightwardsArrow = this._createRequest('￫', 0 , all, null);
-        const middot = this._createRequest('·', 0 , all, monospace);
-        const wsmiddotWidth = this._createRequest(String.fromCharCode(0x2E31), 0 , all, null);
+        const typicalHalfwidthCharacter = this._createRequest('n', CharWidthRequestType.Regular, all, monospace);
+        const typicalFullwidthCharacter = this._createRequest('\uff4d', CharWidthRequestType.Regular, all, null);
+        const space = this._createRequest(' ', CharWidthRequestType.Regular, all, monospace);
+        const digit0 = this._createRequest('0', CharWidthRequestType.Regular, all, monospace);
+        const digit1 = this._createRequest('1', CharWidthRequestType.Regular, all, monospace);
+        const digit2 = this._createRequest('2', CharWidthRequestType.Regular, all, monospace);
+        const digit3 = this._createRequest('3', CharWidthRequestType.Regular, all, monospace);
+        const digit4 = this._createRequest('4', CharWidthRequestType.Regular, all, monospace);
+        const digit5 = this._createRequest('5', CharWidthRequestType.Regular, all, monospace);
+        const digit6 = this._createRequest('6', CharWidthRequestType.Regular, all, monospace);
+        const digit7 = this._createRequest('7', CharWidthRequestType.Regular, all, monospace);
+        const digit8 = this._createRequest('8', CharWidthRequestType.Regular, all, monospace);
+        const digit9 = this._createRequest('9', CharWidthRequestType.Regular, all, monospace);
+        const rightwardsArrow = this._createRequest('→', CharWidthRequestType.Regular, all, monospace);
+        const halfwidthRightwardsArrow = this._createRequest('￫', CharWidthRequestType.Regular, all, null);
+        const middot = this._createRequest('·', CharWidthRequestType.Regular, all, monospace);
+        const wsmiddotWidth = this._createRequest(String.fromCharCode(0x2E31), CharWidthRequestType.Regular, all, null);
         const monospaceTestChars = '|/-_ilm%';
         for (let i = 0, len = monospaceTestChars.length; i < len; i++) {
-            this._createRequest(monospaceTestChars.charAt(i), 0 , all, monospace);
-            this._createRequest(monospaceTestChars.charAt(i), 1 , all, monospace);
-            this._createRequest(monospaceTestChars.charAt(i), 2 , all, monospace);
+            this._createRequest(monospaceTestChars.charAt(i), CharWidthRequestType.Regular, all, monospace);
+            this._createRequest(monospaceTestChars.charAt(i), CharWidthRequestType.Italic, all, monospace);
+            this._createRequest(monospaceTestChars.charAt(i), CharWidthRequestType.Bold, all, monospace);
         }
         readCharWidths(targetWindow, bareFontInfo, all);
         const maxDigitWidth = Math.max(digit0.width, digit1.width, digit2.width, digit3.width, digit4.width, digit5.width, digit6.width, digit7.width, digit8.width, digit9.width);

package/vscode/src/vs/editor/browser/controller/mouseHandler.js

@@ -3,11 +3,14 @@ import { StandardWheelEvent } from '../../../base/browser/mouseEvent.js';
 import { Disposable } from '../../../base/common/lifecycle.js';
 import { isMacintosh } from '../../../base/common/platform.js';
 import { MouseTargetFactory, HitTestContext, MouseTarget } from './mouseTarget.js';
+import { MouseTargetType } from '../editorBrowser.js';
 import { EditorMouseEvent, createEditorPagePosition, GlobalEditorPointerMoveMonitor, EditorMouseEventFactory, ClientCoordinates, createCoordinatesRelativeToEditor, PageCoordinates } from '../editorDom.js';
 import { EditorZoom } from '../../common/config/editorZoom.js';
 import { Position } from '../../common/core/position.js';
 import { Selection } from '../../common/core/selection.js';
 import { ViewEventHandler } from '../../common/viewEventHandler.js';
+import { EditorOption } from '../../common/config/editorOptions.js';
+import { NavigationCommandRevealType } from '../coreCommands.js';
 import { MouseWheelClassifier } from '../../../base/browser/ui/scrollbar/scrollableElement.js';
 class MouseHandler extends ViewEventHandler {
     constructor(context, viewController, viewHelper) {
@@ -26,7 +29,7 @@ class MouseHandler extends ViewEventHandler {
             (e) => this._getMouseColumn(e)
         )));
         this.lastMouseLeaveTime = -1;
-        this._height = this._context.configuration.options.get(145 ).height;
+        this._height = this._context.configuration.options.get(EditorOption.layoutInfo).height;
         const mouseEvents = ( new EditorMouseEventFactory(this.viewHelper.viewDomNode));
         this._register(mouseEvents.onContextMenu(this.viewHelper.viewDomNode, (e) => this._onContextMenu(e, true)));
         this._register(mouseEvents.onMouseMove(this.viewHelper.viewDomNode, (e) => {
@@ -60,7 +63,7 @@ class MouseHandler extends ViewEventHandler {
         let gestureAccumulatedDelta = 0;
         const onMouseWheel = (browserEvent) => {
             this.viewController.emitMouseWheel(browserEvent);
-            if (!this._context.configuration.options.get(76 )) {
+            if (!this._context.configuration.options.get(EditorOption.mouseWheelZoom)) {
                 return;
             }
             const e = ( new StandardWheelEvent(browserEvent));
@@ -105,8 +108,8 @@ class MouseHandler extends ViewEventHandler {
         super.dispose();
     }
     onConfigurationChanged(e) {
-        if (e.hasChanged(145 )) {
-            const height = this._context.configuration.options.get(145 ).height;
+        if (e.hasChanged(EditorOption.layoutInfo)) {
+            const height = this._context.configuration.options.get(EditorOption.layoutInfo).height;
             if (this._height !== height) {
                 this._height = height;
                 this._mouseDownOperation.onHeightChanged();
@@ -186,12 +189,12 @@ class MouseHandler extends ViewEventHandler {
     }
     _onMouseDown(e, pointerId) {
         const t = this._createMouseTarget(e, true);
-        const targetIsContent = ((t.type === 6  || t.type === 7) );
-        const targetIsGutter = ((t.type === 2  || t.type === 3  || t.type === 4) );
-        const targetIsLineNumbers = ((t.type === 3) );
-        const selectOnLineNumbers = this._context.configuration.options.get(109 );
-        const targetIsViewZone = ((t.type === 8  || t.type === 5) );
-        const targetIsWidget = ((t.type === 9) );
+        const targetIsContent = (t.type === MouseTargetType.CONTENT_TEXT || t.type === MouseTargetType.CONTENT_EMPTY);
+        const targetIsGutter = (t.type === MouseTargetType.GUTTER_GLYPH_MARGIN || t.type === MouseTargetType.GUTTER_LINE_NUMBERS || t.type === MouseTargetType.GUTTER_LINE_DECORATIONS);
+        const targetIsLineNumbers = (t.type === MouseTargetType.GUTTER_LINE_NUMBERS);
+        const selectOnLineNumbers = this._context.configuration.options.get(EditorOption.selectOnLineNumbers);
+        const targetIsViewZone = (t.type === MouseTargetType.CONTENT_VIEW_ZONE || t.type === MouseTargetType.GUTTER_VIEW_ZONE);
+        const targetIsWidget = (t.type === MouseTargetType.CONTENT_WIDGET);
         let shouldHandle = e.leftButton || e.middleButton;
         if (isMacintosh && e.leftButton && e.ctrlKey) {
             shouldHandle = false;
@@ -269,18 +272,18 @@ class MouseDownOperation extends Disposable {
             });
         }
         else {
-            if (position.type === 13  && (position.outsidePosition === 'above' || position.outsidePosition === 'below')) {
+            if (position.type === MouseTargetType.OUTSIDE_EDITOR && (position.outsidePosition === 'above' || position.outsidePosition === 'below')) {
                 this._topBottomDragScrolling.start(position, e);
             }
             else {
                 this._topBottomDragScrolling.stop();
-                this._dispatchMouse(position, true, 1 );
+                this._dispatchMouse(position, true, NavigationCommandRevealType.Minimal);
             }
         }
     }
     start(targetType, e, pointerId) {
         this._lastMouseEvent = e;
-        this._mouseState.setStartedOnLineNumbers(targetType === 3 );
+        this._mouseState.setStartedOnLineNumbers(targetType === MouseTargetType.GUTTER_LINE_NUMBERS);
         this._mouseState.setStartButtons(e);
         this._mouseState.setModifiers(e);
         const position = this._findMousePosition(e, true);
@@ -290,14 +293,14 @@ class MouseDownOperation extends Disposable {
         this._mouseState.trySetCount(e.detail, position.position);
         e.detail = this._mouseState.count;
         const options = this._context.configuration.options;
-        if (!options.get(91 )
-            && options.get(35 )
-            && !options.get(22 )
+        if (!options.get(EditorOption.readOnly)
+            && options.get(EditorOption.dragAndDrop)
+            && !options.get(EditorOption.columnSelection)
             && !this._mouseState.altKey
             && e.detail < 2
             && !this._isActive
             && !this._currentSelection.isEmpty()
-            && ((position.type === 6) )
+            && (position.type === MouseTargetType.CONTENT_TEXT)
             && position.position && this._currentSelection.containsPosition(position.position)
         ) {
             this._mouseState.isDragAndDrop = true;
@@ -318,7 +321,7 @@ class MouseDownOperation extends Disposable {
             return;
         }
         this._mouseState.isDragAndDrop = false;
-        this._dispatchMouse(position, e.shiftKey, 1 );
+        this._dispatchMouse(position, e.shiftKey, NavigationCommandRevealType.Minimal);
         if (!this._isActive) {
             this._isActive = true;
             this._mouseMoveMonitor.startMonitoring(this._viewHelper.viewLinesDomNode, pointerId, e.buttons, (e) => this._onMouseDownThenMove(e), () => this._stop());
@@ -389,7 +392,7 @@ class MouseDownOperation extends Disposable {
         if (!hintedPosition) {
             return null;
         }
-        if (t.type === 8  || t.type === 5 ) {
+        if (t.type === MouseTargetType.CONTENT_VIEW_ZONE || t.type === MouseTargetType.GUTTER_VIEW_ZONE) {
             const newPosition = this._helpPositionJumpOverViewZone(t.detail);
             if (newPosition) {
                 return MouseTarget.createViewZone(t.type, t.element, t.mouseColumn, newPosition, t.detail);
@@ -431,7 +434,7 @@ class MouseDownOperation extends Disposable {
             shiftKey: this._mouseState.shiftKey,
             leftButton: this._mouseState.leftButton,
             middleButton: this._mouseState.middleButton,
-            onInjectedText: position.type === 6  && position.detail.injectedText !== null
+            onInjectedText: position.type === MouseTargetType.CONTENT_TEXT && position.detail.injectedText !== null
         });
     }
 }
@@ -497,8 +500,8 @@ class TopBottomDragScrollingOperation extends Disposable {
         return elapsed;
     }
     _getScrollSpeed() {
-        const lineHeight = this._context.configuration.options.get(67 );
-        const viewportInLines = this._context.configuration.options.get(145 ).height / lineHeight;
+        const lineHeight = this._context.configuration.options.get(EditorOption.lineHeight);
+        const viewportInLines = this._context.configuration.options.get(EditorOption.layoutInfo).height / lineHeight;
         const outsideDistanceInLines = this._position.outsideDistance / lineHeight;
         if (outsideDistanceInLines <= 1.5) {
             return Math.max(30, viewportInLines * (1 + outsideDistanceInLines));
@@ -509,7 +512,7 @@ class TopBottomDragScrollingOperation extends Disposable {
         return Math.max(200, viewportInLines * (7 + outsideDistanceInLines));
     }
     _execute() {
-        const lineHeight = this._context.configuration.options.get(67 );
+        const lineHeight = this._context.configuration.options.get(EditorOption.lineHeight);
         const scrollSpeedInLines = this._getScrollSpeed();
         const elapsed = this._tick();
         const scrollInPixels = scrollSpeedInLines * (elapsed / 1000) * lineHeight;
@@ -521,7 +524,7 @@ class TopBottomDragScrollingOperation extends Disposable {
         let mouseTarget;
         {
             const editorPos = createEditorPagePosition(this._viewHelper.viewDomNode);
-            const horizontalScrollbarHeight = this._context.configuration.options.get(145 ).horizontalScrollbarHeight;
+            const horizontalScrollbarHeight = this._context.configuration.options.get(EditorOption.layoutInfo).horizontalScrollbarHeight;
             const pos = ( new PageCoordinates(
                 this._mouseEvent.pos.x,
                 editorPos.y + editorPos.height - horizontalScrollbarHeight - 0.1
@@ -537,7 +540,7 @@ class TopBottomDragScrollingOperation extends Disposable {
                 mouseTarget = MouseTarget.createOutsideEditor(this._position.mouseColumn, ( new Position(edgeLineNumber, this._context.viewModel.getLineMaxColumn(edgeLineNumber))), 'below', this._position.outsideDistance);
             }
         }
-        this._dispatchMouse(mouseTarget, true, 2 );
+        this._dispatchMouse(mouseTarget, true, NavigationCommandRevealType.None);
         this._animationFrameDisposable = scheduleAtNextAnimationFrame(getWindow(mouseTarget.element), () => this._execute());
     }
 }

package/vscode/src/vs/editor/browser/controller/mouseTarget.js

@@ -1,16 +1,24 @@
+import { MouseTargetType } from '../editorBrowser.js';
 import { PageCoordinates } from '../editorDom.js';
-import { PartFingerprints } from '../view/viewPart.js';
+import { PartFingerprints, PartFingerprint } from '../view/viewPart.js';
 import { ViewLine } from '../viewParts/lines/viewLine.js';
+import { EditorOption } from '../../common/config/editorOptions.js';
 import { Position } from '../../common/core/position.js';
 import { Range } from '../../common/core/range.js';
 import { CursorColumns } from '../../common/core/cursorColumns.js';
 import { getWindow, getShadowRoot } from '../../../base/browser/dom.js';
-import { AtomicTabMoveOperations } from '../../common/cursor/cursorAtomicMoveOperations.js';
+import { AtomicTabMoveOperations, Direction } from '../../common/cursor/cursorAtomicMoveOperations.js';
+import { PositionAffinity } from '../../common/model.js';
 import { Lazy } from '../../../base/common/lazy.js';
+var HitTestResultType;
+( (function(HitTestResultType) {
+    HitTestResultType[HitTestResultType["Unknown"] = 0] = "Unknown";
+    HitTestResultType[HitTestResultType["Content"] = 1] = "Content";
+})(HitTestResultType || (HitTestResultType = {})));
 class UnknownHitTestResult {
     constructor(hitTarget = null) {
         this.hitTarget = hitTarget;
-        this.type = 0 ;
+        this.type = HitTestResultType.Unknown;
     }
 }
 class ContentHitTestResult {
@@ -19,7 +27,7 @@ class ContentHitTestResult {
         this.position = position;
         this.spanNode = spanNode;
         this.injectedText = injectedText;
-        this.type = 1 ;
+        this.type = HitTestResultType.Content;
     }
 }
 var HitTestResult;
@@ -47,10 +55,10 @@ class MouseTarget {
         return range ?? null;
     }
     static createUnknown(element, mouseColumn, position) {
-        return { type: 0 , element, mouseColumn, position, range: this._deduceRage(position) };
+        return { type: MouseTargetType.UNKNOWN, element, mouseColumn, position, range: this._deduceRage(position) };
     }
     static createTextarea(element, mouseColumn) {
-        return { type: 1 , element, mouseColumn, position: null, range: null };
+        return { type: MouseTargetType.TEXTAREA, element, mouseColumn, position: null, range: null };
     }
     static createMargin(type, element, mouseColumn, position, range, detail) {
         return { type, element, mouseColumn, position, range, detail };
@@ -59,58 +67,58 @@ class MouseTarget {
         return { type, element, mouseColumn, position, range: this._deduceRage(position), detail };
     }
     static createContentText(element, mouseColumn, position, range, detail) {
-        return { type: 6 , element, mouseColumn, position, range: this._deduceRage(position, range), detail };
+        return { type: MouseTargetType.CONTENT_TEXT, element, mouseColumn, position, range: this._deduceRage(position, range), detail };
     }
     static createContentEmpty(element, mouseColumn, position, detail) {
-        return { type: 7 , element, mouseColumn, position, range: this._deduceRage(position), detail };
+        return { type: MouseTargetType.CONTENT_EMPTY, element, mouseColumn, position, range: this._deduceRage(position), detail };
     }
     static createContentWidget(element, mouseColumn, detail) {
-        return { type: 9 , element, mouseColumn, position: null, range: null, detail };
+        return { type: MouseTargetType.CONTENT_WIDGET, element, mouseColumn, position: null, range: null, detail };
     }
     static createScrollbar(element, mouseColumn, position) {
-        return { type: 11 , element, mouseColumn, position, range: this._deduceRage(position) };
+        return { type: MouseTargetType.SCROLLBAR, element, mouseColumn, position, range: this._deduceRage(position) };
     }
     static createOverlayWidget(element, mouseColumn, detail) {
-        return { type: 12 , element, mouseColumn, position: null, range: null, detail };
+        return { type: MouseTargetType.OVERLAY_WIDGET, element, mouseColumn, position: null, range: null, detail };
     }
     static createOutsideEditor(mouseColumn, position, outsidePosition, outsideDistance) {
-        return { type: 13 , element: null, mouseColumn, position, range: this._deduceRage(position), outsidePosition, outsideDistance };
+        return { type: MouseTargetType.OUTSIDE_EDITOR, element: null, mouseColumn, position, range: this._deduceRage(position), outsidePosition, outsideDistance };
     }
     static _typeToString(type) {
-        if (type === 1 ) {
+        if (type === MouseTargetType.TEXTAREA) {
             return 'TEXTAREA';
         }
-        if (type === 2 ) {
+        if (type === MouseTargetType.GUTTER_GLYPH_MARGIN) {
             return 'GUTTER_GLYPH_MARGIN';
         }
-        if (type === 3 ) {
+        if (type === MouseTargetType.GUTTER_LINE_NUMBERS) {
             return 'GUTTER_LINE_NUMBERS';
         }
-        if (type === 4 ) {
+        if (type === MouseTargetType.GUTTER_LINE_DECORATIONS) {
             return 'GUTTER_LINE_DECORATIONS';
         }
-        if (type === 5 ) {
+        if (type === MouseTargetType.GUTTER_VIEW_ZONE) {
             return 'GUTTER_VIEW_ZONE';
         }
-        if (type === 6 ) {
+        if (type === MouseTargetType.CONTENT_TEXT) {
             return 'CONTENT_TEXT';
         }
-        if (type === 7 ) {
+        if (type === MouseTargetType.CONTENT_EMPTY) {
             return 'CONTENT_EMPTY';
         }
-        if (type === 8 ) {
+        if (type === MouseTargetType.CONTENT_VIEW_ZONE) {
             return 'CONTENT_VIEW_ZONE';
         }
-        if (type === 9 ) {
+        if (type === MouseTargetType.CONTENT_WIDGET) {
             return 'CONTENT_WIDGET';
         }
-        if (type === 10 ) {
+        if (type === MouseTargetType.OVERVIEW_RULER) {
             return 'OVERVIEW_RULER';
         }
-        if (type === 11 ) {
+        if (type === MouseTargetType.SCROLLBAR) {
             return 'SCROLLBAR';
         }
-        if (type === 12 ) {
+        if (type === MouseTargetType.OVERLAY_WIDGET) {
             return 'OVERLAY_WIDGET';
         }
         return 'UNKNOWN';
@@ -122,51 +130,61 @@ class MouseTarget {
 class ElementPath {
     static isTextArea(path) {
         return (path.length === 2
-            && path[0] === 3  && path[1] === 7) ;
+            && path[0] === PartFingerprint.OverflowGuard
+            && path[1] === PartFingerprint.TextArea);
     }
     static isChildOfViewLines(path) {
         return (path.length >= 4
-            && path[0] === 3  && path[3] === 8) ;
+            && path[0] === PartFingerprint.OverflowGuard
+            && path[3] === PartFingerprint.ViewLines);
     }
     static isStrictChildOfViewLines(path) {
         return (path.length > 4
-            && path[0] === 3  && path[3] === 8) ;
+            && path[0] === PartFingerprint.OverflowGuard
+            && path[3] === PartFingerprint.ViewLines);
     }
     static isChildOfScrollableElement(path) {
         return (path.length >= 2
-            && path[0] === 3  && path[1] === 6) ;
+            && path[0] === PartFingerprint.OverflowGuard
+            && path[1] === PartFingerprint.ScrollableElement);
     }
     static isChildOfMinimap(path) {
         return (path.length >= 2
-            && path[0] === 3  && path[1] === 9) ;
+            && path[0] === PartFingerprint.OverflowGuard
+            && path[1] === PartFingerprint.Minimap);
     }
     static isChildOfContentWidgets(path) {
         return (path.length >= 4
-            && path[0] === 3  && path[3] === 1) ;
+            && path[0] === PartFingerprint.OverflowGuard
+            && path[3] === PartFingerprint.ContentWidgets);
     }
     static isChildOfOverflowGuard(path) {
-        return (path.length >= 1 && path[0] === 3) ;
+        return (path.length >= 1
+            && path[0] === PartFingerprint.OverflowGuard);
     }
     static isChildOfOverflowingContentWidgets(path) {
-        return (path.length >= 1 && path[0] === 2) ;
+        return (path.length >= 1
+            && path[0] === PartFingerprint.OverflowingContentWidgets);
     }
     static isChildOfOverlayWidgets(path) {
         return (path.length >= 2
-            && path[0] === 3  && path[1] === 4) ;
+            && path[0] === PartFingerprint.OverflowGuard
+            && path[1] === PartFingerprint.OverlayWidgets);
     }
     static isChildOfOverflowingOverlayWidgets(path) {
-        return (path.length >= 1 && path[0] === 5) ;
+        return (path.length >= 1
+            && path[0] === PartFingerprint.OverflowingOverlayWidgets);
     }
 }
 class HitTestContext {
     constructor(context, viewHelper, lastRenderData) {
         this.viewModel = context.viewModel;
         const options = context.configuration.options;
-        this.layoutInfo = options.get(145 );
+        this.layoutInfo = options.get(EditorOption.layoutInfo);
         this.viewDomNode = viewHelper.viewDomNode;
-        this.lineHeight = options.get(67 );
-        this.stickyTabStops = options.get(116 );
-        this.typicalHalfwidthCharacterWidth = options.get(50 ).typicalHalfwidthCharacterWidth;
+        this.lineHeight = options.get(EditorOption.lineHeight);
+        this.stickyTabStops = options.get(EditorOption.stickyTabStops);
+        this.typicalHalfwidthCharacterWidth = options.get(EditorOption.fontInfo).typicalHalfwidthCharacterWidth;
         this.lastRenderData = lastRenderData;
         this._context = context;
         this._viewHelper = viewHelper;
@@ -384,7 +402,7 @@ class MouseTargetFactory {
         const request = ( new HitTestRequest(ctx, editorPos, pos, relativePos, target));
         try {
             const r = MouseTargetFactory._createMouseTarget(ctx, request);
-            if (r.type === 6 ) {
+            if (r.type === MouseTargetType.CONTENT_TEXT) {
                 if (ctx.stickyTabStops && r.position !== null) {
                     const position = MouseTargetFactory._snapToSoftTabBoundary(r.position, ctx.viewModel);
                     const range = Range.fromPositions(position, position).plusRange(r.range);
@@ -474,7 +492,7 @@ class MouseTargetFactory {
     static _hitTestViewZone(ctx, request) {
         const viewZoneData = ctx.getZoneAtCoord(request.mouseVerticalOffset);
         if (viewZoneData) {
-            const mouseTargetType = ((request.isInContentArea ? 8  : 5) );
+            const mouseTargetType = (request.isInContentArea ? MouseTargetType.CONTENT_VIEW_ZONE : MouseTargetType.GUTTER_VIEW_ZONE);
             return request.fulfillViewZone(mouseTargetType, viewZoneData.position, viewZoneData);
         }
         return null;
@@ -505,14 +523,14 @@ class MouseTargetFactory {
                 const modelCoordinate = ctx.viewModel.coordinatesConverter.convertViewPositionToModelPosition(res.range.getStartPosition());
                 const lanes = ctx.viewModel.glyphLanes.getLanesAtLine(modelCoordinate.lineNumber);
                 detail.glyphMarginLane = lanes[Math.floor(offset / ctx.lineHeight)];
-                return request.fulfillMargin(2 , pos, res.range, detail);
+                return request.fulfillMargin(MouseTargetType.GUTTER_GLYPH_MARGIN, pos, res.range, detail);
             }
             offset -= ctx.layoutInfo.glyphMarginWidth;
             if (offset <= ctx.layoutInfo.lineNumbersWidth) {
-                return request.fulfillMargin(3 , pos, res.range, detail);
+                return request.fulfillMargin(MouseTargetType.GUTTER_LINE_NUMBERS, pos, res.range, detail);
             }
             offset -= ctx.layoutInfo.lineNumbersWidth;
-            return request.fulfillMargin(4 , pos, res.range, detail);
+            return request.fulfillMargin(MouseTargetType.GUTTER_LINE_DECORATIONS, pos, res.range, detail);
         }
         return null;
     }
@@ -543,7 +561,7 @@ class MouseTargetFactory {
             }
         }
         const hitTestResult = request.hitTestResult.value;
-        if (hitTestResult.type === 1 ) {
+        if (hitTestResult.type === HitTestResultType.Content) {
             return MouseTargetFactory.createMouseTargetFromHitTestPosition(ctx, request, hitTestResult.spanNode, hitTestResult.position, hitTestResult.injectedText);
         }
         if (request.wouldBenefitFromHitTestTargetSwitch) {
@@ -583,9 +601,9 @@ class MouseTargetFactory {
     }
     getMouseColumn(relativePos) {
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(145 );
+        const layoutInfo = options.get(EditorOption.layoutInfo);
         const mouseContentHorizontalOffset = this._context.viewLayout.getCurrentScrollLeft() + relativePos.x - layoutInfo.contentLeft;
-        return MouseTargetFactory._getMouseColumn(mouseContentHorizontalOffset, options.get(50 ).typicalHalfwidthCharacterWidth);
+        return MouseTargetFactory._getMouseColumn(mouseContentHorizontalOffset, options.get(EditorOption.fontInfo).typicalHalfwidthCharacterWidth);
     }
     static _getMouseColumn(mouseContentHorizontalOffset, typicalHalfwidthCharacterWidth) {
         if (mouseContentHorizontalOffset < 0) {
@@ -662,7 +680,7 @@ class MouseTargetFactory {
             }
             const adjustedPage = ( new PageCoordinates(request.pos.x, adjustedPageY));
             const r = this._actualDoHitTestWithCaretRangeFromPoint(ctx, adjustedPage.toClientCoordinates(getWindow(ctx.viewDomNode)));
-            if (r.type === 1 ) {
+            if (r.type === HitTestResultType.Content) {
                 return r;
             }
         }
@@ -745,7 +763,7 @@ class MouseTargetFactory {
     static _snapToSoftTabBoundary(position, viewModel) {
         const lineContent = viewModel.getLineContent(position.lineNumber);
         const { tabSize } = viewModel.model.getOptions();
-        const newPosition = AtomicTabMoveOperations.atomicPosition(lineContent, position.column - 1, tabSize, 2 );
+        const newPosition = AtomicTabMoveOperations.atomicPosition(lineContent, position.column - 1, tabSize, Direction.Nearest);
         if (newPosition !== -1) {
             return ( new Position(position.lineNumber, newPosition + 1));
         }
@@ -759,9 +777,9 @@ class MouseTargetFactory {
         else if (ctx.viewDomNode.ownerDocument.caretPositionFromPoint) {
             result = this._doHitTestWithCaretPositionFromPoint(ctx, request.pos.toClientCoordinates(getWindow(ctx.viewDomNode)));
         }
-        if (result.type === 1 ) {
+        if (result.type === HitTestResultType.Content) {
             const injectedText = ctx.viewModel.getInjectedTextAt(result.position);
-            const normalizedPosition = ctx.viewModel.normalizePosition(result.position, 2 );
+            const normalizedPosition = ctx.viewModel.normalizePosition(result.position, PositionAffinity.None);
             if (injectedText || !normalizedPosition.equals(result.position)) {
                 result = ( new ContentHitTestResult(normalizedPosition, result.spanNode, injectedText));
             }

package/vscode/src/vs/editor/browser/controller/pointerHandler.js

@@ -6,6 +6,8 @@ import { Disposable } from '../../../base/common/lifecycle.js';
 import { isIOS, isAndroid, isMobile } from '../../../base/common/platform.js';
 import { MouseHandler } from './mouseHandler.js';
 import { TextAreaSyntethicEvents } from './textAreaInput.js';
+import { NavigationCommandRevealType } from '../coreCommands.js';
+import { MouseTargetType } from '../editorBrowser.js';
 import { EditorMouseEvent, EditorPointerEventFactory } from '../editorDom.js';
 class PointerEventHandler extends MouseHandler {
     constructor(context, viewController, viewHelper) {
@@ -57,7 +59,7 @@ class PointerEventHandler extends MouseHandler {
                 position: target.position,
                 mouseColumn: target.position.column,
                 startedOnLineNumbers: false,
-                revealType: 1 ,
+                revealType: NavigationCommandRevealType.Minimal,
                 mouseDownCount: event.tapCount,
                 inSelectionMode,
                 altKey: false,
@@ -66,7 +68,7 @@ class PointerEventHandler extends MouseHandler {
                 shiftKey: false,
                 leftButton: false,
                 middleButton: false,
-                onInjectedText: target.type === 6  && target.detail.injectedText !== null
+                onInjectedText: target.type === MouseTargetType.CONTENT_TEXT && target.detail.injectedText !== null
             });
         }
     }
@@ -93,7 +95,7 @@ class TouchHandler extends MouseHandler {
             const event = document.createEvent('CustomEvent');
             event.initEvent(TextAreaSyntethicEvents.Tap, false, true);
             this.viewHelper.dispatchTextAreaEvent(event);
-            this.viewController.moveTo(target.position, 1 );
+            this.viewController.moveTo(target.position, NavigationCommandRevealType.Minimal);
         }
     }
     onChange(e) {