@codingame/monaco-vscode-api 4.5.2 → 5.0.0

package/vscode/src/vs/editor/common/services/languageFeatures.d.ts

@@ -1,6 +1,6 @@
 import { ServiceIdentifier } from '../../../platform/instantiation/common/instantiation.js';
 import { LanguageFeatureRegistry, NotebookInfoResolver } from '../languageFeatureRegistry.js';
-import { ReferenceProvider, DefinitionProvider, TypeDefinitionProvider, DeclarationProvider, ImplementationProvider, CodeActionProvider, DocumentPasteEditProvider, RenameProvider, NewSymbolNamesProvider, DocumentFormattingEditProvider, DocumentRangeFormattingEditProvider, OnTypeFormattingEditProvider, DocumentSymbolProvider, InlayHintsProvider, DocumentColorProvider, CodeLensProvider, SignatureHelpProvider, HoverProvider, DocumentHighlightProvider, MultiDocumentHighlightProvider, DocumentRangeSemanticTokensProvider, DocumentSemanticTokensProvider, SelectionRangeProvider, FoldingRangeProvider, LinkProvider, InlineCompletionsProvider, InlineEditProvider, CompletionItemProvider, LinkedEditingRangeProvider, InlineValuesProvider, EvaluatableExpressionProvider, DocumentOnDropEditProvider, MappedEditsProvider } from '../languages.js';
+import { ReferenceProvider, DefinitionProvider, TypeDefinitionProvider, DeclarationProvider, ImplementationProvider, CodeActionProvider, DocumentPasteEditProvider, RenameProvider, NewSymbolNamesProvider, DocumentFormattingEditProvider, DocumentRangeFormattingEditProvider, OnTypeFormattingEditProvider, DocumentSymbolProvider, InlayHintsProvider, DocumentColorProvider, CodeLensProvider, SignatureHelpProvider, HoverProvider, DocumentHighlightProvider, MultiDocumentHighlightProvider, DocumentRangeSemanticTokensProvider, DocumentSemanticTokensProvider, SelectionRangeProvider, FoldingRangeProvider, LinkProvider, InlineCompletionsProvider, InlineEditProvider, CompletionItemProvider, LinkedEditingRangeProvider, InlineValuesProvider, EvaluatableExpressionProvider, DocumentDropEditProvider, MappedEditsProvider } from '../languages.js';
 
 declare const ILanguageFeaturesService: ServiceIdentifier<ILanguageFeaturesService>;
 interface ILanguageFeaturesService {
@@ -36,7 +36,7 @@ interface ILanguageFeaturesService {
     readonly linkedEditingRangeProvider: LanguageFeatureRegistry<LinkedEditingRangeProvider>;
     readonly inlineValuesProvider: LanguageFeatureRegistry<InlineValuesProvider>;
     readonly evaluatableExpressionProvider: LanguageFeatureRegistry<EvaluatableExpressionProvider>;
-    readonly documentOnDropEditProvider: LanguageFeatureRegistry<DocumentOnDropEditProvider>;
+    readonly documentDropEditProvider: LanguageFeatureRegistry<DocumentDropEditProvider>;
     readonly mappedEditsProvider: LanguageFeatureRegistry<MappedEditsProvider>;
     setNotebookTypeResolver(resolver: NotebookInfoResolver | undefined): void;
 }

package/vscode/src/vs/editor/common/services/languageFeaturesService.js

@@ -33,7 +33,7 @@ class LanguageFeaturesService {
         this.evaluatableExpressionProvider = ( new LanguageFeatureRegistry(this._score.bind(this)));
         this.documentRangeSemanticTokensProvider = ( new LanguageFeatureRegistry(this._score.bind(this)));
         this.documentSemanticTokensProvider = ( new LanguageFeatureRegistry(this._score.bind(this)));
-        this.documentOnDropEditProvider = ( new LanguageFeatureRegistry(this._score.bind(this)));
+        this.documentDropEditProvider = ( new LanguageFeatureRegistry(this._score.bind(this)));
         this.documentPasteEditProvider = ( new LanguageFeatureRegistry(this._score.bind(this)));
         this.mappedEditsProvider = ( new LanguageFeatureRegistry(this._score.bind(this)));
     }

package/vscode/src/vs/editor/common/standalone/standaloneEnums.js

@@ -261,6 +261,11 @@ var GlyphMarginLane;
     GlyphMarginLane[GlyphMarginLane["Center"] = 2] = "Center";
     GlyphMarginLane[GlyphMarginLane["Right"] = 3] = "Right";
 })(GlyphMarginLane || (GlyphMarginLane = {})));
