@codingame/monaco-vscode-api 1.81.8-next.2 → 1.82.0-next.0

package/vscode/src/vs/workbench/browser/parts/editor/textDiffEditor.js

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { localize } from 'monaco-editor/esm/vs/nls.js';
 import { deepClone } from 'monaco-editor/esm/vs/base/common/objects.js';
-import { assertIsDefined, isObject, withNullAsUndefined } from 'monaco-editor/esm/vs/base/common/types.js';
+import { assertIsDefined, isObject } from 'monaco-editor/esm/vs/base/common/types.js';
 import '../../../../../../../override/vs/workbench/browser/parts/editor/textEditor.js';
 import { TEXT_DIFF_EDITOR_ID, isTextEditorViewState, createTooLargeFileError, EditorExtensions, isEditorInput } from '../../../common/editor.js';
 import { applyTextEditorOptions } from '../../../common/editor/editorOptions.js';
@@ -27,7 +27,9 @@ import { IPreferencesService } from '../../../services/preferences/common/prefer
 import { StopWatch } from 'monaco-editor/esm/vs/base/common/stopwatch.js';
 import { DiffEditorWidget2 } from 'monaco-editor/esm/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.js';
 import { AbstractTextEditor } from './textEditor.js';
+var TextDiffEditor_1;
 let TextDiffEditor = class TextDiffEditor extends AbstractTextEditor {
+    static { TextDiffEditor_1 = this; }
     static { this.ID = TEXT_DIFF_EDITOR_ID; }
     static { this.widgetCounter = 0; }
     get scopedContextKeyService() {
@@ -39,7 +41,7 @@ let TextDiffEditor = class TextDiffEditor extends AbstractTextEditor {
         return (originalEditor.hasTextFocus() ? originalEditor : modifiedEditor).invokeWithinContext(accessor => accessor.get(IContextKeyService));
     }
     constructor(telemetryService, instantiationService, storageService, configurationService, editorService, themeService, editorGroupService, fileService, preferencesService) {
-        super(TextDiffEditor.ID, telemetryService, instantiationService, storageService, configurationService, themeService, editorService, editorGroupService, fileService);
+        super(TextDiffEditor_1.ID, telemetryService, instantiationService, storageService, configurationService, themeService, editorService, editorGroupService, fileService);
         this.preferencesService = preferencesService;
         this.diffEditorControl = undefined;
         this.diffNavigatorDisposables = this._register(( (new DisposableStore())));
@@ -54,10 +56,10 @@ let TextDiffEditor = class TextDiffEditor extends AbstractTextEditor {
         );
     }
     createEditorControl(parent, configuration) {
-        TextDiffEditor.widgetCounter++;
+        TextDiffEditor_1.widgetCounter++;
         let useVersion2 = this.textResourceConfigurationService.getValue(undefined, 'diffEditor.experimental.useVersion2');
         if (useVersion2 === 'first') {
-            useVersion2 = TextDiffEditor.widgetCounter === 1;
+            useVersion2 = TextDiffEditor_1.widgetCounter === 1;
         }
         if (useVersion2) {
             this.diffEditorControl = this._register(this.instantiationService.createInstance(DiffEditorWidget2, parent, configuration, {}));
@@ -232,9 +234,14 @@ let TextDiffEditor = class TextDiffEditor extends AbstractTextEditor {
         this.diffEditorControl?.setModel(null);
     }
     logInputLifecycleTelemetry(duration, languageId) {
+        let collapseUnchangedRegions = false;
+        if (this.diffEditorControl instanceof DiffEditorWidget2) {
+            collapseUnchangedRegions = this.diffEditorControl.collapseUnchangedRegions;
+        }
         this.telemetryService.publicLog2('diffEditor.editorVisibleTime', {
             editorVisibleTimeMs: duration,
             languageId: languageId ?? '',
+            collapseUnchangedRegions,
         });
     }
     getControl() {
@@ -279,7 +286,7 @@ let TextDiffEditor = class TextDiffEditor extends AbstractTextEditor {
         if (!isEqual(modelUri, resource)) {
             return undefined;
         }
-        return withNullAsUndefined(this.diffEditorControl.saveViewState());
+        return this.diffEditorControl.saveViewState() ?? undefined;
     }
     toEditorViewStateResource(modelOrInput) {
         let original;
@@ -300,7 +307,7 @@ let TextDiffEditor = class TextDiffEditor extends AbstractTextEditor {
         );
     }
 };
-TextDiffEditor = ( (__decorate([
+TextDiffEditor = TextDiffEditor_1 = ( (__decorate([
     ( (__param(0, ITelemetryService))),
     ( (__param(1, IInstantiationService))),
     ( (__param(2, IStorageService))),

package/vscode/src/vs/workbench/browser/parts/editor/textEditor.js

@@ -14,10 +14,12 @@ import { ITextResourceConfigurationService } from 'monaco-editor/esm/vs/editor/c
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
+var AbstractTextEditor_1;
 let AbstractTextEditor = class AbstractTextEditor extends AbstractEditorWithViewState {
+    static { AbstractTextEditor_1 = this; }
     static { this.VIEW_STATE_PREFERENCE_KEY = 'textEditorViewState'; }
     constructor(id, telemetryService, instantiationService, storageService, textResourceConfigurationService, themeService, editorService, editorGroupService, fileService) {
-        super(id, AbstractTextEditor.VIEW_STATE_PREFERENCE_KEY, telemetryService, instantiationService, storageService, textResourceConfigurationService, themeService, editorService, editorGroupService);
+        super(id, AbstractTextEditor_1.VIEW_STATE_PREFERENCE_KEY, telemetryService, instantiationService, storageService, textResourceConfigurationService, themeService, editorService, editorGroupService);
         this.fileService = fileService;
         this._onDidChangeSelection = this._register(( new Emitter()));
         this.onDidChangeSelection = this._onDidChangeSelection.event;
@@ -180,7 +182,7 @@ let AbstractTextEditor = class AbstractTextEditor extends AbstractEditorWithView
         super.dispose();
     }
 };
-AbstractTextEditor = ( __decorate([
+AbstractTextEditor = AbstractTextEditor_1 = ( __decorate([
     ( __param(1, ITelemetryService)),
     ( __param(2, IInstantiationService)),
     ( __param(3, IStorageService)),

package/vscode/src/vs/workbench/browser/parts/editor/textResourceEditor.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { withNullAsUndefined, assertIsDefined } from 'monaco-editor/esm/vs/base/common/types.js';
+import { assertIsDefined } from 'monaco-editor/esm/vs/base/common/types.js';
 import { isTextEditorViewState } from '../../../common/editor.js';
 import { applyTextEditorOptions } from '../../../common/editor/editorOptions.js';
 import { TextResourceEditorInput } from '../../../common/editor/textResourceEditorInput.js';
@@ -17,6 +17,7 @@ import { IModelService } from 'monaco-editor/esm/vs/editor/common/services/model
 import { ILanguageService } from 'monaco-editor/esm/vs/editor/common/languages/language.js';
 import { PLAINTEXT_LANGUAGE_ID } from 'monaco-editor/esm/vs/editor/common/languages/modesRegistry.js';
 import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
+var TextResourceEditor_1;
 let AbstractTextResourceEditor = class AbstractTextResourceEditor extends AbstractTextCodeEditor {
     constructor(id, telemetryService, instantiationService, storageService, textResourceConfigurationService, themeService, editorGroupService, editorService, fileService) {
         super(id, telemetryService, instantiationService, storageService, textResourceConfigurationService, themeService, editorService, editorGroupService, fileService);
@@ -77,9 +78,10 @@ AbstractTextResourceEditor = ( __decorate([
     ( __param(8, IFileService))
 ], AbstractTextResourceEditor));
 let TextResourceEditor = class TextResourceEditor extends AbstractTextResourceEditor {
+    static { TextResourceEditor_1 = this; }
     static { this.ID = 'workbench.editors.textResourceEditor'; }
     constructor(telemetryService, instantiationService, storageService, textResourceConfigurationService, themeService, editorService, editorGroupService, modelService, languageService, fileService) {
-        super(TextResourceEditor.ID, telemetryService, instantiationService, storageService, textResourceConfigurationService, themeService, editorGroupService, editorService, fileService);
+        super(TextResourceEditor_1.ID, telemetryService, instantiationService, storageService, textResourceConfigurationService, themeService, editorGroupService, editorService, fileService);
         this.modelService = modelService;
         this.languageService = languageService;
     }
@@ -117,7 +119,7 @@ let TextResourceEditor = class TextResourceEditor extends AbstractTextResourceEd
             candidateLanguage = { id: e.languageId, source: 'event' };
         }
         else {
-            const guess = withNullAsUndefined(this.languageService.guessLanguageIdByFilepathOrFirstLine(textModel.uri, textModel.getLineContent(1).substr(0, 1000 )));
+            const guess = this.languageService.guessLanguageIdByFilepathOrFirstLine(textModel.uri, textModel.getLineContent(1).substr(0, 1000 )) ?? undefined;
             if (guess) {
                 candidateLanguage = { id: guess, source: 'guess' };
             }
@@ -134,7 +136,7 @@ let TextResourceEditor = class TextResourceEditor extends AbstractTextResourceEd
         }
     }
 };
-TextResourceEditor = ( __decorate([
+TextResourceEditor = TextResourceEditor_1 = ( __decorate([
     ( __param(0, ITelemetryService)),
     ( __param(1, IInstantiationService)),
     ( __param(2, IStorageService)),

package/vscode/src/vs/workbench/browser/parts/editor/titleControl.js

@@ -25,7 +25,7 @@ import { BreadcrumbsControl } from './breadcrumbsControl.js';
 import { EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
 import { ResourceContextKey, ActiveEditorPinnedContext, ActiveEditorFirstInGroupContext, ActiveEditorLastInGroupContext, ActiveEditorStickyContext, ActiveEditorAvailableEditorIdsContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, ActiveEditorGroupLockedContext, applyAvailableEditorIds } from '../../../common/contextkeys.js';
 import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
-import { assertIsDefined, withUndefinedAsNull, withNullAsUndefined } from 'monaco-editor/esm/vs/base/common/types.js';
+import { assertIsDefined } from 'monaco-editor/esm/vs/base/common/types.js';
 import { isFirefox } from 'monaco-editor/esm/vs/base/browser/browser.js';
 import { isCancellationError } from 'monaco-editor/esm/vs/base/common/errors.js';
 import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
@@ -119,7 +119,8 @@ let TitleControl = class TitleControl extends Themable {
             renderDropdownAsChildElement: this.renderDropdownAsChildElement,
             telemetrySource: 'editorPart',
             resetMenu: MenuId.EditorTitle,
-            maxNumberOfItems: 9
+            maxNumberOfItems: 9,
+            highlightToggledItems: true,
         }));
         this.editorActionsToolbar.context = context;
         this._register(this.editorActionsToolbar.actionRunner.onDidRun(e => {
@@ -149,7 +150,7 @@ let TitleControl = class TitleControl extends Themable {
         this.editorToolBarMenuDisposables.clear();
         this.contextKeyService.bufferChangeEvents(() => {
             const activeEditor = this.group.activeEditor;
-            this.resourceContext.set(withUndefinedAsNull(EditorResourceAccessor.getOriginalUri(activeEditor, { supportSideBySide: SideBySideEditor.PRIMARY })));
+            this.resourceContext.set(EditorResourceAccessor.getOriginalUri(activeEditor, { supportSideBySide: SideBySideEditor.PRIMARY } ?? null));
             this.editorPinnedContext.set(activeEditor ? this.group.isPinned(activeEditor) : false);
             this.editorIsFirstContext.set(activeEditor ? this.group.isFirst(activeEditor) : false);
             this.editorIsLastContext.set(activeEditor ? this.group.isLast(activeEditor) : false);
@@ -220,7 +221,7 @@ let TitleControl = class TitleControl extends Themable {
     }
     onContextMenu(editor, e, node) {
         const currentResourceContext = this.resourceContext.get();
-        this.resourceContext.set(withUndefinedAsNull(EditorResourceAccessor.getOriginalUri(editor, { supportSideBySide: SideBySideEditor.PRIMARY })));
+        this.resourceContext.set(EditorResourceAccessor.getOriginalUri(editor, { supportSideBySide: SideBySideEditor.PRIMARY } ?? null));
         const currentPinnedContext = !!this.editorPinnedContext.get();
         this.editorPinnedContext.set(this.group.isPinned(editor));
         const currentEditorIsFirstContext = !!this.editorIsFirstContext.get();
@@ -267,7 +268,7 @@ let TitleControl = class TitleControl extends Themable {
     }
     getKeybindingLabel(action) {
         const keybinding = this.getKeybinding(action);
-        return keybinding ? withNullAsUndefined(keybinding.getLabel()) : undefined;
+        return keybinding ? keybinding.getLabel() ?? undefined : undefined;
     }
     dispose() {
         dispose(this.breadcrumbsControl);

package/vscode/src/vs/workbench/browser/parts/notifications/notificationsActions.js

@@ -101,7 +101,7 @@ CollapseNotificationAction = ( __decorate([
 ], CollapseNotificationAction));
 class ConfigureNotificationAction extends Action {
     static { this.ID = 'workbench.action.configureNotification'; }
-    static { this.LABEL = ( localize('configureNotification', "Configure Notification")); }
+    static { this.LABEL = ( localize('configureNotification', "More Actions...")); }
     constructor(id, label, configurationActions) {
         super(id, label, ThemeIcon.asClassName(configureIcon));
         this.configurationActions = configurationActions;

package/vscode/src/vs/workbench/browser/parts/notifications/notificationsCenter.js

@@ -19,7 +19,9 @@ import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/com
 import { assertIsDefined, assertAllDefined } from 'monaco-editor/esm/vs/base/common/types.js';
 import { NotificationsCenterVisibleContext } from '../../../common/contextkeys.js';
 import { INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
+var NotificationsCenter_1;
 let NotificationsCenter = class NotificationsCenter extends Themable {
+    static { NotificationsCenter_1 = this; }
     static { this.MAX_DIMENSIONS = ( new Dimension(450, 400)); }
     constructor(container, model, themeService, instantiationService, layoutService, contextKeyService, editorGroupService, keybindingService, notificationService) {
         super(themeService);
@@ -184,8 +186,8 @@ let NotificationsCenter = class NotificationsCenter extends Themable {
     layout(dimension) {
         this.workbenchDimensions = dimension;
         if (this._isVisible && this.notificationsCenterContainer) {
-            const maxWidth = NotificationsCenter.MAX_DIMENSIONS.width;
-            const maxHeight = NotificationsCenter.MAX_DIMENSIONS.height;
+            const maxWidth = NotificationsCenter_1.MAX_DIMENSIONS.width;
+            const maxHeight = NotificationsCenter_1.MAX_DIMENSIONS.height;
             let availableWidth = maxWidth;
             let availableHeight = maxHeight;
             if (this.workbenchDimensions) {
@@ -213,7 +215,7 @@ let NotificationsCenter = class NotificationsCenter extends Themable {
         }
     }
 };
-NotificationsCenter = ( __decorate([
+NotificationsCenter = NotificationsCenter_1 = ( __decorate([
     ( __param(2, IThemeService)),
     ( __param(3, IInstantiationService)),
     ( __param(4, IWorkbenchLayoutService)),

package/vscode/src/vs/workbench/browser/parts/notifications/notificationsCommands.js

@@ -36,9 +36,14 @@ function getNotificationFromContext(listService, context) {
     }
     const list = listService.lastFocusedList;
     if (list instanceof WorkbenchList) {
-        const focusedElement = list.getFocusedElements()[0];
-        if (isNotificationViewItem(focusedElement)) {
-            return focusedElement;
+        let element = list.getFocusedElements()[0];
+        if (!isNotificationViewItem(element)) {
+            if (list.isDOMFocused()) {
+                element = list.element(0);
+            }
+        }
+        if (isNotificationViewItem(element)) {
+            return element;
         }
     }
     return undefined;

package/vscode/src/vs/workbench/browser/parts/notifications/notificationsToasts.js

@@ -18,6 +18,7 @@ import { IHostService } from '../../../services/host/browser/host.js';
 import { IntervalCounter } from 'monaco-editor/esm/vs/base/common/async.js';
 import { assertIsDefined } from 'monaco-editor/esm/vs/base/common/types.js';
 import { NotificationsToastsVisibleContext } from '../../../common/contextkeys.js';
+var NotificationsToasts_1;
 var ToastVisibility;
 ( (function(ToastVisibility) {
     ToastVisibility[ToastVisibility["HIDDEN_OR_VISIBLE"] = 0] = "HIDDEN_OR_VISIBLE";
@@ -25,6 +26,7 @@ var ToastVisibility;
     ToastVisibility[ToastVisibility["VISIBLE"] = 2] = "VISIBLE";
 })(ToastVisibility || (ToastVisibility = {})));
 let NotificationsToasts = class NotificationsToasts extends Themable {
+    static { NotificationsToasts_1 = this; }
     static { this.MAX_WIDTH = 450; }
     static { this.MAX_NOTIFICATIONS = 3; }
     static { this.PURGE_TIMEOUT = {
@@ -34,7 +36,7 @@ let NotificationsToasts = class NotificationsToasts extends Themable {
     }; }
     static { this.SPAM_PROTECTION = {
         interval: 800,
-        limit: NotificationsToasts.MAX_NOTIFICATIONS
+        limit: NotificationsToasts_1.MAX_NOTIFICATIONS
     }; }
     get isVisible() { return !!this._isVisible; }
     constructor(container, model, instantiationService, layoutService, themeService, editorGroupService, contextKeyService, lifecycleService, hostService) {
@@ -53,7 +55,7 @@ let NotificationsToasts = class NotificationsToasts extends Themable {
         this.mapNotificationToToast = ( new Map());
         this.mapNotificationToDisposable = ( new Map());
         this.notificationsToastsVisibleContextKey = NotificationsToastsVisibleContext.bindTo(this.contextKeyService);
-        this.addedToastsIntervalCounter = ( new IntervalCounter(NotificationsToasts.SPAM_PROTECTION.interval));
+        this.addedToastsIntervalCounter = ( new IntervalCounter(NotificationsToasts_1.SPAM_PROTECTION.interval));
         this.registerListeners();
     }
     registerListeners() {
@@ -83,7 +85,7 @@ let NotificationsToasts = class NotificationsToasts extends Themable {
         if (item.priority === NotificationPriority.SILENT) {
             return;
         }
-        if (this.addedToastsIntervalCounter.increment() > NotificationsToasts.SPAM_PROTECTION.limit) {
+        if (this.addedToastsIntervalCounter.increment() > NotificationsToasts_1.SPAM_PROTECTION.limit) {
             return;
         }
         const itemDisposables = ( new DisposableStore());
@@ -192,7 +194,7 @@ let NotificationsToasts = class NotificationsToasts extends Themable {
                 else {
                     this.removeToast(item);
                 }
-            }, NotificationsToasts.PURGE_TIMEOUT[item.severity]);
+            }, NotificationsToasts_1.PURGE_TIMEOUT[item.severity]);
         };
         hideAfterTimeout();
         disposables.add(toDisposable(() => clearTimeout(purgeTimeoutHandle)));
@@ -345,7 +347,7 @@ let NotificationsToasts = class NotificationsToasts extends Themable {
         this.layoutLists(maxDimensions.width);
     }
     computeMaxDimensions() {
-        const maxWidth = NotificationsToasts.MAX_WIDTH;
+        const maxWidth = NotificationsToasts_1.MAX_WIDTH;
         let availableWidth = maxWidth;
         let availableHeight;
         if (this.workbenchDimensions) {
@@ -375,7 +377,7 @@ let NotificationsToasts = class NotificationsToasts extends Themable {
             this.updateToastVisibility(toast, true);
             heightToGive -= toast.container.offsetHeight;
             let makeVisible = false;
-            if (visibleToasts === NotificationsToasts.MAX_NOTIFICATIONS) {
+            if (visibleToasts === NotificationsToasts_1.MAX_NOTIFICATIONS) {
                 makeVisible = false;
             }
             else if (heightToGive >= 0) {
@@ -405,7 +407,7 @@ let NotificationsToasts = class NotificationsToasts extends Themable {
         return !!toast.container.parentElement;
     }
 };
-NotificationsToasts = ( __decorate([
+NotificationsToasts = NotificationsToasts_1 = ( __decorate([
     ( __param(2, IInstantiationService)),
     ( __param(3, IWorkbenchLayoutService)),
     ( __param(4, IThemeService)),

package/vscode/src/vs/workbench/browser/parts/notifications/notificationsViewer.js

@@ -23,6 +23,7 @@ import { Gesture, EventType as EventType$1 } from 'monaco-editor/esm/vs/base/bro
 import { Event } from 'monaco-editor/esm/vs/base/common/event.js';
 import { defaultProgressBarStyles, defaultButtonStyles } from 'monaco-editor/esm/vs/platform/theme/browser/defaultStyles.js';
 import { StandardKeyboardEvent } from 'monaco-editor/esm/vs/base/browser/keyboardEvent.js';
+var NotificationRenderer_1, NotificationTemplateRenderer_1;
 class NotificationsListDelegate {
     static { this.ROW_HEIGHT = 42; }
     static { this.LINE_HEIGHT = 22; }
@@ -65,7 +66,7 @@ class NotificationsListDelegate {
         if (isNonEmptyArray(notification.actions && notification.actions.secondary)) {
             actions++;
         }
-        this.offsetHelper.style.width = `${450  - ((10  + 26  + (actions * (24 + 8))  - 4) )}px`;
+        this.offsetHelper.style.width = `${450  - ((10  + 30  + (actions * 30)  - (Math.max(actions - 1, 0) * 4)) )}px`;
         const renderedMessage = NotificationMessageRenderer.render(notification.message);
         this.offsetHelper.appendChild(renderedMessage);
         const preferredHeight = Math.max(this.offsetHelper.offsetHeight, this.offsetHelper.scrollHeight);
@@ -123,6 +124,7 @@ class NotificationMessageRenderer {
     }
 }
 let NotificationRenderer = class NotificationRenderer {
+    static { NotificationRenderer_1 = this; }
     static { this.TEMPLATE_ID = 'notification'; }
     constructor(actionRunner, contextMenuService, instantiationService) {
         this.actionRunner = actionRunner;
@@ -130,7 +132,7 @@ let NotificationRenderer = class NotificationRenderer {
         this.instantiationService = instantiationService;
     }
     get templateId() {
-        return NotificationRenderer.TEMPLATE_ID;
+        return NotificationRenderer_1.TEMPLATE_ID;
     }
     renderTemplate(container) {
         const data = Object.create(null);
@@ -190,11 +192,12 @@ let NotificationRenderer = class NotificationRenderer {
         dispose(templateData.toDispose);
     }
 };
-NotificationRenderer = ( __decorate([
+NotificationRenderer = NotificationRenderer_1 = ( __decorate([
     ( __param(1, IContextMenuService)),
     ( __param(2, IInstantiationService))
 ], NotificationRenderer));
 let NotificationTemplateRenderer = class NotificationTemplateRenderer extends Disposable {
+    static { NotificationTemplateRenderer_1 = this; }
     static { this.SEVERITIES = [Severity.Info, Severity.Warning, Severity.Error]; }
     constructor(template, actionRunner, openerService, instantiationService, keybindingService, contextMenuService) {
         super();
@@ -205,10 +208,10 @@ let NotificationTemplateRenderer = class NotificationTemplateRenderer extends Di
         this.keybindingService = keybindingService;
         this.contextMenuService = contextMenuService;
         this.inputDisposables = this._register(( new DisposableStore()));
-        if (!NotificationTemplateRenderer.closeNotificationAction) {
-            NotificationTemplateRenderer.closeNotificationAction = instantiationService.createInstance(ClearNotificationAction, ClearNotificationAction.ID, ClearNotificationAction.LABEL);
-            NotificationTemplateRenderer.expandNotificationAction = instantiationService.createInstance(ExpandNotificationAction, ExpandNotificationAction.ID, ExpandNotificationAction.LABEL);
-            NotificationTemplateRenderer.collapseNotificationAction = instantiationService.createInstance(CollapseNotificationAction, CollapseNotificationAction.ID, CollapseNotificationAction.LABEL);
+        if (!NotificationTemplateRenderer_1.closeNotificationAction) {
+            NotificationTemplateRenderer_1.closeNotificationAction = instantiationService.createInstance(ClearNotificationAction, ClearNotificationAction.ID, ClearNotificationAction.LABEL);
+            NotificationTemplateRenderer_1.expandNotificationAction = instantiationService.createInstance(ExpandNotificationAction, ExpandNotificationAction.ID, ExpandNotificationAction.LABEL);
+            NotificationTemplateRenderer_1.collapseNotificationAction = instantiationService.createInstance(CollapseNotificationAction, CollapseNotificationAction.ID, CollapseNotificationAction.LABEL);
         }
     }
     setInput(notification) {
@@ -249,7 +252,7 @@ let NotificationTemplateRenderer = class NotificationTemplateRenderer extends Di
         }));
     }
     renderSeverity(notification) {
-        NotificationTemplateRenderer.SEVERITIES.forEach(severity => {
+        NotificationTemplateRenderer_1.SEVERITIES.forEach(severity => {
             if (notification.severity !== severity) {
                 this.template.icon.classList.remove(...ThemeIcon.asClassNameArray(this.toSeverityIcon(severity)));
             }
@@ -292,10 +295,10 @@ let NotificationTemplateRenderer = class NotificationTemplateRenderer extends Di
             }
         }
         if (showExpandCollapseAction) {
-            actions.push(notification.expanded ? NotificationTemplateRenderer.collapseNotificationAction : NotificationTemplateRenderer.expandNotificationAction);
+            actions.push(notification.expanded ? NotificationTemplateRenderer_1.collapseNotificationAction : NotificationTemplateRenderer_1.expandNotificationAction);
         }
         if (!notification.hasProgress) {
-            actions.push(NotificationTemplateRenderer.closeNotificationAction);
+            actions.push(NotificationTemplateRenderer_1.closeNotificationAction);
         }
         this.template.toolbar.clear();
         this.template.toolbar.context = notification;
@@ -386,7 +389,7 @@ let NotificationTemplateRenderer = class NotificationTemplateRenderer extends Di
         return keybinding ? keybinding.getLabel() : null;
     }
 };
-NotificationTemplateRenderer = ( __decorate([
+NotificationTemplateRenderer = NotificationTemplateRenderer_1 = ( __decorate([
     ( __param(2, IOpenerService)),
     ( __param(3, IInstantiationService)),
     ( __param(4, IKeybindingService)),

package/vscode/src/vs/workbench/browser/parts/paneCompositePart.d.ts

@@ -53,4 +53,4 @@ interface IPaneCompositeSelectorPart {
     showActivity(id: string, badge: IBadge, clazz?: string, priority?: number): IDisposable;
 }
 
-export { IPaneCompositePart, IPaneCompositeSelectorPart };
+export type { IPaneCompositePart, IPaneCompositeSelectorPart };

package/vscode/src/vs/workbench/browser/parts/panel/panelPart.d.ts

@@ -46,7 +46,7 @@ declare abstract class BasePanelPart extends CompositePart<PaneComposite> implem
     readonly maximumWidth: number;
     readonly minimumHeight: number;
     readonly maximumHeight: number;
-    readonly snap = true;
+    get snap(): boolean;
     get preferredHeight(): number | undefined;
     get preferredWidth(): number | undefined;
     get onDidPaneCompositeOpen(): Event<IPaneComposite>;

package/vscode/src/vs/workbench/browser/parts/panel/panelPart.js

@@ -38,8 +38,13 @@ import { ToolBar } from 'monaco-editor/esm/vs/base/browser/ui/toolbar/toolbar.js
 import { ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
 import { PlaceHolderToggleCompositeBadgeAction } from '../activitybar/activitybarActions.js';
 import { createAndFillInContextMenuActions } from 'monaco-editor/esm/vs/platform/actions/browser/menuEntryActionViewItem.js';
+var BasePanelPart_1, PanelPart_1;
 let BasePanelPart = class BasePanelPart extends CompositePart {
+    static { BasePanelPart_1 = this; }
     static { this.MIN_COMPOSITE_BAR_WIDTH = 50; }
+    get snap() {
+        return this.layoutService.isVisible(this.partId) || this.compositeBar.getVisibleComposites().length > 0;
+    }
     get preferredHeight() {
         return this.layoutService.dimension.height * 0.4;
     }
@@ -72,7 +77,6 @@ let BasePanelPart = class BasePanelPart extends CompositePart {
         this.maximumWidth = Number.POSITIVE_INFINITY;
         this.minimumHeight = 77;
         this.maximumHeight = Number.POSITIVE_INFINITY;
-        this.snap = true;
         this.onDidPaneCompositeClose = this.onDidCompositeClose.event;
         this.compositeActions = ( new Map());
         this.panelDisposables = ( new Map());
@@ -212,7 +216,7 @@ let BasePanelPart = class BasePanelPart extends CompositePart {
         }
     }
     toActivity(viewContainerModel) {
-        return BasePanelPart.toActivity(viewContainerModel.viewContainer.id, viewContainerModel.title, this.panelOptions.useIcons ? viewContainerModel.icon : undefined, viewContainerModel.keybindingId);
+        return BasePanelPart_1.toActivity(viewContainerModel.viewContainer.id, viewContainerModel.title, this.panelOptions.useIcons ? viewContainerModel.icon : undefined, viewContainerModel.keybindingId);
     }
     static toActivity(id, name, icon, keybindingId) {
         let classNames = undefined;
@@ -281,7 +285,7 @@ let BasePanelPart = class BasePanelPart extends CompositePart {
             disposables.clear();
             this.onDidRegisterExtensions();
             this.compositeBar.onDidChange(() => this.saveCachedPanels(), this, disposables);
-            this.storageService.onDidChangeValue(e => this.onDidStorageValueChange(e), this, disposables);
+            this.storageService.onDidChangeValue(0 , this.pinnedPanelsKey, disposables)(() => this.onDidStorageValueChange(), this, disposables);
         }));
     }
     onDidRegisterExtensions() {
@@ -502,7 +506,7 @@ let BasePanelPart = class BasePanelPart extends CompositePart {
         if (this.contentDimension && this.dimension) {
             let availableWidth = this.contentDimension.width - 40;
             if (this.toolBar) {
-                availableWidth = Math.max(BasePanelPart.MIN_COMPOSITE_BAR_WIDTH, availableWidth - this.getToolbarWidth());
+                availableWidth = Math.max(BasePanelPart_1.MIN_COMPOSITE_BAR_WIDTH, availableWidth - this.getToolbarWidth());
             }
             this.compositeBar.layout(( new Dimension(availableWidth, this.dimension.height)));
         }
@@ -562,9 +566,8 @@ let BasePanelPart = class BasePanelPart extends CompositePart {
         }
         return this.toolBar.getItemsWidth() + (this.globalToolBar?.getItemsWidth() ?? 0);
     }
-    onDidStorageValueChange(e) {
-        if (e.key === this.pinnedPanelsKey && e.scope === 0
-            && this.cachedPanelsValue !== this.getStoredCachedPanelsValue() ) {
+    onDidStorageValueChange() {
+        if (this.cachedPanelsValue !== this.getStoredCachedPanelsValue() ) {
             this._cachedPanelsValue = undefined;
             const newCompositeItems = [];
             const compositeItems = this.compositeBar.getCompositeBarItems();
@@ -664,7 +667,7 @@ let BasePanelPart = class BasePanelPart extends CompositePart {
         this.storageService.store(this.placeholdeViewContainersKey, value, 1 , 1 );
     }
 };
-BasePanelPart = ( __decorate([
+BasePanelPart = BasePanelPart_1 = ( __decorate([
     ( __param(0, INotificationService)),
     ( __param(1, IStorageService)),
     ( __param(2, IContextMenuService)),
@@ -677,9 +680,10 @@ BasePanelPart = ( __decorate([
     ( __param(9, IExtensionService))
 ], BasePanelPart));
 let PanelPart = class PanelPart extends BasePanelPart {
+    static { PanelPart_1 = this; }
     static { this.activePanelSettingsKey = 'workbench.panelpart.activepanelid'; }
     constructor(notificationService, storageService, telemetryService, contextMenuService, layoutService, keybindingService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, commandService, menuService) {
-        super(notificationService, storageService, contextMenuService, layoutService, keybindingService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, "workbench.parts.panel" , PanelPart.activePanelSettingsKey, 'workbench.panel.pinnedPanels', 'workbench.panel.placeholderPanels', Extensions.Panels, PANEL_BACKGROUND, 1 , ActivePanelContext.bindTo(contextKeyService), PanelFocusContext.bindTo(contextKeyService), {
+        super(notificationService, storageService, contextMenuService, layoutService, keybindingService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, "workbench.parts.panel" , PanelPart_1.activePanelSettingsKey, 'workbench.panel.pinnedPanels', 'workbench.panel.placeholderPanels', Extensions.Panels, PANEL_BACKGROUND, 1 , ActivePanelContext.bindTo(contextKeyService), PanelFocusContext.bindTo(contextKeyService), {
             useIcons: false,
             hasTitle: true
         });
@@ -734,7 +738,7 @@ let PanelPart = class PanelPart extends BasePanelPart {
         };
     }
 };
-PanelPart = ( __decorate([
+PanelPart = PanelPart_1 = ( __decorate([
     ( __param(0, INotificationService)),
     ( __param(1, IStorageService)),
     ( __param(2, ITelemetryService)),

package/vscode/src/vs/workbench/browser/parts/sidebar/sidebarPart.js

@@ -22,7 +22,9 @@ import { assertIsDefined } from 'monaco-editor/esm/vs/base/common/types.js';
 import { CompositeDragAndDropObserver } from '../../dnd.js';
 import { IViewDescriptorService } from '../../../common/views.js';
 import { Gesture, EventType as EventType$1 } from 'monaco-editor/esm/vs/base/browser/touch.js';
+var SidebarPart_1;
 let SidebarPart = class SidebarPart extends CompositePart {
+    static { SidebarPart_1 = this; }
     static { this.activeViewletSettingsKey = 'workbench.sidebar.activeviewletid'; }
     get preferredWidth() {
         const viewlet = this.getActivePaneComposite();
@@ -39,7 +41,7 @@ let SidebarPart = class SidebarPart extends CompositePart {
     get onDidPaneCompositeOpen() { return ( Event.map(this.onDidCompositeOpen.event, compositeEvent => compositeEvent.composite)); }
     get onDidPaneCompositeClose() { return this.onDidCompositeClose.event; }
     constructor(notificationService, storageService, contextMenuService, layoutService, keybindingService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService) {
-        super(notificationService, storageService, contextMenuService, layoutService, keybindingService, instantiationService, themeService, ( Registry.as(Extensions.Viewlets)), SidebarPart.activeViewletSettingsKey, viewDescriptorService.getDefaultViewContainer(0 ).id, 'sideBar', 'viewlet', SIDE_BAR_TITLE_FOREGROUND, "workbench.parts.sidebar" , { hasTitle: true, borderWidth: () => (this.getColor(SIDE_BAR_BORDER) || this.getColor(contrastBorder)) ? 1 : 0 });
+        super(notificationService, storageService, contextMenuService, layoutService, keybindingService, instantiationService, themeService, ( Registry.as(Extensions.Viewlets)), SidebarPart_1.activeViewletSettingsKey, viewDescriptorService.getDefaultViewContainer(0 ).id, 'sideBar', 'viewlet', SIDE_BAR_TITLE_FOREGROUND, "workbench.parts.sidebar" , { hasTitle: true, borderWidth: () => (this.getColor(SIDE_BAR_BORDER) || this.getColor(contrastBorder)) ? 1 : 0 });
         this.viewDescriptorService = viewDescriptorService;
         this.contextKeyService = contextKeyService;
         this.extensionService = extensionService;
@@ -200,7 +202,7 @@ let SidebarPart = class SidebarPart extends CompositePart {
         };
     }
 };
-SidebarPart = ( __decorate([
+SidebarPart = SidebarPart_1 = ( __decorate([
     ( __param(0, INotificationService)),
     ( __param(1, IStorageService)),
     ( __param(2, IContextMenuService)),

package/vscode/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-workbench .part.statusbar{box-sizing:border-box;cursor:default;display:flex;font-size:12px;height:22px;overflow:hidden;width:100%}.monaco-workbench:not(.reduce-motion) .part.statusbar{transition:background-color .15s ease-out}.monaco-workbench .part.statusbar.status-border-top:after{background-color:var(--status-border-top-color);content:\"\";height:1px;left:0;pointer-events:none;position:absolute;top:0;width:100%;z-index:5}.monaco-workbench .part.statusbar>.left-items,.monaco-workbench .part.statusbar>.right-items{display:flex}.monaco-workbench .part.statusbar>.right-items{flex-direction:row-reverse;flex-wrap:wrap}.monaco-workbench .part.statusbar>.left-items{flex-grow:1}.monaco-workbench .part.statusbar>.items-container>.statusbar-item{display:inline-block;font-variant-numeric:tabular-nums;height:100%;line-height:22px;max-width:40vw;vertical-align:top}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-beak{position:relative}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-beak>.status-bar-item-beak-container{height:5px;left:calc(50% - 5px);position:absolute;top:-5px;width:10px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-beak>.status-bar-item-beak-container:before{border-bottom-style:solid;border-bottom-width:5px;border-left:5px solid transparent;border-right:5px solid transparent;content:\"\";position:fixed}.monaco-workbench .part.statusbar>.items-container>.statusbar-item>.statusbar-item-label{margin-left:3px;margin-right:3px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-left>.statusbar-item-label{margin-left:0;margin-right:3px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-right>.statusbar-item-label{margin-left:3px;margin-right:0}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.left.first-visible-item{padding-left:7px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.right.last-visible-item{margin-right:7px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-background-color.left.first-visible-item,.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-background-color.right.last-visible-item{padding-left:0;padding-right:0}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-background-color>.statusbar-item-label{margin-left:0;margin-right:0;padding-left:10px;padding-right:10px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-left.has-background-color>.statusbar-item-label{padding-left:3px;padding-right:10px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-right.has-background-color>.statusbar-item-label{padding-left:10px;padding-right:3px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item>.statusbar-item-label{align-items:center;cursor:pointer;display:flex;height:100%;outline-width:0;overflow:hidden;padding:0 5px;text-overflow:ellipsis;white-space:pre}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-left>.statusbar-item-label,.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-right>.statusbar-item-label{padding:0 3px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item>a:hover:not(.disabled){text-decoration:none}.monaco-workbench .part.statusbar>.items-container>.statusbar-item>a.disabled{cursor:default}.monaco-workbench .part.statusbar>.items-container>.statusbar-item span.codicon{color:inherit;font-size:14px;text-align:center}.monaco-workbench .part.statusbar>.items-container>.statusbar-item .status-bar-info{background-color:var(--vscode-statusBarItem-prominentBackground);color:var(--vscode-statusBarItem-prominentForeground)}.monaco-workbench .part.statusbar>.items-container>.statusbar-item a.status-bar-info:hover:not(.disabled){background-color:var(--vscode-statusBarItem-prominentHoverBackground)}.monaco-workbench .part.statusbar>.items-container>.statusbar-item a:active:not(.disabled){outline:1px solid var(--vscode-contrastActiveBorder)!important;outline-offset:-1px}.monaco-workbench:not(.hc-light):not(.hc-black) .part.statusbar>.items-container>.statusbar-item a:active:not(.disabled){background-color:var(--vscode-statusBarItem-activeBackground)!important}.monaco-workbench .part.statusbar>.items-container>.statusbar-item a:hover:not(.disabled){outline:1px dashed var(--vscode-contrastActiveBorder);outline-offset:-1px}.monaco-workbench:not(.hc-light):not(.hc-black) .part.statusbar>.items-container>.statusbar-item a:hover:not(.disabled){background-color:var(--vscode-statusBarItem-hoverBackground)}";
+var css = ".monaco-workbench .part.statusbar{box-sizing:border-box;cursor:default;display:flex;font-size:12px;height:22px;overflow:hidden;width:100%}.monaco-workbench:not(.reduce-motion) .part.statusbar{transition:background-color .15s ease-out}.monaco-workbench .part.statusbar.status-border-top:after{background-color:var(--status-border-top-color);content:\"\";height:1px;left:0;pointer-events:none;position:absolute;top:0;width:100%;z-index:5}.monaco-workbench .part.statusbar>.left-items,.monaco-workbench .part.statusbar>.right-items{display:flex}.monaco-workbench .part.statusbar>.right-items{flex-direction:row-reverse;flex-wrap:wrap}.monaco-workbench .part.statusbar>.left-items{flex-grow:1}.monaco-workbench .part.statusbar>.items-container>.statusbar-item{display:inline-block;font-variant-numeric:tabular-nums;height:100%;line-height:22px;max-width:40vw;vertical-align:top}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-beak{position:relative}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-beak>.status-bar-item-beak-container{height:5px;left:calc(50% - 5px);position:absolute;top:-5px;width:10px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-beak>.status-bar-item-beak-container:before{border-bottom-style:solid;border-bottom-width:5px;border-left:5px solid transparent;border-right:5px solid transparent;content:\"\";position:fixed}.monaco-workbench .part.statusbar>.items-container>.statusbar-item>.statusbar-item-label{margin-left:3px;margin-right:3px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-left>.statusbar-item-label{margin-left:0;margin-right:3px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-right>.statusbar-item-label{margin-left:3px;margin-right:0}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.left.first-visible-item{padding-left:7px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.right.last-visible-item{margin-right:7px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-background-color.left.first-visible-item,.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-background-color.right.last-visible-item{padding-left:0;padding-right:0}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-background-color>.statusbar-item-label{margin-left:0;margin-right:0;padding-left:10px;padding-right:10px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-left.has-background-color>.statusbar-item-label{padding-left:3px;padding-right:10px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-right.has-background-color>.statusbar-item-label{padding-left:10px;padding-right:3px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item>.statusbar-item-label{align-items:center;cursor:pointer;display:flex;height:100%;outline-width:0;overflow:hidden;padding:0 5px;text-overflow:ellipsis;white-space:pre}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-left>.statusbar-item-label,.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-right>.statusbar-item-label{padding:0 3px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item>a:hover:not(.disabled){color:var(--vscode-statusBarItem-hoverForeground);text-decoration:none}.monaco-workbench .part.statusbar>.items-container>.statusbar-item>a.disabled{cursor:default}.monaco-workbench .part.statusbar>.items-container>.statusbar-item span.codicon{color:inherit;font-size:14px;text-align:center}.monaco-workbench .part.statusbar>.items-container>.statusbar-item a:active:not(.disabled){outline:1px solid var(--vscode-contrastActiveBorder)!important;outline-offset:-1px}.monaco-workbench:not(.hc-light):not(.hc-black) .part.statusbar>.items-container>.statusbar-item a:active:not(.disabled){background-color:var(--vscode-statusBarItem-activeBackground)!important}.monaco-workbench .part.statusbar>.items-container>.statusbar-item a:hover:not(.disabled){outline:1px dashed var(--vscode-contrastActiveBorder);outline-offset:-1px}.monaco-workbench:not(.hc-light):not(.hc-black) .part.statusbar>.items-container>.statusbar-item a:hover:not(.disabled){background-color:var(--vscode-statusBarItem-hoverBackground)}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.warning-kind{background-color:var(--vscode-statusBarItem-warningBackground);color:var(--vscode-statusBarItem-warningForeground)}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.warning-kind a:hover:not(.disabled){background-color:var(--vscode-statusBarItem-warningHoverBackground)!important;color:var(--vscode-statusBarItem-warningHoverForeground)}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.error-kind{background-color:var(--vscode-statusBarItem-errorBackground);color:var(--vscode-statusBarItem-errorForeground)}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.error-kind a:hover:not(.disabled){background-color:var(--vscode-statusBarItem-errorHoverBackground)!important;color:var(--vscode-statusBarItem-errorHoverForeground)}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.prominent-kind{background-color:var(--vscode-statusBarItem-prominentBackground);color:var(--vscode-statusBarItem-prominentForeground)}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.prominent-kind a:hover:not(.disabled){background-color:var(--vscode-statusBarItem-prominentHoverBackground)!important;color:var(--vscode-statusBarItem-prominentHoverForeground)}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.remote-kind{background-color:var(--vscode-statusBarItem-remoteBackground);color:var(--vscode-statusBarItem-remoteForeground)}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.remote-kind a:hover:not(.disabled){background-color:var(--vscode-statusBarItem-remoteHoverBackground)!important;color:var(--vscode-statusBarItem-remoteHoverForeground)}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.offline-kind{background-color:var(--vscode-statusBarItem-offlineBackground);color:var(--vscode-statusBarItem-offlineForeground)}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.offline-kind a:hover:not(.disabled){background-color:var(--vscode-statusBarItem-offlineHoverBackground)!important;color:var(--vscode-statusBarItem-offlineHoverForeground)}";
 n(css,{});
 export { css, css as default };

package/vscode/src/vs/workbench/browser/parts/statusbar/statusbarItem.js

@@ -4,7 +4,7 @@ import { Disposable, MutableDisposable } from 'monaco-editor/esm/vs/base/common/
 import { SimpleIconLabel } from '../../../../base/browser/ui/iconLabel/simpleIconLabel.js';
 import { ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
 import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
-import { ShowTooltipCommand } from '../../../services/statusbar/browser/statusbar.js';
+import { ShowTooltipCommand, StatusbarEntryKinds } from '../../../services/statusbar/browser/statusbar.js';
 import { IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
 import { isThemeColor } from 'monaco-editor/esm/vs/editor/common/editorCommon.js';
 import { show, hide, addDisposableListener, EventType, EventHelper, append } from 'monaco-editor/esm/vs/base/browser/dom.js';
@@ -106,11 +106,21 @@ let StatusbarEntryItem = class StatusbarEntryItem extends Disposable {
                 this.container.classList.remove('has-beak');
             }
         }
+        const hasBackgroundColor = !!entry.backgroundColor || (entry.kind && entry.kind !== 'standard');
+        if (!this.entry || entry.kind !== this.entry.kind) {
+            for (const kind of StatusbarEntryKinds) {
+                this.container.classList.remove(`${kind}-kind`);
+            }
+            if (entry.kind && entry.kind !== 'standard') {
+                this.container.classList.add(`${entry.kind}-kind`);
+            }
+            this.container.classList.toggle('has-background-color', hasBackgroundColor);
+        }
         if (!this.entry || entry.color !== this.entry.color) {
             this.applyColor(this.labelContainer, entry.color);
         }
         if (!this.entry || entry.backgroundColor !== this.entry.backgroundColor) {
-            this.container.classList.toggle('has-background-color', !!entry.backgroundColor);
+            this.container.classList.toggle('has-background-color', hasBackgroundColor);
             this.applyColor(this.container, entry.backgroundColor, true);
         }
         this.entry = entry;