@codingame/monaco-vscode-api 22.1.8 → 23.0.0

package/vscode/src/vs/base/browser/dom.d.ts

@@ -19,15 +19,15 @@ export declare function addDisposableListener<K extends keyof GlobalEventHandler
 export declare function addDisposableListener(node: EventTarget, type: string, handler: (event: any) => void, useCapture?: boolean): IDisposable;
 export declare function addDisposableListener(node: EventTarget, type: string, handler: (event: any) => void, options: AddEventListenerOptions): IDisposable;
 export interface IAddStandardDisposableListenerSignature {
-    (node: HTMLElement, type: "click", handler: (event: IMouseEvent) => void, useCapture?: boolean): IDisposable;
-    (node: HTMLElement, type: "mousedown", handler: (event: IMouseEvent) => void, useCapture?: boolean): IDisposable;
-    (node: HTMLElement, type: "keydown", handler: (event: IKeyboardEvent) => void, useCapture?: boolean): IDisposable;
-    (node: HTMLElement, type: "keypress", handler: (event: IKeyboardEvent) => void, useCapture?: boolean): IDisposable;
-    (node: HTMLElement, type: "keyup", handler: (event: IKeyboardEvent) => void, useCapture?: boolean): IDisposable;
-    (node: HTMLElement, type: "pointerdown", handler: (event: PointerEvent) => void, useCapture?: boolean): IDisposable;
-    (node: HTMLElement, type: "pointermove", handler: (event: PointerEvent) => void, useCapture?: boolean): IDisposable;
-    (node: HTMLElement, type: "pointerup", handler: (event: PointerEvent) => void, useCapture?: boolean): IDisposable;
-    (node: HTMLElement, type: string, handler: (event: any) => void, useCapture?: boolean): IDisposable;
+    (node: HTMLElement | Element | Document, type: "click", handler: (event: IMouseEvent) => void, useCapture?: boolean): IDisposable;
+    (node: HTMLElement | Element | Document, type: "mousedown", handler: (event: IMouseEvent) => void, useCapture?: boolean): IDisposable;
+    (node: HTMLElement | Element | Document, type: "keydown", handler: (event: IKeyboardEvent) => void, useCapture?: boolean): IDisposable;
+    (node: HTMLElement | Element | Document, type: "keypress", handler: (event: IKeyboardEvent) => void, useCapture?: boolean): IDisposable;
+    (node: HTMLElement | Element | Document, type: "keyup", handler: (event: IKeyboardEvent) => void, useCapture?: boolean): IDisposable;
+    (node: HTMLElement | Element | Document, type: "pointerdown", handler: (event: PointerEvent) => void, useCapture?: boolean): IDisposable;
+    (node: HTMLElement | Element | Document, type: "pointermove", handler: (event: PointerEvent) => void, useCapture?: boolean): IDisposable;
+    (node: HTMLElement | Element | Document, type: "pointerup", handler: (event: PointerEvent) => void, useCapture?: boolean): IDisposable;
+    (node: HTMLElement | Element | Document, type: string, handler: (event: any) => void, useCapture?: boolean): IDisposable;
 }
 export declare const addStandardDisposableListener: IAddStandardDisposableListenerSignature;
 export declare const addStandardDisposableGenericMouseDownListener: (node: HTMLElement, handler: (event: any) => void, useCapture?: boolean) => IDisposable;
@@ -208,6 +208,8 @@ export declare const sharedMutationObserver: {
 };
 export declare function createMetaElement(container?: HTMLElement): HTMLMetaElement;
 export declare function createLinkElement(container?: HTMLElement): HTMLLinkElement;
+export declare function createDocumentFragment(): DocumentFragment;
+export declare function createTextNode(data: string): Text;
 export declare function createElement<K extends keyof HTMLElementTagNameMap>(tagName: K, options?: ElementCreationOptions): HTMLElementTagNameMap[K];
 export declare function createElement(tagName: string, options?: ElementCreationOptions): HTMLElement;
 export declare function createElementNS(namespaceURI: "http://www.w3.org/1999/xhtml", qualifiedName: string): HTMLElement;

package/vscode/src/vs/base/browser/dom.js

@@ -1,7 +1,7 @@
 
 import './browser.js';
 import { BrowserFeatures } from './canIUse.js';
-import { StandardKeyboardEvent } from './keyboardEvent.js';
+import { StandardKeyboardEvent, hasModifierKeys } from './keyboardEvent.js';
 import { StandardMouseEvent } from './mouseEvent.js';
 import { _runWhenIdle, AbstractIdleValue, IntervalTimer, TimeoutTimer } from '../common/async.js';
 import { onUnexpectedError, BugIndicatingError } from '../common/errors.js';
