@codingame/monaco-vscode-api 2.0.3-improve-modularity.1 → 2.1.0-update-vscode-1.86.1

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

@@ -457,42 +457,10 @@ const findArgDescription = {
                 properties: {
                     searchString: { type: 'string' },
                     replaceString: { type: 'string' },
-                    regex: { type: 'boolean' },
-                    regexOverride: {
-                        type: 'number',
-                        description: ( localizeWithPath(
-                            'vs/editor/contrib/find/browser/findController',
-                            'actions.find.isRegexOverride',
-                            'Overrides "Use Regular Expression" flag.\nThe flag will not be saved for the future.\n0: Do Nothing\n1: True\n2: False'
-                        ))
-                    },
-                    wholeWord: { type: 'boolean' },
-                    wholeWordOverride: {
-                        type: 'number',
-                        description: ( localizeWithPath(
-                            'vs/editor/contrib/find/browser/findController',
-                            'actions.find.wholeWordOverride',
-                            'Overrides "Match Whole Word" flag.\nThe flag will not be saved for the future.\n0: Do Nothing\n1: True\n2: False'
-                        ))
-                    },
-                    matchCase: { type: 'boolean' },
-                    matchCaseOverride: {
-                        type: 'number',
-                        description: ( localizeWithPath(
-                            'vs/editor/contrib/find/browser/findController',
-                            'actions.find.matchCaseOverride',
-                            'Overrides "Math Case" flag.\nThe flag will not be saved for the future.\n0: Do Nothing\n1: True\n2: False'
-                        ))
-                    },
+                    isRegex: { type: 'boolean' },
+                    matchWholeWord: { type: 'boolean' },
+                    isCaseSensitive: { type: 'boolean' },
                     preserveCase: { type: 'boolean' },
-                    preserveCaseOverride: {
-                        type: 'number',
-                        description: ( localizeWithPath(
-                            'vs/editor/contrib/find/browser/findController',
-                            'actions.find.preserveCaseOverride',
-                            'Overrides "Preserve Case" flag.\nThe flag will not be saved for the future.\n0: Do Nothing\n1: True\n2: False'
-                        ))
-                    },
                     findInSelection: { type: 'boolean' },
                 }
             }

package/vscode/src/vs/editor/contrib/folding/browser/foldingDecorations.js

@@ -37,12 +37,23 @@ const foldingManualExpandedIcon = registerIcon('folding-manual-expanded', foldin
     'Icon for manually expanded ranges in the editor glyph margin.'
 )));
 const foldedBackgroundMinimap = { color: themeColorFromId(foldBackground), position: MinimapPosition.Inline };
