@codingame/monaco-vscode-api 6.0.3 → 7.0.0

package/vscode/src/vs/base/browser/ui/actionbar/actionViewItems.js

@@ -157,7 +157,7 @@ class BaseActionViewItem extends Disposable {
         else {
             if (!this.customHover && title !== '') {
                 const hoverDelegate = this.options.hoverDelegate ?? getDefaultHoverDelegate('element');
-                this.customHover = this._store.add(getBaseLayerHoverDelegate().setupUpdatableHover(hoverDelegate, this.element, title));
+                this.customHover = this._store.add(getBaseLayerHoverDelegate().setupManagedHover(hoverDelegate, this.element, title));
             }
             else if (this.customHover) {
                 this.customHover.update(title);

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

@@ -289,7 +289,7 @@ class ActionBar extends Disposable {
     }
     pull(index) {
         if (index >= 0 && index < this.viewItems.length) {
-            this.actionsList.removeChild(this.actionsList.childNodes[index]);
+            this.actionsList.childNodes[index].remove();
             this.viewItemDisposables.deleteAndDispose(this.viewItems[index]);
             dispose(this.viewItems.splice(index, 1));
             this.refreshRole();

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

@@ -218,7 +218,7 @@ class Button extends Disposable {
     }
     setTitle(title) {
         if (!this._hover && title !== '') {
-            this._hover = this._register(getBaseLayerHoverDelegate().setupUpdatableHover(this.options.hoverDelegate ?? getDefaultHoverDelegate('mouse'), this._element, title));
+            this._hover = this._register(getBaseLayerHoverDelegate().setupManagedHover(this.options.hoverDelegate ?? getDefaultHoverDelegate('mouse'), this._element, title));
         }
         else if (this._hover) {
             this._hover.update(title);
@@ -262,7 +262,7 @@ class ButtonWithDropdown extends Disposable {
         this.separatorContainer.style.backgroundColor = buttonBackground ?? '';
         this.separator.style.backgroundColor = options.buttonSeparator ?? '';
         this.dropdownButton = this._register(( (new Button(this.element, { ...options, title: false, supportIcons: true }))));
-        this._register(getBaseLayerHoverDelegate().setupUpdatableHover(getDefaultHoverDelegate('mouse'), this.dropdownButton.element, ( localizeWithPath(_moduleId, 0, 'More Actions...'))));
+        this._register(getBaseLayerHoverDelegate().setupManagedHover(getDefaultHoverDelegate('mouse'), this.dropdownButton.element, ( localizeWithPath(_moduleId, 0, 'More Actions...'))));
         this.dropdownButton.element.setAttribute('aria-haspopup', 'true');
         this.dropdownButton.element.setAttribute('aria-expanded', 'false');
         this.dropdownButton.element.classList.add('monaco-dropdown-button');

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

@@ -88,15 +88,12 @@ class ContextView extends Disposable {
         }
         if (this.container) {
             this.toDisposeOnSetContainer.dispose();
+            this.view.remove();
             if (this.shadowRoot) {
-                this.shadowRoot.removeChild(this.view);
                 this.shadowRoot = null;
                 this.shadowRootHostElement?.remove();
                 this.shadowRootHostElement = null;
             }
-            else {
-                this.container.removeChild(this.view);
-            }
             this.container = null;
         }
         if (container) {

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

@@ -65,7 +65,7 @@ class BaseDropdown extends ActionRunner {
     set tooltip(tooltip) {
         if (this._label) {
             if (!this.hover && tooltip !== '') {
-                this.hover = this._register(getBaseLayerHoverDelegate().setupUpdatableHover(getDefaultHoverDelegate('mouse'), this._label, tooltip));
+                this.hover = this._register(getBaseLayerHoverDelegate().setupManagedHover(getDefaultHoverDelegate('mouse'), this._label, tooltip));
             }
             else if (this.hover) {
                 this.hover.update(tooltip);

package/vscode/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.js

@@ -44,7 +44,7 @@ class DropdownMenuActionViewItem extends BaseActionViewItem {
             this.element.setAttribute('aria-haspopup', 'true');
             this.element.setAttribute('aria-expanded', 'false');
             if (this._action.label) {
-                this._register(getBaseLayerHoverDelegate().setupUpdatableHover(this.options.hoverDelegate ?? getDefaultHoverDelegate('mouse'), this.element, this._action.label));
+                this._register(getBaseLayerHoverDelegate().setupManagedHover(this.options.hoverDelegate ?? getDefaultHoverDelegate('mouse'), this.element, this._action.label));
             }
             this.element.ariaLabel = this._action.label || '';
             return null;

package/vscode/src/vs/base/browser/ui/highlightedlabel/highlightedLabel.js

@@ -74,7 +74,7 @@ class HighlightedLabel extends Disposable {
         else {
             if (!this.customHover && this.title !== '') {
                 const hoverDelegate = this.options?.hoverDelegate ?? getDefaultHoverDelegate('mouse');
-                this.customHover = this._register(getBaseLayerHoverDelegate().setupUpdatableHover(hoverDelegate, this.domNode, this.title));
+                this.customHover = this._register(getBaseLayerHoverDelegate().setupManagedHover(hoverDelegate, this.domNode, this.title));
             }
             else if (this.customHover) {
                 this.customHover.update(this.title);

package/vscode/src/vs/base/browser/ui/hover/hover.d.ts

@@ -9,11 +9,12 @@ import { IDisposable } from '../../../common/lifecycle.js';
  */
 interface IHoverDelegate2 {
     /**
-     * Shows a hover, provided a hover with the same options object is not already visible.
+     * Shows a hover, provided a hover with the same {@link options} object is not already visible.
+     *
      * @param options A set of options defining the characteristics of the hover.
      * @param focus Whether to focus the hover (useful for keyboard accessibility).
      *
-     * **Example:** A simple usage with a single element target.
+     * @example A simple usage with a single element target.
      *
      * ```typescript
      * showHover({
@@ -33,13 +34,31 @@ interface IHoverDelegate2 {
      * simultaneously. #188822
      */
     showAndFocusLastHover(): void;
-    setupUpdatableHover(hoverDelegate: IHoverDelegate, htmlElement: HTMLElement, content: IUpdatableHoverContentOrFactory, options?: IUpdatableHoverOptions): IUpdatableHover;
+    /**
+     * Sets up a managed hover for the given element. A managed hover will set up listeners for
+     * mouse events, show the hover after a delay and provide hooks to easily update the content.
+     *
+     * This should be used over {@link showHover} when fine-grained control is not needed. The
+     * managed hover also does not scale well, consider using {@link showHover} when showing hovers
+     * for many elements.
+     *
+     * @param hoverDelegate The hover delegate containing hooks and configuration for the hover.
+     * @param targetElement The target element to show the hover for.
+     * @param content The content of the hover or a factory that creates it at the time it's shown.
+     * @param options Additional options for the managed hover.
+     */
+    setupManagedHover(hoverDelegate: IHoverDelegate, targetElement: HTMLElement, content: IManagedHoverContentOrFactory, options?: IManagedHoverOptions): IManagedHover;
     /**
      * Shows the hover for the given element if one has been setup.
+     *
+     * @param targetElement The target element of the hover, as set up in {@link setupManagedHover}.
      */
-    triggerUpdatableHover(htmlElement: HTMLElement): void;
+    showManagedHover(targetElement: HTMLElement): void;
 }
 interface IHoverWidget extends IDisposable {
+    /**
+     * Whether the hover widget has been disposed.
+     */
     readonly isDisposed: boolean;
 }
 interface IHoverOptions {
@@ -186,25 +205,22 @@ interface IHoverTarget extends IDisposable {
      * An optional absolute x coordinate to position the hover with, for example to position the
      * hover using `MouseEvent.pageX`.
      */
-    x?: number;
+    readonly x?: number;
     /**
      * An optional absolute y coordinate to position the hover with, for example to position the
      * hover using `MouseEvent.pageY`.
      */
-    y?: number;
+    readonly y?: number;
 }
-interface IUpdatableHoverTooltipMarkdownString {
+interface IManagedHoverTooltipMarkdownString {
     markdown: IMarkdownString | string | undefined | ((token: CancellationToken) => Promise<IMarkdownString | string | undefined>);
     markdownNotSupportedFallback: string | undefined;
 }
-type IUpdatableHoverContent = string | IUpdatableHoverTooltipMarkdownString | HTMLElement | undefined;
-type IUpdatableHoverContentOrFactory = IUpdatableHoverContent | (() => IUpdatableHoverContent);
-interface IUpdatableHoverOptions {
-    actions?: IHoverAction[];
-    linkHandler?(url: string): void;
-    trapFocus?: boolean;
+type IManagedHoverContent = string | IManagedHoverTooltipMarkdownString | HTMLElement | undefined;
+type IManagedHoverContentOrFactory = IManagedHoverContent | (() => IManagedHoverContent);
+interface IManagedHoverOptions extends Pick<IHoverOptions, 'actions' | 'linkHandler' | 'trapFocus'> {
 }
-interface IUpdatableHover extends IDisposable {
+interface IManagedHover extends IDisposable {
     /**
      * Allows to programmatically open the hover.
      */
@@ -216,7 +232,7 @@ interface IUpdatableHover extends IDisposable {
     /**
      * Updates the contents of the hover.
      */
-    update(tooltip: IUpdatableHoverContent, options?: IUpdatableHoverOptions): void;
+    update(tooltip: IManagedHoverContent, options?: IManagedHoverOptions): void;
 }
 
-export type { IHoverAction, IHoverAppearanceOptions, IHoverDelegate2, IHoverOptions, IHoverPersistenceOptions, IHoverPositionOptions, IHoverTarget, IHoverWidget, IUpdatableHover, IUpdatableHoverContent, IUpdatableHoverContentOrFactory, IUpdatableHoverOptions, IUpdatableHoverTooltipMarkdownString };
+export type { IHoverAction, IHoverAppearanceOptions, IHoverDelegate2, IHoverOptions, IHoverPersistenceOptions, IHoverPositionOptions, IHoverTarget, IHoverWidget, IManagedHover, IManagedHoverContent, IManagedHoverContentOrFactory, IManagedHoverOptions, IManagedHoverTooltipMarkdownString };

package/vscode/src/vs/base/browser/ui/hover/hoverDelegate.d.ts

@@ -1,4 +1,4 @@
-import { IHoverWidget, IUpdatableHoverOptions } from './hover.js';
+import { IHoverWidget, IManagedHoverOptions } from './hover.js';
 import { HoverPosition } from './hoverWidget.js';
 import { IMarkdownString } from '../../../common/htmlContent.js';
 import { IDisposable } from '../../../common/lifecycle.js';
@@ -7,7 +7,7 @@ interface IHoverDelegateTarget extends IDisposable {
     readonly targetElements: readonly HTMLElement[];
     x?: number;
 }
-interface IHoverDelegateOptions extends IUpdatableHoverOptions {
+interface IHoverDelegateOptions extends IManagedHoverOptions {
     /**
      * The content to display in the primary section of the hover. The type of text determines the
      * default `hideOnHover` behavior.

package/vscode/src/vs/base/browser/ui/hover/hoverDelegate2.js

@@ -2,8 +2,8 @@ let baseHoverDelegate = {
     showHover: () => undefined,
     hideHover: () => undefined,
     showAndFocusLastHover: () => undefined,
-    setupUpdatableHover: () => null,
-    triggerUpdatableHover: () => undefined
+    setupManagedHover: () => null,
+    showManagedHover: () => undefined
 };
 function setBaseLayerHoverDelegate(hoverDelegate) {
     baseHoverDelegate = hoverDelegate;

package/vscode/src/vs/base/browser/ui/hover/hoverWidget.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-hover{animation:fadein .1s linear;box-sizing:border-box;cursor:default;line-height:1.5em;overflow:hidden;position:absolute;user-select:text;-webkit-user-select:text;white-space:var(--vscode-hover-whiteSpace,normal)}.monaco-hover.hidden{display:none}.monaco-hover a:hover:not(.disabled){cursor:pointer}.monaco-hover .hover-contents:not(.html-hover-contents){padding:4px 8px}.monaco-hover .markdown-hover>.hover-contents:not(.code-hover-contents){word-wrap:break-word;max-width:var(--vscode-hover-maxWidth,500px)}.monaco-hover .markdown-hover>.hover-contents:not(.code-hover-contents) hr{min-width:100%}.monaco-hover .code,.monaco-hover h1,.monaco-hover h2,.monaco-hover h3,.monaco-hover h4,.monaco-hover h5,.monaco-hover h6,.monaco-hover p,.monaco-hover ul{margin:8px 0}.monaco-hover h1,.monaco-hover h2,.monaco-hover h3,.monaco-hover h4,.monaco-hover h5,.monaco-hover h6{line-height:1.1}.monaco-hover code{font-family:var(--monaco-monospace-font)}.monaco-hover hr{border-left:0;border-right:0;box-sizing:border-box;height:1px;margin:4px -8px -4px}.monaco-hover .code:first-child,.monaco-hover p:first-child,.monaco-hover ul:first-child{margin-top:0}.monaco-hover .code:last-child,.monaco-hover p:last-child,.monaco-hover ul:last-child{margin-bottom:0}.monaco-hover ol,.monaco-hover ul{padding-left:20px}.monaco-hover li>p{margin-bottom:0}.monaco-hover li>ul{margin-top:0}.monaco-hover code{border-radius:3px;padding:0 .4em}.monaco-hover .monaco-tokenized-source{white-space:var(--vscode-hover-sourceWhiteSpace,pre-wrap)}.monaco-hover .hover-row.status-bar{font-size:12px;line-height:22px}.monaco-hover .hover-row.status-bar .info{font-style:italic;padding:0 8px}.monaco-hover .hover-row.status-bar .actions{display:flex;padding:0 8px;width:100%}.monaco-hover .hover-row.status-bar .actions .action-container{cursor:pointer;margin-right:16px}.monaco-hover .hover-row.status-bar .actions .action-container .action .icon{padding-right:4px}.monaco-hover .markdown-hover .hover-contents .codicon{color:inherit;font-size:inherit;vertical-align:middle}.monaco-hover .hover-contents a.code-link,.monaco-hover .hover-contents a.code-link:hover{color:inherit}.monaco-hover .hover-contents a.code-link:before{content:\"(\"}.monaco-hover .hover-contents a.code-link:after{content:\")\"}.monaco-hover .hover-contents a.code-link>span{border-bottom:1px solid transparent;color:var(--vscode-textLink-foreground);text-decoration:underline;text-underline-position:under}.monaco-hover .hover-contents a.code-link>span:hover{color:var(--vscode-textLink-activeForeground)}.monaco-hover .markdown-hover .hover-contents:not(.code-hover-contents):not(.html-hover-contents) span{display:inline-block;margin-bottom:4px}.monaco-hover-content .action-container a{-webkit-user-select:none;user-select:none}.monaco-hover-content .action-container.disabled{cursor:default;opacity:.4;pointer-events:none}";
+var css = ".monaco-hover{animation:fadein .1s linear;box-sizing:border-box;cursor:default;line-height:1.5em;overflow:hidden;position:absolute;user-select:text;-webkit-user-select:text;white-space:var(--vscode-hover-whiteSpace,normal)}.monaco-hover.hidden{display:none}.monaco-hover a:hover:not(.disabled){cursor:pointer}.monaco-hover .hover-contents:not(.html-hover-contents){padding:4px 8px}.monaco-hover .markdown-hover>.hover-contents:not(.code-hover-contents){word-wrap:break-word;max-width:var(--vscode-hover-maxWidth,500px)}.monaco-hover .markdown-hover>.hover-contents:not(.code-hover-contents) hr{min-width:100%}.monaco-hover .code,.monaco-hover h1,.monaco-hover h2,.monaco-hover h3,.monaco-hover h4,.monaco-hover h5,.monaco-hover h6,.monaco-hover p,.monaco-hover ul{margin:8px 0}.monaco-hover h1,.monaco-hover h2,.monaco-hover h3,.monaco-hover h4,.monaco-hover h5,.monaco-hover h6{line-height:1.1}.monaco-hover code{font-family:var(--monaco-monospace-font)}.monaco-hover hr{border-left:0;border-right:0;box-sizing:border-box;height:1px;margin:4px -8px -4px}.monaco-hover .code:first-child,.monaco-hover p:first-child,.monaco-hover ul:first-child{margin-top:0}.monaco-hover .code:last-child,.monaco-hover p:last-child,.monaco-hover ul:last-child{margin-bottom:0}.monaco-hover ol,.monaco-hover ul{padding-left:20px}.monaco-hover li>p{margin-bottom:0}.monaco-hover li>ul{margin-top:0}.monaco-hover code{border-radius:3px;padding:0 .4em}.monaco-hover .monaco-tokenized-source{white-space:var(--vscode-hover-sourceWhiteSpace,pre-wrap)}.monaco-hover .hover-row.status-bar{font-size:12px;line-height:22px}.monaco-hover .hover-row.status-bar .info{font-style:italic;padding:0 8px}.monaco-hover .hover-row.status-bar .actions{display:flex;padding:0 8px;width:100%}.monaco-hover .hover-row.status-bar .actions .action-container{cursor:pointer;margin-right:16px}.monaco-hover .hover-row.status-bar .actions .action-container .action .icon{padding-right:4px}.monaco-hover .hover-row.status-bar .actions .action-container a{color:var(--vscode-textLink-foreground);text-decoration:var(--text-link-decoration)}.monaco-hover .markdown-hover .hover-contents .codicon{color:inherit;font-size:inherit;vertical-align:middle}.monaco-hover .hover-contents a.code-link,.monaco-hover .hover-contents a.code-link:hover{color:inherit}.monaco-hover .hover-contents a.code-link:before{content:\"(\"}.monaco-hover .hover-contents a.code-link:after{content:\")\"}.monaco-hover .hover-contents a.code-link>span{border-bottom:1px solid transparent;color:var(--vscode-textLink-foreground);text-decoration:underline;text-underline-position:under}.monaco-hover .hover-contents a.code-link>span:hover{color:var(--vscode-textLink-activeForeground)}.monaco-hover .markdown-hover .hover-contents:not(.code-hover-contents):not(.html-hover-contents) span{display:inline-block;margin-bottom:4px}.monaco-hover-content .action-container a{-webkit-user-select:none;user-select:none}.monaco-hover-content .action-container.disabled{cursor:default;opacity:.4;pointer-events:none}";
 n(css,{});
 export { css, css as default };

package/vscode/src/vs/base/browser/ui/hover/hoverWidget.js

@@ -40,6 +40,8 @@ class HoverAction extends Disposable {
     }
     constructor(parent, actionOptions, keybindingLabel) {
         super();
+        this.actionLabel = actionOptions.label;
+        this.actionKeybindingLabel = keybindingLabel;
         this.actionContainer = append(parent, $('div.action-container'));
         this.actionContainer.setAttribute('tabindex', '0');
         this.action = append(this.actionContainer, $('a.action'));

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

@@ -147,7 +147,7 @@ class IconLabel extends Disposable {
             setupNativeHover(htmlElement, tooltip);
         }
         else {
-            const hoverDisposable = getBaseLayerHoverDelegate().setupUpdatableHover(this.hoverDelegate, htmlElement, tooltip);
+            const hoverDisposable = getBaseLayerHoverDelegate().setupManagedHover(this.hoverDelegate, htmlElement, tooltip);
             if (hoverDisposable) {
                 this.customHovers.set(htmlElement, hoverDisposable);
             }

package/vscode/src/vs/base/browser/ui/iconLabel/simpleIconLabel.js

@@ -11,7 +11,7 @@ class SimpleIconLabel {
     }
     set title(title) {
         if (!this.hover && title) {
-            this.hover = getBaseLayerHoverDelegate().setupUpdatableHover(getDefaultHoverDelegate('mouse'), this._container, title);
+            this.hover = getBaseLayerHoverDelegate().setupManagedHover(getDefaultHoverDelegate('mouse'), this._container, title);
         }
         else if (this.hover) {
             this.hover.update(title);

package/vscode/src/vs/base/browser/ui/inputbox/inputBox.js

@@ -127,7 +127,7 @@ class InputBox extends Widget {
     setTooltip(tooltip) {
         this.tooltip = tooltip;
         if (!this.hover) {
-            this.hover = this._register(getBaseLayerHoverDelegate().setupUpdatableHover(getDefaultHoverDelegate('mouse'), this.input, tooltip));
+            this.hover = this._register(getBaseLayerHoverDelegate().setupManagedHover(getDefaultHoverDelegate('mouse'), this.input, tooltip));
         }
         else {
             this.hover.update(tooltip);

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

@@ -26,7 +26,7 @@ class KeybindingLabel extends Disposable {
         if (labelForeground) {
             this.domNode.style.color = labelForeground;
         }
-        this.hover = this._register(getBaseLayerHoverDelegate().setupUpdatableHover(getDefaultHoverDelegate('mouse'), this.domNode, ''));
+        this.hover = this._register(getBaseLayerHoverDelegate().setupManagedHover(getDefaultHoverDelegate('mouse'), this.domNode, ''));
         this.didEverRender = false;
         container.appendChild(this.domNode);
     }

package/vscode/src/vs/base/browser/ui/list/listView.js

@@ -787,7 +787,7 @@ class ListView {
             const container = getDragImageContainer(this.domNode);
             container.appendChild(dragImage);
             event.dataTransfer.setDragImage(dragImage, -10, -10);
-            setTimeout(() => container.removeChild(dragImage), 0);
+            setTimeout(() => dragImage.remove(), 0);
         }
         this.domNode.classList.add('dragging');
         this.currentDragData = ( new ElementsDragAndDropData(elements));
@@ -1075,7 +1075,7 @@ class ListView {
         renderer.disposeElement?.(item.element, index, row.templateData, undefined);
         this.virtualDelegate.setDynamicHeight?.(item.element, item.size);
         item.lastDynamicHeightWidth = this.renderWidth;
-        this.rowsContainer.removeChild(row.domNode);
+        row.domNode.remove();
         this.cache.release(row);
         return item.size - size;
     }
@@ -1095,9 +1095,7 @@ class ListView {
             }
         }
         this.items = [];
-        if (this.domNode && this.domNode.parentNode) {
-            this.domNode.parentNode.removeChild(this.domNode);
-        }
+        this.domNode?.remove();
         this.dragOverAnimationDisposable?.dispose();
         this.disposables.dispose();
     }

package/vscode/src/vs/base/browser/ui/list/rowCache.js

@@ -1,11 +1,4 @@
 import { $ } from '../../dom.js';
-function removeFromParent(element) {
-    try {
-        element.parentElement?.removeChild(element);
-    }
-    catch (e) {
-    }
-}
 class RowCache {
     constructor(renderers) {
         this.renderers = renderers;
@@ -67,7 +60,7 @@ class RowCache {
     }
     doRemoveNode(domNode) {
         domNode.classList.remove('scrolling');
-        removeFromParent(domNode);
+        domNode.remove();
     }
     getTemplateCache(templateId) {
         let result = this.cache.get(templateId);

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

@@ -309,7 +309,7 @@ class Sash extends Disposable {
         };
         const onPointerUp = (e) => {
             EventHelper.stop(e, false);
-            this.el.removeChild(style);
+            style.remove();
             this.el.classList.remove('active');
             this._onDidEnd.fire();
             disposables.dispose();

package/vscode/src/vs/base/browser/ui/selectBox/selectBoxCustom.js

@@ -86,7 +86,7 @@ class SelectBoxList extends Disposable {
     }
     setTitle(title) {
         if (!this._hover && title) {
-            this._hover = this._register(getBaseLayerHoverDelegate().setupUpdatableHover(getDefaultHoverDelegate('mouse'), this.selectElement, title));
+            this._hover = this._register(getBaseLayerHoverDelegate().setupManagedHover(getDefaultHoverDelegate('mouse'), this.selectElement, title));
         }
         else if (this._hover) {
             this._hover.update(title);
@@ -349,11 +349,7 @@ class SelectBoxList extends Disposable {
         this.layoutSelectDropDown(preLayoutPosition);
         return {
             dispose: () => {
-                try {
-                    container.removeChild(this.selectDropDownContainer);
-                }
-                catch (error) {
-                }
+                this.selectDropDownContainer.remove();
             }
         };
     }
@@ -403,8 +399,8 @@ class SelectBoxList extends Disposable {
                     && maxVisibleOptionsAbove > maxVisibleOptionsBelow
                     && this.options.length > maxVisibleOptionsBelow) {
                     this._dropDownPosition = AnchorPosition.ABOVE;
-                    this.selectDropDownContainer.removeChild(this.selectDropDownListContainer);
-                    this.selectDropDownContainer.removeChild(this.selectionDetailsPane);
+                    this.selectDropDownListContainer.remove();
+                    this.selectionDetailsPane.remove();
                     this.selectDropDownContainer.appendChild(this.selectionDetailsPane);
                     this.selectDropDownContainer.appendChild(this.selectDropDownListContainer);
                     this.selectionDetailsPane.classList.remove('border-top');
@@ -412,8 +408,8 @@ class SelectBoxList extends Disposable {
                 }
                 else {
                     this._dropDownPosition = AnchorPosition.BELOW;
-                    this.selectDropDownContainer.removeChild(this.selectDropDownListContainer);
-                    this.selectDropDownContainer.removeChild(this.selectionDetailsPane);
+                    this.selectDropDownListContainer.remove();
+                    this.selectionDetailsPane.remove();
                     this.selectDropDownContainer.appendChild(this.selectDropDownListContainer);
                     this.selectDropDownContainer.appendChild(this.selectionDetailsPane);
                     this.selectionDetailsPane.classList.remove('border-bottom');
@@ -601,7 +597,7 @@ class SelectBoxList extends Disposable {
                 const child = element.childNodes.item(i);
                 const tagName = child.tagName && child.tagName.toLowerCase();
                 if (tagName === 'img') {
-                    element.removeChild(child);
+                    child.remove();
                 }
                 else {
                     cleanRenderedMarkdown(child);

package/vscode/src/vs/base/browser/ui/splitview/paneview.js

@@ -264,7 +264,7 @@ class PaneDraggable extends Disposable {
         }
         const dragImage = append(this.pane.element.ownerDocument.body, $('.monaco-drag-image', {}, this.pane.draggableElement.textContent || ''));
         e.dataTransfer.setDragImage(dragImage, -10, -10);
-        setTimeout(() => this.pane.element.ownerDocument.body.removeChild(dragImage), 0);
+        setTimeout(() => dragImage.remove(), 0);
         this.context.draggable = this;
     }
     onDragEnter(e) {

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

@@ -561,7 +561,7 @@ class SplitView extends Disposable {
                 this.viewContainer.insertBefore(container, this.viewContainer.children.item(index));
             }
             const onChangeDisposable = view.onDidChange(size => this.onViewChange(item, size));
-            const containerDisposable = toDisposable(() => this.viewContainer.removeChild(container));
+            const containerDisposable = toDisposable(() => container.remove());
             const disposable = combinedDisposable(onChangeDisposable, containerDisposable);
             let viewSize;
             if (typeof size === 'number') {

package/vscode/src/vs/base/browser/ui/table/tableWidget.js

@@ -90,7 +90,7 @@ class ColumnHeader extends Disposable {
         this.onDidLayout = this._onDidLayout.event;
         this.element = $('.monaco-table-th', { 'data-col-index': index }, column.label);
         if (column.tooltip) {
-            this._register(getBaseLayerHoverDelegate().setupUpdatableHover(getDefaultHoverDelegate('mouse'), this.element, column.tooltip));
+            this._register(getBaseLayerHoverDelegate().setupManagedHover(getDefaultHoverDelegate('mouse'), this.element, column.tooltip));
         }
     }
     layout(size) {

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

@@ -78,7 +78,7 @@ class Toggle extends Widget {
             classes.push('checked');
         }
         this.domNode = document.createElement('div');
-        this._hover = this._register(getBaseLayerHoverDelegate().setupUpdatableHover(opts.hoverDelegate ?? getDefaultHoverDelegate('mouse'), this.domNode, this._opts.title));
+        this._hover = this._register(getBaseLayerHoverDelegate().setupManagedHover(opts.hoverDelegate ?? getDefaultHoverDelegate('mouse'), this.domNode, this._opts.title));
         this.domNode.classList.add(...classes);
         if (!this._opts.notFocusable) {
             this.domNode.tabIndex = 0;

package/vscode/src/vs/base/browser/ui/toolbar/toolbar.d.ts

@@ -25,6 +25,14 @@ interface IToolBarOptions {
      * If true, toggled primary items are highlighted with a background color.
      */
     highlightToggledItems?: boolean;
+    /**
+     * Render action with icons (default: `true`)
+     */
+    icon?: boolean;
+    /**
+     * Render action with label (default: `false`)
+     */
+    label?: boolean;
 }
 /**
  * A widget that combines an action bar for primary actions and a dropdown for secondary actions.
@@ -36,7 +44,6 @@ declare class ToolBar extends Disposable {
     private toggleMenuActionViewItem;
     private submenuActionViewItems;
     private hasSecondaryActions;
-    private readonly lookupKeybindings;
     private readonly element;
     private _onDidChangeDropdownVisibility;
     readonly onDidChangeDropdownVisibility: Event<boolean>;

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

@@ -19,7 +19,6 @@ class ToolBar extends Disposable {
         this.disposables = this._register(( (new DisposableStore())));
         options.hoverDelegate = options.hoverDelegate ?? this._register(createInstantHoverDelegate());
         this.options = options;
-        this.lookupKeybindings = typeof this.options.getKeyBinding === 'function';
         this.toggleMenuAction = this._register(( (new ToggleMenuAction(() => this.toggleMenuActionViewItem?.show(), options.toggleMenuTitle))));
         this.element = document.createElement('div');
         this.element.className = 'monaco-toolbar';
@@ -121,14 +120,14 @@ class ToolBar extends Disposable {
             primaryActionsToSet.push(this.toggleMenuAction);
         }
         primaryActionsToSet.forEach(action => {
-            this.actionBar.push(action, { icon: true, label: false, keybinding: this.getKeybindingLabel(action) });
+            this.actionBar.push(action, { icon: this.options.icon ?? true, label: this.options.label ?? false, keybinding: this.getKeybindingLabel(action) });
         });
     }
     isEmpty() {
         return this.actionBar.isEmpty();
     }
     getKeybindingLabel(action) {
-        const key = this.lookupKeybindings ? this.options.getKeyBinding?.(action) : undefined;
+        const key = this.options.getKeyBinding?.(action);
         return key?.getLabel() ?? undefined;
     }
     clear() {

package/vscode/src/vs/base/browser/ui/tree/abstractTree.js

@@ -603,7 +603,7 @@ class FindWidget extends Disposable {
         this._onDidDisable = ( (new Emitter()));
         this.onDidDisable = this._onDidDisable.event;
         container.appendChild(this.elements.root);
-        this._register(toDisposable(() => container.removeChild(this.elements.root)));
+        this._register(toDisposable(() => this.elements.root.remove()));
         const styles = options?.styles ?? unthemedFindWidgetStyles;
         if (styles.listFilterWidgetBackground) {
             this.elements.root.style.backgroundColor = styles.listFilterWidgetBackground;

package/vscode/src/vs/base/browser/ui/tree/asyncDataTree.js

@@ -398,9 +398,6 @@ class AsyncDataTree {
     resort(element = this.root.element, recursive = true) {
         this.tree.resort(this.getDataNode(element), recursive);
     }
-    hasElement(element) {
-        return this.tree.hasElement(this.getDataNode(element));
-    }
     hasNode(element) {
         return element === this.root.element || ( this.nodes.has(element));
     }

package/vscode/src/vs/base/common/assert.js

@@ -1,4 +1,4 @@
-import { BugIndicatingError, onUnexpectedError } from './errors.js';
+import { onUnexpectedError, BugIndicatingError } from './errors.js';
 function ok(value, message) {
     if (!value) {
         throw ( new Error(message ? `Assertion failed (${message})` : 'Assertion Failed'));

package/vscode/src/vs/base/common/collections.js

@@ -1,3 +1,4 @@
+var _a;
 function groupBy(data, groupFn) {
     const result = Object.create(null);
     for (const element of data) {
@@ -49,4 +50,51 @@ function intersection(setA, setB) {
     }
     return result;
 }
-export { diffMaps, diffSets, groupBy, intersection };
+class SetWithKey {
+    static { _a = Symbol.toStringTag; }
+    constructor(values, toKey) {
+        this.toKey = toKey;
+        this._map = ( new Map());
+        this[_a] = 'SetWithKey';
+        for (const value of values) {
+            this.add(value);
+        }
+    }
+    get size() {
+        return this._map.size;
+    }
+    add(value) {
+        const key = this.toKey(value);
+        this._map.set(key, value);
+        return this;
+    }
+    delete(value) {
+        return this._map.delete(this.toKey(value));
+    }
+    has(value) {
+        return ( this._map.has(this.toKey(value)));
+    }
+    *entries() {
+        for (const entry of ( this._map.values())) {
+            yield [entry, entry];
+        }
+    }
+    keys() {
+        return ( this.values());
+    }
+    *values() {
+        for (const entry of ( this._map.values())) {
+            yield entry;
+        }
+    }
+    clear() {
+        this._map.clear();
+    }
+    forEach(callbackfn, thisArg) {
+        this._map.forEach(entry => callbackfn.call(thisArg, entry, entry, this));
+    }
+    [Symbol.iterator]() {
+        return ( this.values());
+    }
+}
+export { SetWithKey, diffMaps, diffSets, groupBy, intersection };

package/vscode/src/vs/base/common/equals.js

@@ -6,11 +6,61 @@ function itemsEquals(itemEquals = strictEquals) {
 function itemEquals() {
     return (a, b) => a.equals(b);
 }
-function equalsIfDefined(v1, v2, equals) {
-    if (!v1 || !v2) {
-        return v1 === v2;
+function equalsIfDefined(equalsOrV1, v2, equals) {
+    if (equals !== undefined) {
+        const v1 = equalsOrV1;
+        if (v1 === undefined || v1 === null || v2 === undefined || v2 === null) {
+            return v2 === v1;
+        }
+        return equals(v1, v2);
+    }
+    else {
+        const equals = equalsOrV1;
+        return (v1, v2) => {
+            if (v1 === undefined || v1 === null || v2 === undefined || v2 === null) {
+                return v2 === v1;
+            }
+            return equals(v1, v2);
+        };
+    }
+}
+function structuralEquals(a, b) {
+    if (a === b) {
+        return true;
+    }
+    if (Array.isArray(a) && Array.isArray(b)) {
+        if (a.length !== b.length) {
+            return false;
+        }
+        for (let i = 0; i < a.length; i++) {
+            if (!structuralEquals(a[i], b[i])) {
+                return false;
+            }
+        }
+        return true;
+    }
+    if (a && typeof a === 'object' && b && typeof b === 'object') {
+        if (Object.getPrototypeOf(a) === Object.prototype && Object.getPrototypeOf(b) === Object.prototype) {
+            const aObj = a;
+            const bObj = b;
+            const keysA = ( Object.keys(aObj));
+            const keysB = ( Object.keys(bObj));
+            const keysBSet = ( new Set(keysB));
+            if (keysA.length !== keysB.length) {
+                return false;
+            }
+            for (const key of keysA) {
+                if (!( keysBSet.has(key))) {
+                    return false;
+                }
+                if (!structuralEquals(aObj[key], bObj[key])) {
+                    return false;
+                }
+            }
+            return true;
+        }
     }
-    return equals(v1, v2);
+    return false;
 }
 function getStructuralKey(t) {
     return JSON.stringify(toNormalizedJsonStructure(t));
@@ -41,4 +91,4 @@ function toNormalizedJsonStructure(t) {
     }
     return t;
 }
-export { equalsIfDefined, getStructuralKey, itemEquals, itemsEquals, strictEquals };
+export { equalsIfDefined, getStructuralKey, itemEquals, itemsEquals, strictEquals, structuralEquals };