@codingame/monaco-vscode-api 8.0.3 → 9.0.0

package/vscode/src/vs/editor/contrib/hover/browser/{hoverController.js → contentHoverController2.js}

@@ -2,28 +2,21 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 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 { InlineSuggestionHintsContentWidget } from '../../inlineCompletions/browser/hintsWidget/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 { isMousePositionWithinElement } from './hoverUtils.js';
+import { ContentHoverWidgetWrapper } from './contentHoverWidgetWrapper.js';
 import './hover.css.js';
-import { MarginHoverWidget } from './marginHoverWidget.js';
 import { Emitter } from '../../../../base/common/event.js';
-var HoverController_1;
+var ContentHoverController_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'; }
+let ContentHoverController = class ContentHoverController extends Disposable {
+    static { ContentHoverController_1 = this; }
+    static { this.ID = 'editor.contrib.contentHover'; }
     constructor(_editor, _instantiationService, _keybindingService) {
         super();
         this._editor = _editor;
@@ -47,14 +40,14 @@ let HoverController = class HoverController extends Disposable {
         }));
     }
     static get(editor) {
-        return editor.getContribution(HoverController_1.ID);
+        return editor.getContribution(ContentHoverController_1.ID);
     }
     _hookListeners() {
         const hoverOpts = this._editor.getOption(EditorOption.hover);
         this._hoverSettings = {
             enabled: hoverOpts.enabled,
             sticky: hoverOpts.sticky,
-            hidingDelay: hoverOpts.delay
+            hidingDelay: hoverOpts.hidingDelay
         };
         if (hoverOpts.enabled) {
             this._listenersStore.add(this._editor.onMouseDown((e) => this._onEditorMouseDown(e)));
@@ -95,26 +88,14 @@ let HoverController = class HoverController extends Disposable {
         this._hideWidgets();
     }
     _shouldNotHideCurrentHoverWidget(mouseEvent) {
-        if (this._isMouseOnContentHoverWidget(mouseEvent)
-            || this._isMouseOnMarginHoverWidget(mouseEvent)
-            || this._isContentWidgetResizing()) {
-            return true;
-        }
-        return false;
-    }
-    _isMouseOnMarginHoverWidget(mouseEvent) {
-        const target = mouseEvent.target;
-        if (!target) {
-            return false;
-        }
-        return target.type === MouseTargetType.OVERLAY_WIDGET && target.detail === MarginHoverWidget.ID;
+        return this._isMouseOnContentHoverWidget(mouseEvent) || this._isContentWidgetResizing();
     }
     _isMouseOnContentHoverWidget(mouseEvent) {
-        const target = mouseEvent.target;
-        if (!target) {
-            return false;
+        const contentWidgetNode = this._contentWidget?.getDomNode();
+        if (contentWidgetNode) {
+            return isMousePositionWithinElement(contentWidgetNode, mouseEvent.event.posx, mouseEvent.event.posy);
         }
-        return target.type === MouseTargetType.CONTENT_WIDGET && target.detail === ContentHoverWidget.ID;
+        return false;
     }
     _onEditorMouseUp() {
         this._hoverState.mouseDown = false;
@@ -132,31 +113,23 @@ let HoverController = class HoverController extends Disposable {
     }
     _shouldNotRecomputeCurrentHoverWidget(mouseEvent) {
         const isHoverSticky = this._hoverSettings.sticky;
-        const isMouseOnStickyMarginHoverWidget = (mouseEvent, isHoverSticky) => {
-            const isMouseOnMarginHoverWidget = this._isMouseOnMarginHoverWidget(mouseEvent);
-            return isHoverSticky && isMouseOnMarginHoverWidget;
-        };
         const isMouseOnStickyContentHoverWidget = (mouseEvent, isHoverSticky) => {
             const isMouseOnContentHoverWidget = this._isMouseOnContentHoverWidget(mouseEvent);
             return isHoverSticky && isMouseOnContentHoverWidget;
         };
         const isMouseOnColorPicker = (mouseEvent) => {
             const isMouseOnContentHoverWidget = this._isMouseOnContentHoverWidget(mouseEvent);
-            const isColorPickerVisible = this._contentWidget?.isColorPickerVisible;
+            const isColorPickerVisible = this._contentWidget?.isColorPickerVisible ?? false;
             return isMouseOnContentHoverWidget && isColorPickerVisible;
         };
         const isTextSelectedWithinContentHoverWidget = (mouseEvent, sticky) => {
-            return sticky
+            return (sticky
                 && this._contentWidget?.containsNode(mouseEvent.event.browserEvent.view?.document.activeElement)
-                && !mouseEvent.event.browserEvent.view?.getSelection()?.isCollapsed;
+                && !mouseEvent.event.browserEvent.view?.getSelection()?.isCollapsed) ?? false;
         };
-        if (isMouseOnStickyMarginHoverWidget(mouseEvent, isHoverSticky)
-            || isMouseOnStickyContentHoverWidget(mouseEvent, isHoverSticky)
+        return isMouseOnStickyContentHoverWidget(mouseEvent, isHoverSticky)
             || isMouseOnColorPicker(mouseEvent)
-            || isTextSelectedWithinContentHoverWidget(mouseEvent, isHoverSticky)) {
-            return true;
-        }
-        return false;
+            || isTextSelectedWithinContentHoverWidget(mouseEvent, isHoverSticky);
     }
     _onEditorMouseMove(mouseEvent) {
         if (this.shouldKeepOpenOnEditorMouseMoveOrLeave) {
@@ -201,38 +174,15 @@ let HoverController = class HoverController extends Disposable {
             this._hideWidgets();
             return;
         }
-        const contentHoverShowsOrWillShow = this._tryShowHoverWidget(mouseEvent, HoverWidgetType.Content);
+        const contentHoverShowsOrWillShow = this._tryShowHoverWidget(mouseEvent);
         if (contentHoverShowsOrWillShow) {
             return;
         }
-        const glyphWidgetShowsOrWillShow = this._tryShowHoverWidget(mouseEvent, HoverWidgetType.Glyph);
-        if (glyphWidgetShowsOrWillShow) {
-            return;
-        }
         this._hideWidgets();
     }
-    _tryShowHoverWidget(mouseEvent, hoverWidgetType) {
+    _tryShowHoverWidget(mouseEvent) {
         const contentWidget = this._getOrCreateContentWidget();
-        const glyphWidget = this._getOrCreateGlyphWidget();
-        let currentWidget;
-        let otherWidget;
-        switch (hoverWidgetType) {
-            case HoverWidgetType.Content:
-                currentWidget = contentWidget;
-                otherWidget = glyphWidget;
-                break;
-            case HoverWidgetType.Glyph:
-                currentWidget = glyphWidget;
-                otherWidget = contentWidget;
-                break;
-            default:
-                throw ( new Error(`HoverWidgetType ${hoverWidgetType} is unrecognized`));
-        }
-        const showsOrWillShow = currentWidget.showsOrWillShow(mouseEvent);
-        if (showsOrWillShow) {
-            otherWidget.hide();
-        }
-        return showsOrWillShow;
+        return contentWidget.showsOrWillShow(mouseEvent);
     }
     _onKeyDown(e) {
         if (!this._editor.hasModel()) {
@@ -260,22 +210,15 @@ let HoverController = class HoverController extends Disposable {
             return;
         }
         this._hoverState.activatedByDecoratorClick = false;
-        this._glyphWidget?.hide();
         this._contentWidget?.hide();
     }
     _getOrCreateContentWidget() {
         if (!this._contentWidget) {
-            this._contentWidget = this._instantiationService.createInstance(ContentHoverController, this._editor);
+            this._contentWidget = this._instantiationService.createInstance(ContentHoverWidgetWrapper, this._editor);
             this._listenersStore.add(this._contentWidget.onContentsChanged(() => this._onHoverContentsChanged.fire()));
         }
         return this._contentWidget;
     }
-    _getOrCreateGlyphWidget() {
-        if (!this._glyphWidget) {
-            this._glyphWidget = this._instantiationService.createInstance(MarginHoverWidget, this._editor);
-        }
-        return this._glyphWidget;
-    }
     hideContentHover() {
         this._hideWidgets();
     }
@@ -344,12 +287,11 @@ let HoverController = class HoverController extends Disposable {
         super.dispose();
         this._unhookListeners();
         this._listenersStore.dispose();
-        this._glyphWidget?.dispose();
         this._contentWidget?.dispose();
     }
 };
-HoverController = HoverController_1 = ( __decorate([
+ContentHoverController = ContentHoverController_1 = ( __decorate([
     ( __param(1, IInstantiationService)),
     ( __param(2, IKeybindingService))
-], HoverController));
-export { HoverController };
+], ContentHoverController));
+export { ContentHoverController };

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

@@ -238,19 +238,19 @@ class RenderedContentHoverParts extends Disposable {
             return '';
         }
         if (renderedPart.type === 'statusBar') {
-            const statusBarDescription = [( localize(11233, "This is a hover status bar."))];
+            const statusBarDescription = [( localize(11293, "This is a hover status bar."))];
             for (const action of renderedPart.actions) {
                 const keybinding = action.actionKeybindingLabel;
                 if (keybinding) {
                     statusBarDescription.push(( localize(
-                        11234,
+                        11294,
                         "It has an action with label {0} and keybinding {1}.",
                         action.actionLabel,
                         keybinding
                     )));
                 }
                 else {
-                    statusBarDescription.push(( localize(11235, "It has an action with label {0}.", action.actionLabel)));
+                    statusBarDescription.push(( localize(11295, "It has an action with label {0}.", action.actionLabel)));
                 }
             }
             return statusBarDescription.join('\n');

package/vscode/src/vs/editor/contrib/hover/browser/{contentHoverController.js → contentHoverWidgetWrapper.js}

@@ -14,7 +14,8 @@ import { ContentHoverComputer } from './contentHoverComputer.js';
 import { HoverResult } from './contentHoverTypes.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { RenderedContentHover } from './contentHoverRendered.js';
-let ContentHoverController = class ContentHoverController extends Disposable {
+import { isMousePositionWithinElement } from './hoverUtils.js';
+let ContentHoverWidgetWrapper = class ContentHoverWidgetWrapper extends Disposable {
     constructor(_editor, _instantiationService, _keybindingService) {
         super();
         this._editor = _editor;
@@ -49,11 +50,15 @@ let ContentHoverController = class ContentHoverController extends Disposable {
             const messages = (result.hasLoadingMessage ? this._addLoadingMessage(result.value) : result.value);
             this._withResult(( new HoverResult(this._computer.anchor, messages, result.isComplete)));
         }));
-        this._register(addStandardDisposableListener(this._contentHoverWidget.getDomNode(), 'keydown', (e) => {
+        const contentHoverWidgetNode = this._contentHoverWidget.getDomNode();
+        this._register(addStandardDisposableListener(contentHoverWidgetNode, 'keydown', (e) => {
             if (e.equals(KeyCode.Escape)) {
                 this.hide();
             }
         }));
+        this._register(addStandardDisposableListener(contentHoverWidgetNode, 'mouseleave', (e) => {
+            this._onMouseLeave(e);
+        }));
         this._register(TokenizationRegistry.onDidChange(() => {
             if (this._contentHoverWidget.position && this._currentResult) {
                 this._setCurrentResult(this._currentResult);
@@ -238,6 +243,13 @@ let ContentHoverController = class ContentHoverController extends Disposable {
         anchorCandidates.sort((a, b) => b.priority - a.priority);
         return anchorCandidates;
     }
+    _onMouseLeave(e) {
+        const editorDomNode = this._editor.getDomNode();
+        const isMousePositionOutsideOfEditor = !editorDomNode || !isMousePositionWithinElement(editorDomNode, e.x, e.y);
+        if (isMousePositionOutsideOfEditor) {
+            this.hide();
+        }
+    }
     startShowingAtRange(range, mode, source, focus) {
         this._startShowingOrUpdateHover(( new HoverRangeAnchor(0, range, undefined, undefined)), mode, source, focus, null);
     }
@@ -301,6 +313,9 @@ let ContentHoverController = class ContentHoverController extends Disposable {
         this._hoverOperation.cancel();
         this._setCurrentResult(null);
     }
+    getDomNode() {
+        return this._contentHoverWidget.getDomNode();
+    }
     get isColorPickerVisible() {
         return this._renderedContentHover?.isColorPickerVisible() ?? false;
     }
@@ -320,8 +335,8 @@ let ContentHoverController = class ContentHoverController extends Disposable {
         return this._contentHoverWidget;
     }
 };
-ContentHoverController = ( __decorate([
+ContentHoverWidgetWrapper = ( __decorate([
     ( __param(1, IInstantiationService)),
     ( __param(2, IKeybindingService))
-], ContentHoverController));
-export { ContentHoverController };
+], ContentHoverWidgetWrapper));
+export { ContentHoverWidgetWrapper };

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

@@ -1,6 +1,6 @@
 import { localize } from '../../../../nls.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
-import { HoverController } from './hoverController.js';
+import { ContentHoverController } from './contentHoverController2.js';
 import { AccessibleViewType, AccessibleContentProvider, AccessibleViewProviderId } from '../../../../platform/accessibility/browser/accessibleView.js';
 import { IContextViewService } from '../../../../platform/contextview/browser/contextView.service.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
@@ -18,12 +18,12 @@ import { labelForHoverVerbosityAction } from './markdownHoverParticipant.js';
 var HoverAccessibilityHelpNLS;
 ( ((function(HoverAccessibilityHelpNLS) {
     HoverAccessibilityHelpNLS.increaseVerbosity = ( localize(
-        5160,
+        5153,
         '- The focused hover part verbosity level can be increased with the Increase Hover Verbosity command.',
         `<keybinding:${INCREASE_HOVER_VERBOSITY_ACTION_ID}>`
     ));
     HoverAccessibilityHelpNLS.decreaseVerbosity = ( localize(
-        5161,
+        5154,
         '- The focused hover part verbosity level can be decreased with the Decrease Hover Verbosity command.',
         `<keybinding:${DECREASE_HOVER_VERBOSITY_ACTION_ID}>`
     ));
@@ -41,7 +41,7 @@ class HoverAccessibleView {
         if (!codeEditor) {
             throw ( (new Error('No active or focused code editor')));
         }
-        const hoverController = HoverController.get(codeEditor);
+        const hoverController = ContentHoverController.get(codeEditor);
         if (!hoverController) {
             return;
         }
@@ -62,7 +62,7 @@ class HoverAccessibilityHelp {
         if (!codeEditor) {
             throw ( (new Error('No active or focused code editor')));
         }
-        const hoverController = HoverController.get(codeEditor);
+        const hoverController = ContentHoverController.get(codeEditor);
         if (!hoverController) {
             return;
         }

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

@@ -11,8 +11,8 @@ const GO_TO_TOP_HOVER_ACTION_ID = 'editor.action.goToTopHover';
 const GO_TO_BOTTOM_HOVER_ACTION_ID = 'editor.action.goToBottomHover';
 const INCREASE_HOVER_VERBOSITY_ACTION_ID = 'editor.action.increaseHoverVerbosityLevel';
 const INCREASE_HOVER_VERBOSITY_ACCESSIBLE_ACTION_ID = 'editor.action.increaseHoverVerbosityLevelFromAccessibleView';
-const INCREASE_HOVER_VERBOSITY_ACTION_LABEL = ( localize(9857, "Increase Hover Verbosity Level"));
+const INCREASE_HOVER_VERBOSITY_ACTION_LABEL = ( localize(9901, "Increase Hover Verbosity Level"));
 const DECREASE_HOVER_VERBOSITY_ACTION_ID = 'editor.action.decreaseHoverVerbosityLevel';
 const DECREASE_HOVER_VERBOSITY_ACCESSIBLE_ACTION_ID = 'editor.action.decreaseHoverVerbosityLevelFromAccessibleView';
-const DECREASE_HOVER_VERBOSITY_ACTION_LABEL = ( localize(9858, "Decrease Hover Verbosity Level"));
+const DECREASE_HOVER_VERBOSITY_ACTION_LABEL = ( localize(9902, "Decrease Hover Verbosity Level"));
 export { DECREASE_HOVER_VERBOSITY_ACCESSIBLE_ACTION_ID, DECREASE_HOVER_VERBOSITY_ACTION_ID, DECREASE_HOVER_VERBOSITY_ACTION_LABEL, GO_TO_BOTTOM_HOVER_ACTION_ID, GO_TO_TOP_HOVER_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACCESSIBLE_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACTION_LABEL, PAGE_DOWN_HOVER_ACTION_ID, PAGE_UP_HOVER_ACTION_ID, SCROLL_DOWN_HOVER_ACTION_ID, SCROLL_LEFT_HOVER_ACTION_ID, SCROLL_RIGHT_HOVER_ACTION_ID, SCROLL_UP_HOVER_ACTION_ID, SHOW_DEFINITION_PREVIEW_HOVER_ACTION_ID, SHOW_OR_FOCUS_HOVER_ACTION_ID };

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

@@ -8,7 +8,7 @@ import { GotoDefinitionAtPositionEditorContribution } from '../../gotoSymbol/bro
 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 { ContentHoverController } from './contentHoverController2.js';
 import { HoverVerbosityAction } from '../../../common/languages.js';
 import { localize, localize2 } from '../../../../nls.js';
 import './hover.css.js';
@@ -22,10 +22,10 @@ class ShowOrFocusHoverAction extends EditorAction {
     constructor() {
         super({
             id: SHOW_OR_FOCUS_HOVER_ACTION_ID,
-            label: ( localize(5124, "Show or Focus Hover")),
+            label: ( localize(5117, "Show or Focus Hover")),
             metadata: {
                 description: ( localize2(
-                    5125,
+                    5118,
                     'Show or focus the editor hover which shows documentation, references, and other content for a symbol at the current cursor position.'
                 )),
                 args: [{
@@ -37,9 +37,9 @@ class ShowOrFocusHoverAction extends EditorAction {
                                     description: 'Controls if and when the hover should take focus upon being triggered by this action.',
                                     enum: [HoverFocusBehavior.NoAutoFocus, HoverFocusBehavior.FocusIfVisible, HoverFocusBehavior.AutoFocusImmediately],
                                     enumDescriptions: [
-                                        ( localize(5126, 'The hover will not automatically take focus.')),
-                                        ( localize(5127, 'The hover will take focus only if it is already visible.')),
-                                        ( localize(5128, 'The hover will automatically take focus when it appears.')),
+                                        ( localize(5119, 'The hover will not automatically take focus.')),
+                                        ( localize(5120, 'The hover will take focus only if it is already visible.')),
+                                        ( localize(5121, 'The hover will automatically take focus when it appears.')),
                                     ],
                                     default: HoverFocusBehavior.FocusIfVisible,
                                 }
@@ -60,7 +60,7 @@ class ShowOrFocusHoverAction extends EditorAction {
         if (!editor.hasModel()) {
             return;
         }
-        const controller = HoverController.get(editor);
+        const controller = ContentHoverController.get(editor);
         if (!controller) {
             return;
         }
@@ -95,16 +95,16 @@ class ShowDefinitionPreviewHoverAction extends EditorAction {
     constructor() {
         super({
             id: SHOW_DEFINITION_PREVIEW_HOVER_ACTION_ID,
-            label: ( localize(5129, "Show Definition Preview Hover")),
+            label: ( localize(5122, "Show Definition Preview Hover")),
             alias: 'Show Definition Preview Hover',
             precondition: undefined,
             metadata: {
-                description: ( localize2(5130, 'Show the definition preview hover in the editor.')),
+                description: ( localize2(5123, 'Show the definition preview hover in the editor.')),
             },
         });
     }
     run(accessor, editor) {
-        const controller = HoverController.get(editor);
+        const controller = ContentHoverController.get(editor);
         if (!controller) {
             return;
         }
@@ -127,7 +127,7 @@ class ScrollUpHoverAction extends EditorAction {
     constructor() {
         super({
             id: SCROLL_UP_HOVER_ACTION_ID,
-            label: ( localize(5131, "Scroll Up Hover")),
+            label: ( localize(5124, "Scroll Up Hover")),
             alias: 'Scroll Up Hover',
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
@@ -136,12 +136,12 @@ class ScrollUpHoverAction extends EditorAction {
                 weight: KeybindingWeight.EditorContrib
             },
             metadata: {
-                description: ( localize2(5132, 'Scroll up the editor hover.'))
+                description: ( localize2(5125, 'Scroll up the editor hover.'))
             },
         });
     }
     run(accessor, editor) {
-        const controller = HoverController.get(editor);
+        const controller = ContentHoverController.get(editor);
         if (!controller) {
             return;
         }
@@ -152,7 +152,7 @@ class ScrollDownHoverAction extends EditorAction {
     constructor() {
         super({
             id: SCROLL_DOWN_HOVER_ACTION_ID,
-            label: ( localize(5133, "Scroll Down Hover")),
+            label: ( localize(5126, "Scroll Down Hover")),
             alias: 'Scroll Down Hover',
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
@@ -161,12 +161,12 @@ class ScrollDownHoverAction extends EditorAction {
                 weight: KeybindingWeight.EditorContrib
             },
             metadata: {
-                description: ( localize2(5134, 'Scroll down the editor hover.')),
+                description: ( localize2(5127, 'Scroll down the editor hover.')),
             },
         });
     }
     run(accessor, editor) {
-        const controller = HoverController.get(editor);
+        const controller = ContentHoverController.get(editor);
         if (!controller) {
             return;
         }
@@ -177,7 +177,7 @@ class ScrollLeftHoverAction extends EditorAction {
     constructor() {
         super({
             id: SCROLL_LEFT_HOVER_ACTION_ID,
-            label: ( localize(5135, "Scroll Left Hover")),
+            label: ( localize(5128, "Scroll Left Hover")),
             alias: 'Scroll Left Hover',
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
@@ -186,12 +186,12 @@ class ScrollLeftHoverAction extends EditorAction {
                 weight: KeybindingWeight.EditorContrib
             },
             metadata: {
-                description: ( localize2(5136, 'Scroll left the editor hover.')),
+                description: ( localize2(5129, 'Scroll left the editor hover.')),
             },
         });
     }
     run(accessor, editor) {
-        const controller = HoverController.get(editor);
+        const controller = ContentHoverController.get(editor);
         if (!controller) {
             return;
         }
@@ -202,7 +202,7 @@ class ScrollRightHoverAction extends EditorAction {
     constructor() {
         super({
             id: SCROLL_RIGHT_HOVER_ACTION_ID,
-            label: ( localize(5137, "Scroll Right Hover")),
+            label: ( localize(5130, "Scroll Right Hover")),
             alias: 'Scroll Right Hover',
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
@@ -211,12 +211,12 @@ class ScrollRightHoverAction extends EditorAction {
                 weight: KeybindingWeight.EditorContrib
             },
             metadata: {
-                description: ( localize2(5138, 'Scroll right the editor hover.'))
+                description: ( localize2(5131, 'Scroll right the editor hover.'))
             },
         });
     }
     run(accessor, editor) {
-        const controller = HoverController.get(editor);
+        const controller = ContentHoverController.get(editor);
         if (!controller) {
             return;
         }
@@ -227,7 +227,7 @@ class PageUpHoverAction extends EditorAction {
     constructor() {
         super({
             id: PAGE_UP_HOVER_ACTION_ID,
-            label: ( localize(5139, "Page Up Hover")),
+            label: ( localize(5132, "Page Up Hover")),
             alias: 'Page Up Hover',
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
@@ -237,12 +237,12 @@ class PageUpHoverAction extends EditorAction {
                 weight: KeybindingWeight.EditorContrib
             },
             metadata: {
-                description: ( localize2(5140, 'Page up the editor hover.')),
+                description: ( localize2(5133, 'Page up the editor hover.')),
             },
         });
     }
     run(accessor, editor) {
-        const controller = HoverController.get(editor);
+        const controller = ContentHoverController.get(editor);
         if (!controller) {
             return;
         }
@@ -253,7 +253,7 @@ class PageDownHoverAction extends EditorAction {
     constructor() {
         super({
             id: PAGE_DOWN_HOVER_ACTION_ID,
-            label: ( localize(5141, "Page Down Hover")),
+            label: ( localize(5134, "Page Down Hover")),
             alias: 'Page Down Hover',
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
@@ -263,12 +263,12 @@ class PageDownHoverAction extends EditorAction {
                 weight: KeybindingWeight.EditorContrib
             },
             metadata: {
-                description: ( localize2(5142, 'Page down the editor hover.')),
+                description: ( localize2(5135, 'Page down the editor hover.')),
             },
         });
     }
     run(accessor, editor) {
-        const controller = HoverController.get(editor);
+        const controller = ContentHoverController.get(editor);
         if (!controller) {
             return;
         }
@@ -279,7 +279,7 @@ class GoToTopHoverAction extends EditorAction {
     constructor() {
         super({
             id: GO_TO_TOP_HOVER_ACTION_ID,
-            label: ( localize(5143, "Go To Top Hover")),
+            label: ( localize(5136, "Go To Top Hover")),
             alias: 'Go To Bottom Hover',
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
@@ -289,12 +289,12 @@ class GoToTopHoverAction extends EditorAction {
                 weight: KeybindingWeight.EditorContrib
             },
             metadata: {
-                description: ( localize2(5144, 'Go to the top of the editor hover.')),
+                description: ( localize2(5137, 'Go to the top of the editor hover.')),
             },
         });
     }
     run(accessor, editor) {
-        const controller = HoverController.get(editor);
+        const controller = ContentHoverController.get(editor);
         if (!controller) {
             return;
         }
@@ -305,7 +305,7 @@ class GoToBottomHoverAction extends EditorAction {
     constructor() {
         super({
             id: GO_TO_BOTTOM_HOVER_ACTION_ID,
-            label: ( localize(5145, "Go To Bottom Hover")),
+            label: ( localize(5138, "Go To Bottom Hover")),
             alias: 'Go To Bottom Hover',
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
@@ -315,12 +315,12 @@ class GoToBottomHoverAction extends EditorAction {
                 weight: KeybindingWeight.EditorContrib
             },
             metadata: {
-                description: ( localize2(5146, 'Go to the bottom of the editor hover.'))
+                description: ( localize2(5139, 'Go to the bottom of the editor hover.'))
             },
         });
     }
     run(accessor, editor) {
-        const controller = HoverController.get(editor);
+        const controller = ContentHoverController.get(editor);
         if (!controller) {
             return;
         }
@@ -337,7 +337,7 @@ class IncreaseHoverVerbosityLevel extends EditorAction {
         });
     }
     run(accessor, editor, args) {
-        const hoverController = HoverController.get(editor);
+        const hoverController = ContentHoverController.get(editor);
         if (!hoverController) {
             return;
         }
@@ -355,12 +355,12 @@ class DecreaseHoverVerbosityLevel extends EditorAction {
         });
     }
     run(accessor, editor, args) {
-        const hoverController = HoverController.get(editor);
+        const hoverController = ContentHoverController.get(editor);
         if (!hoverController) {
             return;
         }
         const index = args?.index !== undefined ? args.index : hoverController.focusedHoverPartIndex();
-        HoverController.get(editor)?.updateHoverVerbosityLevel(HoverVerbosityAction.Decrease, index, args?.focus);
+        ContentHoverController.get(editor)?.updateHoverVerbosityLevel(HoverVerbosityAction.Decrease, 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

@@ -15,11 +15,13 @@ import { registerThemingParticipant } from '../../../../platform/theme/common/th
 import { HoverParticipantRegistry } from './hoverTypes.js';
 import { MarkdownHoverParticipant } from './markdownHoverParticipant.js';
 import { MarkerHoverParticipant } from './markerHoverParticipant.js';
-import { HoverController } from './hoverController.js';
+import { ContentHoverController } from './contentHoverController2.js';
+import { MarginHoverController } from './marginHoverController.js';
 import './hover.css.js';
 import { AccessibleViewRegistry } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
 import { HoverAccessibleView, HoverAccessibilityHelp, ExtHoverAccessibleView } from './hoverAccessibleViews.js';
-registerEditorContribution(HoverController.ID, HoverController, EditorContributionInstantiation.BeforeFirstInteraction);
+registerEditorContribution(ContentHoverController.ID, ContentHoverController, EditorContributionInstantiation.BeforeFirstInteraction);
+registerEditorContribution(MarginHoverController.ID, MarginHoverController, EditorContributionInstantiation.BeforeFirstInteraction);
 registerEditorAction(ShowOrFocusHoverAction);
 registerEditorAction(ShowDefinitionPreviewHoverAction);
 registerEditorAction(ScrollUpHoverAction);

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

@@ -0,0 +1,12 @@
+import { getDomNodePagePosition } from '../../../../base/browser/dom.js';
+function isMousePositionWithinElement(element, posx, posy) {
+    const elementRect = getDomNodePagePosition(element);
+    if (posx < elementRect.left
+        || posx > elementRect.left + elementRect.width
+        || posy < elementRect.top
+        || posy > elementRect.top + elementRect.height) {
+        return false;
+    }
+    return true;
+}
+export { isMousePositionWithinElement };