@codingame/monaco-vscode-api 13.1.6 → 14.0.0

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

@@ -8,6 +8,10 @@ export declare class ShowDefinitionPreviewHoverAction extends EditorAction {
     constructor();
     run(accessor: ServicesAccessor, editor: ICodeEditor): void;
 }
+export declare class HideContentHoverAction extends EditorAction {
+    constructor();
+    run(accessor: ServicesAccessor, editor: ICodeEditor): void;
+}
 export declare class ScrollUpHoverAction extends EditorAction {
     constructor();
     run(accessor: ServicesAccessor, editor: ICodeEditor): void;

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

@@ -1,5 +1,5 @@
 
-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_LABEL, INCREASE_HOVER_VERBOSITY_ACTION_ID, DECREASE_HOVER_VERBOSITY_ACTION_LABEL, DECREASE_HOVER_VERBOSITY_ACTION_ID } from './hoverActionIds.js';
+import { SHOW_OR_FOCUS_HOVER_ACTION_ID, SHOW_DEFINITION_PREVIEW_HOVER_ACTION_ID, HIDE_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_LABEL, INCREASE_HOVER_VERBOSITY_ACTION_ID, DECREASE_HOVER_VERBOSITY_ACTION_LABEL, DECREASE_HOVER_VERBOSITY_ACTION_ID } from './hoverActionIds.js';
 import { KeyChord, KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
 import { EditorAction } from '../../../browser/editorExtensions.js';
 import { EditorOption } from '../../../common/config/editorOptions.js';
@@ -24,10 +24,10 @@ class ShowOrFocusHoverAction extends EditorAction {
     constructor() {
         super({
             id: SHOW_OR_FOCUS_HOVER_ACTION_ID,
-            label: ( localize2(1120, "Show or Focus Hover")),
+            label: ( localize2(1129, "Show or Focus Hover")),
             metadata: {
                 description: ( localize2(
-                    1121,
+                    1130,
                     'Show or focus the editor hover which shows documentation, references, and other content for a symbol at the current cursor position.'
                 )),
                 args: [{
@@ -39,9 +39,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(1122, 'The hover will not automatically take focus.')),
-                                        ( localize(1123, 'The hover will take focus only if it is already visible.')),
-                                        ( localize(1124, 'The hover will automatically take focus when it appears.')),
+                                        ( localize(1131, 'The hover will not automatically take focus.')),
+                                        ( localize(1132, 'The hover will take focus only if it is already visible.')),
+                                        ( localize(1133, 'The hover will automatically take focus when it appears.')),
                                     ],
                                     default: HoverFocusBehavior.FocusIfVisible,
                                 }
@@ -96,10 +96,10 @@ class ShowDefinitionPreviewHoverAction extends EditorAction {
     constructor() {
         super({
             id: SHOW_DEFINITION_PREVIEW_HOVER_ACTION_ID,
-            label: ( localize2(1125, "Show Definition Preview Hover")),
+            label: ( localize2(1134, "Show Definition Preview Hover")),
             precondition: undefined,
             metadata: {
-                description: ( localize2(1126, 'Show the definition preview hover in the editor.')),
+                description: ( localize2(1135, 'Show the definition preview hover in the editor.')),
             },
         });
     }
@@ -123,11 +123,24 @@ class ShowDefinitionPreviewHoverAction extends EditorAction {
         });
     }
 }
+class HideContentHoverAction extends EditorAction {
+    constructor() {
+        super({
+            id: HIDE_HOVER_ACTION_ID,
+            label: ( localize2(1136, "Hide Hover")),
+            alias: 'Hide Content Hover',
+            precondition: undefined
+        });
+    }
+    run(accessor, editor) {
+        ContentHoverController.get(editor)?.hideContentHover();
+    }
+}
 class ScrollUpHoverAction extends EditorAction {
     constructor() {
         super({
             id: SCROLL_UP_HOVER_ACTION_ID,
-            label: ( localize2(1127, "Scroll Up Hover")),
+            label: ( localize2(1137, "Scroll Up Hover")),
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
@@ -135,7 +148,7 @@ class ScrollUpHoverAction extends EditorAction {
                 weight: KeybindingWeight.EditorContrib
             },
             metadata: {
-                description: ( localize2(1128, 'Scroll up the editor hover.'))
+                description: ( localize2(1138, 'Scroll up the editor hover.'))
             },
         });
     }
@@ -151,7 +164,7 @@ class ScrollDownHoverAction extends EditorAction {
     constructor() {
         super({
             id: SCROLL_DOWN_HOVER_ACTION_ID,
-            label: ( localize2(1129, "Scroll Down Hover")),
+            label: ( localize2(1139, "Scroll Down Hover")),
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
@@ -159,7 +172,7 @@ class ScrollDownHoverAction extends EditorAction {
                 weight: KeybindingWeight.EditorContrib
             },
             metadata: {
-                description: ( localize2(1130, 'Scroll down the editor hover.')),
+                description: ( localize2(1140, 'Scroll down the editor hover.')),
             },
         });
     }
@@ -175,7 +188,7 @@ class ScrollLeftHoverAction extends EditorAction {
     constructor() {
         super({
             id: SCROLL_LEFT_HOVER_ACTION_ID,
-            label: ( localize2(1131, "Scroll Left Hover")),
+            label: ( localize2(1141, "Scroll Left Hover")),
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
@@ -183,7 +196,7 @@ class ScrollLeftHoverAction extends EditorAction {
                 weight: KeybindingWeight.EditorContrib
             },
             metadata: {
-                description: ( localize2(1132, 'Scroll left the editor hover.')),
+                description: ( localize2(1142, 'Scroll left the editor hover.')),
             },
         });
     }
@@ -199,7 +212,7 @@ class ScrollRightHoverAction extends EditorAction {
     constructor() {
         super({
             id: SCROLL_RIGHT_HOVER_ACTION_ID,
-            label: ( localize2(1133, "Scroll Right Hover")),
+            label: ( localize2(1143, "Scroll Right Hover")),
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
@@ -207,7 +220,7 @@ class ScrollRightHoverAction extends EditorAction {
                 weight: KeybindingWeight.EditorContrib
             },
             metadata: {
-                description: ( localize2(1134, 'Scroll right the editor hover.'))
+                description: ( localize2(1144, 'Scroll right the editor hover.'))
             },
         });
     }
@@ -223,7 +236,7 @@ class PageUpHoverAction extends EditorAction {
     constructor() {
         super({
             id: PAGE_UP_HOVER_ACTION_ID,
-            label: ( localize2(1135, "Page Up Hover")),
+            label: ( localize2(1145, "Page Up Hover")),
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
@@ -232,7 +245,7 @@ class PageUpHoverAction extends EditorAction {
                 weight: KeybindingWeight.EditorContrib
             },
             metadata: {
-                description: ( localize2(1136, 'Page up the editor hover.')),
+                description: ( localize2(1146, 'Page up the editor hover.')),
             },
         });
     }
@@ -248,7 +261,7 @@ class PageDownHoverAction extends EditorAction {
     constructor() {
         super({
             id: PAGE_DOWN_HOVER_ACTION_ID,
-            label: ( localize2(1137, "Page Down Hover")),
+            label: ( localize2(1147, "Page Down Hover")),
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
@@ -257,7 +270,7 @@ class PageDownHoverAction extends EditorAction {
                 weight: KeybindingWeight.EditorContrib
             },
             metadata: {
-                description: ( localize2(1138, 'Page down the editor hover.')),
+                description: ( localize2(1148, 'Page down the editor hover.')),
             },
         });
     }
@@ -273,7 +286,7 @@ class GoToTopHoverAction extends EditorAction {
     constructor() {
         super({
             id: GO_TO_TOP_HOVER_ACTION_ID,
-            label: ( localize2(1139, "Go To Top Hover")),
+            label: ( localize2(1149, "Go To Top Hover")),
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
@@ -282,7 +295,7 @@ class GoToTopHoverAction extends EditorAction {
                 weight: KeybindingWeight.EditorContrib
             },
             metadata: {
-                description: ( localize2(1140, 'Go to the top of the editor hover.')),
+                description: ( localize2(1150, 'Go to the top of the editor hover.')),
             },
         });
     }
@@ -298,7 +311,7 @@ class GoToBottomHoverAction extends EditorAction {
     constructor() {
         super({
             id: GO_TO_BOTTOM_HOVER_ACTION_ID,
-            label: ( localize2(1141, "Go To Bottom Hover")),
+            label: ( localize2(1151, "Go To Bottom Hover")),
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
@@ -307,7 +320,7 @@ class GoToBottomHoverAction extends EditorAction {
                 weight: KeybindingWeight.EditorContrib
             },
             metadata: {
-                description: ( localize2(1142, 'Go to the bottom of the editor hover.'))
+                description: ( localize2(1152, 'Go to the bottom of the editor hover.'))
             },
         });
     }
@@ -356,4 +369,4 @@ class DecreaseHoverVerbosityLevel extends EditorAction {
     }
 }
 
-export { DecreaseHoverVerbosityLevel, GoToBottomHoverAction, GoToTopHoverAction, IncreaseHoverVerbosityLevel, PageDownHoverAction, PageUpHoverAction, ScrollDownHoverAction, ScrollLeftHoverAction, ScrollRightHoverAction, ScrollUpHoverAction, ShowDefinitionPreviewHoverAction, ShowOrFocusHoverAction };
+export { DecreaseHoverVerbosityLevel, GoToBottomHoverAction, GoToTopHoverAction, HideContentHoverAction, IncreaseHoverVerbosityLevel, PageDownHoverAction, PageUpHoverAction, ScrollDownHoverAction, ScrollLeftHoverAction, ScrollRightHoverAction, ScrollUpHoverAction, ShowDefinitionPreviewHoverAction, ShowOrFocusHoverAction };

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

@@ -1,5 +1,5 @@
 
-import { ShowOrFocusHoverAction, ShowDefinitionPreviewHoverAction, ScrollUpHoverAction, ScrollDownHoverAction, ScrollLeftHoverAction, ScrollRightHoverAction, PageUpHoverAction, PageDownHoverAction, GoToTopHoverAction, GoToBottomHoverAction, IncreaseHoverVerbosityLevel, DecreaseHoverVerbosityLevel } from './hoverActions.js';
+import { ShowOrFocusHoverAction, ShowDefinitionPreviewHoverAction, HideContentHoverAction, ScrollUpHoverAction, ScrollDownHoverAction, ScrollLeftHoverAction, ScrollRightHoverAction, PageUpHoverAction, PageDownHoverAction, GoToTopHoverAction, GoToBottomHoverAction, IncreaseHoverVerbosityLevel, DecreaseHoverVerbosityLevel } from './hoverActions.js';
 import { registerEditorContribution, EditorContributionInstantiation, registerEditorAction } from '../../../browser/editorExtensions.js';
 import '../../../../platform/theme/common/colorUtils.js';
 import '../../../../platform/theme/common/colors/baseColors.js';
@@ -26,6 +26,7 @@ registerEditorContribution(ContentHoverController.ID, ContentHoverController, Ed
 registerEditorContribution(GlyphHoverController.ID, GlyphHoverController, EditorContributionInstantiation.BeforeFirstInteraction);
 registerEditorAction(ShowOrFocusHoverAction);
 registerEditorAction(ShowDefinitionPreviewHoverAction);
+registerEditorAction(HideContentHoverAction);
 registerEditorAction(ScrollUpHoverAction);
 registerEditorAction(ScrollDownHoverAction);
 registerEditorAction(ScrollLeftHoverAction);

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

@@ -68,6 +68,7 @@ class HoverOperation extends Disposable {
         return 3 * this._hoverTime;
     }
     _setState(state, options) {
+        this._options = options;
         this._state = state;
         this._fireResult(options);
     }

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

@@ -8,6 +8,7 @@ import { Range } from "../../../common/core/range.js";
 import { IModelDecoration } from "../../../common/model.js";
 import { BrandedService, IConstructorSignature } from "../../../../platform/instantiation/common/instantiation.js";
 import { HoverStartSource } from "./hoverOperation.js";
+import { ScrollEvent } from "../../../../base/common/scrollable.js";
 export interface IHoverPart {
     readonly owner: IEditorHoverParticipant;
     readonly range: Range;
@@ -59,8 +60,9 @@ export interface IEditorHoverColorPickerWidget {
 }
 export interface IEditorHoverContext {
     onContentsChanged(): void;
-    setMinimumDimensions?(dimensions: Dimension): void;
+    setMinimumDimensions(dimensions: Dimension): void;
     hide(): void;
+    focus(): void;
 }
 export interface IEditorHoverRenderContext extends IEditorHoverContext {
     readonly fragment: DocumentFragment;
@@ -88,6 +90,7 @@ export interface IEditorHoverParticipant<T extends IHoverPart = IHoverPart> {
     getAccessibleContent(hoverPart: T): string;
     handleResize?(): void;
     handleHide?(): void;
+    handleScroll?(e: ScrollEvent): void;
 }
 export type IEditorHoverParticipantCtor = IConstructorSignature<IEditorHoverParticipant, [
     ICodeEditor

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

@@ -15,6 +15,7 @@ import { IHoverService } from "../../../../platform/hover/browser/hover.service.
 import { AsyncIterableObject } from "../../../../base/common/async.js";
 import { ICommandService } from "../../../../platform/commands/common/commands.service.js";
 import { HoverStartSource } from "./hoverOperation.js";
+import { ScrollEvent } from "../../../../base/common/scrollable.js";
 export declare class MarkdownHover implements IHoverPart {
     readonly owner: IEditorHoverParticipant<MarkdownHover>;
     readonly range: Range;
@@ -49,9 +50,10 @@ export declare class MarkdownHoverParticipant implements IEditorHoverParticipant
     computeAsync(anchor: HoverAnchor, lineDecorations: IModelDecoration[], source: HoverStartSource, token: CancellationToken): AsyncIterableObject<MarkdownHover>;
     private _getMarkdownHovers;
     renderHoverParts(context: IEditorHoverRenderContext, hoverParts: MarkdownHover[]): IRenderedHoverParts<MarkdownHover>;
+    handleScroll(e: ScrollEvent): void;
     getAccessibleContent(hoverPart: MarkdownHover): string;
     doesMarkdownHoverAtIndexSupportVerbosityAction(index: number, action: HoverVerbosityAction): boolean;
-    updateMarkdownHoverVerbosityLevel(action: HoverVerbosityAction, index: number, focus?: boolean): Promise<{
+    updateMarkdownHoverVerbosityLevel(action: HoverVerbosityAction, index: number): Promise<{
         hoverPart: MarkdownHover;
         hoverElement: HTMLElement;
     } | undefined>;

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

@@ -30,8 +30,8 @@ import { getHoverProviderResultsAsAsyncIterable } from './getHover.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
 
 const $ = $$1;
-const increaseHoverVerbosityIcon = registerIcon('hover-increase-verbosity', Codicon.add, ( localize(1143, 'Icon for increaseing hover verbosity.')));
-const decreaseHoverVerbosityIcon = registerIcon('hover-decrease-verbosity', Codicon.remove, ( localize(1144, 'Icon for decreasing hover verbosity.')));
+const increaseHoverVerbosityIcon = registerIcon('hover-increase-verbosity', Codicon.add, ( localize(1153, 'Icon for increaseing hover verbosity.')));
+const decreaseHoverVerbosityIcon = registerIcon('hover-decrease-verbosity', Codicon.remove, ( localize(1154, 'Icon for decreasing hover verbosity.')));
 class MarkdownHover {
     constructor(owner, range, contents, isBeforeContent, ordinal, source = undefined) {
         this.owner = owner;
@@ -78,7 +78,7 @@ let MarkdownHoverParticipant = class MarkdownHoverParticipant {
         return (new MarkdownHover(
             this,
             anchor.range,
-            [( new MarkdownString()).appendText(( localize(1145, "Loading...")))],
+            [( new MarkdownString()).appendText(( localize(1155, "Loading...")))],
             false,
             2000
         ));
@@ -103,7 +103,7 @@ let MarkdownHoverParticipant = class MarkdownHoverParticipant {
             stopRenderingMessage = true;
             result.push(( new MarkdownHover(this, anchor.range, [{
                     value: ( localize(
-                        1146,
+                        1156,
                         "Rendering paused for long line for performance reasons. This can be configured via `editor.stopRenderingLineAfter`."
                     ))
                 }], false, index++)));
@@ -111,7 +111,7 @@ let MarkdownHoverParticipant = class MarkdownHoverParticipant {
         if (!stopRenderingMessage && typeof maxTokenizationLineLength === 'number' && lineLength >= maxTokenizationLineLength) {
             result.push(( new MarkdownHover(this, anchor.range, [{
                     value: ( localize(
-                        1147,
+                        1157,
                         "Tokenization is skipped for long lines for performance reasons. This can be configured via `editor.maxTokenizationLineLength`."
                     ))
                 }], false, index++)));
@@ -176,14 +176,17 @@ let MarkdownHoverParticipant = class MarkdownHoverParticipant {
         ));
         return this._renderedHoverParts;
     }
+    handleScroll(e) {
+        this._renderedHoverParts?.handleScroll(e);
+    }
     getAccessibleContent(hoverPart) {
         return this._renderedHoverParts?.getAccessibleContent(hoverPart) ?? '';
     }
     doesMarkdownHoverAtIndexSupportVerbosityAction(index, action) {
         return this._renderedHoverParts?.doesMarkdownHoverAtIndexSupportVerbosityAction(index, action) ?? false;
     }
-    updateMarkdownHoverVerbosityLevel(action, index, focus) {
-        return Promise.resolve(this._renderedHoverParts?.updateMarkdownHoverPartVerbosityLevel(action, index, focus));
+    updateMarkdownHoverVerbosityLevel(action, index) {
+        return Promise.resolve(this._renderedHoverParts?.updateMarkdownHoverPartVerbosityLevel(action, index));
     }
 };
 MarkdownHoverParticipant = ( __decorate([
@@ -196,10 +199,11 @@ MarkdownHoverParticipant = ( __decorate([
     ( __param(7, ICommandService))
 ], MarkdownHoverParticipant));
 class RenderedMarkdownHoverPart {
-    constructor(hoverPart, hoverElement, disposables) {
+    constructor(hoverPart, hoverElement, disposables, actionsContainer) {
         this.hoverPart = hoverPart;
         this.hoverElement = hoverElement;
         this.disposables = disposables;
+        this.actionsContainer = actionsContainer;
     }
     get hoverAccessibleContent() {
         return this.hoverElement.innerText.trim();
@@ -255,9 +259,11 @@ class MarkdownRenderedHoverParts {
         }
         const actionsContainer = $('div.verbosity-actions');
         renderedMarkdownElement.prepend(actionsContainer);
-        disposables.add(this._renderHoverExpansionAction(actionsContainer, HoverVerbosityAction.Increase, canIncreaseVerbosity));
-        disposables.add(this._renderHoverExpansionAction(actionsContainer, HoverVerbosityAction.Decrease, canDecreaseVerbosity));
-        return ( new RenderedMarkdownHoverPart(hoverPart, renderedMarkdownElement, disposables));
+        const actionsContainerInner = $('div.verbosity-actions-inner');
+        actionsContainer.append(actionsContainerInner);
+        disposables.add(this._renderHoverExpansionAction(actionsContainerInner, HoverVerbosityAction.Increase, canIncreaseVerbosity));
+        disposables.add(this._renderHoverExpansionAction(actionsContainerInner, HoverVerbosityAction.Decrease, canDecreaseVerbosity));
+        return ( new RenderedMarkdownHoverPart(hoverPart, renderedMarkdownElement, disposables, actionsContainerInner));
     }
     _renderMarkdownHover(markdownHover, onFinishedRendering) {
         const renderedMarkdownHover = renderMarkdownInContainer(this._editor, markdownHover, this._languageService, this._openerService, onFinishedRendering);
@@ -281,12 +287,35 @@ class MarkdownRenderedHoverParts {
             return store;
         }
         actionElement.classList.add('enabled');
-        const actionFunction = () => this._commandService.executeCommand(action === HoverVerbosityAction.Increase ? INCREASE_HOVER_VERBOSITY_ACTION_ID : DECREASE_HOVER_VERBOSITY_ACTION_ID);
+        const actionFunction = () => this._commandService.executeCommand(action === HoverVerbosityAction.Increase ? INCREASE_HOVER_VERBOSITY_ACTION_ID : DECREASE_HOVER_VERBOSITY_ACTION_ID, { focus: true });
         store.add(( new ClickAction(actionElement, actionFunction)));
         store.add(( new KeyDownAction(actionElement, actionFunction, [KeyCode.Enter, KeyCode.Space])));
         return store;
     }
-    async updateMarkdownHoverPartVerbosityLevel(action, index, focus = true) {
+    handleScroll(e) {
+        this.renderedHoverParts.forEach(renderedHoverPart => {
+            const actionsContainerInner = renderedHoverPart.actionsContainer;
+            if (!actionsContainerInner) {
+                return;
+            }
+            const hoverElement = renderedHoverPart.hoverElement;
+            const topOfHoverScrollPosition = e.scrollTop;
+            const bottomOfHoverScrollPosition = topOfHoverScrollPosition + e.height;
+            const topOfRenderedPart = hoverElement.offsetTop;
+            const hoverElementHeight = hoverElement.clientHeight;
+            const bottomOfRenderedPart = topOfRenderedPart + hoverElementHeight;
+            const iconsHeight = 22;
+            let top;
+            if (bottomOfRenderedPart <= bottomOfHoverScrollPosition || topOfRenderedPart >= bottomOfHoverScrollPosition) {
+                top = hoverElementHeight - iconsHeight;
+            }
+            else {
+                top = bottomOfHoverScrollPosition - topOfRenderedPart - iconsHeight;
+            }
+            actionsContainerInner.style.top = `${top}px`;
+        });
+    }
+    async updateMarkdownHoverPartVerbosityLevel(action, index) {
         const model = this._editor.getModel();
         if (!model) {
             return undefined;
@@ -310,10 +339,9 @@ class MarkdownRenderedHoverParts {
             initialHoverPart.ordinal,
             newHoverSource
         ));
-        const newHoverRenderedPart = this._renderHoverPart(newHoverPart, this._onFinishedRendering);
-        this._replaceRenderedHoverPartAtIndex(index, newHoverRenderedPart, newHoverPart);
-        if (focus) {
-            this._focusOnHoverPartWithIndex(index);
+        const newHoverRenderedPart = this._updateRenderedHoverPart(index, newHoverPart);
+        if (!newHoverRenderedPart) {
+            return undefined;
         }
         return {
             hoverPart: newHoverPart,
@@ -363,22 +391,25 @@ class MarkdownRenderedHoverParts {
         this._ongoingHoverOperations.delete(provider);
         return hover;
     }
-    _replaceRenderedHoverPartAtIndex(index, renderedHoverPart, hoverPart) {
+    _updateRenderedHoverPart(index, hoverPart) {
         if (index >= this.renderedHoverParts.length || index < 0) {
-            return;
+            return undefined;
         }
+        const renderedHoverPart = this._renderHoverPart(hoverPart, this._onFinishedRendering);
         const currentRenderedHoverPart = this.renderedHoverParts[index];
         const currentRenderedMarkdown = currentRenderedHoverPart.hoverElement;
         const renderedMarkdown = renderedHoverPart.hoverElement;
         const renderedChildrenElements = Array.from(renderedMarkdown.children);
         currentRenderedMarkdown.replaceChildren(...renderedChildrenElements);
-        const newRenderedHoverPart = ( new RenderedMarkdownHoverPart(hoverPart, currentRenderedMarkdown, renderedHoverPart.disposables));
-        currentRenderedMarkdown.focus();
+        const newRenderedHoverPart = ( new RenderedMarkdownHoverPart(
+            hoverPart,
+            currentRenderedMarkdown,
+            renderedHoverPart.disposables,
+            renderedHoverPart.actionsContainer
+        ));
         currentRenderedHoverPart.dispose();
         this.renderedHoverParts[index] = newRenderedHoverPart;
-    }
-    _focusOnHoverPartWithIndex(index) {
-        this.renderedHoverParts[index].hoverElement.focus();
+        return newRenderedHoverPart;
     }
     _getRenderedHoverPartAtIndex(index) {
         return this.renderedHoverParts[index];
@@ -407,12 +438,13 @@ function renderMarkdownInContainer(editor, markdownHover, languageService, opene
         }
         const markdownHoverElement = $('div.markdown-hover');
         const hoverContentsElement = append(markdownHoverElement, $('div.hover-contents'));
-        const renderer = disposables.add(( new MarkdownRenderer({ editor }, languageService, openerService)));
-        disposables.add(renderer.onDidRenderAsync(() => {
-            hoverContentsElement.className = 'hover-contents code-hover-contents';
-            onFinishedRendering();
+        const renderer = ( new MarkdownRenderer({ editor }, languageService, openerService));
+        const renderedContents = disposables.add(renderer.render(markdownString, {
+            asyncRenderCallback: () => {
+                hoverContentsElement.className = 'hover-contents code-hover-contents';
+                onFinishedRendering();
+            }
         }));
-        const renderedContents = disposables.add(renderer.render(markdownString));
         hoverContentsElement.appendChild(renderedContents.element);
         renderedMarkdownContents.appendChild(markdownHoverElement);
     }
@@ -428,14 +460,14 @@ function labelForHoverVerbosityAction(keybindingService, action) {
         case HoverVerbosityAction.Increase: {
             const kb = keybindingService.lookupKeybinding(INCREASE_HOVER_VERBOSITY_ACTION_ID);
             return kb ?
-                ( localize(1148, "Increase Hover Verbosity ({0})", kb.getLabel())) :
-                ( localize(1149, "Increase Hover Verbosity"));
+                ( localize(1158, "Increase Hover Verbosity ({0})", kb.getLabel())) :
+                ( localize(1159, "Increase Hover Verbosity"));
         }
         case HoverVerbosityAction.Decrease: {
             const kb = keybindingService.lookupKeybinding(DECREASE_HOVER_VERBOSITY_ACTION_ID);
             return kb ?
-                ( localize(1150, "Decrease Hover Verbosity ({0})", kb.getLabel())) :
-                ( localize(1151, "Decrease Hover Verbosity"));
+                ( localize(1160, "Decrease Hover Verbosity ({0})", kb.getLabel())) :
+                ( localize(1161, "Decrease Hover Verbosity"));
         }
     }
 }

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

@@ -162,7 +162,7 @@ let MarkerHoverParticipant = class MarkerHoverParticipant {
             const markerController = MarkerController.get(this._editor);
             if (markerController) {
                 context.statusBar.addAction({
-                    label: ( localize(1152, "View Problem")),
+                    label: ( localize(1162, "View Problem")),
                     commandId: NextMarkerAction.ID,
                     run: () => {
                         context.hide();
@@ -177,14 +177,14 @@ let MarkerHoverParticipant = class MarkerHoverParticipant {
             if (this.recentMarkerCodeActionsInfo) {
                 if (IMarkerData.makeKey(this.recentMarkerCodeActionsInfo.marker) === IMarkerData.makeKey(markerHover.marker)) {
                     if (!this.recentMarkerCodeActionsInfo.hasCodeActions) {
-                        quickfixPlaceholderElement.textContent = ( localize(1153, "No quick fixes available"));
+                        quickfixPlaceholderElement.textContent = ( localize(1163, "No quick fixes available"));
                     }
                 }
                 else {
                     this.recentMarkerCodeActionsInfo = undefined;
                 }
             }
-            const updatePlaceholderDisposable = this.recentMarkerCodeActionsInfo && !this.recentMarkerCodeActionsInfo.hasCodeActions ? Disposable.None : disposableTimeout(() => quickfixPlaceholderElement.textContent = ( localize(1154, "Checking for quick fixes...")), 200, disposables);
+            const updatePlaceholderDisposable = this.recentMarkerCodeActionsInfo && !this.recentMarkerCodeActionsInfo.hasCodeActions ? Disposable.None : disposableTimeout(() => quickfixPlaceholderElement.textContent = ( localize(1164, "Checking for quick fixes...")), 200, disposables);
             if (!quickfixPlaceholderElement.textContent) {
                 quickfixPlaceholderElement.textContent = String.fromCharCode(0xA0);
             }
@@ -195,7 +195,7 @@ let MarkerHoverParticipant = class MarkerHoverParticipant {
                 this.recentMarkerCodeActionsInfo = { marker: markerHover.marker, hasCodeActions: actions.validActions.length > 0 };
                 if (!this.recentMarkerCodeActionsInfo.hasCodeActions) {
                     actions.dispose();
-                    quickfixPlaceholderElement.textContent = ( localize(1153, "No quick fixes available"));
+                    quickfixPlaceholderElement.textContent = ( localize(1163, "No quick fixes available"));
                     return;
                 }
                 quickfixPlaceholderElement.style.display = 'none';
@@ -206,7 +206,7 @@ let MarkerHoverParticipant = class MarkerHoverParticipant {
                     }
                 }));
                 context.statusBar.addAction({
-                    label: ( localize(1155, "Quick Fix...")),
+                    label: ( localize(1165, "Quick Fix...")),
                     commandId: quickFixCommandId,
                     run: (target) => {
                         showing = true;

package/vscode/src/vs/editor/contrib/inPlaceReplace/browser/inPlaceReplace.js

@@ -95,7 +95,7 @@ class InPlaceReplaceUp extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inPlaceReplace.up',
-            label: ( localize2(1156, "Replace with Previous Value")),
+            label: ( localize2(1166, "Replace with Previous Value")),
             precondition: EditorContextKeys.writable,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -116,7 +116,7 @@ class InPlaceReplaceDown extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inPlaceReplace.down',
-            label: ( localize2(1157, "Replace with Next Value")),
+            label: ( localize2(1167, "Replace with Next Value")),
             precondition: EditorContextKeys.writable,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,