@codingame/monaco-vscode-api 5.2.0 → 6.0.0

package/vscode/src/vs/editor/contrib/hover/browser/hoverActions.js

@@ -1,9 +1,13 @@
-import { SHOW_OR_FOCUS_HOVER_ACTION_ID, SHOW_DEFINITION_PREVIEW_HOVER_ACTION_ID, SCROLL_UP_HOVER_ACTION_ID, SCROLL_DOWN_HOVER_ACTION_ID, SCROLL_LEFT_HOVER_ACTION_ID, SCROLL_RIGHT_HOVER_ACTION_ID, PAGE_UP_HOVER_ACTION_ID, PAGE_DOWN_HOVER_ACTION_ID, GO_TO_TOP_HOVER_ACTION_ID, GO_TO_BOTTOM_HOVER_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACTION_ID, DECREASE_HOVER_VERBOSITY_ACTION_ID } from './hoverActionIds.js';
-import { KeyChord } from '../../../../base/common/keyCodes.js';
+import { SHOW_OR_FOCUS_HOVER_ACTION_ID, SHOW_DEFINITION_PREVIEW_HOVER_ACTION_ID, SCROLL_UP_HOVER_ACTION_ID, SCROLL_DOWN_HOVER_ACTION_ID, SCROLL_LEFT_HOVER_ACTION_ID, SCROLL_RIGHT_HOVER_ACTION_ID, PAGE_UP_HOVER_ACTION_ID, PAGE_DOWN_HOVER_ACTION_ID, GO_TO_TOP_HOVER_ACTION_ID, GO_TO_BOTTOM_HOVER_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACTION_LABEL, DECREASE_HOVER_VERBOSITY_ACTION_ID, DECREASE_HOVER_VERBOSITY_ACTION_LABEL } from './hoverActionIds.js';
+import { KeyChord, KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
 import { EditorAction } from '../../../browser/editorExtensions.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Range } from '../../../common/core/range.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { GotoDefinitionAtPositionEditorContribution } from '../../gotoSymbol/browser/link/goToDefinitionAtPosition.js';
+import { HoverStartMode, HoverStartSource } from './hoverOperation.js';
+import { AccessibilitySupport } from '../../../../platform/accessibility/common/accessibility.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { HoverController } from './hoverController.js';
 import { HoverVerbosityAction } from '../../../common/languages.js';
 import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
@@ -49,8 +53,8 @@ class ShowOrFocusHoverAction extends EditorAction {
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
-                primary: KeyChord(2048  | 41 , 2048  | 39 ),
-                weight: 100
+                primary: KeyChord(KeyMod$1.CtrlCmd | KeyCode.KeyK, KeyMod$1.CtrlCmd | KeyCode.KeyI),
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -73,9 +77,9 @@ class ShowOrFocusHoverAction extends EditorAction {
         const showContentHover = (focus) => {
             const position = editor.getPosition();
             const range = ( (new Range(position.lineNumber, position.column, position.lineNumber, position.column)));
-            controller.showContentHover(range, 1 , 1 , focus);
+            controller.showContentHover(range, HoverStartMode.Immediate, HoverStartSource.Keyboard, focus);
         };
-        const accessibilitySupportEnabled = editor.getOption(2 ) === 2 ;
+        const accessibilitySupportEnabled = editor.getOption(EditorOption.accessibilitySupport) === AccessibilitySupport.Enabled;
         if (controller.isHoverVisible) {
             if (focusOption !== HoverFocusBehavior.NoAutoFocus) {
                 controller.focus();
@@ -117,7 +121,7 @@ class ShowDefinitionPreviewHoverAction extends EditorAction {
         }
         const promise = goto.startFindDefinitionFromCursor(position);
         promise.then(() => {
-            controller.showContentHover(range, 1 , 1 , true);
+            controller.showContentHover(range, HoverStartMode.Immediate, HoverStartSource.Keyboard, true);
         });
     }
 }
@@ -130,8 +134,8 @@ class ScrollUpHoverAction extends EditorAction {
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
-                primary: 16 ,
-                weight: 100
+                primary: KeyCode.UpArrow,
+                weight: KeybindingWeight.EditorContrib
             },
             metadata: {
                 description: ( localize2WithPath(_moduleId, 8, 'Scroll up the editor hover.'))
@@ -155,8 +159,8 @@ class ScrollDownHoverAction extends EditorAction {
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
-                primary: 18 ,
-                weight: 100
+                primary: KeyCode.DownArrow,
+                weight: KeybindingWeight.EditorContrib
             },
             metadata: {
                 description: ( localize2WithPath(_moduleId, 10, 'Scroll down the editor hover.')),
@@ -180,8 +184,8 @@ class ScrollLeftHoverAction extends EditorAction {
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
-                primary: 15 ,
-                weight: 100
+                primary: KeyCode.LeftArrow,
+                weight: KeybindingWeight.EditorContrib
             },
             metadata: {
                 description: ( localize2WithPath(_moduleId, 12, 'Scroll left the editor hover.')),
@@ -205,8 +209,8 @@ class ScrollRightHoverAction extends EditorAction {
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
-                primary: 17 ,
-                weight: 100
+                primary: KeyCode.RightArrow,
+                weight: KeybindingWeight.EditorContrib
             },
             metadata: {
                 description: ( localize2WithPath(_moduleId, 14, 'Scroll right the editor hover.'))
@@ -230,9 +234,9 @@ class PageUpHoverAction extends EditorAction {
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
-                primary: 11 ,
-                secondary: [512  | 16 ],
-                weight: 100
+                primary: KeyCode.PageUp,
+                secondary: [KeyMod$1.Alt | KeyCode.UpArrow],
+                weight: KeybindingWeight.EditorContrib
             },
             metadata: {
                 description: ( localize2WithPath(_moduleId, 16, 'Page up the editor hover.')),
@@ -256,9 +260,9 @@ class PageDownHoverAction extends EditorAction {
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
-                primary: 12 ,
-                secondary: [512  | 18 ],
-                weight: 100
+                primary: KeyCode.PageDown,
+                secondary: [KeyMod$1.Alt | KeyCode.DownArrow],
+                weight: KeybindingWeight.EditorContrib
             },
             metadata: {
                 description: ( localize2WithPath(_moduleId, 18, 'Page down the editor hover.')),
@@ -282,9 +286,9 @@ class GoToTopHoverAction extends EditorAction {
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
-                primary: 14 ,
-                secondary: [2048  | 16 ],
-                weight: 100
+                primary: KeyCode.Home,
+                secondary: [KeyMod$1.CtrlCmd | KeyCode.UpArrow],
+                weight: KeybindingWeight.EditorContrib
             },
             metadata: {
                 description: ( localize2WithPath(_moduleId, 20, 'Go to the top of the editor hover.')),
@@ -308,9 +312,9 @@ class GoToBottomHoverAction extends EditorAction {
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
-                primary: 13 ,
-                secondary: [2048  | 18 ],
-                weight: 100
+                primary: KeyCode.End,
+                secondary: [KeyMod$1.CtrlCmd | KeyCode.DownArrow],
+                weight: KeybindingWeight.EditorContrib
             },
             metadata: {
                 description: ( localize2WithPath(_moduleId, 22, 'Go to the bottom of the editor hover.'))
@@ -329,26 +333,26 @@ class IncreaseHoverVerbosityLevel extends EditorAction {
     constructor() {
         super({
             id: INCREASE_HOVER_VERBOSITY_ACTION_ID,
-            label: ( localizeWithPath(_moduleId, 23, "Increase Hover Verbosity Level")),
+            label: INCREASE_HOVER_VERBOSITY_ACTION_LABEL,
             alias: 'Increase Hover Verbosity Level',
-            precondition: EditorContextKeys.hoverFocused
+            precondition: EditorContextKeys.hoverVisible
         });
     }
-    run(accessor, editor) {
-        HoverController.get(editor)?.updateFocusedMarkdownHoverVerbosityLevel(HoverVerbosityAction.Increase);
+    run(accessor, editor, args) {
+        HoverController.get(editor)?.updateMarkdownHoverVerbosityLevel(HoverVerbosityAction.Increase, args?.index, args?.focus);
     }
 }
 class DecreaseHoverVerbosityLevel extends EditorAction {
     constructor() {
         super({
             id: DECREASE_HOVER_VERBOSITY_ACTION_ID,
-            label: ( localizeWithPath(_moduleId, 24, "Decrease Hover Verbosity Level")),
+            label: DECREASE_HOVER_VERBOSITY_ACTION_LABEL,
             alias: 'Decrease Hover Verbosity Level',
-            precondition: EditorContextKeys.hoverFocused
+            precondition: EditorContextKeys.hoverVisible
         });
     }
     run(accessor, editor, args) {
-        HoverController.get(editor)?.updateFocusedMarkdownHoverVerbosityLevel(HoverVerbosityAction.Decrease);
+        HoverController.get(editor)?.updateMarkdownHoverVerbosityLevel(HoverVerbosityAction.Decrease, args?.index, args?.focus);
     }
 }
 export { DecreaseHoverVerbosityLevel, GoToBottomHoverAction, GoToTopHoverAction, IncreaseHoverVerbosityLevel, PageDownHoverAction, PageUpHoverAction, ScrollDownHoverAction, ScrollLeftHoverAction, ScrollRightHoverAction, ScrollUpHoverAction, ShowDefinitionPreviewHoverAction, ShowOrFocusHoverAction };

package/vscode/src/vs/editor/contrib/hover/browser/hoverContribution.js

@@ -1,5 +1,5 @@
 import { ShowOrFocusHoverAction, ShowDefinitionPreviewHoverAction, ScrollUpHoverAction, ScrollDownHoverAction, ScrollLeftHoverAction, ScrollRightHoverAction, PageUpHoverAction, PageDownHoverAction, GoToTopHoverAction, GoToBottomHoverAction, IncreaseHoverVerbosityLevel, DecreaseHoverVerbosityLevel } from './hoverActions.js';
-import { registerEditorContribution, registerEditorAction } from '../../../browser/editorExtensions.js';
+import { registerEditorContribution, registerEditorAction, EditorContributionInstantiation } from '../../../browser/editorExtensions.js';
 import '../../../../platform/theme/common/colorUtils.js';
 import '../../../../platform/theme/common/colors/baseColors.js';
 import '../../../../platform/theme/common/colors/chartsColors.js';
@@ -17,7 +17,9 @@ import { MarkdownHoverParticipant } from './markdownHoverParticipant.js';
 import { MarkerHoverParticipant } from './markerHoverParticipant.js';
 import { HoverController } from './hoverController.js';
 import './hover.css.js';
-registerEditorContribution(HoverController.ID, HoverController, 2 );
+import { AccessibleViewRegistry } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
+import { HoverAccessibleView, HoverAccessibilityHelp, ExtHoverAccessibleView } from './hoverAccessibleViews.js';
+registerEditorContribution(HoverController.ID, HoverController, EditorContributionInstantiation.BeforeFirstInteraction);
 registerEditorAction(ShowOrFocusHoverAction);
 registerEditorAction(ShowDefinitionPreviewHoverAction);
 registerEditorAction(ScrollUpHoverAction);
@@ -40,3 +42,6 @@ registerThemingParticipant((theme, collector) => {
         collector.addRule(`.monaco-editor .monaco-hover hr { border-bottom: 0px solid ${( hoverBorder.transparent(0.5))}; }`);
     }
 });
+AccessibleViewRegistry.register(( new HoverAccessibleView()));
+AccessibleViewRegistry.register(( new HoverAccessibilityHelp()));
+AccessibleViewRegistry.register(( new ExtHoverAccessibleView()));

package/vscode/src/vs/editor/contrib/hover/browser/hoverController.js

@@ -1,16 +1,26 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { SHOW_OR_FOCUS_HOVER_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACTION_ID, DECREASE_HOVER_VERBOSITY_ACTION_ID } from './hoverActionIds.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { MouseTargetType } from '../../../browser/editorBrowser.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { InlineSuggestionHintsContentWidget } from '../../inlineCompletions/browser/inlineCompletionsHintsWidget.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
+import { ResultKind } from '../../../../platform/keybinding/common/keybindingResolver.js';
 import { RunOnceScheduler } from '../../../../base/common/async.js';
 import { ContentHoverWidget } from './contentHoverWidget.js';
 import { ContentHoverController } from './contentHoverController.js';
 import './hover.css.js';
 import { MarginHoverWidget } from './marginHoverWidget.js';
+import { Emitter } from '../../../../base/common/event.js';
 var HoverController_1;
 const _sticky = false;
+var HoverWidgetType;
+( (function(HoverWidgetType) {
+    HoverWidgetType[HoverWidgetType["Content"] = 0] = "Content";
+    HoverWidgetType[HoverWidgetType["Glyph"] = 1] = "Glyph";
+})(HoverWidgetType || (HoverWidgetType = {})));
 let HoverController = class HoverController extends Disposable {
     static { HoverController_1 = this; }
     static { this.ID = 'editor.contrib.hover'; }
@@ -19,6 +29,9 @@ let HoverController = class HoverController extends Disposable {
         this._editor = _editor;
         this._instantiationService = _instantiationService;
         this._keybindingService = _keybindingService;
+        this._onHoverContentsChanged = this._register(( new Emitter()));
+        this.onHoverContentsChanged = this._onHoverContentsChanged.event;
+        this.shouldKeepOpenOnEditorMouseMoveOrLeave = false;
         this._listenersStore = ( new DisposableStore());
         this._hoverState = {
             mouseDown: false,
@@ -27,7 +40,7 @@ let HoverController = class HoverController extends Disposable {
         this._reactToEditorMouseMoveRunner = this._register(( new RunOnceScheduler(() => this._reactToEditorMouseMove(this._mouseMoveEvent), 0)));
         this._hookListeners();
         this._register(this._editor.onDidChangeConfiguration((e) => {
-            if (e.hasChanged(60 )) {
+            if (e.hasChanged(EditorOption.hover)) {
                 this._unhookListeners();
                 this._hookListeners();
             }
@@ -37,7 +50,7 @@ let HoverController = class HoverController extends Disposable {
         return editor.getContribution(HoverController_1.ID);
     }
     _hookListeners() {
-        const hoverOpts = this._editor.getOption(60 );
+        const hoverOpts = this._editor.getOption(EditorOption.hover);
         this._hoverSettings = {
             enabled: hoverOpts.enabled,
             sticky: hoverOpts.sticky,
@@ -94,19 +107,22 @@ let HoverController = class HoverController extends Disposable {
         if (!target) {
             return false;
         }
-        return target.type === 12  && target.detail === MarginHoverWidget.ID;
+        return target.type === MouseTargetType.OVERLAY_WIDGET && target.detail === MarginHoverWidget.ID;
     }
     _isMouseOnContentHoverWidget(mouseEvent) {
         const target = mouseEvent.target;
         if (!target) {
             return false;
         }
-        return target.type === 9  && target.detail === ContentHoverWidget.ID;
+        return target.type === MouseTargetType.CONTENT_WIDGET && target.detail === ContentHoverWidget.ID;
     }
     _onEditorMouseUp() {
         this._hoverState.mouseDown = false;
     }
     _onEditorMouseLeave(mouseEvent) {
+        if (this.shouldKeepOpenOnEditorMouseMoveOrLeave) {
+            return;
+        }
         this._cancelScheduler();
         const shouldNotHideCurrentHoverWidget = this._shouldNotHideCurrentHoverWidget(mouseEvent);
         if (shouldNotHideCurrentHoverWidget) {
@@ -143,6 +159,9 @@ let HoverController = class HoverController extends Disposable {
         return false;
     }
     _onEditorMouseMove(mouseEvent) {
+        if (this.shouldKeepOpenOnEditorMouseMoveOrLeave) {
+            return;
+        }
         this._mouseMoveEvent = mouseEvent;
         if (this._contentWidget?.isFocused || this._contentWidget?.isResizing) {
             return;
@@ -173,7 +192,7 @@ let HoverController = class HoverController extends Disposable {
         }
         const target = mouseEvent.target;
         const mouseOnDecorator = target.element?.classList.contains('colorpicker-color-decoration');
-        const decoratorActivatedOn = this._editor.getOption(148 );
+        const decoratorActivatedOn = this._editor.getOption(EditorOption.colorDecoratorsActivatedOn);
         const enabled = this._hoverSettings.enabled;
         const activatedByDecoratorClick = this._hoverState.activatedByDecoratorClick;
         if ((mouseOnDecorator && ((decoratorActivatedOn === 'click' && !activatedByDecoratorClick) ||
@@ -182,11 +201,11 @@ let HoverController = class HoverController extends Disposable {
             this._hideWidgets();
             return;
         }
-        const contentHoverShowsOrWillShow = this._tryShowHoverWidget(mouseEvent, 0 );
+        const contentHoverShowsOrWillShow = this._tryShowHoverWidget(mouseEvent, HoverWidgetType.Content);
         if (contentHoverShowsOrWillShow) {
             return;
         }
-        const glyphWidgetShowsOrWillShow = this._tryShowHoverWidget(mouseEvent, 1 );
+        const glyphWidgetShowsOrWillShow = this._tryShowHoverWidget(mouseEvent, HoverWidgetType.Glyph);
         if (glyphWidgetShowsOrWillShow) {
             return;
         }
@@ -198,11 +217,11 @@ let HoverController = class HoverController extends Disposable {
         let currentWidget;
         let otherWidget;
         switch (hoverWidgetType) {
-            case 0 :
+            case HoverWidgetType.Content:
                 currentWidget = contentWidget;
                 otherWidget = glyphWidget;
                 break;
-            case 1 :
+            case HoverWidgetType.Glyph:
                 currentWidget = glyphWidget;
                 otherWidget = contentWidget;
                 break;
@@ -220,16 +239,16 @@ let HoverController = class HoverController extends Disposable {
             return;
         }
         const resolvedKeyboardEvent = this._keybindingService.softDispatch(e, this._editor.getDomNode());
-        const shouldKeepHoverVisible = (resolvedKeyboardEvent.kind === 1  ||
-            (resolvedKeyboardEvent.kind === 2
+        const shouldKeepHoverVisible = (resolvedKeyboardEvent.kind === ResultKind.MoreChordsNeeded ||
+            (resolvedKeyboardEvent.kind === ResultKind.KbFound
                 && (resolvedKeyboardEvent.commandId === SHOW_OR_FOCUS_HOVER_ACTION_ID
                     || resolvedKeyboardEvent.commandId === INCREASE_HOVER_VERBOSITY_ACTION_ID
                     || resolvedKeyboardEvent.commandId === DECREASE_HOVER_VERBOSITY_ACTION_ID)
                 && this._contentWidget?.isVisible));
-        if (e.keyCode === 5
-            || e.keyCode === 6
-            || e.keyCode === 57
-            || e.keyCode === 4
+        if (e.keyCode === KeyCode.Ctrl
+            || e.keyCode === KeyCode.Alt
+            || e.keyCode === KeyCode.Meta
+            || e.keyCode === KeyCode.Shift
             || shouldKeepHoverVisible) {
             return;
         }
@@ -247,6 +266,7 @@ let HoverController = class HoverController extends Disposable {
     _getOrCreateContentWidget() {
         if (!this._contentWidget) {
             this._contentWidget = this._instantiationService.createInstance(ContentHoverController, this._editor);
+            this._listenersStore.add(this._contentWidget.onContentsChanged(() => this._onHoverContentsChanged.fire()));
         }
         return this._contentWidget;
     }
@@ -266,8 +286,17 @@ let HoverController = class HoverController extends Disposable {
     _isContentWidgetResizing() {
         return this._contentWidget?.widget.isResizing || false;
     }
-    updateFocusedMarkdownHoverVerbosityLevel(action) {
-        this._getOrCreateContentWidget().updateFocusedMarkdownHoverVerbosityLevel(action);
+    focusedMarkdownHoverIndex() {
+        return this._getOrCreateContentWidget().focusedMarkdownHoverIndex();
+    }
+    markdownHoverContentAtIndex(index) {
+        return this._getOrCreateContentWidget().markdownHoverContentAtIndex(index);
+    }
+    doesMarkdownHoverAtIndexSupportVerbosityAction(index, action) {
+        return this._getOrCreateContentWidget().doesMarkdownHoverAtIndexSupportVerbosityAction(index, action);
+    }
+    updateMarkdownHoverVerbosityLevel(action, index, focus) {
+        this._getOrCreateContentWidget().updateMarkdownHoverVerbosityLevel(action, index, focus);
     }
     focus() {
         this._contentWidget?.focus();

package/vscode/src/vs/editor/contrib/hover/browser/hoverOperation.js

@@ -2,6 +2,25 @@ import { RunOnceScheduler, createCancelableAsyncIterable } from '../../../../bas
 import { onUnexpectedError } from '../../../../base/common/errors.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+var HoverOperationState;
+( (function(HoverOperationState) {
+    HoverOperationState[HoverOperationState["Idle"] = 0] = "Idle";
+    HoverOperationState[HoverOperationState["FirstWait"] = 1] = "FirstWait";
+    HoverOperationState[HoverOperationState["SecondWait"] = 2] = "SecondWait";
+    HoverOperationState[HoverOperationState["WaitingForAsync"] = 3] = "WaitingForAsync";
+    HoverOperationState[HoverOperationState["WaitingForAsyncShowingLoading"] = 4] = "WaitingForAsyncShowingLoading";
+})(HoverOperationState || (HoverOperationState = {})));
+var HoverStartMode;
+( (function(HoverStartMode) {
+    HoverStartMode[HoverStartMode["Delayed"] = 0] = "Delayed";
+    HoverStartMode[HoverStartMode["Immediate"] = 1] = "Immediate";
+})(HoverStartMode || (HoverStartMode = {})));
+var HoverStartSource;
+( (function(HoverStartSource) {
+    HoverStartSource[HoverStartSource["Mouse"] = 0] = "Mouse";
+    HoverStartSource[HoverStartSource["Keyboard"] = 1] = "Keyboard";
+})(HoverStartSource || (HoverStartSource = {})));
 class HoverResult {
     constructor(value, isComplete, hasLoadingMessage) {
         this.value = value;
@@ -19,7 +38,7 @@ class HoverOperation extends Disposable {
         this._firstWaitScheduler = this._register(( new RunOnceScheduler(() => this._triggerAsyncComputation(), 0)));
         this._secondWaitScheduler = this._register(( new RunOnceScheduler(() => this._triggerSyncComputation(), 0)));
         this._loadingMessageScheduler = this._register(( new RunOnceScheduler(() => this._triggerLoadingMessage(), 0)));
-        this._state = 0 ;
+        this._state = HoverOperationState.Idle;
         this._asyncIterable = null;
         this._asyncIterableDone = false;
         this._result = [];
@@ -32,7 +51,7 @@ class HoverOperation extends Disposable {
         super.dispose();
     }
     get _hoverTime() {
-        return this._editor.getOption(60 ).delay;
+        return this._editor.getOption(EditorOption.hover).delay;
     }
     get _firstWaitTime() {
         return this._hoverTime / 2;
@@ -50,7 +69,7 @@ class HoverOperation extends Disposable {
         }
     }
     _triggerAsyncComputation() {
-        this._setState(2 );
+        this._setState(HoverOperationState.SecondWait);
         this._secondWaitScheduler.schedule(this._secondWaitTime);
         if (this._computer.computeAsync) {
             this._asyncIterableDone = false;
@@ -64,8 +83,8 @@ class HoverOperation extends Disposable {
                         }
                     }
                     this._asyncIterableDone = true;
-                    if (this._state === 3  || this._state === 4 ) {
-                        this._setState(0 );
+                    if (this._state === HoverOperationState.WaitingForAsync || this._state === HoverOperationState.WaitingForAsyncShowingLoading) {
+                        this._setState(HoverOperationState.Idle);
                     }
                 }
                 catch (e) {
@@ -81,37 +100,37 @@ class HoverOperation extends Disposable {
         if (this._computer.computeSync) {
             this._result = this._result.concat(this._computer.computeSync());
         }
-        this._setState(this._asyncIterableDone ? 0  : 3 );
+        this._setState(this._asyncIterableDone ? HoverOperationState.Idle : HoverOperationState.WaitingForAsync);
     }
     _triggerLoadingMessage() {
-        if (this._state === 3 ) {
-            this._setState(4 );
+        if (this._state === HoverOperationState.WaitingForAsync) {
+            this._setState(HoverOperationState.WaitingForAsyncShowingLoading);
         }
     }
     _fireResult() {
-        if (this._state === 1  || this._state === 2 ) {
+        if (this._state === HoverOperationState.FirstWait || this._state === HoverOperationState.SecondWait) {
             return;
         }
-        const isComplete = ((this._state === 0) );
-        const hasLoadingMessage = ((this._state === 4) );
+        const isComplete = (this._state === HoverOperationState.Idle);
+        const hasLoadingMessage = (this._state === HoverOperationState.WaitingForAsyncShowingLoading);
         this._onResult.fire(( new HoverResult(this._result.slice(0), isComplete, hasLoadingMessage)));
     }
     start(mode) {
-        if (mode === 0 ) {
-            if (this._state === 0 ) {
-                this._setState(1 );
+        if (mode === HoverStartMode.Delayed) {
+            if (this._state === HoverOperationState.Idle) {
+                this._setState(HoverOperationState.FirstWait);
                 this._firstWaitScheduler.schedule(this._firstWaitTime);
                 this._loadingMessageScheduler.schedule(this._loadingMessageTime);
             }
         }
         else {
             switch (this._state) {
-                case 0 :
+                case HoverOperationState.Idle:
                     this._triggerAsyncComputation();
                     this._secondWaitScheduler.cancel();
                     this._triggerSyncComputation();
                     break;
-                case 2 :
+                case HoverOperationState.SecondWait:
                     this._secondWaitScheduler.cancel();
                     this._triggerSyncComputation();
                     break;
@@ -127,7 +146,7 @@ class HoverOperation extends Disposable {
             this._asyncIterable = null;
         }
         this._result = [];
-        this._setState(0 , false);
+        this._setState(HoverOperationState.Idle, false);
     }
 }
-export { HoverOperation, HoverResult };
+export { HoverOperation, HoverResult, HoverStartMode, HoverStartSource };

package/vscode/src/vs/editor/contrib/hover/browser/hoverTypes.js

@@ -1,16 +1,21 @@
+var HoverAnchorType;
+( (function(HoverAnchorType) {
+    HoverAnchorType[HoverAnchorType["Range"] = 1] = "Range";
+    HoverAnchorType[HoverAnchorType["ForeignElement"] = 2] = "ForeignElement";
+})(HoverAnchorType || (HoverAnchorType = {})));
 class HoverRangeAnchor {
     constructor(priority, range, initialMousePosX, initialMousePosY) {
         this.priority = priority;
         this.range = range;
         this.initialMousePosX = initialMousePosX;
         this.initialMousePosY = initialMousePosY;
-        this.type = 1 ;
+        this.type = HoverAnchorType.Range;
     }
     equals(other) {
-        return (other.type === 1  && this.range.equalsRange(other.range));
+        return (other.type === HoverAnchorType.Range && this.range.equalsRange(other.range));
     }
     canAdoptVisibleHover(lastAnchor, showAtPosition) {
-        return (lastAnchor.type === 1  && showAtPosition.lineNumber === this.range.startLineNumber);
+        return (lastAnchor.type === HoverAnchorType.Range && showAtPosition.lineNumber === this.range.startLineNumber);
     }
 }
 class HoverForeignElementAnchor {
@@ -21,13 +26,13 @@ class HoverForeignElementAnchor {
         this.initialMousePosX = initialMousePosX;
         this.initialMousePosY = initialMousePosY;
         this.supportsMarkerHover = supportsMarkerHover;
-        this.type = 2 ;
+        this.type = HoverAnchorType.ForeignElement;
     }
     equals(other) {
-        return (other.type === 2  && this.owner === other.owner);
+        return (other.type === HoverAnchorType.ForeignElement && this.owner === other.owner);
     }
     canAdoptVisibleHover(lastAnchor, showAtPosition) {
-        return (lastAnchor.type === 2  && this.owner === lastAnchor.owner);
+        return (lastAnchor.type === HoverAnchorType.ForeignElement && this.owner === lastAnchor.owner);
     }
 }
 const HoverParticipantRegistry = (new (class HoverParticipantRegistry {
@@ -41,4 +46,4 @@ const HoverParticipantRegistry = (new (class HoverParticipantRegistry {
         return this._participants;
     }
 })());
-export { HoverForeignElementAnchor, HoverParticipantRegistry, HoverRangeAnchor };
+export { HoverAnchorType, HoverForeignElementAnchor, HoverParticipantRegistry, HoverRangeAnchor };

package/vscode/src/vs/editor/contrib/hover/browser/marginHoverWidget.js

@@ -1,7 +1,9 @@
 import { append, $ as $$1 } from '../../../../base/browser/dom.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { MarkdownRenderer } from '../../../browser/widget/markdownRenderer/browser/markdownRenderer.js';
-import { HoverOperation } from './hoverOperation.js';
+import { MouseTargetType } from '../../../browser/editorBrowser.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { HoverOperation, HoverStartMode } from './hoverOperation.js';
 import { HoverWidget } from '../../../../base/browser/ui/hover/hoverWidget.js';
 import { MarginHoverComputer } from './marginHoverComputer.js';
 const $ = $$1;
@@ -23,7 +25,7 @@ class MarginHoverWidget extends Disposable {
         }));
         this._register(this._editor.onDidChangeModelDecorations(() => this._onModelDecorationsChanged()));
         this._register(this._editor.onDidChangeConfiguration((e) => {
-            if (e.hasChanged(50 )) {
+            if (e.hasChanged(EditorOption.fontInfo)) {
                 this._updateFont();
             }
         }));
@@ -49,16 +51,16 @@ class MarginHoverWidget extends Disposable {
     _onModelDecorationsChanged() {
         if (this._isVisible) {
             this._hoverOperation.cancel();
-            this._hoverOperation.start(0 );
+            this._hoverOperation.start(HoverStartMode.Delayed);
         }
     }
     showsOrWillShow(mouseEvent) {
         const target = mouseEvent.target;
-        if (target.type === 2  && target.detail.glyphMarginLane) {
+        if (target.type === MouseTargetType.GUTTER_GLYPH_MARGIN && target.detail.glyphMarginLane) {
             this._startShowingAt(target.position.lineNumber, target.detail.glyphMarginLane);
             return true;
         }
-        if (target.type === 3 ) {
+        if (target.type === MouseTargetType.GUTTER_LINE_NUMBERS) {
             this._startShowingAt(target.position.lineNumber, 'lineNo');
             return true;
         }
@@ -72,7 +74,7 @@ class MarginHoverWidget extends Disposable {
         this.hide();
         this._computer.lineNumber = lineNumber;
         this._computer.lane = laneOrLine;
-        this._hoverOperation.start(0 );
+        this._hoverOperation.start(HoverStartMode.Delayed);
     }
     hide() {
         this._computer.lineNumber = -1;
@@ -118,7 +120,7 @@ class MarginHoverWidget extends Disposable {
         const editorLayout = this._editor.getLayoutInfo();
         const topForLineNumber = this._editor.getTopForLineNumber(lineNumber);
         const editorScrollTop = this._editor.getScrollTop();
-        const lineHeight = this._editor.getOption(67 );
+        const lineHeight = this._editor.getOption(EditorOption.lineHeight);
         const nodeHeight = this._hover.containerDomNode.clientHeight;
         const top = topForLineNumber - editorScrollTop - ((nodeHeight - lineHeight) / 2);
         const left = editorLayout.glyphMarginLeft + editorLayout.glyphMarginWidth + (this._computer.lane === 'lineNo' ? editorLayout.lineNumbersWidth : 0);