@@ -259,9 +259,9 @@ function modify(targetWindow, callback) {
     return scheduleAtNextAnimationFrame(targetWindow, callback, -1e4 );
 }
 const MINIMUM_TIME_MS = 8;
-const DEFAULT_EVENT_MERGER = function (lastEvent, currentEvent) {
+function DEFAULT_EVENT_MERGER(_lastEvent, currentEvent) {
     return currentEvent;
-};
+}
 class TimeoutThrottledDomListener extends Disposable {
     constructor(node, type, handler, eventMerger = DEFAULT_EVENT_MERGER, minimumTimeMs = MINIMUM_TIME_MS) {
         super();
@@ -663,6 +663,12 @@ function createMetaElement(container = mainWindow.document.head) {
 function createLinkElement(container = mainWindow.document.head) {
     return createHeadElement('link', container);
 }
+function createDocumentFragment() {
+    return mainWindow.document.createDocumentFragment();
+}
+function createTextNode(data) {
+    return mainWindow.document.createTextNode(data);
+}
 function createHeadElement(tagName, container = mainWindow.document.head) {
     const element = createElement(tagName);
     element.setAttribute('data-vscode', 'true');
@@ -1039,7 +1045,8 @@ var DetectedFullscreenMode;
     DetectedFullscreenMode[DetectedFullscreenMode["BROWSER"] = 2] = "BROWSER";
 })(DetectedFullscreenMode || (DetectedFullscreenMode = {}));
 function detectFullscreen(targetWindow, containerElement) {
-    const fullscreenElement = targetWindow.document.fullscreenElement ?? targetWindow.document.webkitFullscreenElement ?? targetWindow.document.webkitIsFullScreen;
+    const fullscreenElement =
+    targetWindow.document.fullscreenElement ?? targetWindow.document.webkitFullscreenElement ?? targetWindow.document.webkitIsFullScreen;
     if (fullscreenElement === containerElement) {
         return { mode: DetectedFullscreenMode.DOCUMENT, guess: false };
     }
@@ -1152,7 +1159,7 @@ class ModifierKeyEmitter extends Emitter {
         return this._keyStatus;
     }
     get isModifierPressed() {
-        return this._keyStatus.altKey || this._keyStatus.ctrlKey || this._keyStatus.metaKey || this._keyStatus.shiftKey;
+        return hasModifierKeys(this._keyStatus);
     }
     resetKeyStatus() {
         this.doResetKeyStatus();
@@ -1716,4 +1723,4 @@ function isObservable(obj) {
     return !!obj && obj.read !== undefined && obj.reportChanges !== undefined;
 }
 
-export { $, DetectedFullscreenMode, Dimension, DragAndDropObserver, EventHelper, EventType, LiveElement, ModifierKeyEmitter, Namespace, ObserverNode, ObserverNodeWithElement, SafeTriangle, WindowIdleValue, WindowIntervalTimer, addDisposableGenericMouseDownListener, addDisposableGenericMouseMoveListener, addDisposableGenericMouseUpListener, addDisposableListener, addDisposableThrottledListener, addStandardDisposableGenericMouseDownListener, addStandardDisposableGenericMouseUpListener, addStandardDisposableListener, after, animate, append, clearNode, computeScreenAwareSize, copyAttributes, createElement, createElementNS, createLinkElement, createMetaElement, detectFullscreen, disposableWindowInterval, finalHandler, findParentWithClass, getActiveDocument, getActiveElement, getActiveWindow, getClientArea, getComputedStyle, getContentHeight, getContentWidth, getDocument, getDomNodePagePosition, getDomNodeZoomLevel, getLargestChildWidth, getRootContainer, getShadowRoot, getTopLeftOffset, getTotalHeight, getTotalScrollWidth, getTotalWidth, getWindow, getWindowById, getWindowId, getWindows, getWindowsCount, h, hasParentWithClass, hide, isActiveDocument, isActiveElement, isAncestor, isAncestorOfActiveElement, isAncestorUsingFlowTo, isDragEvent, isEditableElement, isElement, isElementInBottomRightQuarter, isEventLike, isHTMLAnchorElement, isHTMLButtonElement, isHTMLDivElement, isHTMLElement, isHTMLIframeElement, isHTMLInputElement, isHTMLTextAreaElement, isInShadowDOM, isKeyboardEvent, isMouseEvent, isPointerEvent, isSVGElement, isShadowRoot, measure, modify, n, onDidRegisterWindow, onDidUnregisterWindow, onWillUnregisterWindow, position, prepend, registerWindow, reset, restoreParentsScrollTop, runAtThisOrScheduleAtNextAnimationFrame, runWhenWindowIdle, saveParentsScrollTop, scheduleAtNextAnimationFrame, setParentFlowTo, setVisibility, sharedMutationObserver, show, size, svgElem, trackAttributes, trackFocus, triggerDownload, triggerNotification, triggerUpload, windowOpenNoOpener, windowOpenPopup, windowOpenWithSuccess };
+export { $, DetectedFullscreenMode, Dimension, DragAndDropObserver, EventHelper, EventType, LiveElement, ModifierKeyEmitter, Namespace, ObserverNode, ObserverNodeWithElement, SafeTriangle, WindowIdleValue, WindowIntervalTimer, addDisposableGenericMouseDownListener, addDisposableGenericMouseMoveListener, addDisposableGenericMouseUpListener, addDisposableListener, addDisposableThrottledListener, addStandardDisposableGenericMouseDownListener, addStandardDisposableGenericMouseUpListener, addStandardDisposableListener, after, animate, append, clearNode, computeScreenAwareSize, copyAttributes, createDocumentFragment, createElement, createElementNS, createLinkElement, createMetaElement, createTextNode, detectFullscreen, disposableWindowInterval, finalHandler, findParentWithClass, getActiveDocument, getActiveElement, getActiveWindow, getClientArea, getComputedStyle, getContentHeight, getContentWidth, getDocument, getDomNodePagePosition, getDomNodeZoomLevel, getLargestChildWidth, getRootContainer, getShadowRoot, getTopLeftOffset, getTotalHeight, getTotalScrollWidth, getTotalWidth, getWindow, getWindowById, getWindowId, getWindows, getWindowsCount, h, hasParentWithClass, hide, isActiveDocument, isActiveElement, isAncestor, isAncestorOfActiveElement, isAncestorUsingFlowTo, isDragEvent, isEditableElement, isElement, isElementInBottomRightQuarter, isEventLike, isHTMLAnchorElement, isHTMLButtonElement, isHTMLDivElement, isHTMLElement, isHTMLIframeElement, isHTMLInputElement, isHTMLTextAreaElement, isInShadowDOM, isKeyboardEvent, isMouseEvent, isPointerEvent, isSVGElement, isShadowRoot, measure, modify, n, onDidRegisterWindow, onDidUnregisterWindow, onWillUnregisterWindow, position, prepend, registerWindow, reset, restoreParentsScrollTop, runAtThisOrScheduleAtNextAnimationFrame, runWhenWindowIdle, saveParentsScrollTop, scheduleAtNextAnimationFrame, setParentFlowTo, setVisibility, sharedMutationObserver, show, size, svgElem, trackAttributes, trackFocus, triggerDownload, triggerNotification, triggerUpload, windowOpenNoOpener, windowOpenPopup, windowOpenWithSuccess };

package/vscode/src/vs/base/browser/domSanitize.d.ts

@@ -67,7 +67,7 @@ export interface DomSanitizerConfig {
  * @returns A sanitized string of html.
  */
 export declare function sanitizeHtml(untrusted: string, config?: DomSanitizerConfig): TrustedHTML;
-export declare function convertTagToPlaintext(element: Element): DocumentFragment;
+export declare function convertTagToPlaintext(node: Node): DocumentFragment | undefined;
 /**
  * Sanitizes the given `value` and reset the given `node` with it.
  */

package/vscode/src/vs/base/browser/domSanitize.js

@@ -1,6 +1,6 @@
 
 import { Schemas } from '../common/network.js';
-import { reset } from './dom.js';
+import { createDocumentFragment, reset } from './dom.js';
 import dompurify from 'dompurify';
 import { mainWindow } from './window.js';
 
@@ -228,28 +228,33 @@ function doSanitizeHtml(untrusted, config, outputType) {
     }
 }
 const selfClosingTags = ['area', 'base', 'br', 'col', 'command', 'embed', 'hr', 'img', 'input', 'keygen', 'link', 'meta', 'param', 'source', 'track', 'wbr'];
-function replaceWithPlainTextHook(element, data, _config) {
+const replaceWithPlainTextHook = (node, data, _config) => {
     if (!data.allowedTags[data.tagName] && data.tagName !== 'body') {
-        const replacement = convertTagToPlaintext(element);
-        if (element.nodeType === Node.COMMENT_NODE) {
-            element.parentElement?.insertBefore(replacement, element);
-        }
-        else {
-            element.parentElement?.replaceChild(replacement, element);
+        const replacement = convertTagToPlaintext(node);
+        if (replacement) {
+            if (node.nodeType === Node.COMMENT_NODE) {
+                node.parentElement?.insertBefore(replacement, node);
+            }
+            else {
+                node.parentElement?.replaceChild(replacement, node);
+            }
         }
     }
-}
-function convertTagToPlaintext(element) {
+};
+function convertTagToPlaintext(node) {
+    if (!node.ownerDocument) {
+        return;
+    }
     let startTagText;
     let endTagText;
-    if (element.nodeType === Node.COMMENT_NODE) {
-        startTagText = `<!--${element.textContent}-->`;
+    if (node.nodeType === Node.COMMENT_NODE) {
+        startTagText = `<!--${node.textContent}-->`;
     }
-    else {
-        const tagName = element.tagName.toLowerCase();
+    else if (node instanceof Element) {
+        const tagName = node.tagName.toLowerCase();
         const isSelfClosing = selfClosingTags.includes(tagName);
-        const attrString = element.attributes.length ?
-            ' ' + ( Array.from(element.attributes)
+        const attrString = node.attributes.length ?
+            ' ' + ( Array.from(node.attributes)
                 .map(attr => `${attr.name}="${attr.value}"`))
                 .join(' ')
             : '';
@@ -258,13 +263,16 @@ function convertTagToPlaintext(element) {
             endTagText = `</${tagName}>`;
         }
     }
-    const fragment = document.createDocumentFragment();
-    const textNode = element.ownerDocument.createTextNode(startTagText);
+    else {
+        return;
+    }
+    const fragment = createDocumentFragment();
+    const textNode = node.ownerDocument.createTextNode(startTagText);
     fragment.appendChild(textNode);
-    while (element.firstChild) {
-        fragment.appendChild(element.firstChild);
+    while (node.firstChild) {
+        fragment.appendChild(node.firstChild);
     }
-    const endTagTextNode = endTagText ? element.ownerDocument.createTextNode(endTagText) : undefined;
+    const endTagTextNode = endTagText ? node.ownerDocument.createTextNode(endTagText) : undefined;
     if (endTagTextNode) {
         fragment.appendChild(endTagTextNode);
     }

package/vscode/src/vs/base/browser/formattedTextRenderer.js

@@ -1,5 +1,5 @@
 
-import { createElement, addStandardDisposableListener } from './dom.js';
+import { createElement, createTextNode, addStandardDisposableListener } from './dom.js';
 
 function renderText(text, _options, target) {
     const element = target ?? createElement('div');
@@ -47,7 +47,7 @@ var FormatType;
 function _renderFormattedText(element, treeNode, actionHandler, renderCodeSegments) {
     let child;
     if (treeNode.type === FormatType.Text) {
-        child = document.createTextNode(treeNode.content || '');
+        child = createTextNode(treeNode.content || '');
     }
     else if (treeNode.type === FormatType.Bold) {
         child = createElement('b');

package/vscode/src/vs/base/browser/history.d.ts

@@ -3,6 +3,6 @@ export interface IHistoryNavigationWidget {
     readonly element: HTMLElement;
     showPreviousValue(): void;
     showNextValue(): void;
-    onDidFocus: Event<void>;
-    onDidBlur: Event<void>;
+    readonly onDidFocus: Event<void>;
+    readonly onDidBlur: Event<void>;
 }

package/vscode/src/vs/base/browser/keyboardEvent.d.ts

@@ -21,6 +21,12 @@ export interface IKeyboardEvent {
 }
 export declare function printKeyboardEvent(e: KeyboardEvent): string;
 export declare function printStandardKeyboardEvent(e: StandardKeyboardEvent): string;
+export declare function hasModifierKeys(keyStatus: {
+    readonly ctrlKey: boolean;
+    readonly shiftKey: boolean;
+    readonly altKey: boolean;
+    readonly metaKey: boolean;
+}): boolean;
 export declare class StandardKeyboardEvent implements IKeyboardEvent {
     readonly _standardKeyboardEventBrand = true;
     readonly browserEvent: KeyboardEvent;

package/vscode/src/vs/base/browser/keyboardEvent.js

@@ -79,6 +79,9 @@ function printStandardKeyboardEvent(e) {
     }
     return `modifiers: [${modifiers.join(',')}], code: ${e.code}, keyCode: ${e.keyCode} ('${( KeyCodeUtils.toString(e.keyCode))}')`;
 }
+function hasModifierKeys(keyStatus) {
+    return keyStatus.ctrlKey || keyStatus.shiftKey || keyStatus.altKey || keyStatus.metaKey;
+}
 function getTarget(source) {
     if (isHTMLIframeElement(source.target)) {
         return source.target;
@@ -151,4 +154,4 @@ class StandardKeyboardEvent {
     }
 }
 
-export { StandardKeyboardEvent, printKeyboardEvent, printStandardKeyboardEvent };
+export { StandardKeyboardEvent, hasModifierKeys, printKeyboardEvent, printStandardKeyboardEvent };

package/vscode/src/vs/base/browser/markdownRenderer.d.ts

@@ -1,4 +1,5 @@
 import { IMarkdownString } from "../common/htmlContent.js";
+import { IDisposable } from "../common/lifecycle.js";
 import * as marked from "../common/marked/marked.js";
 import { URI } from "../common/uri.js";
 import * as domSanitize from "./domSanitize.js";
@@ -36,16 +37,16 @@ export interface MarkdownSanitizerConfig {
     };
     readonly remoteImageIsAllowed?: (uri: URI) => boolean;
 }
+export interface IRenderedMarkdown extends IDisposable {
+    readonly element: HTMLElement;
+}
 /**
  * Low-level way create a html element from a markdown string.
  *
  * **Note** that for most cases you should be using {@link import('../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js').MarkdownRenderer MarkdownRenderer}
  * which comes with support for pretty code block rendering and which uses the default way of handling links.
  */
-export declare function renderMarkdown(markdown: IMarkdownString, options?: MarkdownRenderOptions, target?: HTMLElement): {
-    element: HTMLElement;
-    dispose: () => void;
-};
+export declare function renderMarkdown(markdown: IMarkdownString, options?: MarkdownRenderOptions, target?: HTMLElement): IRenderedMarkdown;
 export declare const allowedMarkdownHtmlTags: readonly string[];
 export declare const allowedMarkdownHtmlAttributes: readonly (string | domSanitize.SanitizeAttributeRule)[];
 /**

package/vscode/src/vs/base/browser/markdownRenderer.js

@@ -17,7 +17,7 @@ import { createElement, reset, addDisposableListener, getWindow, $, isHTMLElemen
 import { safeSetInnerHtml, convertTagToPlaintext, sanitizeHtml, basicMarkupHtmlTags } from './domSanitize.js';
 import { StandardKeyboardEvent } from './keyboardEvent.js';
 import { StandardMouseEvent } from './mouseEvent.js';
-import { renderLabelWithIcons } from './ui/iconLabel/iconLabels.js';
+import { renderIcon, renderLabelWithIcons } from './ui/iconLabel/iconLabels.js';
 
 const defaultMarkedRenderers = ( Object.freeze({
     image: ({ href, title, text }) => {
@@ -59,6 +59,43 @@ const defaultMarkedRenderers = ( Object.freeze({
         return `<a href="${href}" title="${title || href}" draggable="false">${text}</a>`;
     },
 }));
+function createAlertBlockquoteRenderer(fallbackRenderer) {
+    return function (token) {
+        const { tokens } = token;
+        const firstToken = tokens[0];
+        if (firstToken?.type !== 'paragraph') {
+            return fallbackRenderer.call(this, token);
+        }
+        const paragraphTokens = firstToken.tokens;
+        if (!paragraphTokens || paragraphTokens.length === 0) {
+            return fallbackRenderer.call(this, token);
+        }
+        const firstTextToken = paragraphTokens[0];
+        if (firstTextToken?.type !== 'text') {
+            return fallbackRenderer.call(this, token);
+        }
+        const pattern = /^\s*\[!(NOTE|TIP|IMPORTANT|WARNING|CAUTION)\]\s*?\n*/i;
+        const match = firstTextToken.raw.match(pattern);
+        if (!match) {
+            return fallbackRenderer.call(this, token);
+        }
+        firstTextToken.raw = firstTextToken.raw.replace(pattern, '');
+        firstTextToken.text = firstTextToken.text.replace(pattern, '');
+        const alertIcons = {
+            'note': 'info',
+            'tip': 'light-bulb',
+            'important': 'comment',
+            'warning': 'alert',
+            'caution': 'stop'
+        };
+        const type = match[1];
+        const typeCapitalized = type.charAt(0).toUpperCase() + type.slice(1).toLowerCase();
+        const severity = type.toLowerCase();
+        const iconHtml = renderIcon({ id: alertIcons[severity] }).outerHTML;
+        const content = this.parser.parse(tokens);
+        return `<blockquote data-severity="${severity}"><p><span>${iconHtml}${typeCapitalized}</span>${content.substring(3)}</blockquote>\n`;
+    };
+}
 function renderMarkdown(markdown, options = {}, target) {
     const disposables = ( new DisposableStore());
     let isDisposed = false;
@@ -154,7 +191,12 @@ function renderMarkdown(markdown, options = {}, target) {
         else {
             if (options.sanitizerConfig?.replaceWithPlaintext) {
                 const replacement = convertTagToPlaintext(input);
-                input.parentElement?.replaceChild(replacement, input);
+                if (replacement) {
+                    input.parentElement?.replaceChild(replacement, input);
+                }
+                else {
+                    input.remove();
+                }
             }
             else {
                 input.remove();
@@ -212,6 +254,9 @@ function createMarkdownRenderer(marked, options, markdown) {
     renderer.image = defaultMarkedRenderers.image;
     renderer.link = defaultMarkedRenderers.link;
     renderer.paragraph = defaultMarkedRenderers.paragraph;
+    if (markdown.supportAlertSyntax) {
+        renderer.blockquote = createAlertBlockquoteRenderer(renderer.blockquote);
+    }
     const codeBlocks = [];
     const syncCodeBlocks = [];
     if (options.codeBlockRendererSync) {
@@ -370,6 +415,7 @@ const allowedMarkdownHtmlAttributes = ( Object.freeze([
     'value',
     'data-code',
     'data-href',
+    'data-severity',
     {
         attributeName: 'style',
         shouldKeep: (element, data) => {
@@ -433,6 +479,7 @@ function getDomSanitizerConfig(mdStrConfig, options) {
                 Schemas.vscodeRemoteResource,
             ]
         },
+        allowRelativeMediaPaths: !!mdStrConfig.baseUri,
         replaceWithPlaintext: options.replaceWithPlaintext,
     };
 }

package/vscode/src/vs/base/browser/trustedTypes.d.ts

@@ -1 +1,3 @@
-export declare function createTrustedTypesPolicy<Options extends TrustedTypePolicyOptions>(policyName: string, policyOptions?: Options): undefined | Pick<TrustedTypePolicy<Options>, "name" | Extract<keyof Options, keyof TrustedTypePolicyOptions>>;
+type TrustedTypePolicyOptions = import("trusted-types/lib/index.js").TrustedTypePolicyOptions;
+export declare function createTrustedTypesPolicy<Options extends TrustedTypePolicyOptions>(policyName: string, policyOptions?: Options): undefined | Pick<TrustedTypePolicy, "name" | Extract<keyof Options, keyof TrustedTypePolicyOptions>>;
+export {};

package/vscode/src/vs/base/browser/trustedTypes.js

@@ -1,8 +1,9 @@
 
 import { onUnexpectedError } from '../common/errors.js';
+import { getMonacoEnvironment } from './browser.js';
 
 function createTrustedTypesPolicy(policyName, policyOptions) {
-    const monacoEnvironment = globalThis.MonacoEnvironment;
+    const monacoEnvironment = getMonacoEnvironment();
     if (monacoEnvironment?.createTrustedTypesPolicy) {
         try {
             return monacoEnvironment.createTrustedTypesPolicy(policyName, policyOptions);

package/vscode/src/vs/base/browser/ui/button/button.js

@@ -6,7 +6,7 @@ import { renderMarkdown, renderAsPlaintext } from '../../markdownRenderer.js';
 import { Gesture, EventType as EventType$1 } from '../../touch.js';
 import { getDefaultHoverDelegate, createInstantHoverDelegate } from '../hover/hoverDelegateFactory.js';
 import { renderLabelWithIcons } from '../iconLabel/iconLabels.js';
-import { Action } from '../../../common/actions.js';
+import { toAction } from '../../../common/actions.js';
 import { Codicon } from '../../../common/codicons.js';
 import { Color } from '../../../common/color.js';
 import { Emitter } from '../../../common/event.js';
@@ -274,13 +274,7 @@ class ButtonWithDropdown extends Disposable {
         }
         this.primaryButton = this._register(( new Button(this.element, options)));
         this._register(this.primaryButton.onDidClick(e => this._onDidClick.fire(e)));
-        this.action = this._register(( new Action(
-            'primaryAction',
-            renderAsPlaintext(this.primaryButton.label),
-            undefined,
-            true,
-            async () => this._onDidClick.fire(undefined)
-        )));
+        this.action = toAction({ id: 'primaryAction', label: renderAsPlaintext(this.primaryButton.label), run: async () => this._onDidClick.fire(undefined) });
         this.separatorContainer = createElement('div');
         this.separatorContainer.classList.add('monaco-button-dropdown-separator');
         this.separator = createElement('div');

package/vscode/src/vs/base/browser/ui/countBadge/countBadge.css

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 .monaco-count-badge {
-	padding: 3px 6px;
+	padding: 3px 5px;
 	border-radius: 11px;
 	font-size: 11px;
 	min-width: 18px;

package/vscode/src/vs/base/browser/ui/findinput/findInput.d.ts

@@ -7,6 +7,7 @@ import { HistoryInputBox, IInputBoxStyles, IInputValidator, IMessage as InputBox
 import { Widget } from "../widget.js";
 import { Event } from "../../../common/event.js";
 import { IHistory } from "../../../common/history.js";
+import type { IHoverLifecycleOptions } from "../hover/hover.js";
 export interface IFindInputOptions {
     readonly placeholder?: string;
     readonly width?: number;
@@ -24,6 +25,7 @@ export interface IFindInputOptions {
     readonly toggleStyles: IToggleStyles;
     readonly inputBoxStyles: IInputBoxStyles;
     readonly history?: IHistory<string>;
+    readonly hoverLifecycleOptions?: IHoverLifecycleOptions;
 }
 export declare class FindInput extends Widget {
     static readonly OPTION_CHANGE: string;

package/vscode/src/vs/base/browser/ui/findinput/findInput.js

@@ -9,7 +9,6 @@ import { KeyCode } from '../../../common/keyCodes.js';
 import * as findInput from './findInput.css';
 import { localize } from '../../../../nls.js';
 import { MutableDisposable, DisposableStore } from '../../../common/lifecycle.js';
-import { createInstantHoverDelegate } from '../hover/hoverDelegateFactory.js';
 
 registerCss(findInput);
 const NLS_DEFAULT_LABEL = ( localize(10, "input"));
@@ -61,12 +60,12 @@ class FindInput extends Widget {
             inputBoxStyles: options.inputBoxStyles,
             history: options.history
         })));
-        const hoverDelegate = this._register(createInstantHoverDelegate());
         if (this.showCommonFindToggles) {
+            const hoverLifecycleOptions = options?.hoverLifecycleOptions || { groupId: 'find-input' };
             this.regex = this._register(( new RegexToggle({
                 appendTitle: appendRegexLabel,
                 isChecked: false,
-                hoverDelegate,
+                hoverLifecycleOptions,
                 ...options.toggleStyles
             })));
             this._register(this.regex.onChange(viaKeyboard => {
@@ -82,7 +81,7 @@ class FindInput extends Widget {
             this.wholeWords = this._register(( new WholeWordsToggle({
                 appendTitle: appendWholeWordsLabel,
                 isChecked: false,
-                hoverDelegate,
+                hoverLifecycleOptions,
                 ...options.toggleStyles
             })));
             this._register(this.wholeWords.onChange(viaKeyboard => {
@@ -95,7 +94,7 @@ class FindInput extends Widget {
             this.caseSensitive = this._register(( new CaseSensitiveToggle({
                 appendTitle: appendCaseSensitiveLabel,
                 isChecked: false,
-                hoverDelegate,
+                hoverLifecycleOptions,
                 ...options.toggleStyles
             })));
             this._register(this.caseSensitive.onChange(viaKeyboard => {

package/vscode/src/vs/base/browser/ui/findinput/findInputToggles.d.ts

@@ -1,12 +1,12 @@
-import { IHoverDelegate } from "../hover/hoverDelegate.js";
 import { Toggle } from "../toggle/toggle.js";
+import { type IHoverLifecycleOptions } from "../hover/hover.js";
 export interface IFindInputToggleOpts {
     readonly appendTitle: string;
     readonly isChecked: boolean;
     readonly inputActiveOptionBorder: string | undefined;
     readonly inputActiveOptionForeground: string | undefined;
     readonly inputActiveOptionBackground: string | undefined;
-    readonly hoverDelegate?: IHoverDelegate;
+    readonly hoverLifecycleOptions?: IHoverLifecycleOptions;
 }
 export declare class CaseSensitiveToggle extends Toggle {
     constructor(opts: IFindInputToggleOpts);

package/vscode/src/vs/base/browser/ui/findinput/findInputToggles.js

@@ -1,5 +1,4 @@
 
-import { getDefaultHoverDelegate } from '../hover/hoverDelegateFactory.js';
 import { Toggle } from '../toggle/toggle.js';
 import { Codicon } from '../../../common/codicons.js';
 import { localize } from '../../../../nls.js';
@@ -13,7 +12,7 @@ class CaseSensitiveToggle extends Toggle {
             icon: Codicon.caseSensitive,
             title: NLS_CASE_SENSITIVE_TOGGLE_LABEL + opts.appendTitle,
             isChecked: opts.isChecked,
-            hoverDelegate: opts.hoverDelegate ?? getDefaultHoverDelegate('element'),
+            hoverLifecycleOptions: opts.hoverLifecycleOptions,
             inputActiveOptionBorder: opts.inputActiveOptionBorder,
             inputActiveOptionForeground: opts.inputActiveOptionForeground,
             inputActiveOptionBackground: opts.inputActiveOptionBackground
@@ -26,7 +25,7 @@ class WholeWordsToggle extends Toggle {
             icon: Codicon.wholeWord,
             title: NLS_WHOLE_WORD_TOGGLE_LABEL + opts.appendTitle,
             isChecked: opts.isChecked,
-            hoverDelegate: opts.hoverDelegate ?? getDefaultHoverDelegate('element'),
+            hoverLifecycleOptions: opts.hoverLifecycleOptions,
             inputActiveOptionBorder: opts.inputActiveOptionBorder,
             inputActiveOptionForeground: opts.inputActiveOptionForeground,
             inputActiveOptionBackground: opts.inputActiveOptionBackground
@@ -39,7 +38,7 @@ class RegexToggle extends Toggle {
             icon: Codicon.regex,
             title: NLS_REGEX_TOGGLE_LABEL + opts.appendTitle,
             isChecked: opts.isChecked,
-            hoverDelegate: opts.hoverDelegate ?? getDefaultHoverDelegate('element'),
+            hoverLifecycleOptions: opts.hoverLifecycleOptions,
             inputActiveOptionBorder: opts.inputActiveOptionBorder,
             inputActiveOptionForeground: opts.inputActiveOptionForeground,
             inputActiveOptionBackground: opts.inputActiveOptionBackground

package/vscode/src/vs/base/browser/ui/findinput/replaceInput.d.ts

@@ -6,6 +6,7 @@ import { HistoryInputBox, IInputBoxStyles, IInputValidator, IMessage as InputBox
 import { Widget } from "../widget.js";
 import { Event } from "../../../common/event.js";
 import { IHistory } from "../../../common/history.js";
+import { type IHoverLifecycleOptions } from "../hover/hover.js";
 export interface IReplaceInputOptions {
     readonly placeholder?: string;
     readonly width?: number;
@@ -14,6 +15,7 @@ export interface IReplaceInputOptions {
     readonly flexibleHeight?: boolean;
     readonly flexibleWidth?: boolean;
     readonly flexibleMaxHeight?: number;
+    readonly hoverLifecycleOptions?: IHoverLifecycleOptions;
     readonly appendPreserveCaseLabel?: string;
     readonly history?: IHistory<string>;
     readonly showHistoryHint?: () => boolean;

package/vscode/src/vs/base/browser/ui/findinput/replaceInput.js

@@ -9,7 +9,6 @@ import { Emitter } from '../../../common/event.js';
 import { KeyCode } from '../../../common/keyCodes.js';
 import * as findInput from './findInput.css';
 import { localize } from '../../../../nls.js';
-import { getDefaultHoverDelegate } from '../hover/hoverDelegateFactory.js';
 
 registerCss(findInput);
 const NLS_DEFAULT_LABEL = ( localize(14, "input"));
@@ -20,7 +19,7 @@ class PreserveCaseToggle extends Toggle {
             icon: Codicon.preserveCase,
             title: NLS_PRESERVE_CASE_LABEL + opts.appendTitle,
             isChecked: opts.isChecked,
-            hoverDelegate: opts.hoverDelegate ?? getDefaultHoverDelegate('element'),
+            hoverLifecycleOptions: opts.hoverLifecycleOptions,
             inputActiveOptionBorder: opts.inputActiveOptionBorder,
             inputActiveOptionForeground: opts.inputActiveOptionForeground,
             inputActiveOptionBackground: opts.inputActiveOptionBackground,
@@ -74,6 +73,7 @@ class ReplaceInput extends Widget {
         this.preserveCase = this._register(( new PreserveCaseToggle({
             appendTitle: appendPreserveCaseLabel,
             isChecked: false,
+            hoverLifecycleOptions: options.hoverLifecycleOptions,
             ...options.toggleStyles
         })));
         this._register(this.preserveCase.onChange(viaKeyboard => {

package/vscode/src/vs/base/browser/ui/highlightedlabel/highlightedLabel.d.ts

@@ -9,10 +9,6 @@ export interface IHighlight {
     readonly extraClasses?: readonly string[];
 }
 export interface IHighlightedLabelOptions {
-    /**
-     * Whether the label supports rendering icons.
-     */
-    readonly supportIcons?: boolean;
     readonly hoverDelegate?: IHoverDelegate;
 }
 /**
@@ -25,7 +21,6 @@ export declare class HighlightedLabel extends Disposable {
     private text;
     private title;
     private highlights;
-    private supportIcons;
     private didEverRender;
     private customHover;
     /**
@@ -47,7 +42,7 @@ export declare class HighlightedLabel extends Disposable {
      * @param escapeNewLines Whether to escape new lines.
      * @returns
      */
-    set(text: string | undefined, highlights?: readonly IHighlight[], title?: string, escapeNewLines?: boolean): void;
+    set(text: string | undefined, highlights?: readonly IHighlight[], title?: string, escapeNewLines?: boolean, supportIcons?: boolean): void;
     private render;
     static escapeNewLines(text: string, highlights: readonly IHighlight[]): string;
 }