@codingame/monaco-vscode-api 1.69.24 → 1.76.0-next.2

package/dist/languageConfiguration.js

@@ -1,6 +1,6 @@
-import { b as parse, g as getNodeType } from './polyfill.js';
-import { h as ITextMateService, d as IExtensionService } from './missing-services.js';
-import { _ as __decorate, a as __param } from './workspace.js';
+import { p as parse, g as getNodeType } from './polyfill.js';
+import { f as ITextMateTokenizationService, c as IExtensionService } from './missing-services.js';
+import { _ as __decorate, a as __param } from './contextkey.js';
 import { g as getParseErrorMessage } from './jsonErrorMessages.js';
 import { r as registerExtensionFile, g as getServiceOverride$1, I as IExtensionResourceLoaderService } from './files.js';
 import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
@@ -14,7 +14,7 @@ import { Extensions } from 'monaco-editor/esm/vs/platform/jsonschemas/common/jso
 import { IndentAction } from 'monaco-editor/esm/vs/editor/common/languages/languageConfiguration.js';
 import { o as onServicesInitialized } from './tools.js';
 import { S as Services } from './services2.js';
-import { be as DEFAULT_EXTENSION } from './extHost.js';
+import { bj as DEFAULT_EXTENSION } from './extHost.js';
 import { joinPath } from 'monaco-editor/esm/vs/base/common/resources.js';
 function isStringArr(something) {
     if (!Array.isArray(something)) {
@@ -408,7 +408,7 @@ let LanguageConfigurationFileHandler = class LanguageConfigurationFileHandler ex
     }
 };
 LanguageConfigurationFileHandler = ( __decorate([
-    ( __param(0, ITextMateService)),
+    ( __param(0, ITextMateTokenizationService)),
     ( __param(1, ILanguageService)),
     ( __param(2, IExtensionResourceLoaderService)),
     ( __param(3, IExtensionService)),

package/dist/languageService.js

@@ -1,5 +1,5 @@
-import { _ as __decorate, a as __param } from './workspace.js';
-import { d as IExtensionService } from './missing-services.js';
+import { _ as __decorate, a as __param } from './contextkey.js';
+import { c as IExtensionService } from './missing-services.js';
 import { E as ExtensionsRegistry } from './tools.js';
 import { O as FILES_ASSOCIATIONS_CONFIG } from './services2.js';
 import { parse } from 'monaco-editor/esm/vs/base/common/glob.js';
@@ -168,6 +168,13 @@ const languagesExtPoint = ( ExtensionsRegistry.registerExtensionPoint({
                 }
             }
         }
+    },
+    activationEventsGenerator: (languageContributions, result) => {
+        for (const languageContribution of languageContributions) {
+            if (languageContribution.id) {
+                result.push(`onLanguage:${languageContribution.id}`);
+            }
+        }
     }
 }));
 let WorkbenchLanguageService = class WorkbenchLanguageService extends LanguageService {
@@ -225,6 +232,7 @@ let WorkbenchLanguageService = class WorkbenchLanguageService extends LanguageSe
         });
         this.onDidEncounterLanguage((languageId) => {
             this._extensionService.activateByEvent(`onLanguage:${languageId}`);
+            this._extensionService.activateByEvent(`onLanguage`);
         });
     }
     updateMime() {
@@ -234,7 +242,7 @@ let WorkbenchLanguageService = class WorkbenchLanguageService extends LanguageSe
             ( Object.keys(configuration.files.associations)).forEach(pattern => {
                 const langId = configuration.files.associations[pattern];
                 if (typeof langId !== 'string') {
-                    this.logService.warn(`Ingnoing configured 'files.associations' for '${pattern}' because its type is not a string but '${typeof langId}'`);
+                    this.logService.warn(`Ignoring configured 'files.associations' for '${pattern}' because its type is not a string but '${typeof langId}'`);
                     return;
                 }
                 const mimeType = this.getMimeType(langId) || `text/x-${langId}`;

package/dist/languages.d.ts

@@ -150,17 +150,28 @@ interface UriComponents {
     fragment: string;
 }
 
+interface ILocalizedString {
+    /**
+     * The localized value of the string.
+     */
+    value: string;
+    /**
+     * The original (non localized value of the string)
+     */
+    original: string;
+}
+
 /**
  * Type of extension.
  *
  * **NOTE**: This is defined in `platform/environment` because it can appear as a CLI argument.
  */
-declare type ExtensionKind = 'ui' | 'workspace' | 'web';
+type ExtensionKind = 'ui' | 'workspace' | 'web';
 
 interface ICommand {
     command: string;
-    title: string;
-    category?: string;
+    title: string | ILocalizedString;
+    category?: string | ILocalizedString;
 }
 interface IConfigurationProperty {
     description: string;
@@ -282,6 +293,7 @@ interface IWalkthroughStep {
 interface IWalkthrough {
     readonly id: string;
     readonly title: string;
+    readonly icon?: string;
     readonly description: string;
     readonly steps: IWalkthroughStep[];
     readonly featuredFor: string[] | undefined;
@@ -351,8 +363,8 @@ interface IExtensionCapabilities {
     readonly virtualWorkspaces?: ExtensionVirtualWorkspaceSupport;
     readonly untrustedWorkspaces?: ExtensionUntrustedWorkspaceSupport;
 }
-declare type LimitedWorkspaceSupportType = 'limited';
-declare type ExtensionUntrustedWorkspaceSupport = {
+type LimitedWorkspaceSupportType = 'limited';
+type ExtensionUntrustedWorkspaceSupport = {
     supported: true;
 } | {
     supported: false;
@@ -362,7 +374,7 @@ declare type ExtensionUntrustedWorkspaceSupport = {
     description: string;
     restrictedConfigurations?: string[];
 };
-declare type ExtensionVirtualWorkspaceSupport = boolean | {
+type ExtensionVirtualWorkspaceSupport = boolean | {
     supported: true;
 } | {
     supported: false | LimitedWorkspaceSupportType;
@@ -379,6 +391,8 @@ interface IRelaxedExtensionManifest {
     description?: string;
     main?: string;
     browser?: string;
+    preview?: boolean;
+    l10n?: string;
     icon?: string;
     categories?: string[];
     keywords?: string[];
@@ -451,8 +465,11 @@ interface IRelaxedExtensionDescription extends IRelaxedExtensionManifest {
     isUserBuiltin: boolean;
     isUnderDevelopment: boolean;
     extensionLocation: URI;
+    browserNlsBundleUris?: {
+        [language: string]: URI;
+    };
 }
-declare type IExtensionDescription = Readonly<IRelaxedExtensionDescription>;
+type IExtensionDescription = Readonly<IRelaxedExtensionDescription>;
 
 type IEditorOverrideServices = monaco.editor.IEditorOverrideServices
 

package/dist/languages.js

@@ -2,7 +2,7 @@ import './polyfill.js';
 import './missing-services.js';
 import { g as getExtensionPoint, a as ExtensionMessageCollector, c as consoleExtensionMessageHandler } from './tools.js';
 import { W as WorkbenchLanguageService } from './languageService.js';
-import { be as DEFAULT_EXTENSION } from './extHost.js';
+import { bj as DEFAULT_EXTENSION } from './extHost.js';
 import { S as Services } from './services2.js';
 import { ILanguageService } from 'monaco-editor/esm/vs/editor/common/languages/language.js';
 import { SyncDescriptor } from 'monaco-editor/esm/vs/platform/instantiation/common/descriptors.js';

package/dist/layout.js

@@ -1,16 +1,14 @@
-import { buttonForeground, buttonSeparator, buttonBackground, buttonHoverBackground, buttonSecondaryForeground, buttonSecondaryBackground, buttonSecondaryHoverBackground, buttonBorder, progressBarBackground, resolveColorValue, editorWidgetBackground, editorWidgetForeground, widgetShadow, contrastBorder, checkboxBorder, checkboxBackground, checkboxForeground, problemsErrorIconForeground, problemsWarningIconForeground, problemsInfoIconForeground, inputBackground, inputForeground, inputBorder, textLinkForeground } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
-import { E as Emitter } from './workspace.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { E as Emitter } from './contextkey.js';
+import { n } from './polyfill.js';
 import { addDisposableListener, EventType, EventHelper, trackFocus, reset, getClientArea } from 'monaco-editor/esm/vs/base/browser/dom.js';
-import { mixin } from 'monaco-editor/esm/vs/base/common/objects.js';
-import { Gesture, EventType as EventType$1 } from 'monaco-editor/esm/vs/base/browser/touch.js';
 import { renderLabelWithIcons } from 'monaco-editor/esm/vs/base/browser/ui/iconLabel/iconLabels.js';
-import { CSSIcon, Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
+import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { Gesture, EventType as EventType$1 } from 'monaco-editor/esm/vs/base/browser/touch.js';
+import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
 import { Action } from 'monaco-editor/esm/vs/base/common/actions.js';
 import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
 import { StandardKeyboardEvent } from 'monaco-editor/esm/vs/base/browser/keyboardEvent.js';
-import { Color } from 'monaco-editor/esm/vs/base/common/color.js';
-import './polyfill.js';
 import './missing-services.js';
 import { I as IWorkbenchLayoutService } from './layoutService.js';
 import { o as onServicesInitialized } from './tools.js';
@@ -18,97 +16,31 @@ import { ILayoutService } from 'monaco-editor/esm/vs/platform/layout/browser/lay
 import { SyncDescriptor } from 'monaco-editor/esm/vs/platform/instantiation/common/descriptors.js';
 import { StandaloneServices } from 'monaco-editor/esm/vs/editor/standalone/browser/standaloneServices.js';
 import { ICodeEditorService } from 'monaco-editor/esm/vs/editor/browser/services/codeEditorService.js';
-var e=[],t=[];function n(n,r){if(n&&"undefined"!=typeof document){var a,s=!0===r.prepend?"prepend":"append",d=!0===r.singleTag,i="string"==typeof r.container?document.querySelector(r.container):document.getElementsByTagName("head")[0];if(d){var u=e.indexOf(i);-1===u&&(u=e.push(i)-1,t[u]={}),a=t[u]&&t[u][s]?t[u][s]:t[u][s]=c();}else a=c();65279===n.charCodeAt(0)&&(n=n.substring(1)),a.styleSheet?a.styleSheet.cssText+=n:a.appendChild(document.createTextNode(n));}function c(){var e=document.createElement("style");if(e.setAttribute("type","text/css"),r.attributes)for(var t=( Object.keys(r.attributes)),n=0;n<t.length;n++)e.setAttribute(t[n],r.attributes[t[n]]);var a="prepend"===s?"afterbegin":"beforeend";return i.insertAdjacentElement(a,e),e}}
-function computeStyles(theme, styleMap) {
-    const styles = Object.create(null);
-    for (const key in styleMap) {
-        const value = styleMap[key];
-        if (value) {
-            styles[key] = resolveColorValue(value, theme);
-        }
-    }
-    return styles;
-}
-function attachStyler(themeService, styleMap, widgetOrCallback) {
-    function applyStyles() {
-        const styles = computeStyles(themeService.getColorTheme(), styleMap);
-        if (typeof widgetOrCallback === 'function') {
-            widgetOrCallback(styles);
-        }
-        else {
-            widgetOrCallback.style(styles);
-        }
-    }
-    applyStyles();
-    return themeService.onDidColorThemeChange(applyStyles);
-}
-function attachButtonStyler(widget, themeService, style) {
-    return attachStyler(themeService, {
-        buttonForeground: style?.buttonForeground || buttonForeground,
-        buttonSeparator: style?.buttonSeparator || buttonSeparator,
-        buttonBackground: style?.buttonBackground || buttonBackground,
-        buttonHoverBackground: style?.buttonHoverBackground || buttonHoverBackground,
-        buttonSecondaryForeground: style?.buttonSecondaryForeground || buttonSecondaryForeground,
-        buttonSecondaryBackground: style?.buttonSecondaryBackground || buttonSecondaryBackground,
-        buttonSecondaryHoverBackground: style?.buttonSecondaryHoverBackground || buttonSecondaryHoverBackground,
-        buttonBorder: style?.buttonBorder || buttonBorder,
-    }, widget);
-}
-function attachProgressBarStyler(widget, themeService, style) {
-    return attachStyler(themeService, {
-        progressBarBackground: style?.progressBarBackground || progressBarBackground
-    }, widget);
-}
-const defaultDialogStyles = {
-    dialogBackground: editorWidgetBackground,
-    dialogForeground: editorWidgetForeground,
-    dialogShadow: widgetShadow,
-    dialogBorder: contrastBorder,
-    buttonForeground: buttonForeground,
-    buttonSeparator: buttonSeparator,
-    buttonBackground: buttonBackground,
-    buttonSecondaryBackground: buttonSecondaryBackground,
-    buttonSecondaryForeground: buttonSecondaryForeground,
-    buttonSecondaryHoverBackground: buttonSecondaryHoverBackground,
-    buttonHoverBackground: buttonHoverBackground,
-    buttonBorder: buttonBorder,
-    checkboxBorder: checkboxBorder,
-    checkboxBackground: checkboxBackground,
-    checkboxForeground: checkboxForeground,
-    errorIconForeground: problemsErrorIconForeground,
-    warningIconForeground: problemsWarningIconForeground,
-    infoIconForeground: problemsInfoIconForeground,
-    inputBackground: inputBackground,
-    inputForeground: inputForeground,
-    inputBorder: inputBorder,
-    textLinkForeground: textLinkForeground
-};
-function attachDialogStyler(widget, themeService, style) {
-    return attachStyler(themeService, { ...defaultDialogStyles, ...style }, widget);
-}
-const defaultOptions = {
-    buttonBackground: ( (Color.fromHex('#0E639C'))),
-    buttonHoverBackground: ( (Color.fromHex('#006BB3'))),
-    buttonSeparator: Color.white,
-    buttonForeground: Color.white
-};
+var css = ".monaco-text-button{align-items:center;border:1px solid var(--vscode-button-border,transparent);border-radius:2px;box-sizing:border-box;cursor:pointer;display:flex;justify-content:center;line-height:18px;padding:4px;text-align:center;width:100%}.monaco-text-button:focus{outline-offset:2px!important}.monaco-text-button:hover{text-decoration:none!important}.monaco-button.disabled,.monaco-button.disabled:focus{cursor:default;opacity:.4!important}.monaco-text-button .codicon{color:inherit!important;margin:0 .2em}.monaco-text-button.monaco-text-button-with-short-label{flex-direction:row;flex-wrap:wrap;height:28px;overflow:hidden;padding:0 4px}.monaco-text-button.monaco-text-button-with-short-label>.monaco-button-label{flex-basis:100%}.monaco-text-button.monaco-text-button-with-short-label>.monaco-button-label-short{flex-grow:1;overflow:hidden;width:0}.monaco-text-button.monaco-text-button-with-short-label>.monaco-button-label,.monaco-text-button.monaco-text-button-with-short-label>.monaco-button-label-short{align-items:center;display:flex;font-style:inherit;font-weight:400;justify-content:center;padding:4px 0}.monaco-button-dropdown{cursor:pointer;display:flex}.monaco-button-dropdown.disabled{cursor:default}.monaco-button-dropdown>.monaco-button:focus{outline-offset:-1px!important}.monaco-button-dropdown.disabled>.monaco-button-dropdown-separator,.monaco-button-dropdown.disabled>.monaco-button.disabled,.monaco-button-dropdown.disabled>.monaco-button.disabled:focus{opacity:.4!important}.monaco-button-dropdown>.monaco-button.monaco-text-button{border-right-width:0!important}.monaco-button-dropdown .monaco-button-dropdown-separator{cursor:default;padding:4px 0}.monaco-button-dropdown .monaco-button-dropdown-separator>div{height:100%;width:1px}.monaco-button-dropdown>.monaco-button.monaco-dropdown-button{border:1px solid var(--vscode-button-border,transparent);border-left-width:0!important;border-radius:0 2px 2px 0}.monaco-button-dropdown>.monaco-button.monaco-text-button{border-radius:2px 0 0 2px}.monaco-description-button{align-items:center;display:flex;flex-direction:column;margin:4px 5px}.monaco-description-button .monaco-button-description{font-size:11px;font-style:italic;padding:4px 20px}.monaco-description-button .monaco-button-description,.monaco-description-button .monaco-button-label{align-items:center;display:flex;justify-content:center}.monaco-description-button .monaco-button-description>.codicon,.monaco-description-button .monaco-button-label>.codicon{color:inherit!important;margin:0 .2em}";
+n(css,{});
 class Button extends Disposable {
+    get onDidClick() { return this._onDidClick.event; }
     constructor(container, options) {
         super();
         this._onDidClick = this._register(( (new Emitter())));
-        this.options = options || Object.create(null);
-        mixin(this.options, defaultOptions, false);
-        this.buttonForeground = this.options.buttonForeground;
-        this.buttonBackground = this.options.buttonBackground;
-        this.buttonHoverBackground = this.options.buttonHoverBackground;
-        this.buttonSecondaryForeground = this.options.buttonSecondaryForeground;
-        this.buttonSecondaryBackground = this.options.buttonSecondaryBackground;
-        this.buttonSecondaryHoverBackground = this.options.buttonSecondaryHoverBackground;
-        this.buttonBorder = this.options.buttonBorder;
+        this.options = options;
         this._element = document.createElement('a');
         this._element.classList.add('monaco-button');
         this._element.tabIndex = 0;
         this._element.setAttribute('role', 'button');
+        const background = options.secondary ? options.buttonSecondaryBackground : options.buttonBackground;
+        const foreground = options.secondary ? options.buttonSecondaryForeground : options.buttonForeground;
+        this._element.style.color = foreground || '';
+        this._element.style.backgroundColor = background || '';
+        if (options.supportShortLabel) {
+            this._labelShortElement = document.createElement('div');
+            this._labelShortElement.classList.add('monaco-button-label-short');
+            this._element.appendChild(this._labelShortElement);
+            this._labelElement = document.createElement('div');
+            this._labelElement.classList.add('monaco-button-label');
+            this._element.appendChild(this._labelElement);
+            this._element.classList.add('monaco-text-button-with-short-label');
+        }
         container.appendChild(this._element);
         this._register(Gesture.addTarget(this._element));
         [EventType.CLICK, EventType$1.Tap].forEach(eventType => {
@@ -137,61 +69,48 @@ class Button extends Disposable {
         }));
         this._register(addDisposableListener(this._element, EventType.MOUSE_OVER, e => {
             if (!this._element.classList.contains('disabled')) {
-                this.setHoverBackground();
+                this.updateBackground(true);
             }
         }));
         this._register(addDisposableListener(this._element, EventType.MOUSE_OUT, e => {
-            this.applyStyles();
+            this.updateBackground(false);
         }));
         this.focusTracker = this._register(trackFocus(this._element));
         this._register(this.focusTracker.onDidFocus(() => { if (this.enabled) {
-            this.setHoverBackground();
+            this.updateBackground(true);
         } }));
         this._register(this.focusTracker.onDidBlur(() => { if (this.enabled) {
-            this.applyStyles();
+            this.updateBackground(false);
         } }));
-        this.applyStyles();
     }
-    get onDidClick() { return this._onDidClick.event; }
-    setHoverBackground() {
-        let hoverBackground;
+    getContentElements(content) {
+        const elements = [];
+        for (let segment of renderLabelWithIcons(content)) {
+            if (typeof (segment) === 'string') {
+                segment = segment.trim();
+                if (segment === '') {
+                    continue;
+                }
+                const node = document.createElement('span');
+                node.textContent = segment;
+                elements.push(node);
+            }
+            else {
+                elements.push(segment);
+            }
+        }
+        return elements;
+    }
+    updateBackground(hover) {
+        let background;
         if (this.options.secondary) {
-            hoverBackground = this.buttonSecondaryHoverBackground ? ( (this.buttonSecondaryHoverBackground.toString())) : null;
+            background = hover ? this.options.buttonSecondaryHoverBackground : this.options.buttonSecondaryBackground;
         }
         else {
-            hoverBackground = this.buttonHoverBackground ? ( (this.buttonHoverBackground.toString())) : null;
+            background = hover ? this.options.buttonHoverBackground : this.options.buttonBackground;
         }
-        if (hoverBackground) {
-            this._element.style.backgroundColor = hoverBackground;
-        }
-    }
-    style(styles) {
-        this.buttonForeground = styles.buttonForeground;
-        this.buttonBackground = styles.buttonBackground;
-        this.buttonHoverBackground = styles.buttonHoverBackground;
-        this.buttonSecondaryForeground = styles.buttonSecondaryForeground;
-        this.buttonSecondaryBackground = styles.buttonSecondaryBackground;
-        this.buttonSecondaryHoverBackground = styles.buttonSecondaryHoverBackground;
-        this.buttonBorder = styles.buttonBorder;
-        this.applyStyles();
-    }
-    applyStyles() {
-        if (this._element) {
-            let background, foreground;
-            if (this.options.secondary) {
-                foreground = this.buttonSecondaryForeground ? ( (this.buttonSecondaryForeground.toString())) : '';
-                background = this.buttonSecondaryBackground ? ( (this.buttonSecondaryBackground.toString())) : '';
-            }
-            else {
-                foreground = this.buttonForeground ? ( (this.buttonForeground.toString())) : '';
-                background = this.buttonBackground ? ( (this.buttonBackground.toString())) : '';
-            }
-            const border = this.buttonBorder ? ( (this.buttonBorder.toString())) : '';
-            this._element.style.color = foreground;
+        if (background) {
             this._element.style.backgroundColor = background;
-            this._element.style.borderWidth = border ? '1px' : '';
-            this._element.style.borderStyle = border ? 'solid' : '';
-            this._element.style.borderColor = border;
         }
     }
     get element() {
@@ -199,11 +118,12 @@ class Button extends Disposable {
     }
     set label(value) {
         this._element.classList.add('monaco-text-button');
+        const labelElement = this.options.supportShortLabel ? this._labelElement : this._element;
         if (this.options.supportIcons) {
-            reset(this._element, ...renderLabelWithIcons(value));
+            reset(labelElement, ...this.getContentElements(value));
         }
         else {
-            this._element.textContent = value;
+            labelElement.textContent = value;
         }
         if (typeof this.options.title === 'string') {
             this._element.title = this.options.title;
@@ -212,8 +132,19 @@ class Button extends Disposable {
             this._element.title = value;
         }
     }
+    set labelShort(value) {
+        if (!this.options.supportShortLabel || !this._labelShortElement) {
+            return;
+        }
+        if (this.options.supportIcons) {
+            reset(this._labelShortElement, ...this.getContentElements(value));
+        }
+        else {
+            this._labelShortElement.textContent = value;
+        }
+    }
     set icon(icon) {
-        this._element.classList.add(...CSSIcon.asClassNameArray(icon));
+        this._element.classList.add(...ThemeIcon.asClassNameArray(icon));
     }
     set enabled(value) {
         if (value) {
@@ -258,6 +189,14 @@ class ButtonWithDropdown extends Disposable {
         this.separator = document.createElement('div');
         this.separatorContainer.appendChild(this.separator);
         this.element.appendChild(this.separatorContainer);
+        const border = options.buttonBorder;
+        if (border) {
+            this.separatorContainer.style.borderTop = '1px solid ' + border;
+            this.separatorContainer.style.borderBottom = '1px solid ' + border;
+        }
+        const buttonBackground = options.secondary ? options.buttonSecondaryBackground : options.buttonBackground;
+        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.dropdownButton.element.title = ( (localize("button dropdown more actions", 'More Actions...')));
         this.dropdownButton.element.setAttribute('aria-haspopup', 'true');
@@ -289,19 +228,6 @@ class ButtonWithDropdown extends Disposable {
     get enabled() {
         return this.button.enabled;
     }
-    style(styles) {
-        this.button.style(styles);
-        this.dropdownButton.style(styles);
-        const border = styles.buttonBorder ? ( (styles.buttonBorder.toString())) : '';
-        this.separatorContainer.style.borderTopWidth = border ? '1px' : '';
-        this.separatorContainer.style.borderTopStyle = border ? 'solid' : '';
-        this.separatorContainer.style.borderTopColor = border;
-        this.separatorContainer.style.borderBottomWidth = border ? '1px' : '';
-        this.separatorContainer.style.borderBottomStyle = border ? 'solid' : '';
-        this.separatorContainer.style.borderBottomColor = border;
-        this.separatorContainer.style.backgroundColor = styles.buttonBackground?.toString() ?? '';
-        this.separator.style.backgroundColor = styles.buttonSeparator?.toString() ?? '';
-    }
     focus() {
         this.button.focus();
     }
@@ -309,31 +235,43 @@ class ButtonWithDropdown extends Disposable {
         return this.button.hasFocus() || this.dropdownButton.hasFocus();
     }
 }
-class ButtonWithDescription extends Button {
+class ButtonWithDescription {
     constructor(container, options) {
-        super(container, options);
+        this.options = options;
+        this._element = document.createElement('div');
         this._element.classList.add('monaco-description-button');
-        this._labelElement = document.createElement('div');
-        this._labelElement.classList.add('monaco-button-label');
-        this._element.appendChild(this._labelElement);
+        this._button = ( (new Button(this._element, options)));
         this._descriptionElement = document.createElement('div');
         this._descriptionElement.classList.add('monaco-button-description');
         this._element.appendChild(this._descriptionElement);
+        container.appendChild(this._element);
+    }
+    get onDidClick() {
+        return this._button.onDidClick;
+    }
+    get element() {
+        return this._element;
     }
     set label(value) {
-        this._element.classList.add('monaco-text-button');
-        if (this.options.supportIcons) {
-            reset(this._labelElement, ...renderLabelWithIcons(value));
-        }
-        else {
-            this._labelElement.textContent = value;
-        }
-        if (typeof this.options.title === 'string') {
-            this._element.title = this.options.title;
-        }
-        else if (this.options.title) {
-            this._element.title = value;
-        }
+        this._button.label = value;
+    }
+    set icon(icon) {
+        this._button.icon = icon;
+    }
+    get enabled() {
+        return this._button.enabled;
+    }
+    set enabled(enabled) {
+        this._button.enabled = enabled;
+    }
+    focus() {
+        this._button.focus();
+    }
+    hasFocus() {
+        return this._button.hasFocus();
+    }
+    dispose() {
+        this._button.dispose();
     }
     set description(value) {
         if (this.options.supportIcons) {
@@ -426,4 +364,4 @@ function getServiceOverride(container = document.body) {
         [( IWorkbenchLayoutService.toString())]: new SyncDescriptor(LayoutService, [container])
     };
 }
-export { ButtonBar as B, attachButtonStyler as a, attachProgressBarStyler as b, attachDialogStyler as c, ButtonWithDescription as d, getServiceOverride as g, n };
+export { ButtonBar as B, ButtonWithDescription as a, getServiceOverride as g };