+var HoverVerbosityAction;
+( (function(HoverVerbosityAction) {
+    HoverVerbosityAction[HoverVerbosityAction["Increase"] = 0] = "Increase";
+    HoverVerbosityAction[HoverVerbosityAction["Decrease"] = 1] = "Decrease";
+})(HoverVerbosityAction || (HoverVerbosityAction = {})));
 var IndentAction;
 ( (function(IndentAction) {
     IndentAction[IndentAction["None"] = 0] = "None";
@@ -470,6 +475,11 @@ var NewSymbolNameTag;
 ( (function(NewSymbolNameTag) {
     NewSymbolNameTag[NewSymbolNameTag["AIGenerated"] = 1] = "AIGenerated";
 })(NewSymbolNameTag || (NewSymbolNameTag = {})));
+var NewSymbolNameTriggerKind;
+( (function(NewSymbolNameTriggerKind) {
+    NewSymbolNameTriggerKind[NewSymbolNameTriggerKind["Invoke"] = 0] = "Invoke";
+    NewSymbolNameTriggerKind[NewSymbolNameTriggerKind["Automatic"] = 1] = "Automatic";
+})(NewSymbolNameTriggerKind || (NewSymbolNameTriggerKind = {})));
 var OverlayWidgetPositionPreference;
 ( (function(OverlayWidgetPositionPreference) {
     OverlayWidgetPositionPreference[OverlayWidgetPositionPreference["TOP_RIGHT_CORNER"] = 0] = "TOP_RIGHT_CORNER";
@@ -604,4 +614,4 @@ var WrappingIndent;
     WrappingIndent[WrappingIndent["Indent"] = 2] = "Indent";
     WrappingIndent[WrappingIndent["DeepIndent"] = 3] = "DeepIndent";
 })(WrappingIndent || (WrappingIndent = {})));
-export { AccessibilitySupport, CodeActionTriggerType, CompletionItemInsertTextRule, CompletionItemKind, CompletionItemTag, CompletionTriggerKind, ContentWidgetPositionPreference, CursorChangeReason, DefaultEndOfLine, DocumentHighlightKind, EditorAutoIndentStrategy, EditorOption, EndOfLinePreference, EndOfLineSequence, GlyphMarginLane, IndentAction, InjectedTextCursorStops, InlayHintKind, InlineCompletionTriggerKind, InlineEditTriggerKind, KeyCode, MarkerSeverity, MarkerTag, MinimapPosition, MinimapSectionHeaderStyle, MouseTargetType, NewSymbolNameTag, OverlayWidgetPositionPreference, OverviewRulerLane, PartialAcceptTriggerKind, PositionAffinity, RenderLineNumbersType, RenderMinimap, ScrollType, ScrollbarVisibility, SelectionDirection, ShowLightbulbIconMode, SignatureHelpTriggerKind, SymbolKind, SymbolTag, TextEditorCursorBlinkingStyle, TextEditorCursorStyle, TrackedRangeStickiness, WrappingIndent };
+export { AccessibilitySupport, CodeActionTriggerType, CompletionItemInsertTextRule, CompletionItemKind, CompletionItemTag, CompletionTriggerKind, ContentWidgetPositionPreference, CursorChangeReason, DefaultEndOfLine, DocumentHighlightKind, EditorAutoIndentStrategy, EditorOption, EndOfLinePreference, EndOfLineSequence, GlyphMarginLane, HoverVerbosityAction, IndentAction, InjectedTextCursorStops, InlayHintKind, InlineCompletionTriggerKind, InlineEditTriggerKind, KeyCode, MarkerSeverity, MarkerTag, MinimapPosition, MinimapSectionHeaderStyle, MouseTargetType, NewSymbolNameTag, NewSymbolNameTriggerKind, OverlayWidgetPositionPreference, OverviewRulerLane, PartialAcceptTriggerKind, PositionAffinity, RenderLineNumbersType, RenderMinimap, ScrollType, ScrollbarVisibility, SelectionDirection, ShowLightbulbIconMode, SignatureHelpTriggerKind, SymbolKind, SymbolTag, TextEditorCursorBlinkingStyle, TextEditorCursorStyle, TrackedRangeStickiness, WrappingIndent };

package/vscode/src/vs/editor/common/viewModel/viewModelImpl.js

@@ -966,6 +966,9 @@ class ViewModel extends Disposable {
             this._eventDispatcher.endEmitViewEvents();
         }
     }
+    batchEvents(callback) {
+        this._withViewEventsCollector(() => { callback(); });
+    }
     normalizePosition(position, affinity) {
         return this._lines.normalizePosition(position, affinity);
     }

package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionController.js

@@ -36,6 +36,7 @@ import { registerThemingParticipant } from '../../../../platform/theme/common/th
 import { CodeActionTriggerSource, CodeActionKind } from '../common/types.js';
 import { CodeActionModel } from './codeActionModel.js';
 import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 var CodeActionController_1;
 const _moduleId = "vs/editor/contrib/codeAction/browser/codeActionController";
 const DECORATION_CLASS_NAME = 'quickfix-edit-highlight';
@@ -45,12 +46,13 @@ let CodeActionController = class CodeActionController extends Disposable {
     static get(editor) {
         return editor.getContribution(CodeActionController_1.ID);
     }
-    constructor(editor, markerService, contextKeyService, instantiationService, languageFeaturesService, progressService, _commandService, _configurationService, _actionWidgetService, _instantiationService) {
+    constructor(editor, markerService, contextKeyService, instantiationService, languageFeaturesService, progressService, _commandService, _configurationService, _actionWidgetService, _instantiationService, _telemetryService) {
         super();
         this._commandService = _commandService;
         this._configurationService = _configurationService;
         this._actionWidgetService = _actionWidgetService;
         this._instantiationService = _instantiationService;
+        this._telemetryService = _telemetryService;
         this._activeCodeActions = this._register(( (new MutableDisposable())));
         this._showDisabled = false;
         this._disposed = false;
@@ -79,6 +81,11 @@ let CodeActionController = class CodeActionController extends Disposable {
         super.dispose();
     }
     async showCodeActionsFromLightbulb(actions, at) {
+        this._telemetryService.publicLog2('codeAction.showCodeActionsFromLightbulb', {
+            codeActionListLength: actions.validActions.length,
+            codeActions: ( (actions.validActions.map(action => action.action.title))),
+            codeActionProviders: ( (actions.validActions.map(action => action.provider?.displayName ?? ''))),
+        });
         if (actions.allAIFixes && actions.validActions.length === 1) {
             const actionItem = actions.validActions[0];
             const command = actionItem.action.command;
@@ -219,13 +226,19 @@ let CodeActionController = class CodeActionController extends Disposable {
         const anchor = Position.isIPosition(at) ? this.toCoords(at) : at;
         const delegate = {
             onSelect: async (action, preview) => {
-                this._applyCodeAction(action,  true, !!preview, ApplyCodeActionReason.FromCodeActions);
-                this._actionWidgetService.hide();
+                this._applyCodeAction(action,  true, !!preview, options.fromLightbulb ? ApplyCodeActionReason.FromAILightbulb : ApplyCodeActionReason.FromCodeActions);
+                this._actionWidgetService.hide(false);
                 currentDecorations.clear();
             },
-            onHide: () => {
+            onHide: (didCancel) => {
                 this._editor?.focus();
                 currentDecorations.clear();
+                if (options.fromLightbulb && didCancel !== undefined) {
+                    this._telemetryService.publicLog2('codeAction.showCodeActionList.onHide', {
+                        codeActionListLength: actions.validActions.length,
+                        didCancel: didCancel,
+                    });
+                }
             },
             onHover: async (action, token) => {
                 if (token.isCancellationRequested) {
@@ -238,7 +251,9 @@ let CodeActionController = class CodeActionController extends Disposable {
                     const refactorKinds = [
                         CodeActionKind.RefactorExtract,
                         CodeActionKind.RefactorInline,
-                        CodeActionKind.RefactorRewrite
+                        CodeActionKind.RefactorRewrite,
+                        CodeActionKind.RefactorMove,
+                        CodeActionKind.Source
                     ];
                     canPreview = ( (refactorKinds.some(refactorKind => refactorKind.contains(hierarchicalKind))));
                 }
@@ -346,7 +361,8 @@ CodeActionController = CodeActionController_1 = ( (__decorate([
     ( (__param(6, ICommandService))),
     ( (__param(7, IConfigurationService))),
     ( (__param(8, IActionWidgetService))),
-    ( (__param(9, IInstantiationService)))
+    ( (__param(9, IInstantiationService))),
+    ( (__param(10, ITelemetryService)))
 ], CodeActionController)));
 registerThemingParticipant((theme, collector) => {
     const addBackgroundColorRule = (selector, color) => {

package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionModel.js

@@ -273,6 +273,11 @@ class CodeActionModel extends Disposable {
                 if (!isManualToAutoTransition) {
                     this.setState(newState);
                 }
+                else {
+                    setTimeout(() => {
+                        this.setState(newState);
+                    }, 500);
+                }
             }, undefined));
             this._codeActionOracle.value.trigger({ type: 2 , triggerAction: CodeActionTriggerSource.Default });
         }

package/vscode/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.js

@@ -44,6 +44,7 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
         this._state = LightBulbState.Hidden;
         this._iconClasses = [];
         this._domNode = $('div.lightBulbWidget');
+        this._domNode.role = 'listbox';
         this._register(Gesture.ignoreTarget(this._domNode));
         this._editor.addContentWidget(this);
         this._register(this._editor.onDidChangeModelContent(_ => {

package/vscode/src/vs/editor/contrib/colorPicker/browser/colorContributions.js

@@ -3,7 +3,7 @@ import { registerEditorContribution } from '../../../browser/editorExtensions.js
 import { Range } from '../../../common/core/range.js';
 import { ColorDecorationInjectedTextMarker } from './colorDetector.js';
 import { ColorHoverParticipant } from './colorHoverParticipant.js';
-import { HoverController } from '../../hover/browser/hover.js';
+import { HoverController } from '../../hover/browser/hoverController.js';
 import { HoverParticipantRegistry } from '../../hover/browser/hoverTypes.js';
 class ColorContribution extends Disposable {
     static { this.ID = 'editor.contrib.colorContribution'; }

package/vscode/src/vs/editor/contrib/colorPicker/browser/standaloneColorPickerActions.js

@@ -16,7 +16,14 @@ class ShowOrFocusStandaloneColorPicker extends EditorAction2 {
             precondition: undefined,
             menu: [
                 { id: MenuId.CommandPalette },
-            ]
+            ],
+            metadata: {
+                description: ( localize2WithPath(
+                    _moduleId,
+                    2,
+                    "Show or focus a standalone color picker which uses the default color provider. It displays hex/rgb/hsl colors."
+                )),
+            }
         });
     }
     runEditorCommand(_accessor, editor) {
@@ -27,12 +34,15 @@ class HideStandaloneColorPicker extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.hideColorPicker',
-            label: ( localizeWithPath(_moduleId, 2, "Hide the Color Picker")),
+            label: ( localizeWithPath(_moduleId, 3, "Hide the Color Picker")),
             alias: 'Hide the Color Picker',
             precondition: ( (EditorContextKeys.standaloneColorPickerVisible.isEqualTo(true))),
             kbOpts: {
                 primary: 9 ,
                 weight: 100
+            },
+            metadata: {
+                description: ( localize2WithPath(_moduleId, 4, "Hide the standalone color picker.")),
             }
         });
     }
@@ -44,12 +54,19 @@ class InsertColorWithStandaloneColorPicker extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.insertColorWithStandaloneColorPicker',
-            label: ( localizeWithPath(_moduleId, 3, "Insert Color with Standalone Color Picker")),
+            label: ( localizeWithPath(_moduleId, 5, "Insert Color with Standalone Color Picker")),
             alias: 'Insert Color with Standalone Color Picker',
             precondition: ( (EditorContextKeys.standaloneColorPickerFocused.isEqualTo(true))),
             kbOpts: {
                 primary: 3 ,
                 weight: 100
+            },
+            metadata: {
+                description: ( localize2WithPath(
+                    _moduleId,
+                    6,
+                    "Insert hex/rgb/hsl colors with the focused standalone color picker."
+                )),
             }
         });
     }

package/vscode/src/vs/editor/contrib/colorPicker/browser/standaloneColorPickerWidget.js

@@ -2,7 +2,7 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { StandaloneColorPickerParticipant } from './colorHoverParticipant.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { EditorHoverStatusBar } from '../../hover/browser/contentHover.js';
+import { EditorHoverStatusBar } from '../../hover/browser/contentHoverStatusBar.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';

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

@@ -7,7 +7,7 @@ import { isIOS } from '../../../../base/common/platform.js';
 import { registerEditorContribution, registerEditorAction, EditorAction } from '../../../browser/editorExtensions.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { localizeWithPath } from '../../../../nls.js';
-import { MenuId, SubmenuItemAction } from '../../../../platform/actions/common/actions.js';
+import { SubmenuItemAction } from '../../../../platform/actions/common/actions.js';
 import { IMenuService } from '../../../../platform/actions/common/actions.service.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IContextMenuService, IContextViewService } from '../../../../platform/contextview/browser/contextView.service.js';
@@ -106,7 +106,7 @@ let ContextMenuController = class ContextMenuController {
         if (!this._editor.hasModel()) {
             return;
         }
-        const menuActions = this._getMenuActions(this._editor.getModel(), this._editor.isSimpleWidget ? MenuId.SimpleEditorContext : MenuId.EditorContext);
+        const menuActions = this._getMenuActions(this._editor.getModel(), this._editor.contextMenuId);
         if (menuActions.length > 0) {
             this._doShowContextMenu(menuActions, anchor);
         }

package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/defaultProviders.js

@@ -23,7 +23,7 @@ class SimplePasteAndDropProvider {
             edits: [{ insertText: edit.insertText, title: edit.title, kind: edit.kind, handledMimeType: edit.handledMimeType, yieldTo: edit.yieldTo }]
         };
     }
-    async provideDocumentOnDropEdits(_model, _position, dataTransfer, token) {
+    async provideDocumentDropEdits(_model, _position, dataTransfer, token) {
         const edit = await this.getEdit(dataTransfer, token);
         return edit ? [{ insertText: edit.insertText, title: edit.title, kind: edit.kind, handledMimeType: edit.handledMimeType, yieldTo: edit.yieldTo }] : undefined;
     }
@@ -176,9 +176,9 @@ async function extractUriList(dataTransfer) {
 let DefaultDropProvidersFeature = class DefaultDropProvidersFeature extends Disposable {
     constructor(languageFeaturesService, workspaceContextService) {
         super();
-        this._register(languageFeaturesService.documentOnDropEditProvider.register('*', ( (new DefaultTextPasteOrDropEditProvider()))));
-        this._register(languageFeaturesService.documentOnDropEditProvider.register('*', ( (new PathProvider()))));
-        this._register(languageFeaturesService.documentOnDropEditProvider.register('*', ( (new RelativePathProvider(workspaceContextService)))));
+        this._register(languageFeaturesService.documentDropEditProvider.register('*', ( (new DefaultTextPasteOrDropEditProvider()))));
+        this._register(languageFeaturesService.documentDropEditProvider.register('*', ( (new PathProvider()))));
+        this._register(languageFeaturesService.documentDropEditProvider.register('*', ( (new RelativePathProvider(workspaceContextService)))));
     }
 };
 DefaultDropProvidersFeature = ( (__decorate([

package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorController.js

@@ -63,7 +63,7 @@ let DropIntoEditorController = class DropIntoEditorController extends Disposable
                 if (!model) {
                     return;
                 }
-                const providers = this._languageFeaturesService.documentOnDropEditProvider
+                const providers = this._languageFeaturesService.documentDropEditProvider
                     .ordered(model)
                     .filter(provider => {
                     if (!provider.dropMimeTypes) {
@@ -96,7 +96,7 @@ let DropIntoEditorController = class DropIntoEditorController extends Disposable
     async getDropEdits(providers, model, position, dataTransfer, tokenSource) {
         const results = await raceCancellation(Promise.all(( (providers.map(async (provider) => {
             try {
-                const edits = await provider.provideDocumentOnDropEdits(model, position, dataTransfer, tokenSource.token);
+                const edits = await provider.provideDocumentDropEdits(model, position, dataTransfer, tokenSource.token);
                 return edits?.map(edit => ({ ...edit, providerId: provider.id }));
             }
             catch (err) {

package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/postEditWidget.js

@@ -115,12 +115,16 @@ let PostEditWidgetManager = class PostEditWidgetManager extends Disposable {
             return;
         }
         const resolvedEdit = await resolve(edit, token);
+        if (token.isCancellationRequested) {
+            return;
+        }
         const combinedWorkspaceEdit = createCombinedWorkspaceEdit(model.uri, ranges, resolvedEdit);
         const primaryRange = ranges[0];
         const editTrackingDecoration = model.deltaDecorations([], [{
                 range: primaryRange,
                 options: { description: 'paste-line-suffix', stickiness: 0  }
             }]);
+        this._editor.focus();
         let editResult;
         let editRange;
         try {
@@ -130,6 +134,9 @@ let PostEditWidgetManager = class PostEditWidgetManager extends Disposable {
         finally {
             model.deltaDecorations(editTrackingDecoration, []);
         }
+        if (token.isCancellationRequested) {
+            return;
+        }
         if (canShowWidget && editResult.isApplied && edits.allEdits.length > 1) {
             this.show(editRange ?? primaryRange, edits, async (newEditIndex) => {
                 const model = this._editor.getModel();

package/vscode/src/vs/editor/contrib/find/browser/findController.js

@@ -23,6 +23,7 @@ import { IQuickInputService } from '../../../../platform/quickinput/common/quick
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 import { themeColorFromId } from '../../../../platform/theme/common/themeService.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
 import Severity$1 from '../../../../base/common/severity.js';
 var CommonFindController_1;
 const _moduleId = "vs/editor/contrib/find/browser/findController";
@@ -57,7 +58,7 @@ let CommonFindController = class CommonFindController extends Disposable {
     static get(editor) {
         return editor.getContribution(CommonFindController_1.ID);
     }
-    constructor(editor, contextKeyService, storageService, clipboardService, notificationService) {
+    constructor(editor, contextKeyService, storageService, clipboardService, notificationService, hoverService) {
         super();
         this._editor = editor;
         this._findWidgetVisible = CONTEXT_FIND_WIDGET_VISIBLE.bindTo(contextKeyService);
@@ -65,6 +66,7 @@ let CommonFindController = class CommonFindController extends Disposable {
         this._storageService = storageService;
         this._clipboardService = clipboardService;
         this._notificationService = notificationService;
+        this._hoverService = hoverService;
         this._updateHistoryDelayer = ( (new Delayer(500)));
         this._state = this._register(( (new FindReplaceState())));
         this.loadQueryState();
@@ -331,11 +333,12 @@ CommonFindController = CommonFindController_1 = ( (__decorate([
     ( (__param(1, IContextKeyService))),
     ( (__param(2, IStorageService))),
     ( (__param(3, IClipboardService))),
-    ( (__param(4, INotificationService)))
+    ( (__param(4, INotificationService))),
+    ( (__param(5, IHoverService)))
 ], CommonFindController)));
 let FindController = class FindController extends CommonFindController {
-    constructor(editor, _contextViewService, _contextKeyService, _keybindingService, _themeService, notificationService, _storageService, clipboardService) {
-        super(editor, _contextKeyService, _storageService, clipboardService, notificationService);
+    constructor(editor, _contextViewService, _contextKeyService, _keybindingService, _themeService, notificationService, _storageService, clipboardService, hoverService) {
+        super(editor, _contextKeyService, _storageService, clipboardService, notificationService, hoverService);
         this._contextViewService = _contextViewService;
         this._keybindingService = _keybindingService;
         this._themeService = _themeService;
@@ -393,7 +396,8 @@ let FindController = class FindController extends CommonFindController {
             this._contextKeyService,
             this._themeService,
             this._storageService,
-            this._notificationService
+            this._notificationService,
+            this._hoverService
         ))));
         this._findOptionsWidget = this._register(( (new FindOptionsWidget(this._editor, this._state, this._keybindingService))));
     }
@@ -411,7 +415,8 @@ FindController = ( (__decorate([
     ( (__param(4, IThemeService))),
     ( (__param(5, INotificationService))),
     ( (__param(6, IStorageService))),
-    ( (__param(7, IClipboardService)))
+    ( (__param(7, IClipboardService))),
+    ( (__param(8, IHoverService)))
 ], FindController)));
 const StartFindAction = registerMultiEditorAction(( (new MultiEditorAction({
     id: FIND_IDS.StartFindAction,

package/vscode/src/vs/editor/contrib/find/browser/findWidget.js

@@ -32,7 +32,6 @@ import { ThemeIcon } from '../../../../base/common/themables.js';
 import { isHighContrast } from '../../../../platform/theme/common/theme.js';
 import { assertIsDefined } from '../../../../base/common/types.js';
 import { defaultInputBoxStyles, defaultToggleStyles } from '../../../../platform/theme/browser/defaultStyles.js';
-import { setupCustomHover } from '../../../../base/browser/ui/hover/updatableHoverWidget.js';
 import { createInstantHoverDelegate, getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 const _moduleId = "vs/editor/contrib/find/browser/findWidget";
 const findSelectionIcon = registerIcon('find-selection', Codicon.selection, ( localizeWithPath(_moduleId, 0, 'Icon for \'Find in Selection\' in the editor find widget.')));
@@ -94,8 +93,9 @@ function stopPropagationForMultiLineDownwards(event, value, textarea) {
 }
 class FindWidget extends Widget {
     static { this.ID = 'editor.contrib.findWidget'; }
-    constructor(codeEditor, controller, state, contextViewProvider, keybindingService, contextKeyService, themeService, storageService, notificationService) {
+    constructor(codeEditor, controller, state, contextViewProvider, keybindingService, contextKeyService, themeService, storageService, notificationService, _hoverService) {
         super();
+        this._hoverService = _hoverService;
         this._cachedHeight = null;
         this._revealTimeouts = [];
         this._codeEditor = codeEditor;
@@ -811,7 +811,7 @@ class FindWidget extends Widget {
             onTrigger: () => {
                 assertIsDefined(this._codeEditor.getAction(FIND_IDS.PreviousMatchFindAction)).run().then(undefined, onUnexpectedError);
             }
-        }))));
+        }, this._hoverService))));
         this._nextBtn = this._register(( (new SimpleButton({
             label: NLS_NEXT_MATCH_BTN_LABEL + this._keybindingLabelFor(FIND_IDS.NextMatchFindAction),
             icon: findNextMatchIcon,
@@ -819,7 +819,7 @@ class FindWidget extends Widget {
             onTrigger: () => {
                 assertIsDefined(this._codeEditor.getAction(FIND_IDS.NextMatchFindAction)).run().then(undefined, onUnexpectedError);
             }
-        }))));
+        }, this._hoverService))));
         const findPart = document.createElement('div');
         findPart.className = 'find-part';
         findPart.appendChild(this._findInput.domNode);
@@ -881,7 +881,7 @@ class FindWidget extends Widget {
                     }
                 }
             }
-        }))));
+        }, this._hoverService))));
         this._replaceInput = this._register(( (new ContextScopedReplaceInput(null, undefined, {
             label: NLS_REPLACE_INPUT_LABEL,
             placeholder: NLS_REPLACE_INPUT_PLACEHOLDER,
@@ -940,7 +940,7 @@ class FindWidget extends Widget {
                     e.preventDefault();
                 }
             }
-        }))));
+        }, this._hoverService))));
         this._replaceAllBtn = this._register(( (new SimpleButton({
             label: NLS_REPLACE_ALL_BTN_LABEL + this._keybindingLabelFor(FIND_IDS.ReplaceAllAction),
             icon: findReplaceAllIcon,
@@ -948,7 +948,7 @@ class FindWidget extends Widget {
             onTrigger: () => {
                 this._controller.replaceAll();
             }
-        }))));
+        }, this._hoverService))));
         const replacePart = document.createElement('div');
         replacePart.className = 'replace-part';
         replacePart.appendChild(this._replaceInput.domNode);
@@ -968,7 +968,7 @@ class FindWidget extends Widget {
                 }
                 this._showViewZone();
             }
-        }))));
+        }, this._hoverService))));
         this._toggleReplaceBtn.setExpanded(this._isReplaceVisible);
         this._domNode = document.createElement('div');
         this._domNode.className = 'editor-widget find-widget';
