@codingame/monaco-vscode-api 19.1.4 → 20.0.0

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

@@ -15,13 +15,14 @@ import * as hover from './hover.css';
 import { Emitter } from '../../../../base/common/event.js';
 import { isOnColorDecorator } from '../../colorPicker/browser/hoverColorPicker/hoverColorPicker.js';
 import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
 
 var ContentHoverController_1;
 registerCss(hover);
 let ContentHoverController = class ContentHoverController extends Disposable {
     static { ContentHoverController_1 = this; }
     static { this.ID = 'editor.contrib.contentHover'; }
-    constructor(_editor, _instantiationService, _keybindingService) {
+    constructor(_editor, _contextMenuService, _instantiationService, _keybindingService) {
         super();
         this._editor = _editor;
         this._instantiationService = _instantiationService;
@@ -31,11 +32,19 @@ let ContentHoverController = class ContentHoverController extends Disposable {
         this.shouldKeepOpenOnEditorMouseMoveOrLeave = false;
         this._listenersStore = ( new DisposableStore());
         this._isMouseDown = false;
+        this._ignoreMouseEvents = false;
         this._reactToEditorMouseMoveRunner = this._register(( new RunOnceScheduler(() => {
             if (this._mouseMoveEvent) {
                 this._reactToEditorMouseMove(this._mouseMoveEvent);
             }
         }, 0)));
+        this._register(_contextMenuService.onDidShowContextMenu(() => {
+            this.hideContentHover();
+            this._ignoreMouseEvents = true;
+        }));
+        this._register(_contextMenuService.onDidHideContextMenu(() => {
+            this._ignoreMouseEvents = false;
+        }));
         this._hookListeners();
         this._register(this._editor.onDidChangeConfiguration((e) => {
             if (e.hasChanged(EditorOption.hover)) {
@@ -78,11 +87,17 @@ let ContentHoverController = class ContentHoverController extends Disposable {
         this._reactToEditorMouseMoveRunner.cancel();
     }
     _onEditorScrollChanged(e) {
+        if (this._ignoreMouseEvents) {
+            return;
+        }
         if (e.scrollTopChanged || e.scrollLeftChanged) {
             this.hideContentHover();
         }
     }
     _onEditorMouseDown(mouseEvent) {
+        if (this._ignoreMouseEvents) {
+            return;
+        }
         this._isMouseDown = true;
         const shouldKeepHoverWidgetVisible = this._shouldKeepHoverWidgetVisible(mouseEvent);
         if (shouldKeepHoverWidgetVisible) {
@@ -100,9 +115,15 @@ let ContentHoverController = class ContentHoverController extends Disposable {
         return isMousePositionWithinElement(this._contentWidget.getDomNode(), mouseEvent.event.posx, mouseEvent.event.posy);
     }
     _onEditorMouseUp() {
+        if (this._ignoreMouseEvents) {
+            return;
+        }
         this._isMouseDown = false;
     }
     _onEditorMouseLeave(mouseEvent) {
+        if (this._ignoreMouseEvents) {
+            return;
+        }
         if (this.shouldKeepOpenOnEditorMouseMoveOrLeave) {
             return;
         }
@@ -149,6 +170,9 @@ let ContentHoverController = class ContentHoverController extends Disposable {
             || isTextSelectedWithinContentHoverWidget(mouseEvent, isHoverSticky);
     }
     _onEditorMouseMove(mouseEvent) {
+        if (this._ignoreMouseEvents) {
+            return;
+        }
         this._mouseMoveEvent = mouseEvent;
         const shouldKeepCurrentHover = this._shouldKeepCurrentHover(mouseEvent);
         if (shouldKeepCurrentHover) {
@@ -179,6 +203,9 @@ let ContentHoverController = class ContentHoverController extends Disposable {
         this.hideContentHover();
     }
     _onKeyDown(e) {
+        if (this._ignoreMouseEvents) {
+            return;
+        }
         if (!this._contentWidget) {
             return;
         }
@@ -292,8 +319,9 @@ let ContentHoverController = class ContentHoverController extends Disposable {
     }
 };
 ContentHoverController = ContentHoverController_1 = ( __decorate([
-    ( __param(1, IInstantiationService)),
-    ( __param(2, IKeybindingService))
+    ( __param(1, IContextMenuService)),
+    ( __param(2, IInstantiationService)),
+    ( __param(3, IKeybindingService))
 ], ContentHoverController));
 
 export { ContentHoverController };

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

@@ -250,19 +250,19 @@ let RenderedContentHoverParts = class RenderedContentHoverParts extends Disposab
             return '';
         }
         if (renderedPart.type === 'statusBar') {
-            const statusBarDescription = [( localize(1174, "This is a hover status bar."))];
+            const statusBarDescription = [( localize(1184, "This is a hover status bar."))];
             for (const action of renderedPart.actions) {
                 const keybinding = action.actionKeybindingLabel;
                 if (keybinding) {
                     statusBarDescription.push(( localize(
-                        1175,
+                        1185,
                         "It has an action with label {0} and keybinding {1}.",
                         action.actionLabel,
                         keybinding
                     )));
                 }
                 else {
-                    statusBarDescription.push(( localize(1176, "It has an action with label {0}.", action.actionLabel)));
+                    statusBarDescription.push(( localize(1186, "It has an action with label {0}.", action.actionLabel)));
                 }
             }
             return statusBarDescription.join('\n');

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

@@ -24,6 +24,8 @@ export declare class ContentHoverWidget extends ResizableContentWidget {
     readonly onDidResize: import("../../../../base/common/event.js").Event<void>;
     private readonly _onDidScroll;
     readonly onDidScroll: import("../../../../base/common/event.js").Event<ScrollEvent>;
+    private readonly _onContentsChanged;
+    readonly onContentsChanged: import("../../../../base/common/event.js").Event<void>;
     get isVisibleFromKeyboard(): boolean;
     get isVisible(): boolean;
     get isFocused(): boolean;
@@ -57,7 +59,7 @@ export declare class ContentHoverWidget extends ResizableContentWidget {
     private _removeConstraintsRenderNormally;
     setMinimumDimensions(dimensions: dom.Dimension): void;
     private _updateMinimumWidth;
-    onContentsChanged(): void;
+    handleContentsChanged(): void;
     focus(): void;
     scrollUp(): void;
     scrollDown(): void;

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

@@ -42,6 +42,8 @@ let ContentHoverWidget = class ContentHoverWidget extends ResizableContentWidget
         this.onDidResize = this._onDidResize.event;
         this._onDidScroll = this._register(( new Emitter()));
         this.onDidScroll = this._onDidScroll.event;
+        this._onContentsChanged = this._register(( new Emitter()));
+        this.onContentsChanged = this._onContentsChanged.event;
         this._minimumSize = minimumSize;
         this._hoverVisibleKey = EditorContextKeys.hoverVisible.bindTo(contextKeyService);
         this._hoverFocusedKey = EditorContextKeys.hoverFocused.bindTo(contextKeyService);
@@ -237,7 +239,7 @@ let ContentHoverWidget = class ContentHoverWidget extends ResizableContentWidget
         this._setRenderedHover(renderedHover);
         this._updateFont();
         this._updateContent(renderedHover.domNode);
-        this.onContentsChanged();
+        this.handleContentsChanged();
         this._editor.render();
     }
     getPosition() {
@@ -259,7 +261,7 @@ let ContentHoverWidget = class ContentHoverWidget extends ResizableContentWidget
         const widgetHeight = getTotalHeight(this._hover.containerDomNode);
         const widgetPosition = renderedHover.showAtPosition;
         this._positionPreference = this._findPositionPreference(widgetHeight, widgetPosition) ?? ContentWidgetPositionPreference.ABOVE;
-        this.onContentsChanged();
+        this.handleContentsChanged();
         if (renderedHover.shouldFocus) {
             this._hover.containerDomNode.focus();
         }
@@ -300,7 +302,7 @@ let ContentHoverWidget = class ContentHoverWidget extends ResizableContentWidget
             : Math.min(this._contentWidth, this._minimumSize.width));
         this._resizableNode.minSize = new Dimension(width, this._minimumSize.height);
     }
-    onContentsChanged() {
+    handleContentsChanged() {
         this._removeConstraintsRenderNormally();
         const contentsDomNode = this._hover.contentsDomNode;
         let height = getTotalHeight(contentsDomNode);
@@ -317,6 +319,7 @@ let ContentHoverWidget = class ContentHoverWidget extends ResizableContentWidget
             this._positionPreference = this._findPositionPreference(widgetHeight, this._renderedHover.showAtPosition);
         }
         this._layoutContentWidget();
+        this._onContentsChanged.fire();
     }
     focus() {
         this._hover.containerDomNode.focus();

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

@@ -47,6 +47,9 @@ let ContentHoverWidgetWrapper = class ContentHoverWidgetWrapper extends Disposab
         this._register(this._contentHoverWidget.onDidScroll((e) => {
             this._participants.forEach(participant => participant.handleScroll?.(e));
         }));
+        this._register(this._contentHoverWidget.onContentsChanged(() => {
+            this._participants.forEach(participant => participant.handleContentsChanged?.());
+        }));
         return participants;
     }
     _registerListeners() {
@@ -68,6 +71,9 @@ let ContentHoverWidgetWrapper = class ContentHoverWidgetWrapper extends Disposab
                 this._setCurrentResult(this._currentResult);
             }
         }));
+        this._register(this._contentHoverWidget.onContentsChanged(() => {
+            this._onContentsChanged.fire();
+        }));
     }
     _startShowingOrUpdateHover(anchor, mode, source, focus, mouseEvent) {
         const contentHoverIsVisible = this._contentHoverWidget.position && this._currentResult;
@@ -195,8 +201,7 @@ let ContentHoverWidgetWrapper = class ContentHoverWidgetWrapper extends Disposab
             this.hide();
         };
         const onContentsChanged = () => {
-            this._onContentsChanged.fire();
-            this._contentHoverWidget.onContentsChanged();
+            this._contentHoverWidget.handleContentsChanged();
         };
         const setMinimumDimensions = (dimensions) => {
             this._contentHoverWidget.setMinimumDimensions(dimensions);

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

@@ -1,4 +1,3 @@
-import { AsyncIterableObject } from "../../../../base/common/async.js";
 import { CancellationToken } from "../../../../base/common/cancellation.js";
 import { Position } from "../../../common/core/position.js";
 import { ITextModel } from "../../../common/model.js";
@@ -10,5 +9,5 @@ export declare class HoverProviderResult {
     readonly ordinal: number;
     constructor(provider: HoverProvider, hover: Hover, ordinal: number);
 }
-export declare function getHoverProviderResultsAsAsyncIterable(registry: LanguageFeatureRegistry<HoverProvider>, model: ITextModel, position: Position, token: CancellationToken, recursive?: boolean): AsyncIterableObject<HoverProviderResult>;
+export declare function getHoverProviderResultsAsAsyncIterable(registry: LanguageFeatureRegistry<HoverProvider>, model: ITextModel, position: Position, token: CancellationToken, recursive?: boolean): AsyncIterable<HoverProviderResult>;
 export declare function getHoversPromise(registry: LanguageFeatureRegistry<HoverProvider>, model: ITextModel, position: Position, token: CancellationToken, recursive?: boolean): Promise<Hover[]>;

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

@@ -28,8 +28,12 @@ function getHoverProviderResultsAsAsyncIterable(registry, model, position, token
     ));
     return AsyncIterableObject.fromPromisesResolveOrder(promises).coalesce();
 }
-function getHoversPromise(registry, model, position, token, recursive = false) {
-    return ( getHoverProviderResultsAsAsyncIterable(registry, model, position, token, recursive).map(item => item.hover)).toPromise();
+async function getHoversPromise(registry, model, position, token, recursive = false) {
+    const out = [];
+    for await (const item of getHoverProviderResultsAsAsyncIterable(registry, model, position, token, recursive)) {
+        out.push(item.hover);
+    }
+    return out;
 }
 registerModelAndPositionCommand('_executeHoverProvider', (accessor, model, position) => {
     const languageFeaturesService = accessor.get(ILanguageFeaturesService);

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(
-        1177,
+        1187,
         '- The focused hover part verbosity level can be increased with the Increase Hover Verbosity command.',
         `<keybinding:${INCREASE_HOVER_VERBOSITY_ACTION_ID}>`
     ));
     HoverAccessibilityHelpNLS.decreaseVerbosity = ( localize(
-        1178,
+        1188,
         '- 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.js

@@ -14,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(1179, "Increase Hover Verbosity Level"));
+const INCREASE_HOVER_VERBOSITY_ACTION_LABEL = ( localize(1189, "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(1180, "Decrease Hover Verbosity Level"));
+const DECREASE_HOVER_VERBOSITY_ACTION_LABEL = ( localize(1190, "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, 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 };

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

@@ -26,10 +26,10 @@ class ShowOrFocusHoverAction extends EditorAction {
     constructor() {
         super({
             id: SHOW_OR_FOCUS_HOVER_ACTION_ID,
-            label: ( localize2(1181, "Show or Focus Hover")),
+            label: ( localize2(1191, "Show or Focus Hover")),
             metadata: {
                 description: ( localize2(
-                    1182,
+                    1192,
                     'Show or focus the editor hover which shows documentation, references, and other content for a symbol at the current cursor position.'
                 )),
                 args: [{
@@ -41,9 +41,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(1183, 'The hover will not automatically take focus.')),
-                                        ( localize(1184, 'The hover will take focus only if it is already visible.')),
-                                        ( localize(1185, 'The hover will automatically take focus when it appears.')),
+                                        ( localize(1193, 'The hover will not automatically take focus.')),
+                                        ( localize(1194, 'The hover will take focus only if it is already visible.')),
+                                        ( localize(1195, 'The hover will automatically take focus when it appears.')),
                                     ],
                                     default: HoverFocusBehavior.FocusIfVisible,
                                 }
@@ -98,10 +98,10 @@ class ShowDefinitionPreviewHoverAction extends EditorAction {
     constructor() {
         super({
             id: SHOW_DEFINITION_PREVIEW_HOVER_ACTION_ID,
-            label: ( localize2(1186, "Show Definition Preview Hover")),
+            label: ( localize2(1196, "Show Definition Preview Hover")),
             precondition: undefined,
             metadata: {
-                description: ( localize2(1187, 'Show the definition preview hover in the editor.')),
+                description: ( localize2(1197, 'Show the definition preview hover in the editor.')),
             },
         });
     }
@@ -129,7 +129,7 @@ class HideContentHoverAction extends EditorAction {
     constructor() {
         super({
             id: HIDE_HOVER_ACTION_ID,
-            label: ( localize2(1188, "Hide Hover")),
+            label: ( localize2(1198, "Hide Hover")),
             alias: 'Hide Content Hover',
             precondition: undefined
         });
@@ -142,7 +142,7 @@ class ScrollUpHoverAction extends EditorAction {
     constructor() {
         super({
             id: SCROLL_UP_HOVER_ACTION_ID,
-            label: ( localize2(1189, "Scroll Up Hover")),
+            label: ( localize2(1199, "Scroll Up Hover")),
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
@@ -150,7 +150,7 @@ class ScrollUpHoverAction extends EditorAction {
                 weight: KeybindingWeight.EditorContrib
             },
             metadata: {
-                description: ( localize2(1190, 'Scroll up the editor hover.'))
+                description: ( localize2(1200, 'Scroll up the editor hover.'))
             },
         });
     }
@@ -166,7 +166,7 @@ class ScrollDownHoverAction extends EditorAction {
     constructor() {
         super({
             id: SCROLL_DOWN_HOVER_ACTION_ID,
-            label: ( localize2(1191, "Scroll Down Hover")),
+            label: ( localize2(1201, "Scroll Down Hover")),
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
@@ -174,7 +174,7 @@ class ScrollDownHoverAction extends EditorAction {
                 weight: KeybindingWeight.EditorContrib
             },
             metadata: {
-                description: ( localize2(1192, 'Scroll down the editor hover.')),
+                description: ( localize2(1202, 'Scroll down the editor hover.')),
             },
         });
     }
@@ -190,7 +190,7 @@ class ScrollLeftHoverAction extends EditorAction {
     constructor() {
         super({
             id: SCROLL_LEFT_HOVER_ACTION_ID,
-            label: ( localize2(1193, "Scroll Left Hover")),
+            label: ( localize2(1203, "Scroll Left Hover")),
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
@@ -198,7 +198,7 @@ class ScrollLeftHoverAction extends EditorAction {
                 weight: KeybindingWeight.EditorContrib
             },
             metadata: {
-                description: ( localize2(1194, 'Scroll left the editor hover.')),
+                description: ( localize2(1204, 'Scroll left the editor hover.')),
             },
         });
     }
@@ -214,7 +214,7 @@ class ScrollRightHoverAction extends EditorAction {
     constructor() {
         super({
             id: SCROLL_RIGHT_HOVER_ACTION_ID,
-            label: ( localize2(1195, "Scroll Right Hover")),
+            label: ( localize2(1205, "Scroll Right Hover")),
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
@@ -222,7 +222,7 @@ class ScrollRightHoverAction extends EditorAction {
                 weight: KeybindingWeight.EditorContrib
             },
             metadata: {
-                description: ( localize2(1196, 'Scroll right the editor hover.'))
+                description: ( localize2(1206, 'Scroll right the editor hover.'))
             },
         });
     }
@@ -238,7 +238,7 @@ class PageUpHoverAction extends EditorAction {
     constructor() {
         super({
             id: PAGE_UP_HOVER_ACTION_ID,
-            label: ( localize2(1197, "Page Up Hover")),
+            label: ( localize2(1207, "Page Up Hover")),
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
@@ -247,7 +247,7 @@ class PageUpHoverAction extends EditorAction {
                 weight: KeybindingWeight.EditorContrib
             },
             metadata: {
-                description: ( localize2(1198, 'Page up the editor hover.')),
+                description: ( localize2(1208, 'Page up the editor hover.')),
             },
         });
     }
@@ -263,7 +263,7 @@ class PageDownHoverAction extends EditorAction {
     constructor() {
         super({
             id: PAGE_DOWN_HOVER_ACTION_ID,
-            label: ( localize2(1199, "Page Down Hover")),
+            label: ( localize2(1209, "Page Down Hover")),
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
@@ -272,7 +272,7 @@ class PageDownHoverAction extends EditorAction {
                 weight: KeybindingWeight.EditorContrib
             },
             metadata: {
-                description: ( localize2(1200, 'Page down the editor hover.')),
+                description: ( localize2(1210, 'Page down the editor hover.')),
             },
         });
     }
@@ -288,7 +288,7 @@ class GoToTopHoverAction extends EditorAction {
     constructor() {
         super({
             id: GO_TO_TOP_HOVER_ACTION_ID,
-            label: ( localize2(1201, "Go To Top Hover")),
+            label: ( localize2(1211, "Go To Top Hover")),
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
@@ -297,7 +297,7 @@ class GoToTopHoverAction extends EditorAction {
                 weight: KeybindingWeight.EditorContrib
             },
             metadata: {
-                description: ( localize2(1202, 'Go to the top of the editor hover.')),
+                description: ( localize2(1212, 'Go to the top of the editor hover.')),
             },
         });
     }
@@ -313,7 +313,7 @@ class GoToBottomHoverAction extends EditorAction {
     constructor() {
         super({
             id: GO_TO_BOTTOM_HOVER_ACTION_ID,
-            label: ( localize2(1203, "Go To Bottom Hover")),
+            label: ( localize2(1213, "Go To Bottom Hover")),
             precondition: EditorContextKeys.hoverFocused,
             kbOpts: {
                 kbExpr: EditorContextKeys.hoverFocused,
@@ -322,7 +322,7 @@ class GoToBottomHoverAction extends EditorAction {
                 weight: KeybindingWeight.EditorContrib
             },
             metadata: {
-                description: ( localize2(1204, 'Go to the bottom of the editor hover.'))
+                description: ( localize2(1214, 'Go to the bottom of the editor hover.'))
             },
         });
     }

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

@@ -1,14 +1,13 @@
 import { Dimension } from "../../../../base/browser/dom.js";
-import { AsyncIterableObject } from "../../../../base/common/async.js";
 import { CancellationToken } from "../../../../base/common/cancellation.js";
 import { IDisposable } from "../../../../base/common/lifecycle.js";
+import { ScrollEvent } from "../../../../base/common/scrollable.js";
+import { BrandedService, IConstructorSignature } from "../../../../platform/instantiation/common/instantiation.js";
 import { ICodeEditor, IEditorMouseEvent } from "../../../browser/editorBrowser.js";
 import { Position } from "../../../common/core/position.js";
 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;
@@ -85,12 +84,13 @@ export interface IEditorHoverParticipant<T extends IHoverPart = IHoverPart> {
     readonly hoverOrdinal: number;
     suggestHoverAnchor?(mouseEvent: IEditorMouseEvent): HoverAnchor | null;
     computeSync(anchor: HoverAnchor, lineDecorations: IModelDecoration[], source: HoverStartSource): T[];
-    computeAsync?(anchor: HoverAnchor, lineDecorations: IModelDecoration[], source: HoverStartSource, token: CancellationToken): AsyncIterableObject<T>;
+    computeAsync?(anchor: HoverAnchor, lineDecorations: IModelDecoration[], source: HoverStartSource, token: CancellationToken): AsyncIterable<T>;
     createLoadingMessage?(anchor: HoverAnchor): T | null;
     renderHoverParts(context: IEditorHoverRenderContext, hoverParts: T[]): IRenderedHoverParts<T>;
     getAccessibleContent(hoverPart: T): string;
     handleResize?(): void;
     handleHide?(): void;
+    handleContentsChanged?(): void;
     handleScroll?(e: ScrollEvent): void;
 }
 export type IEditorHoverParticipantCtor = IConstructorSignature<IEditorHoverParticipant, [

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

@@ -12,7 +12,6 @@ import { ILanguageFeaturesService } from "../../../common/services/languageFeatu
 import { Hover, HoverProvider, HoverVerbosityAction } from "../../../common/languages.js";
 import { IKeybindingService } from "../../../../platform/keybinding/common/keybinding.service.js";
 import { IHoverService } from "../../../../platform/hover/browser/hover.service.js";
-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";
@@ -47,7 +46,7 @@ export declare class MarkdownHoverParticipant implements IEditorHoverParticipant
     constructor(_editor: ICodeEditor, _languageService: ILanguageService, _openerService: IOpenerService, _configurationService: IConfigurationService, _languageFeaturesService: ILanguageFeaturesService, _keybindingService: IKeybindingService, _hoverService: IHoverService, _commandService: ICommandService);
     createLoadingMessage(anchor: HoverAnchor): MarkdownHover | null;
     computeSync(anchor: HoverAnchor, lineDecorations: IModelDecoration[]): MarkdownHover[];
-    computeAsync(anchor: HoverAnchor, lineDecorations: IModelDecoration[], source: HoverStartSource, token: CancellationToken): AsyncIterableObject<MarkdownHover>;
+    computeAsync(anchor: HoverAnchor, lineDecorations: IModelDecoration[], source: HoverStartSource, token: CancellationToken): AsyncIterable<MarkdownHover>;
     private _getMarkdownHovers;
     renderHoverParts(context: IEditorHoverRenderContext, hoverParts: MarkdownHover[]): IRenderedHoverParts<MarkdownHover>;
     handleScroll(e: ScrollEvent): void;

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(1205, 'Icon for increaseing hover verbosity.')));
-const decreaseHoverVerbosityIcon = registerIcon('hover-decrease-verbosity', Codicon.remove, ( localize(1206, 'Icon for decreasing hover verbosity.')));
+const increaseHoverVerbosityIcon = registerIcon('hover-increase-verbosity', Codicon.add, ( localize(1215, 'Icon for increaseing hover verbosity.')));
+const decreaseHoverVerbosityIcon = registerIcon('hover-decrease-verbosity', Codicon.remove, ( localize(1216, '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(1207, "Loading...")))],
+            [( new MarkdownString()).appendText(( localize(1217, "Loading...")))],
             false,
             2000
         ));
@@ -103,7 +103,7 @@ let MarkdownHoverParticipant = class MarkdownHoverParticipant {
             stopRenderingMessage = true;
             result.push(( new MarkdownHover(this, anchor.range, [{
                     value: ( localize(
-                        1208,
+                        1218,
                         "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(
-                        1209,
+                        1219,
                         "Tokenization is skipped for long lines for performance reasons. This can be configured via `editor.maxTokenizationLineLength`."
                     ))
                 }], false, index++)));
@@ -146,19 +146,18 @@ let MarkdownHoverParticipant = class MarkdownHoverParticipant {
         if (!( hoverProviderRegistry.has(model))) {
             return AsyncIterableObject.EMPTY;
         }
-        const markdownHovers = this._getMarkdownHovers(hoverProviderRegistry, model, anchor, token);
-        return markdownHovers;
+        return this._getMarkdownHovers(hoverProviderRegistry, model, anchor, token);
     }
-    _getMarkdownHovers(hoverProviderRegistry, model, anchor, token) {
+    async *_getMarkdownHovers(hoverProviderRegistry, model, anchor, token) {
         const position = anchor.range.getStartPosition();
         const hoverProviderResults = getHoverProviderResultsAsAsyncIterable(hoverProviderRegistry, model, position, token);
-        const markdownHovers = ( hoverProviderResults.filter(item => !isEmptyMarkdownString(item.hover.contents))
-            .map(item => {
-            const range = item.hover.range ? Range.lift(item.hover.range) : anchor.range;
-            const hoverSource = ( new HoverSource(item.hover, item.provider, position));
-            return ( new MarkdownHover(this, range, item.hover.contents, false, item.ordinal, hoverSource));
-        }));
-        return markdownHovers;
+        for await (const item of hoverProviderResults) {
+            if (!isEmptyMarkdownString(item.hover.contents)) {
+                const range = item.hover.range ? Range.lift(item.hover.range) : anchor.range;
+                const hoverSource = ( new HoverSource(item.hover, item.provider, position));
+                yield ( new MarkdownHover(this, range, item.hover.contents, false, item.ordinal, hoverSource));
+            }
+        }
     }
     renderHoverParts(context, hoverParts) {
         this._renderedHoverParts = ( new MarkdownRenderedHoverParts(
@@ -462,14 +461,14 @@ function labelForHoverVerbosityAction(keybindingService, action) {
         case HoverVerbosityAction.Increase: {
             const kb = keybindingService.lookupKeybinding(INCREASE_HOVER_VERBOSITY_ACTION_ID);
             return kb ?
-                ( localize(1210, "Increase Hover Verbosity ({0})", kb.getLabel())) :
-                ( localize(1211, "Increase Hover Verbosity"));
+                ( localize(1220, "Increase Hover Verbosity ({0})", kb.getLabel())) :
+                ( localize(1221, "Increase Hover Verbosity"));
         }
         case HoverVerbosityAction.Decrease: {
             const kb = keybindingService.lookupKeybinding(DECREASE_HOVER_VERBOSITY_ACTION_ID);
             return kb ?
-                ( localize(1212, "Decrease Hover Verbosity ({0})", kb.getLabel())) :
-                ( localize(1213, "Decrease Hover Verbosity"));
+                ( localize(1222, "Decrease Hover Verbosity ({0})", kb.getLabel())) :
+                ( localize(1223, "Decrease Hover Verbosity"));
         }
     }
 }

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

@@ -166,7 +166,7 @@ let MarkerHoverParticipant = class MarkerHoverParticipant {
             const markerController = MarkerController.get(this._editor);
             if (markerController) {
                 context.statusBar.addAction({
-                    label: ( localize(1214, "View Problem")),
+                    label: ( localize(1224, "View Problem")),
                     commandId: NextMarkerAction.ID,
                     run: () => {
                         context.hide();
@@ -181,14 +181,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(1215, "No quick fixes available"));
+                        quickfixPlaceholderElement.textContent = ( localize(1225, "No quick fixes available"));
                     }
                 }
                 else {
                     this.recentMarkerCodeActionsInfo = undefined;
                 }
             }
-            const updatePlaceholderDisposable = this.recentMarkerCodeActionsInfo && !this.recentMarkerCodeActionsInfo.hasCodeActions ? Disposable.None : disposableTimeout(() => quickfixPlaceholderElement.textContent = ( localize(1216, "Checking for quick fixes...")), 200, disposables);
+            const updatePlaceholderDisposable = this.recentMarkerCodeActionsInfo && !this.recentMarkerCodeActionsInfo.hasCodeActions ? Disposable.None : disposableTimeout(() => quickfixPlaceholderElement.textContent = ( localize(1226, "Checking for quick fixes...")), 200, disposables);
             if (!quickfixPlaceholderElement.textContent) {
                 quickfixPlaceholderElement.textContent = String.fromCharCode(0xA0);
             }
@@ -199,7 +199,7 @@ let MarkerHoverParticipant = class MarkerHoverParticipant {
                 this.recentMarkerCodeActionsInfo = { marker: markerHover.marker, hasCodeActions: actions.validActions.length > 0 };
                 if (!this.recentMarkerCodeActionsInfo.hasCodeActions) {
                     actions.dispose();
-                    quickfixPlaceholderElement.textContent = ( localize(1215, "No quick fixes available"));
+                    quickfixPlaceholderElement.textContent = ( localize(1225, "No quick fixes available"));
                     return;
                 }
                 quickfixPlaceholderElement.style.display = 'none';
@@ -210,7 +210,7 @@ let MarkerHoverParticipant = class MarkerHoverParticipant {
                     }
                 }));
                 context.statusBar.addAction({
-                    label: ( localize(1217, "Quick Fix...")),
+                    label: ( localize(1227, "Quick Fix...")),
                     commandId: quickFixCommandId,
                     run: (target) => {
                         showing = true;