@codingame/monaco-vscode-api 13.1.6 → 14.0.0

package/vscode/src/vs/editor/contrib/hover/browser/contentHoverController.d.ts

@@ -32,14 +32,12 @@ export declare class ContentHoverController extends Disposable implements IEdito
     private _isMouseOnContentHoverWidget;
     private _onEditorMouseUp;
     private _onEditorMouseLeave;
-    private _shouldNotRecomputeCurrentHoverWidget;
+    private _shouldKeepCurrentHover;
     private _onEditorMouseMove;
-    private _shouldReactToEditorMouseMove;
     private _shouldRescheduleHoverComputation;
     private _reactToEditorMouseMove;
     private _onKeyDown;
     private _isPotentialKeyboardShortcut;
-    private _isModifierKeyPressed;
     hideContentHover(): void;
     private _getOrCreateContentWidget;
     showContentHover(range: Range, mode: HoverStartMode, source: HoverStartSource, focus: boolean): void;

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

@@ -1,7 +1,6 @@
 
 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 { EditorOption } from '../../../common/config/editorOptions.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -13,7 +12,8 @@ import { isMousePositionWithinElement } from './hoverUtils.js';
 import { ContentHoverWidgetWrapper } from './contentHoverWidgetWrapper.js';
 import './hover.css.js';
 import { Emitter } from '../../../../base/common/event.js';
