@codingame/monaco-vscode-api 9.0.3 → 10.0.1

package/vscode/src/vs/editor/contrib/hover/browser/{marginHoverWidget.js → glyphHoverWidget.js}

@@ -2,18 +2,16 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { addStandardDisposableListener, 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 { MouseTargetType } from '../../../browser/editorBrowser.js';
-import { EditorOption } from '../../../common/config/editorOptions.js';
 import { ILanguageService } from '../../../common/languages/language.js';
-import { HoverOperation, HoverStartMode } from './hoverOperation.js';
+import { HoverOperation } from './hoverOperation.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.service.js';
 import { HoverWidget } from '../../../../base/browser/ui/hover/hoverWidget.js';
-import { MarginHoverComputer } from './marginHoverComputer.js';
+import { GlyphHoverComputer } from './glyphHoverComputer.js';
 import { isMousePositionWithinElement } from './hoverUtils.js';
-var MarginHoverWidget_1;
+var GlyphHoverWidget_1;
 const $ = $$1;
-let MarginHoverWidget = class MarginHoverWidget extends Disposable {
-    static { MarginHoverWidget_1 = this; }
+let GlyphHoverWidget = class GlyphHoverWidget extends Disposable {
+    static { GlyphHoverWidget_1 = this; }
     static { this.ID = 'editor.contrib.modesGlyphHoverWidget'; }
     constructor(editor, languageService, openerService) {
         super();
@@ -24,14 +22,11 @@ let MarginHoverWidget = class MarginHoverWidget extends Disposable {
         this._hover = this._register(( new HoverWidget()));
         this._hover.containerDomNode.classList.toggle('hidden', !this._isVisible);
         this._markdownRenderer = this._register(( new MarkdownRenderer({ editor: this._editor }, languageService, openerService)));
-        this._computer = ( new MarginHoverComputer(this._editor));
-        this._hoverOperation = this._register(( new HoverOperation(this._editor, this._computer)));
-        this._register(this._hoverOperation.onResult((result) => {
-            this._withResult(result.value);
-        }));
+        this._hoverOperation = this._register(( new HoverOperation(this._editor, ( new GlyphHoverComputer(this._editor)))));
+        this._register(this._hoverOperation.onResult((result) => this._withResult(result)));
         this._register(this._editor.onDidChangeModelDecorations(() => this._onModelDecorationsChanged()));
         this._register(this._editor.onDidChangeConfiguration((e) => {
-            if (e.hasChanged(EditorOption.fontInfo)) {
+            if (e.hasChanged(52 )) {
                 this._updateFont();
             }
         }));
@@ -41,11 +36,12 @@ let MarginHoverWidget = class MarginHoverWidget extends Disposable {
         this._editor.addOverlayWidget(this);
     }
     dispose() {
+        this._hoverComputerOptions = undefined;
         this._editor.removeOverlayWidget(this);
         super.dispose();
     }
     getId() {
-        return MarginHoverWidget_1.ID;
+        return GlyphHoverWidget_1.ID;
     }
     getDomNode() {
         return this._hover.containerDomNode;
@@ -58,35 +54,36 @@ let MarginHoverWidget = class MarginHoverWidget extends Disposable {
         codeClasses.forEach(node => this._editor.applyFontInfo(node));
     }
     _onModelDecorationsChanged() {
-        if (this._isVisible) {
+        if (this._isVisible && this._hoverComputerOptions) {
             this._hoverOperation.cancel();
-            this._hoverOperation.start(HoverStartMode.Delayed);
+            this._hoverOperation.start(0 , this._hoverComputerOptions);
         }
     }
     showsOrWillShow(mouseEvent) {
         const target = mouseEvent.target;
-        if (target.type === MouseTargetType.GUTTER_GLYPH_MARGIN && target.detail.glyphMarginLane) {
+        if (target.type === 2  && target.detail.glyphMarginLane) {
             this._startShowingAt(target.position.lineNumber, target.detail.glyphMarginLane);
             return true;
         }
-        if (target.type === MouseTargetType.GUTTER_LINE_NUMBERS) {
+        if (target.type === 3 ) {
             this._startShowingAt(target.position.lineNumber, 'lineNo');
             return true;
         }
         return false;
     }
     _startShowingAt(lineNumber, laneOrLine) {
-        if (this._computer.lineNumber === lineNumber && this._computer.lane === laneOrLine) {
+        if (this._hoverComputerOptions
+            && this._hoverComputerOptions.lineNumber === lineNumber
+            && this._hoverComputerOptions.laneOrLine === laneOrLine) {
             return;
         }
         this._hoverOperation.cancel();
         this.hide();
-        this._computer.lineNumber = lineNumber;
-        this._computer.lane = laneOrLine;
-        this._hoverOperation.start(HoverStartMode.Delayed);
+        this._hoverComputerOptions = { lineNumber, laneOrLine };
+        this._hoverOperation.start(0 , this._hoverComputerOptions);
     }
     hide() {
-        this._computer.lineNumber = -1;
+        this._hoverComputerOptions = undefined;
         this._hoverOperation.cancel();
         if (!this._isVisible) {
             return;
@@ -95,15 +92,15 @@ let MarginHoverWidget = class MarginHoverWidget extends Disposable {
         this._hover.containerDomNode.classList.toggle('hidden', !this._isVisible);
     }
     _withResult(result) {
-        this._messages = result;
+        this._messages = result.value;
         if (this._messages.length > 0) {
-            this._renderMessages(this._computer.lineNumber, this._messages);
+            this._renderMessages(result.options.lineNumber, result.options.laneOrLine, this._messages);
         }
         else {
             this.hide();
         }
     }
-    _renderMessages(lineNumber, messages) {
+    _renderMessages(lineNumber, laneOrLine, messages) {
         this._renderDisposeables.clear();
         const fragment = document.createDocumentFragment();
         for (const msg of messages) {
@@ -114,14 +111,14 @@ let MarginHoverWidget = class MarginHoverWidget extends Disposable {
             fragment.appendChild(markdownHoverElement);
         }
         this._updateContents(fragment);
-        this._showAt(lineNumber);
+        this._showAt(lineNumber, laneOrLine);
     }
     _updateContents(node) {
         this._hover.contentsDomNode.textContent = '';
         this._hover.contentsDomNode.appendChild(node);
         this._updateFont();
     }
-    _showAt(lineNumber) {
+    _showAt(lineNumber, laneOrLine) {
         if (!this._isVisible) {
             this._isVisible = true;
             this._hover.containerDomNode.classList.toggle('hidden', !this._isVisible);
@@ -129,10 +126,10 @@ let MarginHoverWidget = 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(EditorOption.lineHeight);
+        const lineHeight = this._editor.getOption(69 );
         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);
+        const left = editorLayout.glyphMarginLeft + editorLayout.glyphMarginWidth + (laneOrLine === 'lineNo' ? editorLayout.lineNumbersWidth : 0);
         this._hover.containerDomNode.style.left = `${left}px`;
         this._hover.containerDomNode.style.top = `${Math.max(Math.round(top), 0)}px`;
     }
@@ -144,8 +141,8 @@ let MarginHoverWidget = class MarginHoverWidget extends Disposable {
         }
     }
 };
-MarginHoverWidget = MarginHoverWidget_1 = ( __decorate([
+GlyphHoverWidget = GlyphHoverWidget_1 = ( __decorate([
     ( __param(1, ILanguageService)),
     ( __param(2, IOpenerService))
-], MarginHoverWidget));
-export { MarginHoverWidget };
+], GlyphHoverWidget));
+export { GlyphHoverWidget };

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

@@ -1,4 +1,4 @@
 import n from '../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-editor .hoverHighlight{background-color:var(--vscode-editor-hoverHighlightBackground)}.monaco-editor .monaco-hover-content{box-sizing:border-box;padding-bottom:2px;padding-right:2px}.monaco-editor .monaco-hover{background-color:var(--vscode-editorHoverWidget-background);border:1px solid var(--vscode-editorHoverWidget-border);border-radius:3px;color:var(--vscode-editorHoverWidget-foreground)}.monaco-editor .monaco-hover a{color:var(--vscode-textLink-foreground)}.monaco-editor .monaco-hover a:hover{color:var(--vscode-textLink-activeForeground)}.monaco-editor .monaco-hover .hover-row{display:flex}.monaco-editor .monaco-hover .hover-row .hover-row-contents{display:flex;flex-direction:column;min-width:0}.monaco-editor .monaco-hover .hover-row .verbosity-actions{border-right:1px solid var(--vscode-editorHoverWidget-border);display:flex;flex-direction:column;justify-content:end;padding-left:5px;padding-right:5px}.monaco-editor .monaco-hover .hover-row .verbosity-actions .codicon{cursor:pointer;font-size:11px}.monaco-editor .monaco-hover .hover-row .verbosity-actions .codicon.enabled{color:var(--vscode-textLink-foreground)}.monaco-editor .monaco-hover .hover-row .verbosity-actions .codicon.disabled{opacity:.6}.monaco-editor .monaco-hover .hover-row .actions{background-color:var(--vscode-editorHoverWidget-statusBarBackground)}.monaco-editor .monaco-hover code{background-color:var(--vscode-textCodeBlock-background)}";
+var css = ".monaco-editor .hoverHighlight{background-color:var(--vscode-editor-hoverHighlightBackground)}.monaco-editor .monaco-hover-content{box-sizing:border-box;padding-bottom:2px;padding-right:2px}.monaco-editor .monaco-hover{background-color:var(--vscode-editorHoverWidget-background);border:1px solid var(--vscode-editorHoverWidget-border);border-radius:3px;color:var(--vscode-editorHoverWidget-foreground)}.monaco-editor .monaco-hover a{color:var(--vscode-textLink-foreground)}.monaco-editor .monaco-hover a:hover{color:var(--vscode-textLink-activeForeground)}.monaco-editor .monaco-hover .hover-row{display:flex}.monaco-editor .monaco-hover .hover-row .hover-row-contents{display:flex;flex-direction:column;min-width:0}.monaco-editor .monaco-hover .hover-row .verbosity-actions{border-right:1px solid var(--vscode-editorHoverWidget-border);display:flex;flex-direction:column;justify-content:flex-end;padding-left:5px;padding-right:5px}.monaco-editor .monaco-hover .hover-row .verbosity-actions .codicon{cursor:pointer;font-size:11px}.monaco-editor .monaco-hover .hover-row .verbosity-actions .codicon.enabled{color:var(--vscode-textLink-foreground)}.monaco-editor .monaco-hover .hover-row .verbosity-actions .codicon.disabled{opacity:.6}.monaco-editor .monaco-hover .hover-row .actions{background-color:var(--vscode-editorHoverWidget-statusBarBackground)}.monaco-editor .monaco-hover code{background-color:var(--vscode-textCodeBlock-background)}";
 n(css,{});
 export { css, css as default };

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

@@ -1,7 +1,7 @@
 import { localize } from '../../../../nls.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
-import { ContentHoverController } from './contentHoverController2.js';
-import { AccessibleViewType, AccessibleContentProvider, AccessibleViewProviderId } from '../../../../platform/accessibility/browser/accessibleView.js';
+import { ContentHoverController } from './contentHoverController.js';
+import { AccessibleContentProvider } from '../../../../platform/accessibility/browser/accessibleView.js';
 import { IContextViewService } from '../../../../platform/contextview/browser/contextView.service.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -18,19 +18,19 @@ import { labelForHoverVerbosityAction } from './markdownHoverParticipant.js';
 var HoverAccessibilityHelpNLS;
 ( ((function(HoverAccessibilityHelpNLS) {
     HoverAccessibilityHelpNLS.increaseVerbosity = ( localize(
-        5153,
+        5194,
         '- The focused hover part verbosity level can be increased with the Increase Hover Verbosity command.',
         `<keybinding:${INCREASE_HOVER_VERBOSITY_ACTION_ID}>`
     ));
     HoverAccessibilityHelpNLS.decreaseVerbosity = ( localize(
-        5154,
+        5195,
         '- The focused hover part verbosity level can be decreased with the Decrease Hover Verbosity command.',
         `<keybinding:${DECREASE_HOVER_VERBOSITY_ACTION_ID}>`
     ));
 })(HoverAccessibilityHelpNLS || (HoverAccessibilityHelpNLS = {}))));
 class HoverAccessibleView {
     constructor() {
-        this.type = AccessibleViewType.View;
+        this.type = "view" ;
         this.priority = 95;
         this.name = 'hover';
         this.when = EditorContextKeys.hoverFocused;
@@ -53,7 +53,7 @@ class HoverAccessibilityHelp {
     constructor() {
         this.priority = 100;
         this.name = 'hover';
-        this.type = AccessibleViewType.Help;
+        this.type = "help" ;
         this.when = EditorContextKeys.hoverVisible;
     }
     getProvider(accessor) {
@@ -73,7 +73,7 @@ class BaseHoverAccessibleViewProvider extends Disposable {
     constructor(_hoverController) {
         super();
         this._hoverController = _hoverController;
-        this.id = AccessibleViewProviderId.Hover;
+        this.id = "hover" ;
         this.verbositySettingKey = 'accessibility.verbosity.hover';
         this._onDidChangeContent = this._register(( (new Emitter())));
         this.onDidChangeContent = this._onDidChangeContent.event;
@@ -153,7 +153,7 @@ class BaseHoverAccessibleViewProvider extends Disposable {
 class HoverAccessibilityHelpProvider extends BaseHoverAccessibleViewProvider {
     constructor(hoverController) {
         super(hoverController);
-        this.options = { type: AccessibleViewType.Help };
+        this.options = { type: "help"  };
     }
     provideContent() {
         return this.provideContentAtIndex(this._focusedHoverPartIndex, true);
@@ -164,7 +164,7 @@ class HoverAccessibleViewProvider extends BaseHoverAccessibleViewProvider {
         super(hoverController);
         this._keybindingService = _keybindingService;
         this._editor = _editor;
-        this.options = { type: AccessibleViewType.View };
+        this.options = { type: "view"  };
         this._initializeOptions(this._editor, hoverController);
     }
     provideContent() {
@@ -214,7 +214,7 @@ class HoverAccessibleViewProvider extends BaseHoverAccessibleViewProvider {
 }
 class ExtHoverAccessibleView {
     constructor() {
-        this.type = AccessibleViewType.View;
+        this.type = "view" ;
         this.priority = 90;
         this.name = 'extension-hover';
     }
@@ -228,8 +228,8 @@ class ExtHoverAccessibleView {
         }
         return (
              (new AccessibleContentProvider(
-                AccessibleViewProviderId.Hover,
-                { language: 'typescript', type: AccessibleViewType.View },
+                "hover" ,
+                { language: 'typescript', type: "view"  },
                 () => { return extensionHoverContent; },
                 () => {
                     hoverService.showAndFocusLastHover();

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(9894, "Increase Hover Verbosity Level"));
+const INCREASE_HOVER_VERBOSITY_ACTION_LABEL = ( localize(9995, "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(9895, "Decrease Hover Verbosity Level"));
+const DECREASE_HOVER_VERBOSITY_ACTION_LABEL = ( localize(9996, "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

@@ -1,14 +1,10 @@
 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 { KeyChord } 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 { ContentHoverController } from './contentHoverController2.js';
+import { ContentHoverController } from './contentHoverController.js';
 import { HoverVerbosityAction } from '../../../common/languages.js';
 import { localize, localize2 } from '../../../../nls.js';
 import './hover.css.js';
@@ -22,10 +18,10 @@ class ShowOrFocusHoverAction extends EditorAction {
     constructor() {
         super({
             id: SHOW_OR_FOCUS_HOVER_ACTION_ID,
-            label: ( localize(5117, "Show or Focus Hover")),
+            label: ( localize(5158, "Show or Focus Hover")),
             metadata: {
                 description: ( localize2(
-                    5118,
+                    5159,
                     'Show or focus the editor hover which shows documentation, references, and other content for a symbol at the current cursor position.'
                 )),
                 args: [{
@@ -37,9 +33,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(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.')),
+                                        ( localize(5160, 'The hover will not automatically take focus.')),
+                                        ( localize(5161, 'The hover will take focus only if it is already visible.')),
+                                        ( localize(5162, 'The hover will automatically take focus when it appears.')),
                                     ],
                                     default: HoverFocusBehavior.FocusIfVisible,
                                 }
@@ -51,8 +47,8 @@ class ShowOrFocusHoverAction extends EditorAction {
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
-                primary: KeyChord(KeyMod$1.CtrlCmd | KeyCode.KeyK, KeyMod$1.CtrlCmd | KeyCode.KeyI),
-                weight: KeybindingWeight.EditorContrib
+                primary: KeyChord(2048  | 41 , 2048  | 39 ),
+                weight: 100
             }
         });
     }
@@ -75,9 +71,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, HoverStartMode.Immediate, HoverStartSource.Keyboard, focus);
+            controller.showContentHover(range, 1 , 1 , focus);
         };
-        const accessibilitySupportEnabled = editor.getOption(EditorOption.accessibilitySupport) === AccessibilitySupport.Enabled;
+        const accessibilitySupportEnabled = editor.getOption(2 ) === 2 ;
         if (controller.isHoverVisible) {
             if (focusOption !== HoverFocusBehavior.NoAutoFocus) {
                 controller.focus();
@@ -95,11 +91,11 @@ class ShowDefinitionPreviewHoverAction extends EditorAction {
     constructor() {
         super({
             id: SHOW_DEFINITION_PREVIEW_HOVER_ACTION_ID,
-            label: ( localize(5122, "Show Definition Preview Hover")),
+            label: ( localize(5163, "Show Definition Preview Hover")),
             alias: 'Show Definition Preview Hover',
             precondition: undefined,
             metadata: {
-                description: ( localize2(5123, 'Show the definition preview hover in the editor.')),
+                description: ( localize2(5164, 'Show the definition preview hover in the editor.')),
             },
         });
     }
@@ -119,7 +115,7 @@ class ShowDefinitionPreviewHoverAction extends EditorAction {
         }
         const promise = goto.startFindDefinitionFromCursor(position);
         promise.then(() => {
-            controller.showContentHover(range, HoverStartMode.Immediate, HoverStartSource.Keyboard, true);
+            controller.showContentHover(range, 1 , 1 , true);
         });
     }
 }
@@ -127,16 +123,16 @@ class ScrollUpHoverAction extends EditorAction {
     constructor() {
         super({
             id: SCROLL_UP_HOVER_ACTION_ID,
-            label: ( localize(5124, "Scroll Up Hover")),
+            label: ( localize(5165, "Scroll Up Hover")),
             alias: 'Scroll Up Hover',
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
-                primary: KeyCode.UpArrow,
-                weight: KeybindingWeight.EditorContrib
+                primary: 16 ,
+                weight: 100
             },
             metadata: {
-                description: ( localize2(5125, 'Scroll up the editor hover.'))
+                description: ( localize2(5166, 'Scroll up the editor hover.'))
             },
         });
     }
@@ -152,16 +148,16 @@ class ScrollDownHoverAction extends EditorAction {
     constructor() {
         super({
             id: SCROLL_DOWN_HOVER_ACTION_ID,
-            label: ( localize(5126, "Scroll Down Hover")),
+            label: ( localize(5167, "Scroll Down Hover")),
             alias: 'Scroll Down Hover',
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
-                primary: KeyCode.DownArrow,
-                weight: KeybindingWeight.EditorContrib
+                primary: 18 ,
+                weight: 100
             },
             metadata: {
-                description: ( localize2(5127, 'Scroll down the editor hover.')),
+                description: ( localize2(5168, 'Scroll down the editor hover.')),
             },
         });
     }
@@ -177,16 +173,16 @@ class ScrollLeftHoverAction extends EditorAction {
     constructor() {
         super({
             id: SCROLL_LEFT_HOVER_ACTION_ID,
-            label: ( localize(5128, "Scroll Left Hover")),
+            label: ( localize(5169, "Scroll Left Hover")),
             alias: 'Scroll Left Hover',
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
-                primary: KeyCode.LeftArrow,
-                weight: KeybindingWeight.EditorContrib
+                primary: 15 ,
+                weight: 100
             },
             metadata: {
-                description: ( localize2(5129, 'Scroll left the editor hover.')),
+                description: ( localize2(5170, 'Scroll left the editor hover.')),
             },
         });
     }
@@ -202,16 +198,16 @@ class ScrollRightHoverAction extends EditorAction {
     constructor() {
         super({
             id: SCROLL_RIGHT_HOVER_ACTION_ID,
-            label: ( localize(5130, "Scroll Right Hover")),
+            label: ( localize(5171, "Scroll Right Hover")),
             alias: 'Scroll Right Hover',
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
-                primary: KeyCode.RightArrow,
-                weight: KeybindingWeight.EditorContrib
+                primary: 17 ,
+                weight: 100
             },
             metadata: {
-                description: ( localize2(5131, 'Scroll right the editor hover.'))
+                description: ( localize2(5172, 'Scroll right the editor hover.'))
             },
         });
     }
@@ -227,17 +223,17 @@ class PageUpHoverAction extends EditorAction {
     constructor() {
         super({
             id: PAGE_UP_HOVER_ACTION_ID,
-            label: ( localize(5132, "Page Up Hover")),
+            label: ( localize(5173, "Page Up Hover")),
             alias: 'Page Up Hover',
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
-                primary: KeyCode.PageUp,
-                secondary: [KeyMod$1.Alt | KeyCode.UpArrow],
-                weight: KeybindingWeight.EditorContrib
+                primary: 11 ,
+                secondary: [512  | 16 ],
+                weight: 100
             },
             metadata: {
-                description: ( localize2(5133, 'Page up the editor hover.')),
+                description: ( localize2(5174, 'Page up the editor hover.')),
             },
         });
     }
@@ -253,17 +249,17 @@ class PageDownHoverAction extends EditorAction {
     constructor() {
         super({
             id: PAGE_DOWN_HOVER_ACTION_ID,
-            label: ( localize(5134, "Page Down Hover")),
+            label: ( localize(5175, "Page Down Hover")),
             alias: 'Page Down Hover',
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
-                primary: KeyCode.PageDown,
-                secondary: [KeyMod$1.Alt | KeyCode.DownArrow],
-                weight: KeybindingWeight.EditorContrib
+                primary: 12 ,
+                secondary: [512  | 18 ],
+                weight: 100
             },
             metadata: {
-                description: ( localize2(5135, 'Page down the editor hover.')),
+                description: ( localize2(5176, 'Page down the editor hover.')),
             },
         });
     }
@@ -279,17 +275,17 @@ class GoToTopHoverAction extends EditorAction {
     constructor() {
         super({
             id: GO_TO_TOP_HOVER_ACTION_ID,
-            label: ( localize(5136, "Go To Top Hover")),
+            label: ( localize(5177, "Go To Top Hover")),
             alias: 'Go To Bottom Hover',
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
-                primary: KeyCode.Home,
-                secondary: [KeyMod$1.CtrlCmd | KeyCode.UpArrow],
-                weight: KeybindingWeight.EditorContrib
+                primary: 14 ,
+                secondary: [2048  | 16 ],
+                weight: 100
             },
             metadata: {
-                description: ( localize2(5137, 'Go to the top of the editor hover.')),
+                description: ( localize2(5178, 'Go to the top of the editor hover.')),
             },
         });
     }
@@ -305,17 +301,17 @@ class GoToBottomHoverAction extends EditorAction {
     constructor() {
         super({
             id: GO_TO_BOTTOM_HOVER_ACTION_ID,
-            label: ( localize(5138, "Go To Bottom Hover")),
+            label: ( localize(5179, "Go To Bottom Hover")),
             alias: 'Go To Bottom Hover',
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
-                primary: KeyCode.End,
-                secondary: [KeyMod$1.CtrlCmd | KeyCode.DownArrow],
-                weight: KeybindingWeight.EditorContrib
+                primary: 13 ,
+                secondary: [2048  | 18 ],
+                weight: 100
             },
             metadata: {
-                description: ( localize2(5139, 'Go to the bottom of the editor hover.'))
+                description: ( localize2(5180, 'Go to the bottom of the editor hover.'))
             },
         });
     }

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, EditorContributionInstantiation } from '../../../browser/editorExtensions.js';
+import { registerEditorContribution, registerEditorAction } from '../../../browser/editorExtensions.js';
 import '../../../../platform/theme/common/colorUtils.js';
 import '../../../../platform/theme/common/colors/baseColors.js';
 import '../../../../platform/theme/common/colors/chartsColors.js';
@@ -15,13 +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 { ContentHoverController } from './contentHoverController2.js';
-import { MarginHoverController } from './marginHoverController.js';
+import { ContentHoverController } from './contentHoverController.js';
+import { GlyphHoverController } from './glyphHoverController.js';
 import './hover.css.js';
 import { AccessibleViewRegistry } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
 import { HoverAccessibleView, HoverAccessibilityHelp, ExtHoverAccessibleView } from './hoverAccessibleViews.js';
-registerEditorContribution(ContentHoverController.ID, ContentHoverController, EditorContributionInstantiation.BeforeFirstInteraction);
-registerEditorContribution(MarginHoverController.ID, MarginHoverController, EditorContributionInstantiation.BeforeFirstInteraction);
+registerEditorContribution(ContentHoverController.ID, ContentHoverController, 2 );
+registerEditorContribution(GlyphHoverController.ID, GlyphHoverController, 2 );
 registerEditorAction(ShowOrFocusHoverAction);
 registerEditorAction(ShowDefinitionPreviewHoverAction);
 registerEditorAction(ScrollUpHoverAction);