+const collapsed = ( localizeWithPath(
+    'vs/editor/contrib/folding/browser/foldingDecorations',
+    'linesCollapsed',
+    "Click to expand the range."
+));
+const expanded = ( localizeWithPath(
+    'vs/editor/contrib/folding/browser/foldingDecorations',
+    'linesExpanded',
+    "Click to collapse the range."
+));
 class FoldingDecorationProvider {
     static { this.COLLAPSED_VISUAL_DECORATION = ModelDecorationOptions.register({
         description: 'folding-collapsed-visual-decoration',
         stickiness: 0 ,
         afterContentClassName: 'inline-folded',
         isWholeLine: true,
+        linesDecorationsTooltip: collapsed,
         firstLineDecorationClassName: ThemeIcon.asClassName(foldingCollapsedIcon),
     }); }
     static { this.COLLAPSED_HIGHLIGHTED_VISUAL_DECORATION = ModelDecorationOptions.register({
@@ -52,6 +63,7 @@ class FoldingDecorationProvider {
         className: 'folded-background',
         minimap: foldedBackgroundMinimap,
         isWholeLine: true,
+        linesDecorationsTooltip: collapsed,
         firstLineDecorationClassName: ThemeIcon.asClassName(foldingCollapsedIcon)
     }); }
     static { this.MANUALLY_COLLAPSED_VISUAL_DECORATION = ModelDecorationOptions.register({
@@ -59,6 +71,7 @@ class FoldingDecorationProvider {
         stickiness: 0 ,
         afterContentClassName: 'inline-folded',
         isWholeLine: true,
+        linesDecorationsTooltip: collapsed,
         firstLineDecorationClassName: ThemeIcon.asClassName(foldingManualCollapsedIcon)
     }); }
     static { this.MANUALLY_COLLAPSED_HIGHLIGHTED_VISUAL_DECORATION = ModelDecorationOptions.register({
@@ -68,13 +81,15 @@ class FoldingDecorationProvider {
         className: 'folded-background',
         minimap: foldedBackgroundMinimap,
         isWholeLine: true,
+        linesDecorationsTooltip: collapsed,
         firstLineDecorationClassName: ThemeIcon.asClassName(foldingManualCollapsedIcon)
     }); }
     static { this.NO_CONTROLS_COLLAPSED_RANGE_DECORATION = ModelDecorationOptions.register({
         description: 'folding-no-controls-range-decoration',
         stickiness: 0 ,
         afterContentClassName: 'inline-folded',
-        isWholeLine: true
+        isWholeLine: true,
+        linesDecorationsTooltip: collapsed,
     }); }
     static { this.NO_CONTROLS_COLLAPSED_HIGHLIGHTED_RANGE_DECORATION = ModelDecorationOptions.register({
         description: 'folding-no-controls-range-decoration',
@@ -82,31 +97,36 @@ class FoldingDecorationProvider {
         afterContentClassName: 'inline-folded',
         className: 'folded-background',
         minimap: foldedBackgroundMinimap,
-        isWholeLine: true
+        isWholeLine: true,
+        linesDecorationsTooltip: collapsed,
     }); }
     static { this.EXPANDED_VISUAL_DECORATION = ModelDecorationOptions.register({
         description: 'folding-expanded-visual-decoration',
         stickiness: 1 ,
         isWholeLine: true,
-        firstLineDecorationClassName: 'alwaysShowFoldIcons ' + ThemeIcon.asClassName(foldingExpandedIcon)
+        firstLineDecorationClassName: 'alwaysShowFoldIcons ' + ThemeIcon.asClassName(foldingExpandedIcon),
+        linesDecorationsTooltip: expanded,
     }); }
     static { this.EXPANDED_AUTO_HIDE_VISUAL_DECORATION = ModelDecorationOptions.register({
         description: 'folding-expanded-auto-hide-visual-decoration',
         stickiness: 1 ,
         isWholeLine: true,
-        firstLineDecorationClassName: ThemeIcon.asClassName(foldingExpandedIcon)
+        firstLineDecorationClassName: ThemeIcon.asClassName(foldingExpandedIcon),
+        linesDecorationsTooltip: expanded,
     }); }
     static { this.MANUALLY_EXPANDED_VISUAL_DECORATION = ModelDecorationOptions.register({
         description: 'folding-manually-expanded-visual-decoration',
         stickiness: 0 ,
         isWholeLine: true,
-        firstLineDecorationClassName: 'alwaysShowFoldIcons ' + ThemeIcon.asClassName(foldingManualExpandedIcon)
+        firstLineDecorationClassName: 'alwaysShowFoldIcons ' + ThemeIcon.asClassName(foldingManualExpandedIcon),
+        linesDecorationsTooltip: expanded,
     }); }
     static { this.MANUALLY_EXPANDED_AUTO_HIDE_VISUAL_DECORATION = ModelDecorationOptions.register({
         description: 'folding-manually-expanded-auto-hide-visual-decoration',
         stickiness: 0 ,
         isWholeLine: true,
-        firstLineDecorationClassName: ThemeIcon.asClassName(foldingManualExpandedIcon)
+        firstLineDecorationClassName: ThemeIcon.asClassName(foldingManualExpandedIcon),
+        linesDecorationsTooltip: expanded,
     }); }
     static { this.NO_CONTROLS_EXPANDED_RANGE_DECORATION = ModelDecorationOptions.register({
         description: 'folding-no-controls-range-decoration',

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

@@ -8,9 +8,9 @@ class EditorFontZoomIn extends EditorAction {
             label: ( localizeWithPath(
                 'vs/editor/contrib/fontZoom/browser/fontZoom',
                 'EditorFontZoomIn.label',
-                "Editor Font Zoom In"
+                "Increase Editor Font Size"
             )),
-            alias: 'Editor Font Zoom In',
+            alias: 'Increase Editor Font Size',
             precondition: undefined
         });
     }
@@ -25,9 +25,9 @@ class EditorFontZoomOut extends EditorAction {
             label: ( localizeWithPath(
                 'vs/editor/contrib/fontZoom/browser/fontZoom',
                 'EditorFontZoomOut.label',
-                "Editor Font Zoom Out"
+                "Decrease Editor Font Size"
             )),
-            alias: 'Editor Font Zoom Out',
+            alias: 'Decrease Editor Font Size',
             precondition: undefined
         });
     }
@@ -42,9 +42,9 @@ class EditorFontZoomReset extends EditorAction {
             label: ( localizeWithPath(
                 'vs/editor/contrib/fontZoom/browser/fontZoom',
                 'EditorFontZoomReset.label',
-                "Editor Font Zoom Reset"
+                "Reset Editor Font Size"
             )),
-            alias: 'Editor Font Zoom Reset',
+            alias: 'Reset Editor Font Size',
             precondition: undefined
         });
     }

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

@@ -18,7 +18,7 @@ import { ExtensionIdentifierSet } from '../../../../platform/extensions/common/e
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
-import { IAccessibleNotificationService } from '../../../../platform/accessibility/common/accessibility.js';
+import { IAudioCueService, AudioCue } from '../../../../platform/audioCues/browser/audioCueService.js';
 function getRealAndSyntheticDocumentFormattersOrdered(documentFormattingEditProvider, documentRangeFormattingEditProvider, model) {
     const result = [];
     const seen = ( new ExtensionIdentifierSet());
@@ -53,13 +53,13 @@ class FormattingConflicts {
         const remove = FormattingConflicts._selectors.unshift(selector);
         return { dispose: remove };
     }
-    static async select(formatter, document, mode) {
+    static async select(formatter, document, mode, kind) {
         if (formatter.length === 0) {
             return undefined;
         }
         const selector = Iterable.first(FormattingConflicts._selectors);
         if (selector) {
-            return await selector(formatter, document, mode);
+            return await selector(formatter, document, mode, kind);
         }
         return undefined;
     }
@@ -69,7 +69,7 @@ async function formatDocumentRangesWithSelectedProvider(accessor, editorOrModel,
     const { documentRangeFormattingEditProvider: documentRangeFormattingEditProviderRegistry } = accessor.get(ILanguageFeaturesService);
     const model = isCodeEditor(editorOrModel) ? editorOrModel.getModel() : editorOrModel;
     const provider = documentRangeFormattingEditProviderRegistry.ordered(model);
-    const selected = await FormattingConflicts.select(provider, model, mode);
+    const selected = await FormattingConflicts.select(provider, model, mode, 2 );
     if (selected) {
         progress.report(selected);
         await instaService.invokeFunction(formatDocumentRangesWithProvider, selected, editorOrModel, rangeOrRanges, token, userGesture);
@@ -78,7 +78,7 @@ async function formatDocumentRangesWithSelectedProvider(accessor, editorOrModel,
 async function formatDocumentRangesWithProvider(accessor, provider, editorOrModel, rangeOrRanges, token, userGesture) {
     const workerService = accessor.get(IEditorWorkerService);
     const logService = accessor.get(ILogService);
-    const accessibleNotificationService = accessor.get(IAccessibleNotificationService);
+    const audioCueService = accessor.get(IAudioCueService);
     let model;
     let cts;
     if (isCodeEditor(editorOrModel)) {
@@ -211,7 +211,7 @@ async function formatDocumentRangesWithProvider(accessor, provider, editorOrMode
             return null;
         });
     }
-    accessibleNotificationService.notify("format" , userGesture);
+    audioCueService.playAudioCue(AudioCue.format, { userGesture });
     return true;
 }
 async function formatDocumentWithSelectedProvider(accessor, editorOrModel, mode, progress, token, userGesture) {
@@ -219,7 +219,7 @@ async function formatDocumentWithSelectedProvider(accessor, editorOrModel, mode,
     const languageFeaturesService = accessor.get(ILanguageFeaturesService);
     const model = isCodeEditor(editorOrModel) ? editorOrModel.getModel() : editorOrModel;
     const provider = getRealAndSyntheticDocumentFormattersOrdered(languageFeaturesService.documentFormattingEditProvider, languageFeaturesService.documentRangeFormattingEditProvider, model);
-    const selected = await FormattingConflicts.select(provider, model, mode);
+    const selected = await FormattingConflicts.select(provider, model, mode, 1 );
     if (selected) {
         progress.report(selected);
         await instaService.invokeFunction(formatDocumentWithProvider, selected, editorOrModel, mode, token, userGesture);
@@ -227,7 +227,7 @@ async function formatDocumentWithSelectedProvider(accessor, editorOrModel, mode,
 }
 async function formatDocumentWithProvider(accessor, provider, editorOrModel, mode, token, userGesture) {
     const workerService = accessor.get(IEditorWorkerService);
-    const accessibleNotificationService = accessor.get(IAccessibleNotificationService);
+    const audioCueService = accessor.get(IAudioCueService);
     let model;
     let cts;
     if (isCodeEditor(editorOrModel)) {
@@ -291,7 +291,7 @@ async function formatDocumentWithProvider(accessor, provider, editorOrModel, mod
             return null;
         });
     }
-    accessibleNotificationService.notify("format" , userGesture);
+    audioCueService.playAudioCue(AudioCue.format, { userGesture });
     return true;
 }
 async function getDocumentRangeFormattingEditsUntilResult(workerService, languageFeaturesService, model, range, options, token) {

package/vscode/src/vs/editor/contrib/format/browser/formatActions.js

@@ -14,18 +14,18 @@ import { ILanguageFeaturesService } from '../../../common/services/languageFeatu
 import { getOnTypeFormattingEdits, formatDocumentRangesWithSelectedProvider, formatDocumentWithSelectedProvider } from './format.js';
 import { FormattingEdit } from './formattingEdit.js';
 import { localizeWithPath } from '../../../../nls.js';
-import { IAccessibleNotificationService } from '../../../../platform/accessibility/common/accessibility.js';
+import { AudioCue, IAudioCueService } from '../../../../platform/audioCues/browser/audioCueService.js';
 import { CommandsRegistry, ICommandService } from '../../../../platform/commands/common/commands.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { Progress, IEditorProgressService } from '../../../../platform/progress/common/progress.js';
 let FormatOnType = class FormatOnType {
     static { this.ID = 'editor.contrib.autoFormat'; }
-    constructor(_editor, _languageFeaturesService, _workerService, _accessibleNotificationService) {
+    constructor(_editor, _languageFeaturesService, _workerService, _audioCueService) {
         this._editor = _editor;
         this._languageFeaturesService = _languageFeaturesService;
         this._workerService = _workerService;
-        this._accessibleNotificationService = _accessibleNotificationService;
+        this._audioCueService = _audioCueService;
         this._disposables = ( new DisposableStore());
         this._sessionDisposables = ( new DisposableStore());
         this._disposables.add(_languageFeaturesService.onTypeFormattingEditProvider.onDidChange(this._update, this));
@@ -96,7 +96,7 @@ let FormatOnType = class FormatOnType {
                 return;
             }
             if (isNonEmptyArray(edits)) {
-                this._accessibleNotificationService.notify("format" , false);
+                this._audioCueService.playAudioCue(AudioCue.format, { userGesture: false });
                 FormattingEdit.execute(this._editor, edits, true);
             }
         }).finally(() => {
@@ -107,7 +107,7 @@ let FormatOnType = class FormatOnType {
 FormatOnType = ( __decorate([
     ( __param(1, ILanguageFeaturesService)),
     ( __param(2, IEditorWorkerService)),
-    ( __param(3, IAccessibleNotificationService))
+    ( __param(3, IAudioCueService))
 ], FormatOnType));
 let FormatOnPaste = class FormatOnPaste {
     static { this.ID = 'editor.contrib.formatOnPaste'; }

package/vscode/src/vs/editor/contrib/gotoError/browser/media/gotoErrorWidget.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-editor .peekview-widget .head .peekview-title .severity-icon{display:inline-block;margin-right:4px;vertical-align:text-top}.monaco-editor .marker-widget{text-overflow:ellipsis;white-space:nowrap}.monaco-editor .marker-widget>.stale{font-style:italic;opacity:.6}.monaco-editor .marker-widget .title{display:inline-block;padding-right:5px}.monaco-editor .marker-widget .descriptioncontainer{padding:8px 12px 0 20px;position:absolute;user-select:text;-webkit-user-select:text;white-space:pre}.monaco-editor .marker-widget .descriptioncontainer .message{display:flex;flex-direction:column}.monaco-editor .marker-widget .descriptioncontainer .message .details{padding-left:6px}.monaco-editor .marker-widget .descriptioncontainer .message .source,.monaco-editor .marker-widget .descriptioncontainer .message span.code{opacity:.6}.monaco-editor .marker-widget .descriptioncontainer .message a.code-link{color:inherit;opacity:.6}.monaco-editor .marker-widget .descriptioncontainer .message a.code-link:before{content:\"(\"}.monaco-editor .marker-widget .descriptioncontainer .message a.code-link:after{content:\")\"}.monaco-editor .marker-widget .descriptioncontainer .message a.code-link>span{border-bottom:1px solid transparent;color:var(--vscode-textLink-foreground);color:var(--vscode-textLink-activeForeground);text-decoration:underline;text-underline-position:under}.monaco-editor .marker-widget .descriptioncontainer .filename{cursor:pointer}";
+var css = ".monaco-editor .peekview-widget .head .peekview-title .severity-icon{display:inline-block;margin-right:4px;vertical-align:text-top}.monaco-editor .marker-widget{text-overflow:ellipsis;white-space:nowrap}.monaco-editor .marker-widget>.stale{font-style:italic;opacity:.6}.monaco-editor .marker-widget .title{display:inline-block;padding-right:5px}.monaco-editor .marker-widget .descriptioncontainer{padding:8px 12px 0 20px;position:absolute;user-select:text;-webkit-user-select:text;white-space:pre}.monaco-editor .marker-widget .descriptioncontainer .message{display:flex;flex-direction:column}.monaco-editor .marker-widget .descriptioncontainer .message .details{padding-left:6px}.monaco-editor .marker-widget .descriptioncontainer .message .source,.monaco-editor .marker-widget .descriptioncontainer .message span.code{opacity:.6}.monaco-editor .marker-widget .descriptioncontainer .message a.code-link{color:inherit;opacity:.6}.monaco-editor .marker-widget .descriptioncontainer .message a.code-link:before{content:\"(\"}.monaco-editor .marker-widget .descriptioncontainer .message a.code-link:after{content:\")\"}.monaco-editor .marker-widget .descriptioncontainer .message a.code-link>span{border-bottom:1px solid transparent;color:var(--vscode-textLink-activeForeground);text-decoration:underline;text-underline-position:under}.monaco-editor .marker-widget .descriptioncontainer .filename{color:var(--vscode-textLink-activeForeground);cursor:pointer}";
 n(css,{});
 export { css, css as default };

package/vscode/src/vs/editor/contrib/gotoSymbol/browser/goToCommands.js

@@ -822,7 +822,7 @@ CommandsRegistry.registerCommand({
             { name: 'uri', description: 'The text document in which to start', constraint: URI },
             { name: 'position', description: 'The position at which to start', constraint: Position.isIPosition },
             { name: 'locations', description: 'An array of locations.', constraint: Array },
-            { name: 'multiple', description: 'Define what to do when having multiple results, either `peek`, `gotoAndPeek`, or `goto' },
+            { name: 'multiple', description: 'Define what to do when having multiple results, either `peek`, `gotoAndPeek`, or `goto`' },
             { name: 'noResultsMessage', description: 'Human readable message that shows when locations is empty.' },
         ]
     },
@@ -860,7 +860,7 @@ CommandsRegistry.registerCommand({
             { name: 'uri', description: 'The text document in which to start', constraint: URI },
             { name: 'position', description: 'The position at which to start', constraint: Position.isIPosition },
             { name: 'locations', description: 'An array of locations.', constraint: Array },
-            { name: 'multiple', description: 'Define what to do when having multiple results, either `peek`, `gotoAndPeek`, or `goto' },
+            { name: 'multiple', description: 'Define what to do when having multiple results, either `peek`, `gotoAndPeek`, or `goto`' },
         ]
     },
     handler: async (accessor, resource, position, references, multiple) => {

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

@@ -21,13 +21,6 @@ var ContentHoverController_1, ContentHoverWidget_1;
 const $ = $$1;
 let ContentHoverController = class ContentHoverController extends Disposable {
     static { ContentHoverController_1 = this; }
-    getWidgetContent() {
-        const node = this._widget.getDomNode();
-        if (!node.textContent) {
-            return undefined;
-        }
-        return node.textContent;
-    }
     constructor(_editor, _instantiationService, _keybindingService) {
         super();
         this._editor = _editor;
@@ -60,41 +53,6 @@ let ContentHoverController = class ContentHoverController extends Disposable {
             }
         }));
     }
-    get widget() {
-        return this._widget;
-    }
-    maybeShowAt(mouseEvent) {
-        if (this._widget.isResizing) {
-            return true;
-        }
-        const anchorCandidates = [];
-        for (const participant of this._participants) {
-            if (participant.suggestHoverAnchor) {
-                const anchor = participant.suggestHoverAnchor(mouseEvent);
-                if (anchor) {
-                    anchorCandidates.push(anchor);
-                }
-            }
-        }
-        const target = mouseEvent.target;
-        if (target.type === 6 ) {
-            anchorCandidates.push(( new HoverRangeAnchor(0, target.range, mouseEvent.event.posx, mouseEvent.event.posy)));
-        }
-        if (target.type === 7 ) {
-            const epsilon = this._editor.getOption(50 ).typicalHalfwidthCharacterWidth / 2;
-            if (!target.detail.isAfterLines && typeof target.detail.horizontalDistanceToText === 'number' && target.detail.horizontalDistanceToText < epsilon) {
-                anchorCandidates.push(( new HoverRangeAnchor(0, target.range, mouseEvent.event.posx, mouseEvent.event.posy)));
-            }
-        }
-        if (anchorCandidates.length === 0) {
-            return this._startShowingOrUpdateHover(null, 0 , 0 , false, mouseEvent);
-        }
-        anchorCandidates.sort((a, b) => b.priority - a.priority);
-        return this._startShowingOrUpdateHover(anchorCandidates[0], 0 , 0 , false, mouseEvent);
-    }
-    startShowingAtRange(range, mode, source, focus) {
-        this._startShowingOrUpdateHover(( new HoverRangeAnchor(0, range, undefined, undefined)), mode, source, focus, null);
-    }
     _startShowingOrUpdateHover(anchor, mode, source, focus, mouseEvent) {
         if (!this._widget.position || !this._currentResult) {
             if (anchor) {
@@ -103,8 +61,10 @@ let ContentHoverController = class ContentHoverController extends Disposable {
             }
             return false;
         }
-        const hoverIsSticky = this._editor.getOption(60 ).sticky;
-        const isGettingCloser = (hoverIsSticky && mouseEvent && this._widget.isMouseGettingCloser(mouseEvent.event.posx, mouseEvent.event.posy));
+        const isHoverSticky = this._editor.getOption(60 ).sticky;
+        const isGettingCloser = (isHoverSticky
+            && mouseEvent
+            && this._widget.isMouseGettingCloser(mouseEvent.event.posx, mouseEvent.event.posy));
         if (isGettingCloser) {
             if (anchor) {
                 this._startHoverOperationIfNecessary(anchor, mode, source, focus, true);
@@ -153,29 +113,6 @@ let ContentHoverController = class ContentHoverController extends Disposable {
             this._widget.hide();
         }
     }
-    hide() {
-        this._computer.anchor = null;
-        this._hoverOperation.cancel();
-        this._setCurrentResult(null);
-    }
-    get isColorPickerVisible() {
-        return this._widget.isColorPickerVisible;
-    }
-    get isVisibleFromKeyboard() {
-        return this._widget.isVisibleFromKeyboard;
-    }
-    get isVisible() {
-        return this._widget.isVisible;
-    }
-    get isFocused() {
-        return this._widget.isFocused;
-    }
-    get isResizing() {
-        return this._widget.isResizing;
-    }
-    containsNode(node) {
-        return (node ? this._widget.getDomNode().contains(node) : false);
-    }
     _addLoadingMessage(result) {
         if (this._computer.anchor) {
             for (const participant of this._participants) {
@@ -236,6 +173,8 @@ let ContentHoverController = class ContentHoverController extends Disposable {
                 }));
             }
             this._widget.showAt(fragment, ( new ContentHoverVisibleData(
+                anchor.initialMousePosX,
+                anchor.initialMousePosY,
                 colorPicker,
                 showAtPosition,
                 showAtSecondaryPosition,
@@ -243,8 +182,6 @@ let ContentHoverController = class ContentHoverController extends Disposable {
                 this._computer.shouldFocus,
                 this._computer.source,
                 isBeforeContent,
-                anchor.initialMousePosX,
-                anchor.initialMousePosY,
                 disposables
             )));
         }
@@ -281,12 +218,58 @@ let ContentHoverController = class ContentHoverController extends Disposable {
                 forceShowAtRange = msg.range;
             }
         }
+        const showAtPosition = forceShowAtRange ? forceShowAtRange.getStartPosition() : ( new Position(anchorLineNumber, anchorRange.startColumn));
+        const showAtSecondaryPosition = forceShowAtRange ? forceShowAtRange.getStartPosition() : ( new Position(anchorLineNumber, renderStartColumn));
         return {
-            showAtPosition: forceShowAtRange ? forceShowAtRange.getStartPosition() : ( new Position(anchorLineNumber, anchorRange.startColumn)),
-            showAtSecondaryPosition: forceShowAtRange ? forceShowAtRange.getStartPosition() : ( new Position(anchorLineNumber, renderStartColumn)),
+            showAtPosition,
+            showAtSecondaryPosition,
             highlightRange
         };
     }
+    showsOrWillShow(mouseEvent) {
+        if (this._widget.isResizing) {
+            return true;
+        }
+        const anchorCandidates = [];
+        for (const participant of this._participants) {
+            if (participant.suggestHoverAnchor) {
+                const anchor = participant.suggestHoverAnchor(mouseEvent);
+                if (anchor) {
+                    anchorCandidates.push(anchor);
+                }
+            }
+        }
+        const target = mouseEvent.target;
+        if (target.type === 6 ) {
+            anchorCandidates.push(( new HoverRangeAnchor(0, target.range, mouseEvent.event.posx, mouseEvent.event.posy)));
+        }
+        if (target.type === 7 ) {
+            const epsilon = this._editor.getOption(50 ).typicalHalfwidthCharacterWidth / 2;
+            if (!target.detail.isAfterLines
+                && typeof target.detail.horizontalDistanceToText === 'number'
+                && target.detail.horizontalDistanceToText < epsilon) {
+                anchorCandidates.push(( new HoverRangeAnchor(0, target.range, mouseEvent.event.posx, mouseEvent.event.posy)));
+            }
+        }
+        if (anchorCandidates.length === 0) {
+            return this._startShowingOrUpdateHover(null, 0 , 0 , false, mouseEvent);
+        }
+        anchorCandidates.sort((a, b) => b.priority - a.priority);
+        return this._startShowingOrUpdateHover(anchorCandidates[0], 0 , 0 , false, mouseEvent);
+    }
+    startShowingAtRange(range, mode, source, focus) {
+        this._startShowingOrUpdateHover(( new HoverRangeAnchor(0, range, undefined, undefined)), mode, source, focus, null);
+    }
+    getWidgetContent() {
+        const node = this._widget.getDomNode();
+        if (!node.textContent) {
+            return undefined;
+        }
+        return node.textContent;
+    }
+    containsNode(node) {
+        return (node ? this._widget.getDomNode().contains(node) : false);
+    }
     focus() {
         this._widget.focus();
     }
@@ -314,6 +297,29 @@ let ContentHoverController = class ContentHoverController extends Disposable {
     goToBottom() {
         this._widget.goToBottom();
     }
+    hide() {
+        this._computer.anchor = null;
+        this._hoverOperation.cancel();
+        this._setCurrentResult(null);
+    }
+    get isColorPickerVisible() {
+        return this._widget.isColorPickerVisible;
+    }
+    get isVisibleFromKeyboard() {
+        return this._widget.isVisibleFromKeyboard;
+    }
+    get isVisible() {
+        return this._widget.isVisible;
+    }
+    get isFocused() {
+        return this._widget.isFocused;
+    }
+    get isResizing() {
+        return this._widget.isResizing;
+    }
+    get widget() {
+        return this._widget;
+    }
 };
 ContentHoverController = ContentHoverController_1 = ( __decorate([
     ( __param(1, IInstantiationService)),
@@ -343,7 +349,9 @@ class FilteredHoverResult extends HoverResult {
     }
 }
 class ContentHoverVisibleData {
-    constructor(colorPicker, showAtPosition, showAtSecondaryPosition, preferAbove, stoleFocus, source, isBeforeContent, initialMousePosX, initialMousePosY, disposables) {
+    constructor(initialMousePosX, initialMousePosY, colorPicker, showAtPosition, showAtSecondaryPosition, preferAbove, stoleFocus, source, isBeforeContent, disposables) {
+        this.initialMousePosX = initialMousePosX;
+        this.initialMousePosY = initialMousePosY;
         this.colorPicker = colorPicker;
         this.showAtPosition = showAtPosition;
         this.showAtSecondaryPosition = showAtSecondaryPosition;
@@ -351,8 +359,6 @@ class ContentHoverVisibleData {
         this.stoleFocus = stoleFocus;
         this.source = source;
         this.isBeforeContent = isBeforeContent;
-        this.initialMousePosX = initialMousePosX;
-        this.initialMousePosY = initialMousePosY;
         this.disposables = disposables;
         this.closestMouseDistance = undefined;
     }
@@ -491,7 +497,9 @@ let ContentHoverWidget = class ContentHoverWidget extends ResizableContentWidget
         if (!position) {
             return;
         }
-        return this._positionPreference === 1  ? this._availableVerticalSpaceAbove(position) : this._availableVerticalSpaceBelow(position);
+        return this._positionPreference === 1  ?
+            this._availableVerticalSpaceAbove(position)
+            : this._availableVerticalSpaceBelow(position);
     }
     _findMaximumRenderingHeight() {
         const availableSpace = this._findAvailableSpaceVertically();
@@ -537,7 +545,8 @@ let ContentHoverWidget = class ContentHoverWidget extends ResizableContentWidget
         if (!this._visibleData) {
             return false;
         }
-        if (typeof this._visibleData.initialMousePosX === 'undefined' || typeof this._visibleData.initialMousePosY === 'undefined') {
+        if (typeof this._visibleData.initialMousePosX === 'undefined'
+            || typeof this._visibleData.initialMousePosY === 'undefined') {
             this._visibleData.initialMousePosX = posx;
             this._visibleData.initialMousePosY = posy;
             return false;