@@ -1049,7 +1049,7 @@ class FindWidget extends Widget {
     }
 }
 class SimpleButton extends Widget {
-    constructor(opts) {
+    constructor(opts, hoverService) {
         super();
         this._opts = opts;
         let className = 'button';
@@ -1064,7 +1064,7 @@ class SimpleButton extends Widget {
         this._domNode.className = className;
         this._domNode.setAttribute('role', 'button');
         this._domNode.setAttribute('aria-label', this._opts.label);
-        this._register(setupCustomHover(opts.hoverDelegate ?? getDefaultHoverDelegate('element'), this._domNode, this._opts.label));
+        this._register(hoverService.setupUpdatableHover(opts.hoverDelegate ?? getDefaultHoverDelegate('element'), this._domNode, this._opts.label));
         this.onclick(this._domNode, (e) => {
             this._opts.onTrigger();
             e.preventDefault();

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

@@ -0,0 +1,74 @@
+import { coalesce } from '../../../../base/common/arrays.js';
+import { AsyncIterableObject } from '../../../../base/common/async.js';
+class ContentHoverComputer {
+    get anchor() { return this._anchor; }
+    set anchor(value) { this._anchor = value; }
+    get shouldFocus() { return this._shouldFocus; }
+    set shouldFocus(value) { this._shouldFocus = value; }
+    get source() { return this._source; }
+    set source(value) { this._source = value; }
+    get insistOnKeepingHoverVisible() { return this._insistOnKeepingHoverVisible; }
+    set insistOnKeepingHoverVisible(value) { this._insistOnKeepingHoverVisible = value; }
+    constructor(_editor, _participants) {
+        this._editor = _editor;
+        this._participants = _participants;
+        this._anchor = null;
+        this._shouldFocus = false;
+        this._source = 0 ;
+        this._insistOnKeepingHoverVisible = false;
+    }
+    static _getLineDecorations(editor, anchor) {
+        if (anchor.type !== 1  && !anchor.supportsMarkerHover) {
+            return [];
+        }
+        const model = editor.getModel();
+        const lineNumber = anchor.range.startLineNumber;
+        if (lineNumber > model.getLineCount()) {
+            return [];
+        }
+        const maxColumn = model.getLineMaxColumn(lineNumber);
+        return editor.getLineDecorations(lineNumber).filter((d) => {
+            if (d.options.isWholeLine) {
+                return true;
+            }
+            const startColumn = (d.range.startLineNumber === lineNumber) ? d.range.startColumn : 1;
+            const endColumn = (d.range.endLineNumber === lineNumber) ? d.range.endColumn : maxColumn;
+            if (d.options.showIfCollapsed) {
+                if (startColumn > anchor.range.startColumn + 1 || anchor.range.endColumn - 1 > endColumn) {
+                    return false;
+                }
+            }
+            else {
+                if (startColumn > anchor.range.startColumn || anchor.range.endColumn > endColumn) {
+                    return false;
+                }
+            }
+            return true;
+        });
+    }
+    computeAsync(token) {
+        const anchor = this._anchor;
+        if (!this._editor.hasModel() || !anchor) {
+            return AsyncIterableObject.EMPTY;
+        }
+        const lineDecorations = ContentHoverComputer._getLineDecorations(this._editor, anchor);
+        return AsyncIterableObject.merge(( this._participants.map((participant) => {
+            if (!participant.computeAsync) {
+                return AsyncIterableObject.EMPTY;
+            }
+            return participant.computeAsync(anchor, lineDecorations, token);
+        })));
+    }
+    computeSync() {
+        if (!this._editor.hasModel() || !this._anchor) {
+            return [];
+        }
+        const lineDecorations = ContentHoverComputer._getLineDecorations(this._editor, this._anchor);
+        let result = [];
+        for (const participant of this._participants) {
+            result = result.concat(participant.computeSync(this._anchor, lineDecorations));
+        }
+        return coalesce(result);
+    }
+}
+export { ContentHoverComputer };