@codingame/monaco-vscode-api 9.0.2 → 10.0.0

package/vscode/src/vs/editor/contrib/hover/browser/{contentHoverController2.js → contentHoverController.js}

@@ -1,12 +1,9 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { SHOW_OR_FOCUS_HOVER_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACTION_ID, DECREASE_HOVER_VERBOSITY_ACTION_ID } from './hoverActionIds.js';
-import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
-import { EditorOption } from '../../../common/config/editorOptions.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { InlineSuggestionHintsContentWidget } from '../../inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
-import { ResultKind } from '../../../../platform/keybinding/common/keybindingResolver.js';
 import { RunOnceScheduler } from '../../../../base/common/async.js';
 import { isMousePositionWithinElement } from './hoverUtils.js';
 import { ContentHoverWidgetWrapper } from './contentHoverWidgetWrapper.js';
@@ -33,7 +30,7 @@ let ContentHoverController = class ContentHoverController extends Disposable {
         this._reactToEditorMouseMoveRunner = this._register(( new RunOnceScheduler(() => this._reactToEditorMouseMove(this._mouseMoveEvent), 0)));
         this._hookListeners();
         this._register(this._editor.onDidChangeConfiguration((e) => {
-            if (e.hasChanged(EditorOption.hover)) {
+            if (e.hasChanged(62 )) {
                 this._unhookListeners();
                 this._hookListeners();
             }
@@ -43,7 +40,7 @@ let ContentHoverController = class ContentHoverController extends Disposable {
         return editor.getContribution(ContentHoverController_1.ID);
     }
     _hookListeners() {
-        const hoverOpts = this._editor.getOption(EditorOption.hover);
+        const hoverOpts = this._editor.getOption(62 );
         this._hoverSettings = {
             enabled: hoverOpts.enabled,
             sticky: hoverOpts.sticky,
@@ -165,7 +162,7 @@ let ContentHoverController = class ContentHoverController extends Disposable {
         }
         const target = mouseEvent.target;
         const mouseOnDecorator = target.element?.classList.contains('colorpicker-color-decoration');
-        const decoratorActivatedOn = this._editor.getOption(EditorOption.colorDecoratorsActivatedOn);
+        const decoratorActivatedOn = this._editor.getOption(151 );
         const enabled = this._hoverSettings.enabled;
         const activatedByDecoratorClick = this._hoverState.activatedByDecoratorClick;
         if ((mouseOnDecorator && ((decoratorActivatedOn === 'click' && !activatedByDecoratorClick) ||
@@ -189,16 +186,16 @@ let ContentHoverController = class ContentHoverController extends Disposable {
             return;
         }
         const resolvedKeyboardEvent = this._keybindingService.softDispatch(e, this._editor.getDomNode());
-        const shouldKeepHoverVisible = (resolvedKeyboardEvent.kind === ResultKind.MoreChordsNeeded ||
-            (resolvedKeyboardEvent.kind === ResultKind.KbFound
+        const shouldKeepHoverVisible = (resolvedKeyboardEvent.kind === 1  ||
+            (resolvedKeyboardEvent.kind === 2
                 && (resolvedKeyboardEvent.commandId === SHOW_OR_FOCUS_HOVER_ACTION_ID
                     || resolvedKeyboardEvent.commandId === INCREASE_HOVER_VERBOSITY_ACTION_ID
                     || resolvedKeyboardEvent.commandId === DECREASE_HOVER_VERBOSITY_ACTION_ID)
                 && this._contentWidget?.isVisible));
-        if (e.keyCode === KeyCode.Ctrl
-            || e.keyCode === KeyCode.Alt
-            || e.keyCode === KeyCode.Meta
-            || e.keyCode === KeyCode.Shift
+        if (e.keyCode === 5
+            || e.keyCode === 6
+            || e.keyCode === 57
+            || e.keyCode === 4
             || shouldKeepHoverVisible) {
             return;
         }

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

@@ -6,24 +6,25 @@ import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
 import { addDisposableListener, EventType } from '../../../../base/browser/dom.js';
 import { MarkdownHoverParticipant } from './markdownHoverParticipant.js';
-import { ColorHoverParticipant } from '../../colorPicker/browser/colorHoverParticipant.js';
+import { HoverColorPickerParticipant } from '../../colorPicker/browser/hoverColorPicker/hoverColorPickerParticipant.js';
 import { localize } from '../../../../nls.js';
 import { InlayHintsHover } from '../../inlayHints/browser/inlayHintsHover.js';
 import { BugIndicatingError } from '../../../../base/common/errors.js';
 class RenderedContentHover extends Disposable {
-    constructor(editor, hoverResult, participants, computer, context, keybindingService) {
+    constructor(editor, hoverResult, participants, context, keybindingService) {
         super();
-        const anchor = hoverResult.anchor;
         const parts = hoverResult.hoverParts;
         this._renderedHoverParts = this._register(( (new RenderedContentHoverParts(editor, participants, parts, keybindingService, context))));
+        const contentHoverComputerOptions = hoverResult.options;
+        const anchor = contentHoverComputerOptions.anchor;
         const { showAtPosition, showAtSecondaryPosition } = RenderedContentHover.computeHoverPositions(editor, anchor.range, parts);
         this.shouldAppearBeforeContent = ( (parts.some(m => m.isBeforeContent)));
         this.showAtPosition = showAtPosition;
         this.showAtSecondaryPosition = showAtSecondaryPosition;
         this.initialMousePosX = anchor.initialMousePosX;
         this.initialMousePosY = anchor.initialMousePosY;
-        this.shouldFocus = computer.shouldFocus;
-        this.source = computer.source;
+        this.shouldFocus = contentHoverComputerOptions.shouldFocus;
+        this.source = contentHoverComputerOptions.source;
     }
     get domNode() {
         return this._renderedHoverParts.domNode;
@@ -217,7 +218,7 @@ class RenderedContentHoverParts extends Disposable {
         if (markdownHoverParticipant) {
             this._markdownHoverParticipant = markdownHoverParticipant;
         }
-        this._colorHoverParticipant = participants.find(p => p instanceof ColorHoverParticipant);
+        this._colorHoverParticipant = participants.find(p => p instanceof HoverColorPickerParticipant);
     }
     focusHoverPartWithIndex(index) {
         if (index < 0 || index >= this._renderedParts.length) {
@@ -238,19 +239,19 @@ class RenderedContentHoverParts extends Disposable {
             return '';
         }
         if (renderedPart.type === 'statusBar') {
-            const statusBarDescription = [( localize(11293, "This is a hover status bar."))];
+            const statusBarDescription = [( localize(11414, "This is a hover status bar."))];
             for (const action of renderedPart.actions) {
                 const keybinding = action.actionKeybindingLabel;
                 if (keybinding) {
                     statusBarDescription.push(( localize(
-                        11294,
+                        11415,
                         "It has an action with label {0} and keybinding {1}.",
                         action.actionLabel,
                         keybinding
                     )));
                 }
                 else {
-                    statusBarDescription.push(( localize(11295, "It has an action with label {0}.", action.actionLabel)));
+                    statusBarDescription.push(( localize(11416, "It has an action with label {0}.", action.actionLabel)));
                 }
             }
             return statusBarDescription.join('\n');

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

@@ -1,24 +1,24 @@
-class HoverResult {
-    constructor(anchor, hoverParts, isComplete) {
-        this.anchor = anchor;
+class ContentHoverResult {
+    constructor(hoverParts, isComplete, options) {
         this.hoverParts = hoverParts;
         this.isComplete = isComplete;
+        this.options = options;
     }
     filter(anchor) {
         const filteredHoverParts = this.hoverParts.filter((m) => m.isValidForHoverAnchor(anchor));
         if (filteredHoverParts.length === this.hoverParts.length) {
             return this;
         }
-        return ( new FilteredHoverResult(this, this.anchor, filteredHoverParts, this.isComplete));
+        return ( new FilteredContentHoverResult(this, filteredHoverParts, this.isComplete, this.options));
     }
 }
-class FilteredHoverResult extends HoverResult {
-    constructor(original, anchor, messages, isComplete) {
-        super(anchor, messages, isComplete);
+class FilteredContentHoverResult extends ContentHoverResult {
+    constructor(original, messages, isComplete, options) {
+        super(messages, isComplete, options);
         this.original = original;
     }
     filter(anchor) {
         return this.original.filter(anchor);
     }
 }
-export { FilteredHoverResult, HoverResult };
+export { ContentHoverResult, FilteredContentHoverResult };

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

@@ -1,8 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Dimension, append, trackFocus, getClientArea, getDomNodePagePosition, getTotalHeight, getTotalWidth } from '../../../../base/browser/dom.js';
-import { ContentWidgetPositionPreference } from '../../../browser/editorBrowser.js';
-import { EditorOption } from '../../../common/config/editorOptions.js';
-import { HoverStartSource } from './hoverOperation.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 import { ResizableContentWidget } from './resizableContentWidget.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
@@ -10,7 +7,6 @@ import { IConfigurationService } from '../../../../platform/configuration/common
 import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.service.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { HoverWidget, getHoverAccessibleViewHint } from '../../../../base/browser/ui/hover/hoverWidget.js';
-import { PositionAffinity } from '../../../common/model.js';
 import { Emitter } from '../../../../base/common/event.js';
 var ContentHoverWidget_1;
 const HORIZONTAL_SCROLLING_BY = 30;
@@ -20,7 +16,7 @@ let ContentHoverWidget = class ContentHoverWidget extends ResizableContentWidget
     static { this.ID = 'editor.contrib.resizableContentHoverWidget'; }
     static { this._lastDimensions = new Dimension(0, 0); }
     get isVisibleFromKeyboard() {
-        return (this._renderedHover?.source === HoverStartSource.Keyboard);
+        return (this._renderedHover?.source === 1) ;
     }
     get isVisible() {
         return this._hoverVisibleKey.get() ?? false;
@@ -29,7 +25,7 @@ let ContentHoverWidget = class ContentHoverWidget extends ResizableContentWidget
         return this._hoverFocusedKey.get() ?? false;
     }
     constructor(editor, contextKeyService, _configurationService, _accessibilityService, _keybindingService) {
-        const minimumHeight = editor.getOption(EditorOption.lineHeight) + 8;
+        const minimumHeight = editor.getOption(69 ) + 8;
         const minimumWidth = 150;
         const minimumSize = new Dimension(minimumWidth, minimumHeight);
         super(editor, minimumSize);
@@ -50,7 +46,7 @@ let ContentHoverWidget = class ContentHoverWidget extends ResizableContentWidget
             }
         }));
         this._register(this._editor.onDidChangeConfiguration((e) => {
-            if (e.hasChanged(EditorOption.fontInfo)) {
+            if (e.hasChanged(52 )) {
                 this._updateFont();
             }
         }));
@@ -129,7 +125,7 @@ let ContentHoverWidget = class ContentHoverWidget extends ResizableContentWidget
         if (!position) {
             return;
         }
-        return this._positionPreference === ContentWidgetPositionPreference.ABOVE ?
+        return this._positionPreference === 1  ?
             this._availableVerticalSpaceAbove(position)
             : this._availableVerticalSpaceBelow(position);
     }
@@ -197,7 +193,7 @@ let ContentHoverWidget = class ContentHoverWidget extends ResizableContentWidget
         this._hover.containerDomNode.classList.toggle('hidden', !renderedHover);
     }
     _updateFont() {
-        const { fontSize, lineHeight } = this._editor.getOption(EditorOption.fontInfo);
+        const { fontSize, lineHeight } = this._editor.getOption(52 );
         const contentsDomNode = this._hover.contentsDomNode;
         contentsDomNode.style.fontSize = `${fontSize}px`;
         contentsDomNode.style.lineHeight = `${lineHeight / fontSize}`;
@@ -216,7 +212,7 @@ let ContentHoverWidget = class ContentHoverWidget extends ResizableContentWidget
     }
     _updateMaxDimensions() {
         const height = Math.max(this._editor.getLayoutInfo().height / 4, 250, ContentHoverWidget_1._lastDimensions.height);
-        const width = Math.max(this._editor.getLayoutInfo().width * 0.66, 500, ContentHoverWidget_1._lastDimensions.width);
+        const width = Math.max(this._editor.getLayoutInfo().width * 0.66, 750, ContentHoverWidget_1._lastDimensions.width);
         this._setHoverWidgetMaxDimensions(width, height);
     }
     _render(renderedHover) {
@@ -234,8 +230,8 @@ let ContentHoverWidget = class ContentHoverWidget extends ResizableContentWidget
         return {
             position: this._renderedHover.showAtPosition,
             secondaryPosition: this._renderedHover.showAtSecondaryPosition,
-            positionAffinity: this._renderedHover.shouldAppearBeforeContent ? PositionAffinity.LeftOfInjectedText : undefined,
-            preference: [this._positionPreference ?? ContentWidgetPositionPreference.ABOVE]
+            positionAffinity: this._renderedHover.shouldAppearBeforeContent ? 3  : undefined,
+            preference: [this._positionPreference ?? 1 ]
         };
     }
     show(renderedHover) {
@@ -245,7 +241,7 @@ let ContentHoverWidget = class ContentHoverWidget extends ResizableContentWidget
         this._render(renderedHover);
         const widgetHeight = getTotalHeight(this._hover.containerDomNode);
         const widgetPosition = renderedHover.showAtPosition;
-        this._positionPreference = this._findPositionPreference(widgetHeight, widgetPosition) ?? ContentWidgetPositionPreference.ABOVE;
+        this._positionPreference = this._findPositionPreference(widgetHeight, widgetPosition) ?? 1 ;
         this.onContentsChanged();
         if (renderedHover.shouldFocus) {
             this._hover.containerDomNode.focus();
@@ -309,12 +305,12 @@ let ContentHoverWidget = class ContentHoverWidget extends ResizableContentWidget
     }
     scrollUp() {
         const scrollTop = this._hover.scrollbar.getScrollPosition().scrollTop;
-        const fontInfo = this._editor.getOption(EditorOption.fontInfo);
+        const fontInfo = this._editor.getOption(52 );
         this._hover.scrollbar.setScrollPosition({ scrollTop: scrollTop - fontInfo.lineHeight });
     }
     scrollDown() {
         const scrollTop = this._hover.scrollbar.getScrollPosition().scrollTop;
-        const fontInfo = this._editor.getOption(EditorOption.fontInfo);
+        const fontInfo = this._editor.getOption(52 );
         this._hover.scrollbar.setScrollPosition({ scrollTop: scrollTop + fontInfo.lineHeight });
     }
     scrollLeft() {

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

@@ -1,17 +1,14 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { addStandardDisposableListener } from '../../../../base/browser/dom.js';
-import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
-import { MouseTargetType } from '../../../browser/editorBrowser.js';
-import { EditorOption } from '../../../common/config/editorOptions.js';
 import { TokenizationRegistry } from '../../../common/languages.js';
-import { HoverOperation, HoverStartMode, HoverStartSource } from './hoverOperation.js';
+import { HoverOperation } from './hoverOperation.js';
 import { HoverParticipantRegistry, HoverRangeAnchor } from './hoverTypes.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 import { ContentHoverWidget } from './contentHoverWidget.js';
 import { ContentHoverComputer } from './contentHoverComputer.js';
-import { HoverResult } from './contentHoverTypes.js';
+import { ContentHoverResult } from './contentHoverTypes.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { RenderedContentHover } from './contentHoverRendered.js';
 import { isMousePositionWithinElement } from './hoverUtils.js';
@@ -26,8 +23,7 @@ let ContentHoverWidgetWrapper = class ContentHoverWidgetWrapper extends Disposab
         this.onContentsChanged = this._onContentsChanged.event;
         this._contentHoverWidget = this._register(this._instantiationService.createInstance(ContentHoverWidget, this._editor));
         this._participants = this._initializeHoverParticipants();
-        this._computer = ( new ContentHoverComputer(this._editor, this._participants));
-        this._hoverOperation = this._register(( new HoverOperation(this._editor, this._computer)));
+        this._hoverOperation = this._register(( new HoverOperation(this._editor, ( new ContentHoverComputer(this._editor, this._participants)))));
         this._registerListeners();
     }
     _initializeHoverParticipants() {
@@ -44,15 +40,12 @@ let ContentHoverWidgetWrapper = class ContentHoverWidgetWrapper extends Disposab
     }
     _registerListeners() {
         this._register(this._hoverOperation.onResult((result) => {
-            if (!this._computer.anchor) {
-                return;
-            }
-            const messages = (result.hasLoadingMessage ? this._addLoadingMessage(result.value) : result.value);
-            this._withResult(( new HoverResult(this._computer.anchor, messages, result.isComplete)));
+            const messages = (result.hasLoadingMessage ? this._addLoadingMessage(result) : result.value);
+            this._withResult(( new ContentHoverResult(messages, result.isComplete, result.options)));
         }));
         const contentHoverWidgetNode = this._contentHoverWidget.getDomNode();
         this._register(addStandardDisposableListener(contentHoverWidgetNode, 'keydown', (e) => {
-            if (e.equals(KeyCode.Escape)) {
+            if (e.equals(9 )) {
                 this.hide();
             }
         }));
@@ -74,7 +67,7 @@ let ContentHoverWidgetWrapper = class ContentHoverWidgetWrapper extends Disposab
             }
             return false;
         }
-        const isHoverSticky = this._editor.getOption(EditorOption.hover).sticky;
+        const isHoverSticky = this._editor.getOption(62 ).sticky;
         const isMouseGettingCloser = mouseEvent && this._contentHoverWidget.isMouseGettingCloser(mouseEvent.event.posx, mouseEvent.event.posy);
         const isHoverStickyAndIsMouseGettingCloser = isHoverSticky && isMouseGettingCloser;
         if (isHoverStickyAndIsMouseGettingCloser) {
@@ -87,31 +80,35 @@ let ContentHoverWidgetWrapper = class ContentHoverWidgetWrapper extends Disposab
             this._setCurrentResult(null);
             return false;
         }
-        const currentAnchorEqualsPreviousAnchor = this._currentResult.anchor.equals(anchor);
+        const currentAnchorEqualsPreviousAnchor = this._currentResult && this._currentResult.options.anchor.equals(anchor);
         if (currentAnchorEqualsPreviousAnchor) {
             return true;
         }
-        const currentAnchorCompatibleWithPreviousAnchor = anchor.canAdoptVisibleHover(this._currentResult.anchor, this._contentHoverWidget.position);
+        const currentAnchorCompatibleWithPreviousAnchor = this._currentResult && anchor.canAdoptVisibleHover(this._currentResult.options.anchor, this._contentHoverWidget.position);
         if (!currentAnchorCompatibleWithPreviousAnchor) {
             this._setCurrentResult(null);
             this._startHoverOperationIfNecessary(anchor, mode, source, focus, false);
             return true;
         }
-        this._setCurrentResult(this._currentResult.filter(anchor));
+        if (this._currentResult) {
+            this._setCurrentResult(this._currentResult.filter(anchor));
+        }
         this._startHoverOperationIfNecessary(anchor, mode, source, focus, false);
         return true;
     }
-    _startHoverOperationIfNecessary(anchor, mode, source, focus, insistOnKeepingHoverVisible) {
-        const currentAnchorEqualToPreviousHover = this._computer.anchor && this._computer.anchor.equals(anchor);
+    _startHoverOperationIfNecessary(anchor, mode, source, shouldFocus, insistOnKeepingHoverVisible) {
+        const currentAnchorEqualToPreviousHover = this._hoverOperation.options && this._hoverOperation.options.anchor.equals(anchor);
         if (currentAnchorEqualToPreviousHover) {
             return;
         }
         this._hoverOperation.cancel();
-        this._computer.anchor = anchor;
-        this._computer.shouldFocus = focus;
-        this._computer.source = source;
-        this._computer.insistOnKeepingHoverVisible = insistOnKeepingHoverVisible;
-        this._hoverOperation.start(mode);
+        const contentHoverComputerOptions = {
+            anchor,
+            source,
+            shouldFocus,
+            insistOnKeepingHoverVisible
+        };
+        this._hoverOperation.start(mode, contentHoverComputerOptions);
     }
     _setCurrentResult(hoverResult) {
         let currentHoverResult = hoverResult;
@@ -131,21 +128,18 @@ let ContentHoverWidgetWrapper = class ContentHoverWidgetWrapper extends Disposab
             this._hideHover();
         }
     }
-    _addLoadingMessage(result) {
-        if (!this._computer.anchor) {
-            return result;
-        }
+    _addLoadingMessage(hoverResult) {
         for (const participant of this._participants) {
             if (!participant.createLoadingMessage) {
                 continue;
             }
-            const loadingMessage = participant.createLoadingMessage(this._computer.anchor);
+            const loadingMessage = participant.createLoadingMessage(hoverResult.options.anchor);
             if (!loadingMessage) {
                 continue;
             }
-            return result.slice(0).concat([loadingMessage]);
+            return hoverResult.value.slice(0).concat([loadingMessage]);
         }
-        return result;
+        return hoverResult.value;
     }
     _withResult(hoverResult) {
         const previousHoverIsVisibleWithCompleteResult = this._contentHoverWidget.position && this._currentResult && this._currentResult.isComplete;
@@ -157,7 +151,7 @@ let ContentHoverWidgetWrapper = class ContentHoverWidgetWrapper extends Disposab
             return;
         }
         const currentHoverResultIsEmpty = hoverResult.hoverParts.length === 0;
-        const insistOnKeepingPreviousHoverVisible = this._computer.insistOnKeepingHoverVisible;
+        const insistOnKeepingPreviousHoverVisible = hoverResult.options.insistOnKeepingHoverVisible;
         const shouldKeepPreviousHoverVisible = currentHoverResultIsEmpty && insistOnKeepingPreviousHoverVisible;
         if (shouldKeepPreviousHoverVisible) {
             return;
@@ -170,7 +164,6 @@ let ContentHoverWidgetWrapper = class ContentHoverWidgetWrapper extends Disposab
             this._editor,
             hoverResult,
             this._participants,
-            this._computer,
             context,
             this._keybindingService
         ));
@@ -205,10 +198,10 @@ let ContentHoverWidgetWrapper = class ContentHoverWidgetWrapper extends Disposab
         const anchorCandidates = this._findHoverAnchorCandidates(mouseEvent);
         const anchorCandidatesExist = anchorCandidates.length > 0;
         if (!anchorCandidatesExist) {
-            return this._startShowingOrUpdateHover(null, HoverStartMode.Delayed, HoverStartSource.Mouse, false, mouseEvent);
+            return this._startShowingOrUpdateHover(null, 0 , 0 , false, mouseEvent);
         }
         const anchor = anchorCandidates[0];
-        return this._startShowingOrUpdateHover(anchor, HoverStartMode.Delayed, HoverStartSource.Mouse, false, mouseEvent);
+        return this._startShowingOrUpdateHover(anchor, 0 , 0 , false, mouseEvent);
     }
     _findHoverAnchorCandidates(mouseEvent) {
         const anchorCandidates = [];
@@ -224,12 +217,12 @@ let ContentHoverWidgetWrapper = class ContentHoverWidgetWrapper extends Disposab
         }
         const target = mouseEvent.target;
         switch (target.type) {
-            case MouseTargetType.CONTENT_TEXT: {
+            case 6 : {
                 anchorCandidates.push(( new HoverRangeAnchor(0, target.range, mouseEvent.event.posx, mouseEvent.event.posy)));
                 break;
             }
-            case MouseTargetType.CONTENT_EMPTY: {
-                const epsilon = this._editor.getOption(EditorOption.fontInfo).typicalHalfwidthCharacterWidth / 2;
+            case 7 : {
+                const epsilon = this._editor.getOption(52 ).typicalHalfwidthCharacterWidth / 2;
                 const mouseIsWithinLinesAndCloseToHover = !target.detail.isAfterLines
                     && typeof target.detail.horizontalDistanceToText === 'number'
                     && target.detail.horizontalDistanceToText < epsilon;
@@ -309,7 +302,6 @@ let ContentHoverWidgetWrapper = class ContentHoverWidgetWrapper extends Disposab
         this._contentHoverWidget.goToBottom();
     }
     hide() {
-        this._computer.anchor = null;
         this._hoverOperation.cancel();
         this._setCurrentResult(null);
     }

package/vscode/src/vs/editor/contrib/hover/browser/{marginHoverComputer.js → glyphHoverComputer.js}

@@ -1,39 +1,25 @@
 import { asArray } from '../../../../base/common/arrays.js';
 import { isEmptyMarkdownString } from '../../../../base/common/htmlContent.js';
 import { GlyphMarginLane } from '../../../common/model.js';
-class MarginHoverComputer {
-    get lineNumber() {
-        return this._lineNumber;
-    }
-    set lineNumber(value) {
-        this._lineNumber = value;
-    }
-    get lane() {
-        return this._laneOrLine;
-    }
-    set lane(value) {
-        this._laneOrLine = value;
-    }
+class GlyphHoverComputer {
     constructor(_editor) {
         this._editor = _editor;
-        this._lineNumber = -1;
-        this._laneOrLine = GlyphMarginLane.Center;
     }
-    computeSync() {
+    computeSync(opts) {
         const toHoverMessage = (contents) => {
             return {
                 value: contents
             };
         };
-        const lineDecorations = this._editor.getLineDecorations(this._lineNumber);
+        const lineDecorations = this._editor.getLineDecorations(opts.lineNumber);
         const result = [];
-        const isLineHover = this._laneOrLine === 'lineNo';
+        const isLineHover = opts.laneOrLine === 'lineNo';
         if (!lineDecorations) {
             return result;
         }
         for (const d of lineDecorations) {
             const lane = d.options.glyphMargin?.position ?? GlyphMarginLane.Center;
-            if (!isLineHover && lane !== this._laneOrLine) {
+            if (!isLineHover && lane !== opts.laneOrLine) {
                 continue;
             }
             const hoverMessage = isLineHover ? d.options.lineNumberHoverMessage : d.options.glyphMarginHoverMessage;
@@ -45,4 +31,4 @@ class MarginHoverComputer {
         return result;
     }
 }
-export { MarginHoverComputer };
+export { GlyphHoverComputer };

package/vscode/src/vs/editor/contrib/hover/browser/{marginHoverController.js → glyphHoverController.js}

@@ -1,15 +1,13 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
-import { EditorOption } from '../../../common/config/editorOptions.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { RunOnceScheduler } from '../../../../base/common/async.js';
 import { isMousePositionWithinElement } from './hoverUtils.js';
 import './hover.css.js';
-import { MarginHoverWidget } from './marginHoverWidget.js';
-var MarginHoverController_1;
-let MarginHoverController = class MarginHoverController extends Disposable {
-    static { MarginHoverController_1 = this; }
+import { GlyphHoverWidget } from './glyphHoverWidget.js';
+var GlyphHoverController_1;
+let GlyphHoverController = class GlyphHoverController extends Disposable {
+    static { GlyphHoverController_1 = this; }
     static { this.ID = 'editor.contrib.marginHover'; }
     constructor(_editor, _instantiationService) {
         super();
@@ -23,17 +21,17 @@ let MarginHoverController = class MarginHoverController extends Disposable {
         this._reactToEditorMouseMoveRunner = this._register(( new RunOnceScheduler(() => this._reactToEditorMouseMove(this._mouseMoveEvent), 0)));
         this._hookListeners();
         this._register(this._editor.onDidChangeConfiguration((e) => {
-            if (e.hasChanged(EditorOption.hover)) {
+            if (e.hasChanged(62 )) {
                 this._unhookListeners();
                 this._hookListeners();
             }
         }));
     }
     static get(editor) {
-        return editor.getContribution(MarginHoverController_1.ID);
+        return editor.getContribution(GlyphHoverController_1.ID);
     }
     _hookListeners() {
-        const hoverOpts = this._editor.getOption(EditorOption.hover);
+        const hoverOpts = this._editor.getOption(62 );
         this._hoverSettings = {
             enabled: hoverOpts.enabled,
             sticky: hoverOpts.sticky,
@@ -71,16 +69,16 @@ let MarginHoverController = class MarginHoverController extends Disposable {
     }
     _onEditorMouseDown(mouseEvent) {
         this._hoverState.mouseDown = true;
-        const shouldNotHideCurrentHoverWidget = this._isMouseOnMarginHoverWidget(mouseEvent);
+        const shouldNotHideCurrentHoverWidget = this._isMouseOnGlyphHoverWidget(mouseEvent);
         if (shouldNotHideCurrentHoverWidget) {
             return;
         }
         this._hideWidgets();
     }
-    _isMouseOnMarginHoverWidget(mouseEvent) {
-        const marginHoverWidgetNode = this._glyphWidget?.getDomNode();
-        if (marginHoverWidgetNode) {
-            return isMousePositionWithinElement(marginHoverWidgetNode, mouseEvent.event.posx, mouseEvent.event.posy);
+    _isMouseOnGlyphHoverWidget(mouseEvent) {
+        const glyphHoverWidgetNode = this._glyphWidget?.getDomNode();
+        if (glyphHoverWidgetNode) {
+            return isMousePositionWithinElement(glyphHoverWidgetNode, mouseEvent.event.posx, mouseEvent.event.posy);
         }
         return false;
     }
@@ -92,7 +90,7 @@ let MarginHoverController = class MarginHoverController extends Disposable {
             return;
         }
         this._cancelScheduler();
-        const shouldNotHideCurrentHoverWidget = this._isMouseOnMarginHoverWidget(mouseEvent);
+        const shouldNotHideCurrentHoverWidget = this._isMouseOnGlyphHoverWidget(mouseEvent);
         if (shouldNotHideCurrentHoverWidget) {
             return;
         }
@@ -100,8 +98,8 @@ let MarginHoverController = class MarginHoverController extends Disposable {
     }
     _shouldNotRecomputeCurrentHoverWidget(mouseEvent) {
         const isHoverSticky = this._hoverSettings.sticky;
-        const isMouseOnMarginHoverWidget = this._isMouseOnMarginHoverWidget(mouseEvent);
-        return isHoverSticky && isMouseOnMarginHoverWidget;
+        const isMouseOnGlyphHoverWidget = this._isMouseOnGlyphHoverWidget(mouseEvent);
+        return isHoverSticky && isMouseOnGlyphHoverWidget;
     }
     _onEditorMouseMove(mouseEvent) {
         if (this.shouldKeepOpenOnEditorMouseMoveOrLeave) {
@@ -133,10 +131,10 @@ let MarginHoverController = class MarginHoverController extends Disposable {
         if (!this._editor.hasModel()) {
             return;
         }
-        if (e.keyCode === KeyCode.Ctrl
-            || e.keyCode === KeyCode.Alt
-            || e.keyCode === KeyCode.Meta
-            || e.keyCode === KeyCode.Shift) {
+        if (e.keyCode === 5
+            || e.keyCode === 6
+            || e.keyCode === 57
+            || e.keyCode === 4 ) {
             return;
         }
         this._hideWidgets();
@@ -146,7 +144,7 @@ let MarginHoverController = class MarginHoverController extends Disposable {
     }
     _getOrCreateGlyphWidget() {
         if (!this._glyphWidget) {
-            this._glyphWidget = this._instantiationService.createInstance(MarginHoverWidget, this._editor);
+            this._glyphWidget = this._instantiationService.createInstance(GlyphHoverWidget, this._editor);
         }
         return this._glyphWidget;
     }
@@ -160,7 +158,7 @@ let MarginHoverController = class MarginHoverController extends Disposable {
         this._glyphWidget?.dispose();
     }
 };
-MarginHoverController = MarginHoverController_1 = ( __decorate([
+GlyphHoverController = GlyphHoverController_1 = ( __decorate([
     ( __param(1, IInstantiationService))
-], MarginHoverController));
-export { MarginHoverController };
+], GlyphHoverController));
+export { GlyphHoverController };