-import { isOnColorDecorator } from '../../colorPicker/browser/hoverColorPicker/hoverColorPickerContribution.js';
+import { isOnColorDecorator } from '../../colorPicker/browser/hoverColorPicker/hoverColorPicker.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
 
 var ContentHoverController_1;
 let ContentHoverController = class ContentHoverController extends Disposable {
@@ -29,7 +29,11 @@ let ContentHoverController = class ContentHoverController extends Disposable {
         this.shouldKeepOpenOnEditorMouseMoveOrLeave = false;
         this._listenersStore = ( new DisposableStore());
         this._isMouseDown = false;
-        this._reactToEditorMouseMoveRunner = this._register(( new RunOnceScheduler(() => this._reactToEditorMouseMove(this._mouseMoveEvent), 0)));
+        this._reactToEditorMouseMoveRunner = this._register(( new RunOnceScheduler(() => {
+            if (this._mouseMoveEvent) {
+                this._reactToEditorMouseMove(this._mouseMoveEvent);
+            }
+        }, 0)));
         this._hookListeners();
         this._register(this._editor.onDidChangeConfiguration((e) => {
             if (e.hasChanged(EditorOption.hover)) {
@@ -48,19 +52,17 @@ let ContentHoverController = class ContentHoverController extends Disposable {
             sticky: hoverOpts.sticky,
             hidingDelay: hoverOpts.hidingDelay
         };
-        if (hoverOpts.enabled) {
-            this._listenersStore.add(this._editor.onMouseDown((e) => this._onEditorMouseDown(e)));
-            this._listenersStore.add(this._editor.onMouseUp(() => this._onEditorMouseUp()));
-            this._listenersStore.add(this._editor.onMouseMove((e) => this._onEditorMouseMove(e)));
-            this._listenersStore.add(this._editor.onKeyDown((e) => this._onKeyDown(e)));
-            this._listenersStore.add(this._editor.onMouseLeave((e) => this._onEditorMouseLeave(e)));
-            this._listenersStore.add(this._editor.onDidChangeModel(() => this._cancelSchedulerAndHide()));
-            this._listenersStore.add(this._editor.onDidChangeModelContent(() => this._cancelScheduler()));
-            this._listenersStore.add(this._editor.onDidScrollChange((e) => this._onEditorScrollChanged(e)));
-        }
-        else {
+        if (!hoverOpts.enabled) {
             this._cancelSchedulerAndHide();
         }
+        this._listenersStore.add(this._editor.onMouseDown((e) => this._onEditorMouseDown(e)));
+        this._listenersStore.add(this._editor.onMouseUp(() => this._onEditorMouseUp()));
+        this._listenersStore.add(this._editor.onMouseMove((e) => this._onEditorMouseMove(e)));
+        this._listenersStore.add(this._editor.onKeyDown((e) => this._onKeyDown(e)));
+        this._listenersStore.add(this._editor.onMouseLeave((e) => this._onEditorMouseLeave(e)));
+        this._listenersStore.add(this._editor.onDidChangeModel(() => this._cancelSchedulerAndHide()));
+        this._listenersStore.add(this._editor.onDidChangeModelContent(() => this._cancelScheduler()));
+        this._listenersStore.add(this._editor.onDidScrollChange((e) => this._onEditorScrollChanged(e)));
     }
     _unhookListeners() {
         this._listenersStore.clear();
@@ -109,29 +111,46 @@ let ContentHoverController = class ContentHoverController extends Disposable {
         }
         this.hideContentHover();
     }
-    _shouldNotRecomputeCurrentHoverWidget(mouseEvent) {
+    _shouldKeepCurrentHover(mouseEvent) {
+        const contentWidget = this._contentWidget;
+        if (!contentWidget) {
+            return false;
+        }
         const isHoverSticky = this._hoverSettings.sticky;
         const isMouseOnStickyContentHoverWidget = (mouseEvent, isHoverSticky) => {
             const isMouseOnContentHoverWidget = this._isMouseOnContentHoverWidget(mouseEvent);
             return isHoverSticky && isMouseOnContentHoverWidget;
         };
-        const isMouseOnColorPicker = (mouseEvent) => {
+        const isMouseOnColorPickerOrChoosingColor = (mouseEvent) => {
+            const isColorPickerVisible = contentWidget.isColorPickerVisible;
             const isMouseOnContentHoverWidget = this._isMouseOnContentHoverWidget(mouseEvent);
-            const isColorPickerVisible = this._contentWidget?.isColorPickerVisible ?? false;
-            return isMouseOnContentHoverWidget && isColorPickerVisible;
+            const isMouseOnHoverWithColorPicker = isColorPickerVisible && isMouseOnContentHoverWidget;
+            const isMaybeChoosingColor = isColorPickerVisible && this._isMouseDown;
+            return isMouseOnHoverWithColorPicker || isMaybeChoosingColor;
         };
         const isTextSelectedWithinContentHoverWidget = (mouseEvent, sticky) => {
-            return (sticky
-                && this._contentWidget?.containsNode(mouseEvent.event.browserEvent.view?.document.activeElement)
-                && !mouseEvent.event.browserEvent.view?.getSelection()?.isCollapsed) ?? false;
+            const view = mouseEvent.event.browserEvent.view;
+            if (!view) {
+                return false;
+            }
+            return sticky && contentWidget.containsNode(view.document.activeElement) && !view.getSelection()?.isCollapsed;
         };
-        return isMouseOnStickyContentHoverWidget(mouseEvent, isHoverSticky)
-            || isMouseOnColorPicker(mouseEvent)
+        const isFocused = contentWidget.isFocused;
+        const isResizing = contentWidget.isResizing;
+        const isStickyAndVisibleFromKeyboard = this._hoverSettings.sticky && contentWidget.isVisibleFromKeyboard;
+        return this.shouldKeepOpenOnEditorMouseMoveOrLeave
+            || isFocused
+            || isResizing
+            || isStickyAndVisibleFromKeyboard
+            || isMouseOnStickyContentHoverWidget(mouseEvent, isHoverSticky)
+            || isMouseOnColorPickerOrChoosingColor(mouseEvent)
             || isTextSelectedWithinContentHoverWidget(mouseEvent, isHoverSticky);
     }
     _onEditorMouseMove(mouseEvent) {
-        const shouldReactToEditorMouseMove = this._shouldReactToEditorMouseMove(mouseEvent);
-        if (!shouldReactToEditorMouseMove) {
+        this._mouseMoveEvent = mouseEvent;
+        const shouldKeepCurrentHover = this._shouldKeepCurrentHover(mouseEvent);
+        if (shouldKeepCurrentHover) {
+            this._reactToEditorMouseMoveRunner.cancel();
             return;
         }
         const shouldRescheduleHoverComputation = this._shouldRescheduleHoverComputation();
@@ -143,47 +162,29 @@ let ContentHoverController = class ContentHoverController extends Disposable {
         }
         this._reactToEditorMouseMove(mouseEvent);
     }
-    _shouldReactToEditorMouseMove(mouseEvent) {
-        if (this.shouldKeepOpenOnEditorMouseMoveOrLeave) {
-            return false;
-        }
-        this._mouseMoveEvent = mouseEvent;
-        if (this._contentWidget && (this._contentWidget.isFocused || this._contentWidget.isResizing || this._isMouseDown && this._contentWidget.isColorPickerVisible)) {
-            return false;
-        }
-        const sticky = this._hoverSettings.sticky;
-        if (sticky && this._contentWidget?.isVisibleFromKeyboard) {
-            return false;
-        }
-        const shouldNotRecomputeCurrentHoverWidget = this._shouldNotRecomputeCurrentHoverWidget(mouseEvent);
-        if (shouldNotRecomputeCurrentHoverWidget) {
-            this._reactToEditorMouseMoveRunner.cancel();
-            return false;
-        }
-        return true;
-    }
     _shouldRescheduleHoverComputation() {
         const hidingDelay = this._hoverSettings.hidingDelay;
         const isContentHoverWidgetVisible = this._contentWidget?.isVisible ?? false;
         return isContentHoverWidgetVisible && this._hoverSettings.sticky && hidingDelay > 0;
     }
     _reactToEditorMouseMove(mouseEvent) {
-        if (!mouseEvent) {
-            return;
-        }
-        const contentWidget = this._getOrCreateContentWidget();
-        if (contentWidget.showsOrWillShow(mouseEvent)) {
-            return;
+        if (this._hoverSettings.enabled) {
+            const contentWidget = this._getOrCreateContentWidget();
+            if (contentWidget.showsOrWillShow(mouseEvent)) {
+                return;
+            }
         }
         this.hideContentHover();
     }
     _onKeyDown(e) {
-        if (!this._editor.hasModel()) {
+        if (!this._contentWidget) {
             return;
         }
         const isPotentialKeyboardShortcut = this._isPotentialKeyboardShortcut(e);
-        const isModifierKeyPressed = this._isModifierKeyPressed(e);
-        if (isPotentialKeyboardShortcut || isModifierKeyPressed) {
+        if (isPotentialKeyboardShortcut) {
+            return;
+        }
+        if (this._contentWidget.isFocused && e.keyCode === KeyCode.Tab) {
             return;
         }
         this.hideContentHover();
@@ -201,12 +202,6 @@ let ContentHoverController = class ContentHoverController extends Disposable {
             && this._contentWidget.isVisible;
         return moreChordsAreNeeded || isHoverAction;
     }
-    _isModifierKeyPressed(e) {
-        return e.keyCode === KeyCode.Ctrl
-            || e.keyCode === KeyCode.Alt
-            || e.keyCode === KeyCode.Meta
-            || e.keyCode === KeyCode.Shift;
-    }
     hideContentHover() {
         if (InlineSuggestionHintsContentWidget.dropDownVisible) {
             return;

package/vscode/src/vs/editor/contrib/hover/browser/contentHoverRendered.d.ts

@@ -22,6 +22,7 @@ export declare class RenderedContentHover extends Disposable {
     get domNode(): DocumentFragment;
     get domNodeHasChildren(): boolean;
     get focusedHoverPartIndex(): number;
+    get hoverPartsCount(): number;
     focusHoverPartWithIndex(index: number): void;
     getAccessibleWidgetContent(): string;
     getAccessibleWidgetContentAtIndex(index: number): string;

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

@@ -41,6 +41,9 @@ let RenderedContentHover = RenderedContentHover_1 = class RenderedContentHover e
     get focusedHoverPartIndex() {
         return this._renderedHoverParts.focusedHoverPartIndex;
     }
+    get hoverPartsCount() {
+        return this._renderedHoverParts.hoverPartsCount;
+    }
     focusHoverPartWithIndex(index) {
         this._renderedHoverParts.focusHoverPartWithIndex(index);
     }
@@ -165,6 +168,7 @@ let RenderedContentHoverParts = class RenderedContentHoverParts extends Disposab
             ...hoverContext
         };
         const disposables = ( new DisposableStore());
+        disposables.add(statusBar);
         for (const participant of participants) {
             const renderedHoverParts = this._renderHoverPartsForParticipant(hoverParts, participant, hoverRenderingContext);
             disposables.add(renderedHoverParts);
@@ -186,7 +190,7 @@ let RenderedContentHoverParts = class RenderedContentHoverParts extends Disposab
                 actions: renderedStatusBar.actions,
             });
         }
-        return toDisposable(() => { disposables.dispose(); });
+        return disposables;
     }
     _renderHoverPartsForParticipant(hoverParts, participant, hoverRenderingContext) {
         const hoverPartsForParticipant = hoverParts.filter(hoverPart => hoverPart.owner === participant);
@@ -246,19 +250,19 @@ let RenderedContentHoverParts = class RenderedContentHoverParts extends Disposab
             return '';
         }
         if (renderedPart.type === 'statusBar') {
-            const statusBarDescription = [( localize(1113, "This is a hover status bar."))];
+            const statusBarDescription = [( localize(1122, "This is a hover status bar."))];
             for (const action of renderedPart.actions) {
                 const keybinding = action.actionKeybindingLabel;
                 if (keybinding) {
                     statusBarDescription.push(( localize(
-                        1114,
+                        1123,
                         "It has an action with label {0} and keybinding {1}.",
                         action.actionLabel,
                         keybinding
                     )));
                 }
                 else {
-                    statusBarDescription.push(( localize(1115, "It has an action with label {0}.", action.actionLabel)));
+                    statusBarDescription.push(( localize(1124, "It has an action with label {0}.", action.actionLabel)));
                 }
             }
             return statusBarDescription.join('\n');
@@ -269,20 +273,37 @@ let RenderedContentHoverParts = class RenderedContentHoverParts extends Disposab
         if (!this._markdownHoverParticipant) {
             return;
         }
-        const normalizedMarkdownHoverIndex = this._normalizedIndexToMarkdownHoverIndexRange(this._markdownHoverParticipant, index);
-        if (normalizedMarkdownHoverIndex === undefined) {
-            return;
+        let rangeOfIndicesToUpdate;
+        if (index >= 0) {
+            rangeOfIndicesToUpdate = { start: index, endExclusive: index + 1 };
         }
-        const renderedPart = await this._markdownHoverParticipant.updateMarkdownHoverVerbosityLevel(action, normalizedMarkdownHoverIndex, focus);
-        if (!renderedPart) {
-            return;
+        else {
+            rangeOfIndicesToUpdate = this._findRangeOfMarkdownHoverParts(this._markdownHoverParticipant);
+        }
+        for (let i = rangeOfIndicesToUpdate.start; i < rangeOfIndicesToUpdate.endExclusive; i++) {
+            const normalizedMarkdownHoverIndex = this._normalizedIndexToMarkdownHoverIndexRange(this._markdownHoverParticipant, i);
+            if (normalizedMarkdownHoverIndex === undefined) {
+                continue;
+            }
+            const renderedPart = await this._markdownHoverParticipant.updateMarkdownHoverVerbosityLevel(action, normalizedMarkdownHoverIndex);
+            if (!renderedPart) {
+                continue;
+            }
+            this._renderedParts[i] = {
+                type: 'hoverPart',
+                participant: this._markdownHoverParticipant,
+                hoverPart: renderedPart.hoverPart,
+                hoverElement: renderedPart.hoverElement,
+            };
+        }
+        if (focus) {
+            if (index >= 0) {
+                this.focusHoverPartWithIndex(index);
+            }
+            else {
+                this._context.focus();
+            }
         }
-        this._renderedParts[index] = {
-            type: 'hoverPart',
-            participant: this._markdownHoverParticipant,
-            hoverPart: renderedPart.hoverPart,
-            hoverElement: renderedPart.hoverElement,
-        };
         this._context.onContentsChanged();
     }
     doesHoverAtIndexSupportVerbosityAction(index, action) {
@@ -314,6 +335,13 @@ let RenderedContentHoverParts = class RenderedContentHoverParts extends Disposab
         }
         return index - firstIndexOfMarkdownHovers;
     }
+    _findRangeOfMarkdownHoverParts(markdownHoverParticipant) {
+        const copiedRenderedParts = this._renderedParts.slice();
+        const firstIndexOfMarkdownHovers = copiedRenderedParts.findIndex(renderedPart => renderedPart.type === 'hoverPart' && renderedPart.participant === markdownHoverParticipant);
+        const inversedLastIndexOfMarkdownHovers = copiedRenderedParts.reverse().findIndex(renderedPart => renderedPart.type === 'hoverPart' && renderedPart.participant === markdownHoverParticipant);
+        const lastIndexOfMarkdownHovers = inversedLastIndexOfMarkdownHovers >= 0 ? copiedRenderedParts.length - inversedLastIndexOfMarkdownHovers : inversedLastIndexOfMarkdownHovers;
+        return { start: firstIndexOfMarkdownHovers, endExclusive: lastIndexOfMarkdownHovers + 1 };
+    }
     get domNode() {
         return this._fragment;
     }
@@ -323,6 +351,9 @@ let RenderedContentHoverParts = class RenderedContentHoverParts extends Disposab
     get focusedHoverPartIndex() {
         return this._focusedHoverPartIndex;
     }
+    get hoverPartsCount() {
+        return this._renderedParts.length;
+    }
 };
 RenderedContentHoverParts = RenderedContentHoverParts_1 = ( __decorate([
     ( __param(4, IKeybindingService)),

package/vscode/src/vs/editor/contrib/hover/browser/contentHoverWidget.d.ts

@@ -6,6 +6,7 @@ import { IContextKeyService } from "../../../../platform/contextkey/common/conte
 import { IConfigurationService } from "../../../../platform/configuration/common/configuration.service.js";
 import { IAccessibilityService } from "../../../../platform/accessibility/common/accessibility.service.js";
 import { RenderedContentHover } from "./contentHoverRendered.js";
+import { ScrollEvent } from "../../../../base/common/scrollable.js";
 export declare class ContentHoverWidget extends ResizableContentWidget {
     private readonly _configurationService;
     private readonly _accessibilityService;
@@ -21,6 +22,8 @@ export declare class ContentHoverWidget extends ResizableContentWidget {
     private readonly _hoverFocusedKey;
     private readonly _onDidResize;
     readonly onDidResize: import("../../../../base/common/event.js").Event<void>;
+    private readonly _onDidScroll;
+    readonly onDidScroll: import("../../../../base/common/event.js").Event<ScrollEvent>;
     get isVisibleFromKeyboard(): boolean;
     get isVisible(): boolean;
     get isFocused(): boolean;
@@ -30,6 +33,7 @@ export declare class ContentHoverWidget extends ResizableContentWidget {
     private static _applyDimensions;
     private _setContentsDomNodeDimensions;
     private _setContainerDomNodeDimensions;
+    private _setScrollableElementDimensions;
     private _setHoverWidgetDimensions;
     private static _applyMaxDimensions;
     private _setHoverWidgetMaxDimensions;

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

@@ -16,7 +16,6 @@ import { Emitter } from '../../../../base/common/event.js';
 
 var ContentHoverWidget_1;
 const HORIZONTAL_SCROLLING_BY = 30;
-const CONTAINER_HEIGHT_PADDING = 6;
 let ContentHoverWidget = class ContentHoverWidget extends ResizableContentWidget {
     static { ContentHoverWidget_1 = this; }
     static { this.ID = 'editor.contrib.resizableContentHoverWidget'; }
@@ -41,11 +40,14 @@ let ContentHoverWidget = class ContentHoverWidget extends ResizableContentWidget
         this._hover = this._register(( new HoverWidget(true)));
         this._onDidResize = this._register(( new Emitter()));
         this.onDidResize = this._onDidResize.event;
+        this._onDidScroll = this._register(( new Emitter()));
+        this.onDidScroll = this._onDidScroll.event;
         this._minimumSize = minimumSize;
         this._hoverVisibleKey = EditorContextKeys.hoverVisible.bindTo(contextKeyService);
         this._hoverFocusedKey = EditorContextKeys.hoverFocused.bindTo(contextKeyService);
         append(this._resizableNode.domNode, this._hover.containerDomNode);
         this._resizableNode.domNode.style.zIndex = '50';
+        this._resizableNode.domNode.className = 'monaco-resizable-hover';
         this._register(this._editor.onDidLayoutChange(() => {
             if (this.isVisible) {
                 this._updateMaxDimensions();
@@ -63,6 +65,9 @@ let ContentHoverWidget = class ContentHoverWidget extends ResizableContentWidget
         this._register(focusTracker.onDidBlur(() => {
             this._hoverFocusedKey.set(false);
         }));
+        this._register(this._hover.scrollbar.onScroll((e) => {
+            this._onDidScroll.fire(e);
+        }));
         this._setRenderedHover(undefined);
         this._editor.addContentWidget(this);
     }
@@ -88,9 +93,14 @@ let ContentHoverWidget = class ContentHoverWidget extends ResizableContentWidget
         const containerDomNode = this._hover.containerDomNode;
         return ContentHoverWidget_1._applyDimensions(containerDomNode, width, height);
     }
+    _setScrollableElementDimensions(width, height) {
+        const scrollbarDomElement = this._hover.scrollbar.getDomNode();
+        return ContentHoverWidget_1._applyDimensions(scrollbarDomElement, width, height);
+    }
     _setHoverWidgetDimensions(width, height) {
-        this._setContentsDomNodeDimensions(width, height);
         this._setContainerDomNodeDimensions(width, height);
+        this._setScrollableElementDimensions(width, height);
+        this._setContentsDomNodeDimensions(width, height);
         this._layoutContentWidget();
     }
     static _applyMaxDimensions(container, width, height) {
@@ -101,15 +111,14 @@ let ContentHoverWidget = class ContentHoverWidget extends ResizableContentWidget
     }
     _setHoverWidgetMaxDimensions(width, height) {
         ContentHoverWidget_1._applyMaxDimensions(this._hover.contentsDomNode, width, height);
+        ContentHoverWidget_1._applyMaxDimensions(this._hover.scrollbar.getDomNode(), width, height);
         ContentHoverWidget_1._applyMaxDimensions(this._hover.containerDomNode, width, height);
         this._hover.containerDomNode.style.setProperty('--vscode-hover-maxWidth', typeof width === 'number' ? `${width}px` : width);
         this._layoutContentWidget();
     }
     _setAdjustedHoverWidgetDimensions(size) {
         this._setHoverWidgetMaxDimensions('none', 'none');
-        const width = size.width;
-        const height = size.height;
-        this._setHoverWidgetDimensions(width, height);
+        this._setHoverWidgetDimensions(size.width, size.height);
     }
     _updateResizableNodeMaxDimensions() {
         const maxRenderingWidth = this._findMaximumRenderingWidth() ?? Infinity;
@@ -140,7 +149,8 @@ let ContentHoverWidget = class ContentHoverWidget extends ResizableContentWidget
         if (!availableSpace) {
             return;
         }
-        let maximumHeight = CONTAINER_HEIGHT_PADDING;
+        const children = this._hover.contentsDomNode.children;
+        let maximumHeight = children.length - 1;
         Array.from(this._hover.contentsDomNode.children).forEach((hoverPart) => {
             maximumHeight += hoverPart.clientHeight;
         });
@@ -161,15 +171,16 @@ let ContentHoverWidget = class ContentHoverWidget extends ResizableContentWidget
             return;
         }
         const overflowing = this._isHoverTextOverflowing();
-        const initialWidth = ((typeof this._contentWidth === 'undefined' ? 0 : this._contentWidth - 2)
-        );
+        const initialWidth = (typeof this._contentWidth === 'undefined'
+            ? 0
+            : this._contentWidth);
         if (overflowing || this._hover.containerDomNode.clientWidth < initialWidth) {
             const bodyBoxWidth = getClientArea(this._hover.containerDomNode.ownerDocument.body).width;
             const horizontalPadding = 14;
             return bodyBoxWidth - horizontalPadding;
         }
         else {
-            return this._hover.containerDomNode.clientWidth + 2;
+            return this._hover.containerDomNode.clientWidth;
         }
     }
     isMouseGettingCloser(posx, posy) {
@@ -219,13 +230,13 @@ let ContentHoverWidget = class ContentHoverWidget extends ResizableContentWidget
     _updateMaxDimensions() {
         const height = Math.max(this._editor.getLayoutInfo().height / 4, 250, ContentHoverWidget_1._lastDimensions.height);
         const width = Math.max(this._editor.getLayoutInfo().width * 0.66, 750, ContentHoverWidget_1._lastDimensions.width);
+        this._resizableNode.maxSize = new Dimension(width, height);
         this._setHoverWidgetMaxDimensions(width, height);
     }
     _render(renderedHover) {
         this._setRenderedHover(renderedHover);
         this._updateFont();
         this._updateContent(renderedHover.domNode);
-        this._updateMaxDimensions();
         this.onContentsChanged();
         this._editor.render();
     }
@@ -277,6 +288,7 @@ let ContentHoverWidget = class ContentHoverWidget extends ResizableContentWidget
         const layoutInfo = this._editor.getLayoutInfo();
         this._resizableNode.layout(layoutInfo.height, layoutInfo.width);
         this._setHoverWidgetDimensions('auto', 'auto');
+        this._updateMaxDimensions();
     }
     setMinimumDimensions(dimensions) {
         this._minimumSize = new Dimension(Math.max(this._minimumSize.width, dimensions.width), Math.max(this._minimumSize.height, dimensions.height));
@@ -290,13 +302,13 @@ let ContentHoverWidget = class ContentHoverWidget extends ResizableContentWidget
     }
     onContentsChanged() {
         this._removeConstraintsRenderNormally();
-        const containerDomNode = this._hover.containerDomNode;
-        let height = getTotalHeight(containerDomNode);
-        let width = getTotalWidth(containerDomNode);
+        const contentsDomNode = this._hover.contentsDomNode;
+        let height = getTotalHeight(contentsDomNode);
+        let width = getTotalWidth(contentsDomNode) + 2;
         this._resizableNode.layout(height, width);
         this._setHoverWidgetDimensions(width, height);
-        height = getTotalHeight(containerDomNode);
-        width = getTotalWidth(containerDomNode);
+        height = getTotalHeight(contentsDomNode);
+        width = getTotalWidth(contentsDomNode);
         this._contentWidth = width;
         this._updateMinimumWidth();
         this._resizableNode.layout(height, width);

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

@@ -43,6 +43,9 @@ let ContentHoverWidgetWrapper = class ContentHoverWidgetWrapper extends Disposab
         this._register(this._contentHoverWidget.onDidResize(() => {
             this._participants.forEach(participant => participant.handleResize?.());
         }));
+        this._register(this._contentHoverWidget.onDidScroll((e) => {
+            this._participants.forEach(participant => participant.handleScroll?.(e));
+        }));
         return participants;
     }
     _registerListeners() {
@@ -197,7 +200,8 @@ let ContentHoverWidgetWrapper = class ContentHoverWidgetWrapper extends Disposab
         const setMinimumDimensions = (dimensions) => {
             this._contentHoverWidget.setMinimumDimensions(dimensions);
         };
-        return { hide, onContentsChanged, setMinimumDimensions };
+        const focus = () => this.focus();
+        return { hide, onContentsChanged, setMinimumDimensions, focus };
     }
     showsOrWillShow(mouseEvent) {
         const isContentWidgetResizing = this._contentHoverWidget.isResizing;
@@ -281,6 +285,11 @@ let ContentHoverWidgetWrapper = class ContentHoverWidgetWrapper extends Disposab
         return (node ? this._contentHoverWidget.getDomNode().contains(node) : false);
     }
     focus() {
+        const hoverPartsCount = this._renderedContentHover?.hoverPartsCount;
+        if (hoverPartsCount === 1) {
+            this.focusHoverPartWithIndex(0);
+            return;
+        }
         this._contentHoverWidget.focus();
     }
     focusHoverPartWithIndex(index) {

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

@@ -25,7 +25,7 @@ let GlyphHoverWidget = class GlyphHoverWidget extends Disposable {
         this._messages = [];
         this._hover = this._register(( new HoverWidget(true)));
         this._hover.containerDomNode.classList.toggle('hidden', !this._isVisible);
-        this._markdownRenderer = this._register(( new MarkdownRenderer({ editor: this._editor }, languageService, openerService)));
+        this._markdownRenderer = ( new MarkdownRenderer({ editor: this._editor }, languageService, openerService));
         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()));
@@ -136,6 +136,7 @@ let GlyphHoverWidget = class GlyphHoverWidget extends Disposable {
         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`;
+        this._hover.containerDomNode.style.zIndex = '11';
     }
     _onMouseLeave(e) {
         const editorDomNode = this._editor.getDomNode();

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

@@ -1,6 +1,6 @@
 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: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)}";
+var css = ".monaco-editor .hoverHighlight{background-color:var(--vscode-editor-hoverHighlightBackground)}.monaco-editor .monaco-resizable-hover{border:1px solid var(--vscode-editorHoverWidget-border);border-radius:3px;box-sizing:content-box}.monaco-editor .monaco-resizable-hover>.monaco-hover{border:none;border-radius:none}.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);overflow:hidden;width:22px}.monaco-editor .monaco-hover .hover-row .verbosity-actions-inner{display:flex;flex-direction:column;justify-content:flex-end;padding-left:5px;padding-right:5px;position:relative}.monaco-editor .monaco-hover .hover-row .verbosity-actions-inner .codicon{cursor:pointer;font-size:11px}.monaco-editor .monaco-hover .hover-row .verbosity-actions-inner .codicon.enabled{color:var(--vscode-textLink-foreground)}.monaco-editor .monaco-hover .hover-row .verbosity-actions-inner .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.d.ts

@@ -1,20 +1,20 @@
 import { ContentHoverController } from "./contentHoverController.js";
 import { AccessibleViewType, AccessibleViewProviderId, AccessibleContentProvider, IAccessibleViewContentProvider, IAccessibleViewOptions } from "../../../../platform/accessibility/browser/accessibleView.js";
-import { IAccessibleViewImplentation } from "../../../../platform/accessibility/browser/accessibleViewRegistry.js";
+import { IAccessibleViewImplementation } from "../../../../platform/accessibility/browser/accessibleViewRegistry.js";
 import { ServicesAccessor } from "../../../../platform/instantiation/common/instantiation.js";
 import { ICodeEditor } from "../../../browser/editorBrowser.js";
 import { IAction } from "../../../../base/common/actions.js";
 import { Event } from "../../../../base/common/event.js";
 import { Disposable } from "../../../../base/common/lifecycle.js";
 import { IKeybindingService } from "../../../../platform/keybinding/common/keybinding.service.js";
-export declare class HoverAccessibleView implements IAccessibleViewImplentation {
+export declare class HoverAccessibleView implements IAccessibleViewImplementation {
     readonly type = AccessibleViewType.View;
     readonly priority = 95;
     readonly name = "hover";
     readonly when: import("../../../../platform/contextkey/common/contextkey.js").RawContextKey<boolean>;
     getProvider(accessor: ServicesAccessor): AccessibleContentProvider | undefined;
 }
-export declare class HoverAccessibilityHelp implements IAccessibleViewImplentation {
+export declare class HoverAccessibilityHelp implements IAccessibleViewImplementation {
     readonly priority = 100;
     readonly name = "hover";
     readonly type = AccessibleViewType.Help;
@@ -52,7 +52,7 @@ export declare class HoverAccessibleViewProvider extends BaseHoverAccessibleView
     private _getActionFor;
     private _initializeOptions;
 }
-export declare class ExtHoverAccessibleView implements IAccessibleViewImplentation {
+export declare class ExtHoverAccessibleView implements IAccessibleViewImplementation {
     readonly type = AccessibleViewType.View;
     readonly priority = 90;
     readonly name = "extension-hover";

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

@@ -20,12 +20,12 @@ import { labelForHoverVerbosityAction } from './markdownHoverParticipant.js';
 var HoverAccessibilityHelpNLS;
 (function (HoverAccessibilityHelpNLS) {
     HoverAccessibilityHelpNLS.increaseVerbosity = ( localize(
-        1116,
+        1125,
         '- The focused hover part verbosity level can be increased with the Increase Hover Verbosity command.',
         `<keybinding:${INCREASE_HOVER_VERBOSITY_ACTION_ID}>`
     ));
     HoverAccessibilityHelpNLS.decreaseVerbosity = ( localize(
-        1117,
+        1126,
         '- The focused hover part verbosity level can be decreased with the Decrease Hover Verbosity command.',
         `<keybinding:${DECREASE_HOVER_VERBOSITY_ACTION_ID}>`
     ));

package/vscode/src/vs/editor/contrib/hover/browser/hoverActionIds.d.ts

@@ -1,5 +1,6 @@
 export declare const SHOW_OR_FOCUS_HOVER_ACTION_ID = "editor.action.showHover";
 export declare const SHOW_DEFINITION_PREVIEW_HOVER_ACTION_ID = "editor.action.showDefinitionPreviewHover";
+export declare const HIDE_HOVER_ACTION_ID = "editor.action.hideHover";
 export declare const SCROLL_UP_HOVER_ACTION_ID = "editor.action.scrollUpHover";
 export declare const SCROLL_DOWN_HOVER_ACTION_ID = "editor.action.scrollDownHover";
 export declare const SCROLL_LEFT_HOVER_ACTION_ID = "editor.action.scrollLeftHover";

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

@@ -3,6 +3,7 @@ import { localize } from '../../../../nls.js';
 
 const SHOW_OR_FOCUS_HOVER_ACTION_ID = 'editor.action.showHover';
 const SHOW_DEFINITION_PREVIEW_HOVER_ACTION_ID = 'editor.action.showDefinitionPreviewHover';
+const HIDE_HOVER_ACTION_ID = 'editor.action.hideHover';
 const SCROLL_UP_HOVER_ACTION_ID = 'editor.action.scrollUpHover';
 const SCROLL_DOWN_HOVER_ACTION_ID = 'editor.action.scrollDownHover';
 const SCROLL_LEFT_HOVER_ACTION_ID = 'editor.action.scrollLeftHover';
@@ -13,9 +14,9 @@ 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(1118, "Increase Hover Verbosity Level"));
+const INCREASE_HOVER_VERBOSITY_ACTION_LABEL = ( localize(1127, "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(1119, "Decrease Hover Verbosity Level"));
+const DECREASE_HOVER_VERBOSITY_ACTION_LABEL = ( localize(1128, "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 };
+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, HIDE_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 };