@codingame/monaco-vscode-api 22.1.9 → 23.0.0

package/vscode/src/vs/platform/files/common/files.js

@@ -109,7 +109,7 @@ function createFileSystemProviderError(error, code) {
 }
 function ensureFileSystemProviderError(error) {
     if (!error) {
-        return createFileSystemProviderError(( localize(1913, "Unknown Error")), FileSystemProviderErrorCode.Unknown);
+        return createFileSystemProviderError(( localize(1920, "Unknown Error")), FileSystemProviderErrorCode.Unknown);
     }
     return error;
 }
@@ -378,18 +378,18 @@ class ByteSize {
             size = 0;
         }
         if (size < ByteSize.KB) {
-            return localize(1914, "{0}B", size.toFixed(0));
+            return localize(1921, "{0}B", size.toFixed(0));
         }
         if (size < ByteSize.MB) {
-            return localize(1915, "{0}KB", (size / ByteSize.KB).toFixed(2));
+            return localize(1922, "{0}KB", (size / ByteSize.KB).toFixed(2));
         }
         if (size < ByteSize.GB) {
-            return localize(1916, "{0}MB", (size / ByteSize.MB).toFixed(2));
+            return localize(1923, "{0}MB", (size / ByteSize.MB).toFixed(2));
         }
         if (size < ByteSize.TB) {
-            return localize(1917, "{0}GB", (size / ByteSize.GB).toFixed(2));
+            return localize(1924, "{0}GB", (size / ByteSize.GB).toFixed(2));
         }
