@codingame/monaco-vscode-api 3.2.3 → 4.0.0

package/service-override/tools/editor.js

@@ -25,6 +25,85 @@ import { IContextKeyService } from '../../vscode/src/vs/platform/contextkey/comm
 import { mainWindow } from '../../vscode/src/vs/base/browser/window.js';
 import { unsupported } from '../../tools.js';
 var StandaloneEditorGroup_1;
+class EmptyEditorGroup {
+    constructor() {
+        this.isTransient = () => false;
+        this.windowId = mainWindow.vscodeWindowId;
+        this.createEditorActions = unsupported;
+        this.onDidFocus = Event.None;
+        this.onDidOpenEditorFail = Event.None;
+        this.whenRestored = Promise.resolve();
+        this.disposed = false;
+        this.setActive = unsupported;
+        this.notifyIndexChanged = unsupported;
+        this.relayout = unsupported;
+        this.dispose = unsupported;
+        this.toJSON = unsupported;
+        this.minimumWidth = 0;
+        this.maximumWidth = Number.POSITIVE_INFINITY;
+        this.minimumHeight = 0;
+        this.maximumHeight = Number.POSITIVE_INFINITY;
+        this.onDidChange = Event.None;
+        this.layout = unsupported;
+        this.onDidModelChange = Event.None;
+        this.onWillDispose = Event.None;
+        this.onDidActiveEditorChange = Event.None;
+        this.onWillCloseEditor = Event.None;
+        this.onDidCloseEditor = Event.None;
+        this.onWillMoveEditor = Event.None;
+        this.onWillOpenEditor = Event.None;
+        this.id = 0;
+        this.index = 0;
+        this.label = 'main';
+        this.ariaLabel = 'main';
+        this.activeEditorPane = undefined;
+        this.activeEditor = null;
+        this.previewEditor = null;
+        this.count = 0;
+        this.isEmpty = false;
+        this.isLocked = false;
+        this.stickyCount = 0;
+        this.editors = [];
+        this.getEditors = () => [];
+        this.findEditors = () => [];
+        this.getEditorByIndex = () => undefined;
+        this.getIndexOfEditor = unsupported;
+        this.openEditor = unsupported;
+        this.openEditors = unsupported;
+        this.isPinned = () => false;
+        this.isSticky = () => false;
+        this.isActive = () => false;
+        this.contains = () => false;
+        this.moveEditor = unsupported;
+        this.moveEditors = unsupported;
+        this.copyEditor = unsupported;
+        this.copyEditors = unsupported;
+        this.closeEditor = unsupported;
+        this.closeEditors = unsupported;
+        this.closeAllEditors = unsupported;
+        this.replaceEditors = unsupported;
+        this.pinEditor = () => { };
+        this.stickEditor = () => { };
+        this.unstickEditor = () => { };
+        this.lock = () => { };
+        this.isFirst = unsupported;
+        this.isLast = unsupported;
+    }
+    get groupsView() {
+        return unsupported();
+    }
+    notifyLabelChanged() { }
+    get titleHeight() {
+        return unsupported();
+    }
+    get element() {
+        return unsupported();
+    }
+    get scopedContextKeyService() { return StandaloneServices.get(IContextKeyService); }
+    focus() {
+    }
+}
+const fakeActiveGroup = new EmptyEditorGroup();
 class SimpleEditorPane {
     constructor(editor) {
         this.editor = editor;
@@ -34,7 +113,7 @@ class SimpleEditorPane {
         this.onDidBlur = Event.None;
         this.input = undefined;
         this.options = undefined;
-        this.group = undefined;
+        this.group = fakeActiveGroup;
         this.scopedContextKeyService = undefined;
         this.getViewState = unsupported;
         this.isVisible = unsupported;
@@ -164,6 +243,7 @@ let StandaloneEditorGroup = StandaloneEditorGroup_1 = class StandaloneEditorGrou
         this.editor = editor;
         this.scopedContextKeyService = scopedContextKeyService;
         this.active = false;
+        this.isTransient = () => false;
         this.windowId = mainWindow.vscodeWindowId;
         this.onDidFocus = this.editor.onDidFocusEditorWidget;
         this.onDidOpenEditorFail = Event.None;
@@ -477,7 +557,6 @@ let MonacoDelegateEditorGroupsService = class MonacoDelegateEditorGroupsService
         return this.delegate.createAuxiliaryEditorPart(options);
     }
     get mainPart() { return this.delegate.mainPart; }
-    get activePart() { return this.delegate.activePart; }
     getPart(container) {
         return this.delegate.getPart(container);
     }
@@ -504,4 +583,4 @@ let MonacoDelegateEditorGroupsService = class MonacoDelegateEditorGroupsService
 MonacoDelegateEditorGroupsService = __decorate([
     ( __param(1, IInstantiationService))
 ], MonacoDelegateEditorGroupsService);
-export { MonacoDelegateEditorGroupsService, MonacoEditorService, wrapOpenEditor };
+export { MonacoDelegateEditorGroupsService, MonacoEditorService, fakeActiveGroup, wrapOpenEditor };

package/service-override/tools/views.d.ts

@@ -16,6 +16,7 @@ import { EditorInput, IEditorCloseHandler } from '../../vscode/src/vs/workbench/
 import { IEditorOpenContext, EditorInputCapabilities, Verbosity, IEditorSerializer } from '../../vscode/src/vs/workbench/common/editor.js';
 import { EditorPane } from '../../vscode/src/vs/workbench/browser/parts/editor/editorPane.js';
 import '../../vscode/src/vs/editor/editor.api.js';
+import { IEditorGroup } from '../../vscode/src/vs/workbench/services/editor/common/editorGroupsService.js';
 
 type Label = string | {
     short: string;
@@ -61,7 +62,7 @@ declare abstract class SimpleEditorInput extends EditorInput {
     isDirty(): boolean;
     setDirty(dirty: boolean): void;
 }
-declare function registerEditorPane<Services extends BrandedService[]>(typeId: string, name: string, ctor: new (...services: Services) => EditorPane, inputCtors: (new (...args: any[]) => EditorInput)[]): IDisposable;
+declare function registerEditorPane<Services extends BrandedService[]>(typeId: string, name: string, ctor: new (group: IEditorGroup, ...services: Services) => EditorPane, inputCtors: (new (...args: any[]) => EditorInput)[]): IDisposable;
 declare function registerEditor(globPattern: string, editorInfo: RegisteredEditorInfo, editorOptions: RegisteredEditorOptions, factory: EditorInputFactoryObject): IDisposable;
 declare function registerEditorSerializer<Services extends BrandedService[]>(editorTypeId: string, ctor: {
     new (...Services: Services): IEditorSerializer;

package/service-override/tools/views.js

@@ -25,13 +25,17 @@ import { IThemeService } from '../../vscode/src/vs/platform/theme/common/themeSe
 import { DomScrollableElement } from '../../vscode/src/vs/base/browser/ui/scrollbar/scrollableElement.js';
 import { assertIsDefined, assertAllDefined } from '../../vscode/src/vs/base/common/types.js';
 export { ConfirmResult } from '../../override/vs/platform/dialogs/common/dialogs.js';
+export { AbstractResourceEditorInput } from '../../vscode/src/vs/workbench/common/editor/resourceEditorInput.js';
+export { AbstractTextResourceEditorInput } from '../../vscode/src/vs/workbench/common/editor/textResourceEditorInput.js';
 import { IWorkbenchLayoutService } from '../../vscode/src/vs/workbench/services/layout/browser/layoutService.js';
 export { Parts } from '../../vscode/src/vs/workbench/services/layout/browser/layoutService.js';
 import { StandaloneServices } from '../../vscode/src/vs/editor/standalone/browser/standaloneServices.js';
+export { SplitView } from '../../vscode/src/vs/base/browser/ui/splitview/splitview.js';
+import { fakeActiveGroup } from './editor.js';
 import { withReadyServices } from '../../services.js';
 class InjectedEditorPane extends EditorPane {
     constructor(id) {
-        super(id, StandaloneServices.get(ITelemetryService), StandaloneServices.get(IThemeService), StandaloneServices.get(IStorageService));
+        super(id, fakeActiveGroup, StandaloneServices.get(ITelemetryService), StandaloneServices.get(IThemeService), StandaloneServices.get(IStorageService));
     }
 }
 class SimpleEditorPane extends InjectedEditorPane {

package/services.js

@@ -2,7 +2,7 @@ import { __decorate, __param } from './external/tslib/tslib.es6.js';
 import './missing-services.js';
 import './contributions.js';
 import './vscode/src/vs/editor/browser/coreCommands.js';
-import './vscode/src/vs/editor/browser/widget/codeEditorWidget.js';
+import './vscode/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.js';
 import './vscode/src/vs/editor/browser/widget/diffEditor/diffEditor.contribution.js';
 import './vscode/src/vs/editor/contrib/anchorSelect/browser/anchorSelect.js';
 import './vscode/src/vs/editor/contrib/bracketMatching/browser/bracketMatching.js';
@@ -42,6 +42,7 @@ import './vscode/src/vs/editor/contrib/multicursor/browser/multicursor.js';
 import './vscode/src/vs/editor/contrib/inlineEdit/browser/inlineEdit.contribution.js';
 import './vscode/src/vs/editor/contrib/parameterHints/browser/parameterHints.js';
 import './vscode/src/vs/editor/contrib/rename/browser/rename.js';
+import './vscode/src/vs/editor/contrib/sectionHeaders/browser/sectionHeaders.js';
 import './vscode/src/vs/editor/contrib/semanticTokens/browser/documentSemanticTokens.js';
 import './vscode/src/vs/editor/contrib/semanticTokens/browser/viewportSemanticTokens.js';
 import './vscode/src/vs/editor/contrib/smartSelect/browser/smartSelect.js';
@@ -149,9 +150,9 @@ async function initialize(overrides, container = document.body, configuration =
     initialize$1(container, configuration, env);
     const instantiationService = StandaloneServices.initialize({
         [( IProductService.toString())]: mixin({
-            version: "1.87.2",
+            version: "1.88.0",
             quality: 'stable',
-            commit: "863d2581ecda6849923a2118d93a088b0745d9d6",
+            commit: "5c3e652f63e798a5ac2f31ffd0d863669328dc4c",
             nameShort: 'Code - OSS',
             nameLong: 'Code - OSS',
             applicationName: 'code-oss',

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

@@ -594,12 +594,6 @@ function getActiveWindow() {
     const document = getActiveDocument();
     return (document.defaultView?.window ?? mainWindow);
 }
-function focusWindow(element) {
-    const window = getWindow(element);
-    if (!window.document.hasFocus()) {
-        window.focus();
-    }
-}
 const globalStylesheets = ( new Map());
 function isGlobalStylesheet(node) {
     return ( globalStylesheets.has(node));
@@ -1543,4 +1537,4 @@ function trackAttributes(from, to, filter) {
     }));
     return disposables;
 }
-export { $, DetectedFullscreenMode, Dimension, DragAndDropObserver, EventHelper, EventType, ModifierKeyEmitter, Namespace, WindowIdleValue, WindowIntervalTimer, addDisposableGenericMouseDownListener, addDisposableGenericMouseUpListener, addDisposableListener, addDisposableThrottledListener, addStandardDisposableGenericMouseDownListener, addStandardDisposableGenericMouseUpListener, addStandardDisposableListener, after, animate, append, asCSSPropertyValue, asCSSUrl, asCssValueWithDefault, basicMarkupHtmlTags, clearNode, cloneGlobalStylesheets, computeScreenAwareSize, copyAttributes, createCSSRule, createLinkElement, createMetaElement, createStyleSheet, createStyleSheet2, detectFullscreen, disposableWindowInterval, finalHandler, findParentWithClass, focusWindow, getActiveDocument, getActiveElement, getActiveWindow, getClientArea, getComputedStyle, getContentHeight, getContentWidth, getDocument, getDomNodePagePosition, getDomNodeZoomLevel, getLargestChildWidth, getShadowRoot, getTopLeftOffset, getTotalHeight, getTotalScrollWidth, getTotalWidth, getWindow, getWindowById, getWindowId, getWindows, getWindowsCount, h, hasParentWithClass, hasWindow, hide, hookDomPurifyHrefAndSrcSanitizer, isActiveDocument, isActiveElement, isAncestor, isAncestorOfActiveElement, isAncestorUsingFlowTo, isDragEvent, isEventLike, isGlobalStylesheet, isInShadowDOM, isKeyboardEvent, isMouseEvent, isPointerEvent, isShadowRoot, measure, modify, multibyteAwareBtoa, onDidRegisterWindow, onDidUnregisterWindow, onWillUnregisterWindow, position, prepend, registerWindow, removeCSSRulesContainingSelector, reset, restoreParentsScrollTop, runAtThisOrScheduleAtNextAnimationFrame, runWhenWindowIdle, safeInnerHtml, saveParentsScrollTop, scheduleAtNextAnimationFrame, setParentFlowTo, setVisibility, sharedMutationObserver, show, size, trackAttributes, trackFocus, triggerDownload, triggerUpload, windowOpenNoOpener, windowOpenPopup, windowOpenWithSuccess };
+export { $, DetectedFullscreenMode, Dimension, DragAndDropObserver, EventHelper, EventType, ModifierKeyEmitter, Namespace, WindowIdleValue, WindowIntervalTimer, addDisposableGenericMouseDownListener, addDisposableGenericMouseUpListener, addDisposableListener, addDisposableThrottledListener, addStandardDisposableGenericMouseDownListener, addStandardDisposableGenericMouseUpListener, addStandardDisposableListener, after, animate, append, asCSSPropertyValue, asCSSUrl, asCssValueWithDefault, basicMarkupHtmlTags, clearNode, cloneGlobalStylesheets, computeScreenAwareSize, copyAttributes, createCSSRule, createLinkElement, createMetaElement, createStyleSheet, createStyleSheet2, detectFullscreen, disposableWindowInterval, finalHandler, findParentWithClass, getActiveDocument, getActiveElement, getActiveWindow, getClientArea, getComputedStyle, getContentHeight, getContentWidth, getDocument, getDomNodePagePosition, getDomNodeZoomLevel, getLargestChildWidth, getShadowRoot, getTopLeftOffset, getTotalHeight, getTotalScrollWidth, getTotalWidth, getWindow, getWindowById, getWindowId, getWindows, getWindowsCount, h, hasParentWithClass, hasWindow, hide, hookDomPurifyHrefAndSrcSanitizer, isActiveDocument, isActiveElement, isAncestor, isAncestorOfActiveElement, isAncestorUsingFlowTo, isDragEvent, isEventLike, isGlobalStylesheet, isInShadowDOM, isKeyboardEvent, isMouseEvent, isPointerEvent, isShadowRoot, measure, modify, multibyteAwareBtoa, onDidRegisterWindow, onDidUnregisterWindow, onWillUnregisterWindow, position, prepend, registerWindow, removeCSSRulesContainingSelector, reset, restoreParentsScrollTop, runAtThisOrScheduleAtNextAnimationFrame, runWhenWindowIdle, safeInnerHtml, saveParentsScrollTop, scheduleAtNextAnimationFrame, setParentFlowTo, setVisibility, sharedMutationObserver, show, size, trackAttributes, trackFocus, triggerDownload, triggerUpload, windowOpenNoOpener, windowOpenPopup, windowOpenWithSuccess };

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

@@ -0,0 +1,3 @@
+import { isWindows, isMacintosh } from '../common/platform.js';
+const DEFAULT_FONT_FAMILY = isWindows ? '"Segoe WPC", "Segoe UI", sans-serif' : isMacintosh ? '-apple-system, BlinkMacSystemFont, sans-serif' : 'system-ui, "Ubuntu", "Droid Sans", sans-serif';
+export { DEFAULT_FONT_FAMILY };

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

@@ -86,7 +86,7 @@ class StandardKeyboardEvent {
         this.shiftKey = e.shiftKey;
         this.altKey = e.altKey;
         this.metaKey = e.metaKey;
-        this.altGraphKey = e.getModifierState('AltGraph');
+        this.altGraphKey = e.getModifierState?.('AltGraph');
         this.keyCode = extractKeyCode(e);
         this.code = e.code;
         this.ctrlKey = this.ctrlKey || this.keyCode === 5 ;

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

@@ -179,8 +179,8 @@ function renderMarkdown(markdown, options = {}, markedOptions = {}) {
     }
     markedOptions.renderer = renderer;
     let value = markdown.value ?? '';
-    if (value.length > 100000) {
-        value = `${value.substr(0, 100000)}…`;
+    if (value.length > 100_000) {
+        value = `${value.substr(0, 100_000)}…`;
     }
     if (markdown.supportThemeIcons) {
         value = markdownEscapeEscapedIcons(value);
@@ -398,8 +398,8 @@ function renderStringAsPlaintext(string) {
 }
 function renderMarkdownAsPlaintext(markdown) {
     let value = markdown.value ?? '';
-    if (value.length > 100000) {
-        value = `${value.substr(0, 100000)}…`;
+    if (value.length > 100_000) {
+        value = `${value.substr(0, 100_000)}…`;
     }
     const html = marked_1.parse(value, { renderer: plainTextRenderer.value }).replace(/&(#\d+|[a-zA-Z]+);/g, m => unescapeInfo.get(m) ?? m);
     return ( sanitizeRenderedMarkdown({ isTrusted: false }, html).toString());

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

@@ -169,12 +169,23 @@ class Gesture extends Disposable {
                     return;
                 }
             }
+            const targets = [];
             for (const target of this.targets) {
                 if (target.contains(event.initialTarget)) {
-                    target.dispatchEvent(event);
-                    this.dispatched = true;
+                    let depth = 0;
+                    let now = event.initialTarget;
+                    while (now && now !== target) {
+                        depth++;
+                        now = now.parentElement;
+                    }
+                    targets.push([depth, target]);
                 }
             }
+            targets.sort((a, b) => a[0] - b[0]);
+            for (const [_, target] of targets) {
+                target.dispatchEvent(event);
+                this.dispatched = true;
+            }
         }
     }
     inertia(targetWindow, dispatchTo, t1, vX, dirX, x, vY, dirY, y) {

package/vscode/src/vs/base/browser/ui/actionbar/actionViewItems.d.ts

@@ -1,4 +1,4 @@
-import { IHoverDelegate } from '../iconLabel/iconHoverDelegate.js';
+import { IHoverDelegate } from '../hover/hoverDelegate.js';
 import { IToggleStyles } from '../toggle/toggle.js';
 
 interface IBaseActionViewItemOptions {

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

@@ -2,8 +2,8 @@ import { isFirefox } from '../../browser.js';
 import { DataTransfers } from '../../dnd.js';
 import { addDisposableListener, EventType, EventHelper } from '../../dom.js';
 import { Gesture, EventType as EventType$1 } from '../../touch.js';
-import { getDefaultHoverDelegate } from '../hover/hoverDelegate.js';
-import { setupCustomHover } from '../iconLabel/iconLabelHover.js';
+import { getDefaultHoverDelegate } from '../hover/hoverDelegateFactory.js';
+import { setupCustomHover } from '../hover/updatableHoverWidget.js';
 import { SelectBox } from '../selectBox/selectBox.js';
 import { Action, ActionRunner, Separator } from '../../../common/actions.js';
 import { Disposable } from '../../../common/lifecycle.js';
@@ -154,12 +154,11 @@ class BaseActionViewItem extends Disposable {
             this.element.title = title;
         }
         else {
-            if (!this.customHover) {
+            if (!this.customHover && title !== '') {
                 const hoverDelegate = this.options.hoverDelegate ?? getDefaultHoverDelegate('element');
-                this.customHover = setupCustomHover(hoverDelegate, this.element, title);
-                this._store.add(this.customHover);
+                this.customHover = this._store.add(setupCustomHover(hoverDelegate, this.element, title));
             }
-            else {
+            else if (this.customHover) {
                 this.customHover.update(title);
             }
         }

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

@@ -1,6 +1,6 @@
 import { Event } from '../../../common/event.js';
 import { IActionViewItemOptions } from './actionViewItems.js';
-import { IHoverDelegate } from '../iconLabel/iconHoverDelegate.js';
+import { IHoverDelegate } from '../hover/hoverDelegate.js';
 import { IAction, IActionRunner, IRunEvent } from '../../../common/actions.js';
 import { KeyCode } from '../../../common/keyCodes.js';
 import { IDisposable, Disposable } from '../../../common/lifecycle.js';

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

@@ -1,7 +1,7 @@
 import { addDisposableListener, EventType, trackFocus, getActiveElement, isAncestor, EventHelper, clearNode } from '../../dom.js';
 import { StandardKeyboardEvent } from '../../keyboardEvent.js';
 import { BaseActionViewItem, ActionViewItem } from './actionViewItems.js';
-import { getDefaultHoverDelegate } from '../hover/hoverDelegate.js';
+import { createInstantHoverDelegate } from '../hover/hoverDelegateFactory.js';
 import { ActionRunner, Separator } from '../../../common/actions.js';
 import { Emitter } from '../../../common/event.js';
 import { Disposable, DisposableStore, DisposableMap, dispose } from '../../../common/lifecycle.js';
@@ -30,7 +30,7 @@ class ActionBar extends Disposable {
             keyDown: this.options.triggerKeys?.keyDown ?? false,
             keys: this.options.triggerKeys?.keys ?? [3 , 10 ]
         };
-        this._hoverDelegate = options.hoverDelegate ?? this._register(getDefaultHoverDelegate('element', true));
+        this._hoverDelegate = options.hoverDelegate ?? this._register(createInstantHoverDelegate());
         if (this.options.actionRunner) {
             this._actionRunner = this.options.actionRunner;
         }

package/vscode/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.d.ts

@@ -37,6 +37,7 @@ declare class BreadcrumbsWidget {
     private _enabled;
     private _focusedItemIdx;
     private _selectedItemIdx;
+    private _pendingDimLayout;
     private _pendingLayout;
     private _dimension;
     constructor(container: HTMLElement, horizontalScrollbarSize: number, separatorIcon: ThemeIcon, styles: IBreadcrumbsWidgetStyles);

package/vscode/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.js

@@ -52,6 +52,7 @@ class BreadcrumbsWidget {
     dispose() {
         this._disposables.dispose();
         this._pendingLayout?.dispose();
+        this._pendingDimLayout?.dispose();
         this._onDidSelectItem.dispose();
         this._onDidFocusItem.dispose();
         this._onDidChangeFocus.dispose();
@@ -63,11 +64,12 @@ class BreadcrumbsWidget {
         if (dim && Dimension.equals(dim, this._dimension)) {
             return;
         }
-        this._pendingLayout?.dispose();
         if (dim) {
-            this._pendingLayout = this._updateDimensions(dim);
+            this._pendingDimLayout?.dispose();
+            this._pendingDimLayout = this._updateDimensions(dim);
         }
         else {
+            this._pendingLayout?.dispose();
             this._pendingLayout = this._updateScrollbar();
         }
     }

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

@@ -3,11 +3,12 @@ import { sanitize } from '../../dompurify/dompurify.js';
 import { StandardKeyboardEvent } from '../../keyboardEvent.js';
 import { renderMarkdown, renderStringAsPlaintext } from '../../markdownRenderer.js';
 import { Gesture, EventType as EventType$1 } from '../../touch.js';
-import { getDefaultHoverDelegate } from '../hover/hoverDelegate.js';
-import { setupCustomHover } from '../iconLabel/iconLabelHover.js';
+import { getDefaultHoverDelegate } from '../hover/hoverDelegateFactory.js';
+import { setupCustomHover } from '../hover/updatableHoverWidget.js';
 import { renderLabelWithIcons } from '../iconLabel/iconLabels.js';
 import { Action } from '../../../common/actions.js';
 import { Codicon } from '../../../common/codicons.js';
+import '../../../common/color.js';
 import { Emitter } from '../../../common/event.js';
 import { isMarkdownString, markdownStringEqual } from '../../../common/htmlContent.js';
 import { Disposable, DisposableStore } from '../../../common/lifecycle.js';
@@ -41,6 +42,9 @@ class Button extends Disposable {
             this._element.appendChild(this._labelElement);
             this._element.classList.add('monaco-text-button-with-short-label');
         }
+        if (typeof options.title === 'string') {
+            this.setTitle(options.title);
+        }
         if (typeof options.ariaLabel === 'string') {
             this._element.setAttribute('aria-label', options.ariaLabel);
         }
@@ -160,17 +164,12 @@ class Button extends Disposable {
         else if (this.options.title) {
             title = renderStringAsPlaintext(value);
         }
-        if (!this._hover) {
-            this._hover = this._register(setupCustomHover(getDefaultHoverDelegate('mouse'), this._element, title));
-        }
-        else {
-            this._hover.update(title);
-        }
+        this.setTitle(title);
         if (typeof this.options.ariaLabel === 'string') {
             this._element.setAttribute('aria-label', this.options.ariaLabel);
         }
         else if (this.options.ariaLabel) {
-            this._element.setAttribute('aria-label', this._element.title);
+            this._element.setAttribute('aria-label', title);
         }
         this._label = value;
     }
@@ -205,6 +204,14 @@ class Button extends Disposable {
     get enabled() {
         return !this._element.classList.contains('disabled');
     }
+    setTitle(title) {
+        if (!this._hover && title !== '') {
+            this._hover = this._register(setupCustomHover(this.options.hoverDelegate ?? getDefaultHoverDelegate('mouse'), this._element, title));
+        }
+        else if (this._hover) {
+            this._hover.update(title);
+        }
+    }
     focus() {
         this._element.focus();
     }