-        return localize(1918, "{0}TB", (size / ByteSize.TB).toFixed(2));
+        return localize(1925, "{0}TB", (size / ByteSize.TB).toFixed(2));
     }
 }
 function getLargeFileConfirmationLimit(arg) {

package/vscode/src/vs/platform/history/browser/contextScopedHistoryWidget.js

@@ -11,7 +11,7 @@ import { localize } from '../../../nls.js';
 import { DisposableStore, toDisposable } from '../../../base/common/lifecycle.js';
 import { isActiveElement } from '../../../base/browser/dom.js';
 
-const historyNavigationVisible = ( new RawContextKey('suggestWidgetVisible', false, ( localize(1920, "Whether suggestion are visible"))));
+const historyNavigationVisible = ( new RawContextKey('suggestWidgetVisible', false, ( localize(1927, "Whether suggestion are visible"))));
 const HistoryNavigationWidgetFocusContext = 'historyNavigationWidgetFocus';
 const HistoryNavigationForwardsEnablementContext = 'historyNavigationForwardsEnabled';
 const HistoryNavigationBackwardsEnablementContext = 'historyNavigationBackwardsEnabled';

package/vscode/src/vs/{editor/browser/services/hoverService → platform/hover/browser}/hover.css

@@ -3,7 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-.monaco-workbench .workbench-hover {
+/* stylelint-disable layer-checker */
+
+.monaco-hover.workbench-hover {
 	position: relative;
 	font-size: 13px;
 	line-height: 19px;
@@ -18,45 +20,45 @@
 	box-shadow: 0 2px 8px var(--vscode-widget-shadow);
 }
 
-.monaco-workbench .workbench-hover .monaco-action-bar .action-item .codicon {
+.monaco-hover.workbench-hover .monaco-action-bar .action-item .codicon {
 	/* Given our font-size, adjust action icons accordingly */
 	width: 13px;
 	height: 13px;
 }
 
-.monaco-workbench .workbench-hover hr {
+.monaco-hover.workbench-hover hr {
 	border-bottom: none;
 }
 
-.monaco-workbench .workbench-hover.compact {
+.monaco-hover.workbench-hover.compact {
 	font-size: 12px;
 }
 
-.monaco-workbench .workbench-hover.compact .monaco-action-bar .action-item .codicon {
+.monaco-hover.workbench-hover.compact .monaco-action-bar .action-item .codicon {
 	/* Given our font-size, adjust action icons accordingly */
 	width: 12px;
 	height: 12px;
 }
 
-.monaco-workbench .workbench-hover.compact .hover-contents {
+.monaco-hover.workbench-hover.compact .hover-contents {
 	padding: 2px 8px;
 }
 
-.monaco-workbench .workbench-hover-container.locked .workbench-hover {
+.workbench-hover-container.locked .monaco-hover.workbench-hover {
 	outline: 1px solid var(--vscode-editorHoverWidget-border);
 }
-.monaco-workbench .workbench-hover-container:focus-within.locked .workbench-hover {
+.workbench-hover-container:focus-within.locked .monaco-hover.workbench-hover {
 	outline-color: var(--vscode-focusBorder);
 }
 
-.monaco-workbench .workbench-hover-pointer {
+.workbench-hover-pointer {
 	position: absolute;
 	/* Must be higher than workbench hover z-index */
 	z-index: 41;
 	pointer-events: none;
 }
 
-.monaco-workbench .workbench-hover-pointer:after {
+.workbench-hover-pointer:after {
 	content: '';
 	position: absolute;
 	width: 5px;
@@ -65,77 +67,77 @@
 	border-right: 1px solid var(--vscode-editorHoverWidget-border);
 	border-bottom: 1px solid var(--vscode-editorHoverWidget-border);
 }
-.monaco-workbench .workbench-hover-container:not(:focus-within).locked .workbench-hover-pointer:after {
+.workbench-hover-container:not(:focus-within).locked .workbench-hover-pointer:after {
 	width: 4px;
 	height: 4px;
 	border-right-width: 2px;
 	border-bottom-width: 2px;
 }
-.monaco-workbench .workbench-hover-container:focus-within .workbench-hover-pointer:after {
+.workbench-hover-container:focus-within .workbench-hover-pointer:after {
 	border-right: 1px solid var(--vscode-focusBorder);
 	border-bottom: 1px solid var(--vscode-focusBorder);
 }
 
-.monaco-workbench .workbench-hover-pointer.left   { left: -3px; }
-.monaco-workbench .workbench-hover-pointer.right  { right: 3px; }
-.monaco-workbench .workbench-hover-pointer.top    { top: -3px; }
-.monaco-workbench .workbench-hover-pointer.bottom { bottom: 3px; }
+.workbench-hover-pointer.left   { left: -3px; }
+.workbench-hover-pointer.right  { right: 3px; }
+.workbench-hover-pointer.top    { top: -3px; }
+.workbench-hover-pointer.bottom { bottom: 3px; }
 
-.monaco-workbench .workbench-hover-pointer.left:after {
+.workbench-hover-pointer.left:after {
 	transform: rotate(135deg);
 }
 
-.monaco-workbench .workbench-hover-pointer.right:after {
+.workbench-hover-pointer.right:after {
 	transform: rotate(315deg);
 }
 
-.monaco-workbench .workbench-hover-pointer.top:after {
+.workbench-hover-pointer.top:after {
 	transform: rotate(225deg);
 }
 
-.monaco-workbench .workbench-hover-pointer.bottom:after {
+.workbench-hover-pointer.bottom:after {
 	transform: rotate(45deg);
 }
 
-.monaco-workbench .workbench-hover a {
+.monaco-hover.workbench-hover a {
 	color: var(--vscode-textLink-foreground);
 }
 
-.monaco-workbench .workbench-hover a:focus {
+.monaco-hover.workbench-hover a:focus {
 	outline: 1px solid;
 	outline-offset: -1px;
 	text-decoration: underline;
 	outline-color: var(--vscode-focusBorder);
 }
 
-.monaco-workbench .workbench-hover a.codicon:focus,
-.monaco-workbench .workbench-hover a.monaco-button:focus {
+.monaco-hover.workbench-hover a.codicon:focus,
+.monaco-hover.workbench-hover a.monaco-button:focus {
 	text-decoration: none;
 }
 
-.monaco-workbench .workbench-hover a:hover,
-.monaco-workbench .workbench-hover a:active {
+.monaco-hover.workbench-hover a:hover,
+.monaco-hover.workbench-hover a:active {
 	color: var(--vscode-textLink-activeForeground);
 }
 
-.monaco-workbench .workbench-hover code {
+.monaco-hover.workbench-hover code {
 	background: var(--vscode-textCodeBlock-background);
 }
 
-.monaco-workbench .workbench-hover .hover-row .actions {
+.monaco-hover.workbench-hover .hover-row .actions {
 	background: var(--vscode-editorHoverWidget-statusBarBackground);
 }
 
-.monaco-workbench .workbench-hover.right-aligned {
+.monaco-hover.workbench-hover.right-aligned {
 	/* The context view service wraps strangely when it's right up against the edge without this */
 	left: 1px;
 }
 
-.monaco-workbench .workbench-hover.right-aligned .hover-row.status-bar .actions {
+.monaco-hover.workbench-hover.right-aligned .hover-row.status-bar .actions {
 	flex-direction: row-reverse;
 }
 
-.monaco-workbench .workbench-hover.right-aligned .hover-row.status-bar .actions .action-container {
+.monaco-hover.workbench-hover.right-aligned .hover-row.status-bar .actions .action-container {
 	margin-right: 0;
 	margin-left: 16px;
 }

package/vscode/src/vs/{editor/browser/services/hoverService → platform/hover/browser}/hoverService.d.ts

@@ -1,13 +1,13 @@
-import { IHoverService } from "../../../../platform/hover/browser/hover.service.js";
-import { IContextMenuService } from "../../../../platform/contextview/browser/contextView.service.js";
-import { IInstantiationService } from "../../../../platform/instantiation/common/instantiation.js";
-import { Disposable, IDisposable } from "../../../../base/common/lifecycle.js";
-import { IKeybindingService } from "../../../../platform/keybinding/common/keybinding.service.js";
-import { IAccessibilityService } from "../../../../platform/accessibility/common/accessibility.service.js";
-import { ILayoutService } from "../../../../platform/layout/browser/layoutService.service.js";
-import { type IHoverLifecycleOptions, type IHoverOptions, type IHoverWidget, type IManagedHover, type IManagedHoverContentOrFactory, type IManagedHoverOptions } from "../../../../base/browser/ui/hover/hover.js";
-import type { IHoverDelegate } from "../../../../base/browser/ui/hover/hoverDelegate.js";
-import { IConfigurationService } from "../../../../platform/configuration/common/configuration.service.js";
+import { IHoverService } from "./hover.service.js";
+import { IContextMenuService } from "../../contextview/browser/contextView.service.js";
+import { IInstantiationService } from "../../instantiation/common/instantiation.js";
+import { Disposable, IDisposable } from "../../../base/common/lifecycle.js";
+import { IKeybindingService } from "../../keybinding/common/keybinding.service.js";
+import { IAccessibilityService } from "../../accessibility/common/accessibility.service.js";
+import { ILayoutService } from "../../layout/browser/layoutService.service.js";
+import { type IHoverLifecycleOptions, type IHoverOptions, type IHoverWidget, type IManagedHover, type IManagedHoverContentOrFactory, type IManagedHoverOptions } from "../../../base/browser/ui/hover/hover.js";
+import type { IHoverDelegate } from "../../../base/browser/ui/hover/hoverDelegate.js";
+import { IConfigurationService } from "../../configuration/common/configuration.service.js";
 export declare class HoverService extends Disposable implements IHoverService {
     private readonly _instantiationService;
     private readonly _configurationService;

package/vscode/src/vs/{editor/browser/services/hoverService → platform/hover/browser}/hoverService.js

@@ -1,39 +1,38 @@
 
-import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import '../../../../platform/instantiation/common/extensions.js';
-import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
-import '../../../../platform/theme/common/colorUtils.js';
-import '../../../../platform/theme/common/colors/baseColors.js';
-import '../../../../platform/theme/common/colors/chartsColors.js';
-import { editorHoverBorder } from '../../../../platform/theme/common/colors/editorColors.js';
-import '../../../../platform/theme/common/colors/inputColors.js';
-import '../../../../platform/theme/common/colors/listColors.js';
-import '../../../../platform/theme/common/colors/menuColors.js';
-import '../../../../platform/theme/common/colors/minimapColors.js';
-import '../../../../platform/theme/common/colors/miscColors.js';
-import '../../../../platform/theme/common/colors/quickpickColors.js';
-import '../../../../platform/theme/common/colors/searchColors.js';
-import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
+import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
+import '../../instantiation/common/extensions.js';
+import { registerThemingParticipant } from '../../theme/common/themeService.js';
+import '../../theme/common/colorUtils.js';
+import '../../theme/common/colors/baseColors.js';
+import '../../theme/common/colors/chartsColors.js';
+import { editorHoverBorder } from '../../theme/common/colors/editorColors.js';
+import '../../theme/common/colors/inputColors.js';
+import '../../theme/common/colors/listColors.js';
+import '../../theme/common/colors/menuColors.js';
+import '../../theme/common/colors/minimapColors.js';
+import '../../theme/common/colors/miscColors.js';
+import '../../theme/common/colors/quickpickColors.js';
+import '../../theme/common/colors/searchColors.js';
+import { IInstantiationService } from '../../instantiation/common/instantiation.js';
+import { IContextMenuService } from '../../contextview/browser/contextView.service.js';
 import { HoverWidget } from './hoverWidget.js';
-import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
-import { addDisposableListener, EventType, getActiveElement, isHTMLElement, isAncestorOfActiveElement, getWindow, isAncestor, isEditableElement } from '../../../../base/browser/dom.js';
-import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
-import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
-import { ResultKind } from '../../../../platform/keybinding/common/keybindingResolver.js';
-import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.service.js';
-import { ILayoutService } from '../../../../platform/layout/browser/layoutService.service.js';
-import { mainWindow } from '../../../../base/browser/window.js';
-import { ContextViewHandler } from '../../../../platform/contextview/browser/contextViewService.js';
-import { isManagedHoverTooltipMarkdownString } from '../../../../base/browser/ui/hover/hover.js';
+import { Disposable, DisposableStore, toDisposable } from '../../../base/common/lifecycle.js';
+import { addDisposableListener, EventType, getActiveElement, isHTMLElement, isAncestorOfActiveElement, getWindow, isAncestor, isEditableElement } from '../../../base/browser/dom.js';
+import { IKeybindingService } from '../../keybinding/common/keybinding.service.js';
+import { StandardKeyboardEvent } from '../../../base/browser/keyboardEvent.js';
+import { ResultKind } from '../../keybinding/common/keybindingResolver.js';
+import { IAccessibilityService } from '../../accessibility/common/accessibility.service.js';
+import { ILayoutService } from '../../layout/browser/layoutService.service.js';
+import { mainWindow } from '../../../base/browser/window.js';
+import { ContextViewHandler } from '../../contextview/browser/contextViewService.js';
+import { isManagedHoverTooltipMarkdownString } from '../../../base/browser/ui/hover/hover.js';
 import { ManagedHoverWidget } from './updatableHoverWidget.js';
-import { timeout, TimeoutTimer } from '../../../../base/common/async.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
-import { isNumber, isString } from '../../../../base/common/types.js';
-import { KeyChord, KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
-import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
-import { EditorContextKeys } from '../../../common/editorContextKeys.js';
-import { stripIcons } from '../../../../base/common/iconLabels.js';
+import { timeout, TimeoutTimer } from '../../../base/common/async.js';
+import { IConfigurationService } from '../../configuration/common/configuration.service.js';
+import { isNumber, isString } from '../../../base/common/types.js';
+import { KeyChord, KeyMod as KeyMod$1, KeyCode } from '../../../base/common/keyCodes.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../keybinding/common/keybindingsRegistry.js';
+import { stripIcons } from '../../../base/common/iconLabels.js';
 
 let HoverService = class HoverService extends Disposable {
     constructor(_instantiationService, _configurationService, contextMenuService, _keybindingService, _layoutService, _accessibilityService) {
@@ -50,8 +49,7 @@ let HoverService = class HoverService extends Disposable {
         this._contextViewHandler = this._register(( new ContextViewHandler(this._layoutService)));
         this._register(KeybindingsRegistry.registerCommandAndKeybindingRule({
             id: 'workbench.action.showHover',
-            weight: KeybindingWeight.WorkbenchContrib - 1,
-            when: ( EditorContextKeys.editorTextFocus.negate()),
+            weight: KeybindingWeight.EditorCore,
             primary: KeyChord(KeyMod$1.CtrlCmd | KeyCode.KeyK, KeyMod$1.CtrlCmd | KeyCode.KeyI),
             handler: () => { this._showAndFocusHoverForActiveElement(); },
         }));
@@ -144,6 +142,9 @@ let HoverService = class HoverService extends Disposable {
     }
     _createHover(options, skipLastFocusedUpdate) {
         this._currentDelayedHover = undefined;
+        if (options.content === '') {
+            return undefined;
+        }
         if (this._currentHover?.isLocked) {
             return undefined;
         }
@@ -348,22 +349,25 @@ let HoverService = class HoverService extends Disposable {
             if (hoverDelegate.placement === undefined || hoverDelegate.placement === 'mouse') {
                 const onMouseMove = (e) => {
                     target.x = e.x + 10;
-                    if ((isHTMLElement(e.target)) && getHoverTargetElement(e.target, targetElement) !== targetElement) {
+                    if (!eventIsRelatedToTarget(e, targetElement)) {
                         hideHover(true, true);
                     }
                 };
                 mouseOverStore.add(addDisposableListener(targetElement, EventType.MOUSE_MOVE, onMouseMove, true));
             }
             hoverPreparation = mouseOverStore;
-            if ((isHTMLElement(e.target)) && getHoverTargetElement(e.target, targetElement) !== targetElement) {
+            if (!eventIsRelatedToTarget(e, targetElement)) {
                 return;
             }
             mouseOverStore.add(triggerShowHover(typeof hoverDelegate.delay === 'function' ? hoverDelegate.delay(content) : hoverDelegate.delay, false, target));
         }, true));
-        const onFocus = () => {
+        const onFocus = (e) => {
             if (isMouseDown || hoverPreparation) {
                 return;
             }
+            if (!eventIsRelatedToTarget(e, targetElement)) {
+                return;
+            }
             const target = {
                 targetElements: [targetElement],
                 dispose: () => { }
@@ -484,6 +488,9 @@ class HoverContextViewDelegate {
         this._hover.layout();
     }
 }
+function eventIsRelatedToTarget(event, target) {
+    return isHTMLElement(event.target) && getHoverTargetElement(event.target, target) === target;
+}
 function getHoverTargetElement(element, stopElement) {
     stopElement = stopElement ?? getWindow(element).document.body;
     while (!element.hasAttribute('custom-hover') && element !== stopElement) {
@@ -494,8 +501,8 @@ function getHoverTargetElement(element, stopElement) {
 registerThemingParticipant((theme, collector) => {
     const hoverBorder = theme.getColor(editorHoverBorder);
     if (hoverBorder) {
-        collector.addRule(`.monaco-workbench .workbench-hover .hover-row:not(:first-child):not(:empty) { border-top: 1px solid ${( hoverBorder.transparent(0.5))}; }`);
-        collector.addRule(`.monaco-workbench .workbench-hover hr { border-top: 1px solid ${( hoverBorder.transparent(0.5))}; }`);
+        collector.addRule(`.monaco-hover.workbench-hover .hover-row:not(:first-child):not(:empty) { border-top: 1px solid ${( hoverBorder.transparent(0.5))}; }`);
+        collector.addRule(`.monaco-hover.workbench-hover hr { border-top: 1px solid ${( hoverBorder.transparent(0.5))}; }`);
     }
 });
 

package/vscode/src/vs/{editor/browser/services/hoverService → platform/hover/browser}/hoverWidget.d.ts

@@ -1,17 +1,15 @@
-import { Event } from "../../../../base/common/event.js";
-import { IKeybindingService } from "../../../../platform/keybinding/common/keybinding.service.js";
-import { IConfigurationService } from "../../../../platform/configuration/common/configuration.service.js";
-import { Widget } from "../../../../base/browser/ui/widget.js";
-import { AnchorPosition } from "../../../../base/browser/ui/contextview/contextview.js";
-import { IOpenerService } from "../../../../platform/opener/common/opener.service.js";
-import { IInstantiationService } from "../../../../platform/instantiation/common/instantiation.js";
-import { IAccessibilityService } from "../../../../platform/accessibility/common/accessibility.service.js";
-import type { IHoverOptions, IHoverWidget } from "../../../../base/browser/ui/hover/hover.js";
+import { Event } from "../../../base/common/event.js";
+import { IKeybindingService } from "../../keybinding/common/keybinding.service.js";
+import { IConfigurationService } from "../../configuration/common/configuration.service.js";
+import { Widget } from "../../../base/browser/ui/widget.js";
+import { AnchorPosition } from "../../../base/browser/ui/contextview/contextview.js";
+import { IMarkdownRendererService } from "../../markdown/browser/markdownRenderer.service.js";
+import { IAccessibilityService } from "../../accessibility/common/accessibility.service.js";
+import { type IHoverOptions, type IHoverWidget } from "../../../base/browser/ui/hover/hover.js";
 export declare class HoverWidget extends Widget implements IHoverWidget {
     private readonly _keybindingService;
     private readonly _configurationService;
-    private readonly _openerService;
-    private readonly _instantiationService;
+    private readonly _markdownRenderer;
     private readonly _accessibilityService;
     private readonly _messageListeners;
     private readonly _lockMouseTracker;
@@ -47,7 +45,7 @@ export declare class HoverWidget extends Widget implements IHoverWidget {
      */
     get isLocked(): boolean;
     set isLocked(value: boolean);
-    constructor(options: IHoverOptions, _keybindingService: IKeybindingService, _configurationService: IConfigurationService, _openerService: IOpenerService, _instantiationService: IInstantiationService, _accessibilityService: IAccessibilityService);
+    constructor(options: IHoverOptions, _keybindingService: IKeybindingService, _configurationService: IConfigurationService, _markdownRenderer: IMarkdownRendererService, _accessibilityService: IAccessibilityService);
     private addFocusTrap;
     private findLastFocusableChild;
     render(container: HTMLElement): void;

package/vscode/src/vs/{editor/browser/services/hoverService → platform/hover/browser}/hoverWidget.js

@@ -1,27 +1,25 @@
 
 import { registerCss } from '@codingame/monaco-vscode-api/css';
-import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import * as hover from './hover.css';
-import { DisposableStore, toDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
-import { Emitter } from '../../../../base/common/event.js';
-import { $ as $$1, getWindow, addDisposableListener, isHTMLElement, prepend, append, getActiveElement, getDomNodeZoomLevel } from '../../../../base/browser/dom.js';
-import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
-import { KeyCode } from '../../../../base/common/keyCodes.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
-import { EDITOR_FONT_DEFAULTS } from '../../../common/config/editorOptions.js';
-import { HoverPosition, HoverWidget as HoverWidget$1, HoverAction, getHoverAccessibleViewHint } from '../../../../base/browser/ui/hover/hoverWidget.js';
-import { Widget } from '../../../../base/browser/ui/widget.js';
-import { AnchorPosition } from '../../../../base/browser/ui/contextview/contextview.js';
-import { IOpenerService } from '../../../../platform/opener/common/opener.service.js';
-import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { openLinkFromMarkdown, MarkdownRenderer } from '../../widget/markdownRenderer/browser/markdownRenderer.js';
-import { isMarkdownString } from '../../../../base/common/htmlContent.js';
-import { localize } from '../../../../nls.js';
-import { isMacintosh } from '../../../../base/common/platform.js';
-import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.service.js';
-import { status } from '../../../../base/browser/ui/aria/aria.js';
-import { TimeoutTimer } from '../../../../base/common/async.js';
-import { isNumber } from '../../../../base/common/types.js';
+import { DisposableStore, MutableDisposable } from '../../../base/common/lifecycle.js';
+import { Emitter } from '../../../base/common/event.js';
+import { $ as $$1, getWindow, addDisposableListener, isHTMLElement, prepend, append, getActiveElement, getDomNodeZoomLevel } from '../../../base/browser/dom.js';
+import { IKeybindingService } from '../../keybinding/common/keybinding.service.js';
+import { KeyCode } from '../../../base/common/keyCodes.js';
+import { IConfigurationService } from '../../configuration/common/configuration.service.js';
+import { HoverPosition, HoverWidget as HoverWidget$1, HoverAction, getHoverAccessibleViewHint } from '../../../base/browser/ui/hover/hoverWidget.js';
+import { Widget } from '../../../base/browser/ui/widget.js';
+import { AnchorPosition } from '../../../base/browser/ui/contextview/contextview.js';
+import { IMarkdownRendererService } from '../../markdown/browser/markdownRenderer.service.js';
+import { isMarkdownString } from '../../../base/common/htmlContent.js';
+import { localize } from '../../../nls.js';
+import { isMacintosh } from '../../../base/common/platform.js';
+import { IAccessibilityService } from '../../accessibility/common/accessibility.service.js';
+import { status } from '../../../base/browser/ui/aria/aria.js';
+import { HoverStyle } from '../../../base/browser/ui/hover/hover.js';
+import { TimeoutTimer } from '../../../base/common/async.js';
+import { isNumber } from '../../../base/common/types.js';
 
 registerCss(hover);
 const $ = $$1;
@@ -54,12 +52,11 @@ let HoverWidget = class HoverWidget extends Widget {
         this._isLocked = value;
         this._hoverContainer.classList.toggle('locked', this._isLocked);
     }
-    constructor(options, _keybindingService, _configurationService, _openerService, _instantiationService, _accessibilityService) {
+    constructor(options, _keybindingService, _configurationService, _markdownRenderer, _accessibilityService) {
         super();
         this._keybindingService = _keybindingService;
         this._configurationService = _configurationService;
-        this._openerService = _openerService;
-        this._instantiationService = _instantiationService;
+        this._markdownRenderer = _markdownRenderer;
         this._accessibilityService = _accessibilityService;
         this._messageListeners = ( new DisposableStore());
         this._isDisposed = false;
@@ -72,10 +69,23 @@ let HoverWidget = class HoverWidget extends Widget {
         this._maxHeightRatioRelativeToWindow = 0.5;
         this._onDispose = this._register(( new Emitter()));
         this._onRequestLayout = this._register(( new Emitter()));
-        this._linkHandler = options.linkHandler || (url => {
-            return openLinkFromMarkdown(this._openerService, url, isMarkdownString(options.content) ? options.content.isTrusted : undefined);
-        });
+        this._linkHandler = options.linkHandler;
         this._target = 'targetElements' in options.target ? options.target : ( new ElementHoverTarget(options.target));
+        if (options.style) {
+            switch (options.style) {
+                case HoverStyle.Pointer: {
+                    options.appearance ??= {};
+                    options.appearance.compact ??= true;
+                    options.appearance.showPointer ??= true;
+                    break;
+                }
+                case HoverStyle.Mouse: {
+                    options.appearance ??= {};
+                    options.appearance.compact ??= true;
+                    break;
+                }
+            }
+        }
         this._hoverPointer = options.appearance?.showPointer ? $('div.workbench-hover-pointer') : undefined;
         this._hover = this._register(( new HoverWidget$1(!options.appearance?.skipFadeInAnimation)));
         this._hover.containerDomNode.classList.add('workbench-hover');
@@ -119,17 +129,15 @@ let HoverWidget = class HoverWidget extends Widget {
         }
         else {
             const markdown = options.content;
-            const mdRenderer = this._instantiationService.createInstance(MarkdownRenderer, { codeBlockFontFamily: this._configurationService.getValue('editor').fontFamily || EDITOR_FONT_DEFAULTS.fontFamily });
-            const { element, dispose } = mdRenderer.render(markdown, {
-                actionHandler: (content) => this._linkHandler(content),
+            const { element } = this._register(this._markdownRenderer.render(markdown, {
+                actionHandler: this._linkHandler,
                 asyncRenderCallback: () => {
                     contentsElement.classList.add('code-hover-contents');
                     this.layout();
                     this._onRequestLayout.fire();
                 }
-            });
+            }));
             contentsElement.appendChild(element);
-            this._register(toDisposable(dispose));
         }
         rowElement.appendChild(contentsElement);
         this._hover.contentsDomNode.appendChild(rowElement);
@@ -173,7 +181,7 @@ let HoverWidget = class HoverWidget extends Widget {
         if (options.appearance?.showHoverHint) {
             const statusBarElement = $('div.hover-row.status-bar');
             const infoElement = $('div.info');
-            infoElement.textContent = ( localize(145, 'Hold {0} key to mouse over', isMacintosh ? 'Option' : 'Alt'));
+            infoElement.textContent = ( localize(1928, 'Hold {0} key to mouse over', isMacintosh ? 'Option' : 'Alt'));
             statusBarElement.appendChild(infoElement);
             this._hover.containerDomNode.appendChild(statusBarElement);
         }
@@ -423,7 +431,7 @@ let HoverWidget = class HoverWidget extends Widget {
             }
         }
         else if (this._hoverPosition === HoverPosition.BELOW) {
-            if (target.bottom + this._hover.containerDomNode.clientHeight + hoverPointerOffset > this._targetWindow.innerHeight) {
+            if (target.bottom + this._hover.containerDomNode.offsetHeight + hoverPointerOffset > this._targetWindow.innerHeight) {
                 this._hoverPosition = HoverPosition.ABOVE;
             }
         }
@@ -498,9 +506,8 @@ let HoverWidget = class HoverWidget extends Widget {
 HoverWidget = ( __decorate([
     ( __param(1, IKeybindingService)),
     ( __param(2, IConfigurationService)),
-    ( __param(3, IOpenerService)),
-    ( __param(4, IInstantiationService)),
-    ( __param(5, IAccessibilityService))
+    ( __param(3, IMarkdownRendererService)),
+    ( __param(4, IAccessibilityService))
 ], HoverWidget));
 class CompositeMouseTracker extends Widget {
     get onMouseOut() { return this._onMouseOut.event; }

package/vscode/src/vs/{editor/browser/services/hoverService → platform/hover/browser}/updatableHoverWidget.d.ts

@@ -1,6 +1,6 @@
-import { type IManagedHoverContent, type IManagedHoverOptions } from "../../../../base/browser/ui/hover/hover.js";
-import type { IHoverDelegate, IHoverDelegateTarget } from "../../../../base/browser/ui/hover/hoverDelegate.js";
-import { IDisposable } from "../../../../base/common/lifecycle.js";
+import { type IManagedHoverContent, type IManagedHoverOptions } from "../../../base/browser/ui/hover/hover.js";
+import type { IHoverDelegate, IHoverDelegateTarget } from "../../../base/browser/ui/hover/hoverDelegate.js";
+import { IDisposable } from "../../../base/common/lifecycle.js";
 export declare class ManagedHoverWidget implements IDisposable {
     private hoverDelegate;
     private target;

package/vscode/src/vs/{editor/browser/services/hoverService → platform/hover/browser}/updatableHoverWidget.js

@@ -1,11 +1,11 @@
 
-import { isHTMLElement } from '../../../../base/browser/dom.js';
-import { isManagedHoverTooltipMarkdownString } from '../../../../base/browser/ui/hover/hover.js';
-import { HoverPosition } from '../../../../base/browser/ui/hover/hoverWidget.js';
-import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
-import { isMarkdownString } from '../../../../base/common/htmlContent.js';
-import { isString, isFunction } from '../../../../base/common/types.js';
-import { localize } from '../../../../nls.js';
+import { isHTMLElement } from '../../../base/browser/dom.js';
+import { isManagedHoverTooltipMarkdownString } from '../../../base/browser/ui/hover/hover.js';
+import { HoverPosition } from '../../../base/browser/ui/hover/hoverWidget.js';
+import { CancellationTokenSource } from '../../../base/common/cancellation.js';
+import { isMarkdownString } from '../../../base/common/htmlContent.js';
+import { isString, isFunction } from '../../../base/common/types.js';
+import { localize } from '../../../nls.js';
 
 class ManagedHoverWidget {
     constructor(hoverDelegate, target, fadeInAnimation) {
@@ -48,7 +48,7 @@ class ManagedHoverWidget {
             }
             if (managedContent instanceof Promise) {
                 if (!this._hoverWidget) {
-                    this.show(( localize(146, "Loading...")), focus, options);
+                    this.show(( localize(1929, "Loading...")), focus, options);
                 }
                 resolvedContent = await managedContent;
             }

package/vscode/src/vs/platform/instantiation/common/descriptors.d.ts

@@ -1,8 +1,8 @@
 export declare class SyncDescriptor<T> {
     readonly ctor: any;
-    readonly staticArguments: any[];
+    readonly staticArguments: unknown[];
     readonly supportsDelayedInstantiation: boolean;
-    constructor(ctor: new (...args: any[]) => T, staticArguments?: any[], supportsDelayedInstantiation?: boolean);
+    constructor(ctor: new (...args: any[]) => T, staticArguments?: unknown[], supportsDelayedInstantiation?: boolean);
 }
 export interface SyncDescriptor0<T> {
     readonly ctor: new () => T;

package/vscode/src/vs/platform/instantiation/common/instantiation.d.ts

@@ -5,10 +5,17 @@ export declare namespace _util {
     const serviceIds: Map<string, ServiceIdentifier<any>>;
     const DI_TARGET = "$di$target";
     const DI_DEPENDENCIES = "$di$dependencies";
-    function getServiceDependencies(ctor: any): {
+    function getServiceDependencies(ctor: DI_TARGET_OBJ): {
         id: ServiceIdentifier<any>;
         index: number;
     }[];
+    interface DI_TARGET_OBJ extends Function {
+        [DI_TARGET]: Function;
+        [DI_DEPENDENCIES]: {
+            id: ServiceIdentifier<any>;
+            index: number;
+        }[];
+    }
 }
 export type BrandedService = {
     _serviceBrand: undefined;