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

package/vscode/src/vs/workbench/browser/parts/activitybar/activitybarActions.js

@@ -31,7 +31,12 @@ import { IUserDataProfileService } from '../../../services/userDataProfile/commo
 import { StandardMouseEvent } from 'monaco-editor/esm/vs/base/browser/mouseEvent.js';
 import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
 import { ISecretStorageService } from '../../../../platform/secrets/common/secrets.js';
+import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.js';
+import { runWhenIdle } from 'monaco-editor/esm/vs/base/common/async.js';
+import { Lazy } from 'monaco-editor/esm/vs/base/common/lazy.js';
+var ViewContainerActivityAction_1, AccountsActivityActionViewItem_1;
 let ViewContainerActivityAction = class ViewContainerActivityAction extends ActivityAction {
+    static { ViewContainerActivityAction_1 = this; }
     static { this.preventDoubleClickDelay = 300; }
     constructor(activity, paneCompositePart, layoutService, telemetryService, configurationService) {
         super(activity);
@@ -49,7 +54,7 @@ let ViewContainerActivityAction = class ViewContainerActivityAction extends Acti
             return;
         }
         const now = Date.now();
-        if (now > this.lastRun  && now - this.lastRun < ViewContainerActivityAction.preventDoubleClickDelay) {
+        if (now > this.lastRun  && now - this.lastRun < ViewContainerActivityAction_1.preventDoubleClickDelay) {
             return;
         }
         this.lastRun = now;
@@ -79,7 +84,7 @@ let ViewContainerActivityAction = class ViewContainerActivityAction extends Acti
         this.telemetryService.publicLog2('activityBarAction', { viewletId: this.activity.id, action });
     }
 };
-ViewContainerActivityAction = ( __decorate([
+ViewContainerActivityAction = ViewContainerActivityAction_1 = ( __decorate([
     ( __param(2, IWorkbenchLayoutService)),
     ( __param(3, ITelemetryService)),
     ( __param(4, IConfigurationService))
@@ -173,9 +178,11 @@ MenuActivityActionViewItem = ( __decorate([
     ( __param(13, IKeybindingService))
 ], MenuActivityActionViewItem));
 let AccountsActivityActionViewItem = class AccountsActivityActionViewItem extends MenuActivityActionViewItem {
+    static { AccountsActivityActionViewItem_1 = this; }
     static { this.ACCOUNTS_VISIBILITY_PREFERENCE_KEY = 'workbench.activity.showAccounts'; }
-    constructor(action, contextMenuActionsProvider, colors, activityHoverOptions, themeService, hoverService, contextMenuService, menuService, contextKeyService, authenticationService, environmentService, productService, configurationService, storageService, keybindingService, secretStorageService, credentialsService, logService) {
+    constructor(action, contextMenuActionsProvider, colors, activityHoverOptions, themeService, lifecycleService, hoverService, contextMenuService, menuService, contextKeyService, authenticationService, environmentService, productService, configurationService, storageService, keybindingService, secretStorageService, credentialsService, logService) {
         super(MenuId.AccountsContext, action, contextMenuActionsProvider, true, colors, activityHoverOptions, themeService, hoverService, menuService, contextMenuService, contextKeyService, configurationService, environmentService, keybindingService);
+        this.lifecycleService = lifecycleService;
         this.authenticationService = authenticationService;
         this.productService = productService;
         this.storageService = storageService;
@@ -185,7 +192,9 @@ let AccountsActivityActionViewItem = class AccountsActivityActionViewItem extend
         this.groupedAccounts = ( new Map());
         this.problematicProviders = ( new Set());
         this.initialized = false;
-        this.sessionFromEmbedder = getCurrentAuthenticationSessionInfo(this.credentialsService, this.secretStorageService, this.productService);
+        this.sessionFromEmbedder = ( new Lazy(
+            () => getCurrentAuthenticationSessionInfo(this.credentialsService, this.secretStorageService, this.productService)
+        ));
         this.registerListeners();
         this.initialize();
     }
@@ -212,6 +221,13 @@ let AccountsActivityActionViewItem = class AccountsActivityActionViewItem extend
         }));
     }
     async initialize() {
+        await this.lifecycleService.when(3 );
+        const disposable = this._register(runWhenIdle(async () => {
+            await this.doInitialize();
+            disposable.dispose();
+        }));
+    }
+    async doInitialize() {
         const providerIds = this.authenticationService.getProviderIds();
         const results = await Promise.allSettled(( providerIds.map(providerId => this.addAccountsFromProvider(providerId))));
         for (const result of results) {
@@ -287,7 +303,7 @@ let AccountsActivityActionViewItem = class AccountsActivityActionViewItem extend
     async resolveContextMenuActions(disposables) {
         const actions = await super.resolveContextMenuActions(disposables);
         actions.unshift(...[
-            toAction({ id: 'hideAccounts', label: ( localize('hideAccounts', "Hide Accounts")), run: () => this.storageService.store(AccountsActivityActionViewItem.ACCOUNTS_VISIBILITY_PREFERENCE_KEY, false, 0 , 0 ) }),
+            toAction({ id: 'hideAccounts', label: ( localize('hideAccounts', "Hide Accounts")), run: () => this.storageService.store(AccountsActivityActionViewItem_1.ACCOUNTS_VISIBILITY_PREFERENCE_KEY, false, 0 , 0 ) }),
             ( new Separator())
         ]);
         return actions;
@@ -307,7 +323,7 @@ let AccountsActivityActionViewItem = class AccountsActivityActionViewItem extend
             accounts = [];
             this.groupedAccounts.set(providerId, accounts);
         }
-        const sessionFromEmbedder = await this.sessionFromEmbedder;
+        const sessionFromEmbedder = await this.sessionFromEmbedder.value;
         let canSignOut = !!sessionFromEmbedder?.canSignOut;
         if (!canSignOut) {
             if (sessionFromEmbedder?.id) {
@@ -353,21 +369,22 @@ let AccountsActivityActionViewItem = class AccountsActivityActionViewItem extend
         }
     }
 };
-AccountsActivityActionViewItem = ( __decorate([
+AccountsActivityActionViewItem = AccountsActivityActionViewItem_1 = ( __decorate([
     ( __param(4, IThemeService)),
-    ( __param(5, IHoverService)),
-    ( __param(6, IContextMenuService)),
-    ( __param(7, IMenuService)),
-    ( __param(8, IContextKeyService)),
-    ( __param(9, IAuthenticationService)),
-    ( __param(10, IWorkbenchEnvironmentService)),
-    ( __param(11, IProductService)),
-    ( __param(12, IConfigurationService)),
-    ( __param(13, IStorageService)),
-    ( __param(14, IKeybindingService)),
-    ( __param(15, ISecretStorageService)),
-    ( __param(16, ICredentialsService)),
-    ( __param(17, ILogService))
+    ( __param(5, ILifecycleService)),
+    ( __param(6, IHoverService)),
+    ( __param(7, IContextMenuService)),
+    ( __param(8, IMenuService)),
+    ( __param(9, IContextKeyService)),
+    ( __param(10, IAuthenticationService)),
+    ( __param(11, IWorkbenchEnvironmentService)),
+    ( __param(12, IProductService)),
+    ( __param(13, IConfigurationService)),
+    ( __param(14, IStorageService)),
+    ( __param(15, IKeybindingService)),
+    ( __param(16, ISecretStorageService)),
+    ( __param(17, ICredentialsService)),
+    ( __param(18, ILogService))
 ], AccountsActivityActionViewItem));
 let GlobalActivityActionViewItem = class GlobalActivityActionViewItem extends MenuActivityActionViewItem {
     constructor(action, contextMenuActionsProvider, colors, activityHoverOptions, userDataProfileService, themeService, hoverService, menuService, contextMenuService, contextKeyService, configurationService, environmentService, keybindingService) {

package/vscode/src/vs/workbench/browser/parts/activitybar/activitybarPart.d.ts

@@ -89,7 +89,7 @@ declare class ActivitybarPart extends Part implements IPaneCompositeSelectorPart
     layout(width: number, height: number): void;
     private getViewContainer;
     private getViewContainers;
-    private onDidStorageValueChange;
+    private onDidPinnedViewContainersStorageValueChange;
     private saveCachedViewContainers;
     private _cachedViewContainers;
     private get cachedViewContainers();

package/vscode/src/vs/workbench/browser/parts/activitybar/activitybarPart.js

@@ -4,7 +4,7 @@ import { localize } from 'monaco-editor/esm/vs/nls.js';
 import { ActionBar } from 'monaco-editor/esm/vs/base/browser/ui/actionbar/actionbar.js';
 import { GLOBAL_ACTIVITY_ID, ACCOUNTS_ACTIVITY_ID } from '../../../common/activity.js';
 import { Part } from '../../part.js';
-import { GlobalActivityActionViewItem, AccountsActivityActionViewItem, ViewContainerActivityAction, PlaceHolderViewContainerActivityAction, PlaceHolderToggleCompositePinnedAction, PlaceHolderToggleCompositeBadgeAction } from './activitybarActions.js';
+import { AccountsActivityActionViewItem, GlobalActivityActionViewItem, ViewContainerActivityAction, PlaceHolderViewContainerActivityAction, PlaceHolderToggleCompositePinnedAction, PlaceHolderToggleCompositeBadgeAction } from './activitybarActions.js';
 import { NumberBadge } from '../../../services/activity/common/activity.js';
 import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
@@ -34,7 +34,9 @@ import { toAction, Separator } from 'monaco-editor/esm/vs/base/common/actions.js
 import { StandardKeyboardEvent } from 'monaco-editor/esm/vs/base/browser/keyboardEvent.js';
 import { registerIcon } from 'monaco-editor/esm/vs/platform/theme/common/iconRegistry.js';
 import { StringSHA1 } from 'monaco-editor/esm/vs/base/common/hash.js';
+var ActivitybarPart_1;
 let ActivitybarPart = class ActivitybarPart extends Part {
+    static { ActivitybarPart_1 = this; }
     static { this.PINNED_VIEW_CONTAINERS = 'workbench.activity.pinnedViewlets2'; }
     static { this.PLACEHOLDER_VIEW_CONTAINERS = 'workbench.activity.placeholderViewlets'; }
     static { this.ACTION_HEIGHT = 48; }
@@ -120,7 +122,7 @@ let ActivitybarPart = class ActivitybarPart extends Part {
             )),
             compositeSize: 52,
             colors: (theme) => this.getActivitybarItemColors(theme),
-            overflowActionSize: ActivitybarPart.ACTION_HEIGHT
+            overflowActionSize: ActivitybarPart_1.ACTION_HEIGHT
         }));
     }
     getActivityHoverOptions() {
@@ -157,7 +159,8 @@ let ActivitybarPart = class ActivitybarPart extends Part {
             disposables.clear();
             this.onDidRegisterExtensions();
             this.compositeBar.onDidChange(() => this.saveCachedViewContainers(), this, disposables);
-            this.storageService.onDidChangeValue(e => this.onDidStorageValueChange(e), this, disposables);
+            this.storageService.onDidChangeValue(0 , ActivitybarPart_1.PINNED_VIEW_CONTAINERS, disposables)(e => this.onDidPinnedViewContainersStorageValueChange(e), this, disposables);
+            this.storageService.onDidChangeValue(0 , AccountsActivityActionViewItem.ACCOUNTS_VISIBILITY_PREFERENCE_KEY, disposables)(() => this.toggleAccountsActivity(), this, disposables);
         }));
         this._register(this.configurationService.onDidChangeConfiguration(e => {
             if (e.affectsConfiguration('window.menuBarVisibility')) {
@@ -380,15 +383,15 @@ let ActivitybarPart = class ActivitybarPart extends Part {
         this.globalActivityAction = this._register(( new ActivityAction({
             id: 'workbench.actions.manage',
             name: ( localize('manage', "Manage")),
-            classNames: ThemeIcon.asClassNameArray(ActivitybarPart.GEAR_ICON),
+            classNames: ThemeIcon.asClassNameArray(ActivitybarPart_1.GEAR_ICON),
         })));
         if (this.accountsVisibilityPreference) {
             this.accountsActivityAction = this._register(( new ActivityAction({
                 id: 'workbench.actions.accounts',
                 name: ( localize('accounts', "Accounts")),
-                classNames: ThemeIcon.asClassNameArray(ActivitybarPart.ACCOUNTS_ICON)
+                classNames: ThemeIcon.asClassNameArray(ActivitybarPart_1.ACCOUNTS_ICON)
             })));
-            this.globalActivityActionBar.push(this.accountsActivityAction, { index: ActivitybarPart.ACCOUNTS_ACTION_INDEX });
+            this.globalActivityActionBar.push(this.accountsActivityAction, { index: ActivitybarPart_1.ACCOUNTS_ACTION_INDEX });
         }
         this.globalActivityActionBar.push(this.globalActivityAction);
     }
@@ -398,7 +401,7 @@ let ActivitybarPart = class ActivitybarPart extends Part {
         }
         if (this.globalActivityActionBar) {
             if (this.accountsActivityAction) {
-                this.globalActivityActionBar.pull(ActivitybarPart.ACCOUNTS_ACTION_INDEX);
+                this.globalActivityActionBar.pull(ActivitybarPart_1.ACCOUNTS_ACTION_INDEX);
                 this.accountsActivityAction = undefined;
             }
             else {
@@ -407,7 +410,7 @@ let ActivitybarPart = class ActivitybarPart extends Part {
                     name: ( localize('accounts', "Accounts")),
                     classNames: ThemeIcon.asClassNameArray(Codicon.account)
                 })));
-                this.globalActivityActionBar.push(this.accountsActivityAction, { index: ActivitybarPart.ACCOUNTS_ACTION_INDEX });
+                this.globalActivityActionBar.push(this.accountsActivityAction, { index: ActivitybarPart_1.ACCOUNTS_ACTION_INDEX });
             }
         }
         this.updateGlobalActivity(ACCOUNTS_ACTIVITY_ID);
@@ -427,7 +430,7 @@ let ActivitybarPart = class ActivitybarPart extends Part {
             else {
                 const cachedComposite = this.cachedViewContainers.filter(c => c.id === compositeId)[0];
                 compositeActions = {
-                    activityAction: this.instantiationService.createInstance(PlaceHolderViewContainerActivityAction, ActivitybarPart.toActivity(compositeId, compositeId, cachedComposite?.icon, undefined), this.paneCompositePart),
+                    activityAction: this.instantiationService.createInstance(PlaceHolderViewContainerActivityAction, ActivitybarPart_1.toActivity(compositeId, compositeId, cachedComposite?.icon, undefined), this.paneCompositePart),
                     pinnedAction: ( new PlaceHolderToggleCompositePinnedAction(compositeId, this.compositeBar)),
                     badgeAction: ( new PlaceHolderToggleCompositeBadgeAction(compositeId, this.compositeBar))
                 };
@@ -472,7 +475,7 @@ let ActivitybarPart = class ActivitybarPart extends Part {
         this.saveCachedViewContainers();
     }
     toActivity(viewContainerModel) {
-        return ActivitybarPart.toActivity(viewContainerModel.viewContainer.id, viewContainerModel.title, viewContainerModel.icon, viewContainerModel.keybindingId);
+        return ActivitybarPart_1.toActivity(viewContainerModel.viewContainer.id, viewContainerModel.title, viewContainerModel.icon, viewContainerModel.keybindingId);
     }
     static toActivity(id, name, icon, keybindingId) {
         let classNames = undefined;
@@ -603,7 +606,7 @@ let ActivitybarPart = class ActivitybarPart extends Part {
             availableHeight -= this.menuBarContainer.clientHeight;
         }
         if (this.globalActivityActionBar) {
-            availableHeight -= (this.globalActivityActionBar.viewItems.length * ActivitybarPart.ACTION_HEIGHT);
+            availableHeight -= (this.globalActivityActionBar.viewItems.length * ActivitybarPart_1.ACTION_HEIGHT);
         }
         this.compositeBar.layout(( new Dimension(width, availableHeight)));
     }
@@ -614,9 +617,8 @@ let ActivitybarPart = class ActivitybarPart extends Part {
     getViewContainers() {
         return this.viewDescriptorService.getViewContainersByLocation(this.location);
     }
-    onDidStorageValueChange(e) {
-        if (e.key === ActivitybarPart.PINNED_VIEW_CONTAINERS && e.scope === 0
-            && this.pinnedViewContainersValue !== this.getStoredPinnedViewContainersValue() ) {
+    onDidPinnedViewContainersStorageValueChange(e) {
+        if (this.pinnedViewContainersValue !== this.getStoredPinnedViewContainersValue() ) {
             this._pinnedViewContainersValue = undefined;
             this._cachedViewContainers = undefined;
             const newCompositeItems = [];
@@ -643,9 +645,6 @@ let ActivitybarPart = class ActivitybarPart extends Part {
             }
             this.compositeBar.setCompositeBarItems(newCompositeItems);
         }
-        if (e.key === AccountsActivityActionViewItem.ACCOUNTS_VISIBILITY_PREFERENCE_KEY && e.scope === 0 ) {
-            this.toggleAccountsActivity();
-        }
     }
     saveCachedViewContainers() {
         const state = [];
@@ -729,10 +728,10 @@ let ActivitybarPart = class ActivitybarPart extends Part {
         }
     }
     getStoredPinnedViewContainersValue() {
-        return this.storageService.get(ActivitybarPart.PINNED_VIEW_CONTAINERS, 0 , '[]');
+        return this.storageService.get(ActivitybarPart_1.PINNED_VIEW_CONTAINERS, 0 , '[]');
     }
     setStoredPinnedViewContainersValue(value) {
-        this.storageService.store(ActivitybarPart.PINNED_VIEW_CONTAINERS, value, 0 , 0 );
+        this.storageService.store(ActivitybarPart_1.PINNED_VIEW_CONTAINERS, value, 0 , 0 );
     }
     getPlaceholderViewContainers() {
         return JSON.parse(this.placeholderViewContainersValue);
@@ -753,10 +752,10 @@ let ActivitybarPart = class ActivitybarPart extends Part {
         }
     }
     getStoredPlaceholderViewContainersValue() {
-        return this.storageService.get(ActivitybarPart.PLACEHOLDER_VIEW_CONTAINERS, 0 , '[]');
+        return this.storageService.get(ActivitybarPart_1.PLACEHOLDER_VIEW_CONTAINERS, 0 , '[]');
     }
     setStoredPlaceholderViewContainersValue(value) {
-        this.storageService.store(ActivitybarPart.PLACEHOLDER_VIEW_CONTAINERS, value, 0 , 1 );
+        this.storageService.store(ActivitybarPart_1.PLACEHOLDER_VIEW_CONTAINERS, value, 0 , 1 );
     }
     get accountsVisibilityPreference() {
         return this.storageService.getBoolean(AccountsActivityActionViewItem.ACCOUNTS_VISIBILITY_PREFERENCE_KEY, 0 , true);
@@ -770,7 +769,7 @@ let ActivitybarPart = class ActivitybarPart extends Part {
         };
     }
 };
-ActivitybarPart = ( __decorate([
+ActivitybarPart = ActivitybarPart_1 = ( __decorate([
     ( __param(1, IInstantiationService)),
     ( __param(2, IWorkbenchLayoutService)),
     ( __param(3, IThemeService)),

package/vscode/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.js

@@ -21,12 +21,14 @@ import { ToggleAuxiliaryBarAction } from './auxiliaryBarActions.js';
 import { assertIsDefined } from 'monaco-editor/esm/vs/base/common/types.js';
 import { ToggleSidebarPositionAction } from '../../actions/layoutActions.js';
 import { ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
+var AuxiliaryBarPart_1;
 let AuxiliaryBarPart = class AuxiliaryBarPart extends BasePanelPart {
+    static { AuxiliaryBarPart_1 = this; }
     static { this.activePanelSettingsKey = 'workbench.auxiliarybar.activepanelid'; }
     static { this.pinnedPanelsKey = 'workbench.auxiliarybar.pinnedPanels'; }
     static { this.placeholdeViewContainersKey = 'workbench.auxiliarybar.placeholderPanels'; }
     constructor(notificationService, storageService, contextMenuService, layoutService, keybindingService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, commandService) {
-        super(notificationService, storageService, contextMenuService, layoutService, keybindingService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, "workbench.parts.auxiliarybar" , AuxiliaryBarPart.activePanelSettingsKey, AuxiliaryBarPart.pinnedPanelsKey, AuxiliaryBarPart.placeholdeViewContainersKey, Extensions.Auxiliary, SIDE_BAR_BACKGROUND, 2 , ActiveAuxiliaryContext.bindTo(contextKeyService), AuxiliaryBarFocusContext.bindTo(contextKeyService), {
+        super(notificationService, storageService, contextMenuService, layoutService, keybindingService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, "workbench.parts.auxiliarybar" , AuxiliaryBarPart_1.activePanelSettingsKey, AuxiliaryBarPart_1.pinnedPanelsKey, AuxiliaryBarPart_1.placeholdeViewContainersKey, Extensions.Auxiliary, SIDE_BAR_BACKGROUND, 2 , ActiveAuxiliaryContext.bindTo(contextKeyService), AuxiliaryBarFocusContext.bindTo(contextKeyService), {
             useIcons: true,
             hasTitle: true,
             borderWidth: () => (this.getColor(SIDE_BAR_BORDER) || this.getColor(contrastBorder)) ? 1 : 0,
@@ -70,7 +72,7 @@ let AuxiliaryBarPart = class AuxiliaryBarPart extends BasePanelPart {
         };
     }
 };
-AuxiliaryBarPart = ( __decorate([
+AuxiliaryBarPart = AuxiliaryBarPart_1 = ( __decorate([
     ( __param(0, INotificationService)),
     ( __param(1, IStorageService)),
     ( __param(2, IContextMenuService)),

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

@@ -4,4 +4,4 @@ interface IActivityHoverOptions {
     readonly position: () => HoverPosition;
 }
 
-export { IActivityHoverOptions };
+export type { IActivityHoverOptions };

package/vscode/src/vs/workbench/browser/parts/compositeBarActions.js

@@ -19,6 +19,7 @@ import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
 import { IHoverService } from '../../services/hover/browser/hover.js';
 import { RunOnceScheduler } from 'monaco-editor/esm/vs/base/common/async.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
+var ActivityActionViewItem_1, CompositeActionViewItem_1;
 class ActivityAction extends Action {
     constructor(_activity) {
         super(_activity.id, _activity.name, _activity.classNames?.join(' '), true);
@@ -64,6 +65,7 @@ class ActivityAction extends Action {
     }
 }
 let ActivityActionViewItem = class ActivityActionViewItem extends BaseActionViewItem {
+    static { ActivityActionViewItem_1 = this; }
     static { this.hoverLeaveTime = 0; }
     constructor(action, options, badgesEnabled, themeService, hoverService, configurationService, keybindingService) {
         super(null, action, options);
@@ -247,7 +249,7 @@ let ActivityActionViewItem = class ActivityActionViewItem extends BaseActionView
         this.updateTitle();
         this.hoverDisposables.add(addDisposableListener(this.container, EventType.MOUSE_OVER, () => {
             if (!this.showHoverScheduler.isScheduled()) {
-                if (Date.now() - ActivityActionViewItem.hoverLeaveTime < 200) {
+                if (Date.now() - ActivityActionViewItem_1.hoverLeaveTime < 200) {
                     this.showHover(true);
                 }
                 else {
@@ -257,7 +259,7 @@ let ActivityActionViewItem = class ActivityActionViewItem extends BaseActionView
         }, true));
         this.hoverDisposables.add(addDisposableListener(this.container, EventType.MOUSE_LEAVE, e => {
             if (e.target === this.container) {
-                ActivityActionViewItem.hoverLeaveTime = Date.now();
+                ActivityActionViewItem_1.hoverLeaveTime = Date.now();
                 this.hoverService.hideHover();
                 this.showHoverScheduler.cancel();
             }
@@ -290,7 +292,7 @@ let ActivityActionViewItem = class ActivityActionViewItem extends BaseActionView
         this.badge.remove();
     }
 };
-ActivityActionViewItem = ( __decorate([
+ActivityActionViewItem = ActivityActionViewItem_1 = ( __decorate([
     ( __param(3, IThemeService)),
     ( __param(4, IHoverService)),
     ( __param(5, IConfigurationService)),
@@ -379,6 +381,7 @@ ManageExtensionAction = ( __decorate([
     ( __param(0, ICommandService))
 ], ManageExtensionAction));
 let CompositeActionViewItem = class CompositeActionViewItem extends ActivityActionViewItem {
+    static { CompositeActionViewItem_1 = this; }
     constructor(options, compositeActivityAction, toggleCompositePinnedAction, toggleCompositeBadgeAction, compositeContextMenuActionsProvider, contextMenuActionsProvider, dndHandler, compositeBar, contextMenuService, keybindingService, instantiationService, themeService, hoverService, configurationService) {
         super(compositeActivityAction, options, compositeBar.areBadgesEnabled.bind(compositeBar), themeService, hoverService, configurationService, keybindingService);
         this.compositeActivityAction = compositeActivityAction;
@@ -389,8 +392,8 @@ let CompositeActionViewItem = class CompositeActionViewItem extends ActivityActi
         this.dndHandler = dndHandler;
         this.compositeBar = compositeBar;
         this.contextMenuService = contextMenuService;
-        if (!CompositeActionViewItem.manageExtensionAction) {
-            CompositeActionViewItem.manageExtensionAction = instantiationService.createInstance(ManageExtensionAction);
+        if (!CompositeActionViewItem_1.manageExtensionAction) {
+            CompositeActionViewItem_1.manageExtensionAction = instantiationService.createInstance(ManageExtensionAction);
         }
     }
     render(container) {
@@ -474,7 +477,7 @@ let CompositeActionViewItem = class CompositeActionViewItem extends ActivityActi
         }
         if (this.compositeActivityAction.activity.extensionId) {
             actions.push(( new Separator()));
-            actions.push(CompositeActionViewItem.manageExtensionAction);
+            actions.push(CompositeActionViewItem_1.manageExtensionAction);
         }
         const isPinned = this.compositeBar.isPinned(this.activity.id);
         if (isPinned) {
@@ -538,7 +541,7 @@ let CompositeActionViewItem = class CompositeActionViewItem extends ActivityActi
         this.label.remove();
     }
 };
-CompositeActionViewItem = ( __decorate([
+CompositeActionViewItem = CompositeActionViewItem_1 = ( __decorate([
     ( __param(8, IContextMenuService)),
     ( __param(9, IKeybindingService)),
     ( __param(10, IInstantiationService)),

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

@@ -81,4 +81,4 @@ declare abstract class CompositePart<T extends Composite> extends Part {
     dispose(): void;
 }
 
-export { CompositePart, ICompositeTitleLabel };
+export { CompositePart, type ICompositeTitleLabel };

package/vscode/src/vs/workbench/browser/parts/compositePart.js

@@ -10,7 +10,7 @@ import { Part } from '../part.js';
 import { ServiceCollection } from 'monaco-editor/esm/vs/platform/instantiation/common/serviceCollection.js';
 import { IEditorProgressService } from 'monaco-editor/esm/vs/platform/progress/common/progress.js';
 import { $, show, hide, append, Dimension } from 'monaco-editor/esm/vs/base/browser/dom.js';
-import { assertIsDefined, withNullAsUndefined } from 'monaco-editor/esm/vs/base/common/types.js';
+import { assertIsDefined } from 'monaco-editor/esm/vs/base/common/types.js';
 import { createActionViewItem } from 'monaco-editor/esm/vs/platform/actions/browser/menuEntryActionViewItem.js';
 import { ScopedProgressIndicator, AbstractProgressScope } from '../../services/progress/browser/progressIndicator.js';
 import { WorkbenchToolBar } from 'monaco-editor/esm/vs/platform/actions/browser/toolbar.js';
@@ -181,7 +181,7 @@ class CompositePart extends Part {
             compositeTitle = compositeDescriptor.name;
         }
         const keybinding = this.keybindingService.lookupKeybinding(compositeId);
-        this.titleLabel.updateTitle(compositeId, compositeTitle, withNullAsUndefined(keybinding?.getLabel()));
+        this.titleLabel.updateTitle(compositeId, compositeTitle, keybinding?.getLabel() ?? undefined);
         const toolBar = assertIsDefined(this.toolBar);
         toolBar.setAriaLabel(( localize('ariaCompositeToolbarLabel', "{0} actions", compositeTitle)));
     }

package/vscode/src/vs/workbench/browser/parts/dialogs/dialogHandler.js

@@ -15,7 +15,9 @@ import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiati
 import { MarkdownRenderer } from 'monaco-editor/esm/vs/editor/contrib/markdownRenderer/browser/markdownRenderer.js';
 import { defaultButtonStyles, defaultCheckboxStyles, defaultInputBoxStyles, defaultDialogStyles } from 'monaco-editor/esm/vs/platform/theme/browser/defaultStyles.js';
 import { AbstractDialogHandler } from '../../../../platform/dialogs/common/dialogs.js';
+var BrowserDialogHandler_1;
 let BrowserDialogHandler = class BrowserDialogHandler extends AbstractDialogHandler {
+    static { BrowserDialogHandler_1 = this; }
     static { this.ALLOWABLE_COMMANDS = [
         'copy',
         'cut',
@@ -91,7 +93,7 @@ let BrowserDialogHandler = class BrowserDialogHandler extends AbstractDialogHand
             keyEventProcessor: (event) => {
                 const resolved = this.keybindingService.softDispatch(event, this.layoutService.container);
                 if (resolved.kind === 2  && resolved.commandId) {
-                    if (BrowserDialogHandler.ALLOWABLE_COMMANDS.indexOf(resolved.commandId) === -1) {
+                    if (BrowserDialogHandler_1.ALLOWABLE_COMMANDS.indexOf(resolved.commandId) === -1) {
                         EventHelper.stop(event, true);
                     }
                 }
@@ -114,7 +116,7 @@ let BrowserDialogHandler = class BrowserDialogHandler extends AbstractDialogHand
         return result;
     }
 };
-BrowserDialogHandler = ( __decorate([
+BrowserDialogHandler = BrowserDialogHandler_1 = ( __decorate([
     ( __param(0, ILogService)),
     ( __param(1, ILayoutService)),
     ( __param(2, IKeybindingService)),

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

@@ -8,8 +8,6 @@ import { CommandsRegistry } from 'monaco-editor/esm/vs/platform/commands/common/
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
 import { NotificationPriority, INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
 import { IStatusbarService } from '../../../services/statusbar/browser/statusbar.js';
-import { themeColorFromId } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
-import { STATUS_BAR_PROMINENT_ITEM_BACKGROUND, STATUS_BAR_PROMINENT_ITEM_FOREGROUND } from '../../../common/theme.js';
 let AccessibilityStatus = class AccessibilityStatus extends Disposable {
     constructor(configurationService, notificationService, _accessibilityService, statusbarService) {
         super();
@@ -30,26 +28,24 @@ let AccessibilityStatus = class AccessibilityStatus extends Disposable {
         this.updateScreenReaderModeElement(this._accessibilityService.isScreenReaderOptimized());
     }
     showScreenReaderNotification() {
-        if (!this.screenReaderNotification) {
-            this.screenReaderNotification = this.notificationService.prompt(Severity.Info, ( localize(
-                'screenReaderDetectedExplanation.question',
-                "Are you using a screen reader to operate VS Code?"
-            )), [{
-                    label: ( localize('screenReaderDetectedExplanation.answerYes', "Yes")),
-                    run: () => {
-                        this.configurationService.updateValue('editor.accessibilitySupport', 'on', 2 );
-                    }
-                }, {
-                    label: ( localize('screenReaderDetectedExplanation.answerNo', "No")),
-                    run: () => {
-                        this.configurationService.updateValue('editor.accessibilitySupport', 'off', 2 );
-                    }
-                }], {
-                sticky: true,
-                priority: NotificationPriority.URGENT
-            });
-            Event.once(this.screenReaderNotification.onDidClose)(() => this.screenReaderNotification = null);
-        }
+        this.screenReaderNotification = this.notificationService.prompt(Severity.Info, ( localize(
+            'screenReaderDetectedExplanation.question',
+            "Are you using a screen reader to operate VS Code?"
+        )), [{
+                label: ( localize('screenReaderDetectedExplanation.answerYes', "Yes")),
+                run: () => {
+                    this.configurationService.updateValue('editor.accessibilitySupport', 'on', 2 );
+                }
+            }, {
+                label: ( localize('screenReaderDetectedExplanation.answerNo', "No")),
+                run: () => {
+                    this.configurationService.updateValue('editor.accessibilitySupport', 'off', 2 );
+                }
+            }], {
+            sticky: true,
+            priority: NotificationPriority.URGENT
+        });
+        Event.once(this.screenReaderNotification.onDidClose)(() => this.screenReaderNotification = null);
     }
     updateScreenReaderModeElement(visible) {
         if (visible) {
@@ -60,8 +56,7 @@ let AccessibilityStatus = class AccessibilityStatus extends Disposable {
                     text,
                     ariaLabel: text,
                     command: 'showEditorScreenReaderNotification',
-                    backgroundColor: themeColorFromId(STATUS_BAR_PROMINENT_ITEM_BACKGROUND),
-                    color: themeColorFromId(STATUS_BAR_PROMINENT_ITEM_FOREGROUND)
+                    kind: 'prominent'
                 }, 'status.editor.screenReaderMode', 1 , 100.6);
             }
         }

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

@@ -31,6 +31,7 @@ import { Categories } from 'monaco-editor/esm/vs/platform/action/common/actionCo
 import { registerIcon } from 'monaco-editor/esm/vs/platform/theme/common/iconRegistry.js';
 import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
 import { defaultBreadcrumbsWidgetStyles } from 'monaco-editor/esm/vs/platform/theme/browser/defaultStyles.js';
+var BreadcrumbsControl_1;
 class OutlineItem extends BreadcrumbsItem {
     constructor(model, element, options) {
         super();
@@ -112,6 +113,7 @@ class FileItem extends BreadcrumbsItem {
 }
 const separatorIcon = registerIcon('breadcrumb-separator', Codicon.chevronRight, ( localize('separatorIcon', 'Icon for the separator in the breadcrumbs.')));
 let BreadcrumbsControl = class BreadcrumbsControl {
+    static { BreadcrumbsControl_1 = this; }
     static { this.HEIGHT = 22; }
     static { this.SCROLLBAR_SIZES = {
         default: 3,
@@ -148,16 +150,16 @@ let BreadcrumbsControl = class BreadcrumbsControl {
         const styles = _options.widgetStyles ?? defaultBreadcrumbsWidgetStyles;
         this._widget = ( new BreadcrumbsWidget(
             this.domNode,
-            BreadcrumbsControl.SCROLLBAR_SIZES[sizing],
+            BreadcrumbsControl_1.SCROLLBAR_SIZES[sizing],
             separatorIcon,
             styles
         ));
         this._widget.onDidSelectItem(this._onSelectEvent, this, this._disposables);
         this._widget.onDidFocusItem(this._onFocusEvent, this, this._disposables);
         this._widget.onDidChangeFocus(this._updateCkBreadcrumbsActive, this, this._disposables);
-        this._ckBreadcrumbsPossible = BreadcrumbsControl.CK_BreadcrumbsPossible.bindTo(this._contextKeyService);
-        this._ckBreadcrumbsVisible = BreadcrumbsControl.CK_BreadcrumbsVisible.bindTo(this._contextKeyService);
-        this._ckBreadcrumbsActive = BreadcrumbsControl.CK_BreadcrumbsActive.bindTo(this._contextKeyService);
+        this._ckBreadcrumbsPossible = BreadcrumbsControl_1.CK_BreadcrumbsPossible.bindTo(this._contextKeyService);
+        this._ckBreadcrumbsVisible = BreadcrumbsControl_1.CK_BreadcrumbsVisible.bindTo(this._contextKeyService);
+        this._ckBreadcrumbsActive = BreadcrumbsControl_1.CK_BreadcrumbsActive.bindTo(this._contextKeyService);
         this._disposables.add(breadcrumbsService.register(this._editorGroup.id, this._widget));
         this.hide();
     }
@@ -247,7 +249,7 @@ let BreadcrumbsControl = class BreadcrumbsControl {
         this._breadcrumbsDisposables.add(toDisposable(() => this._widget.setItems([])));
         const updateScrollbarSizing = () => {
             const sizing = this._cfTitleScrollbarSizing.getValue() ?? 'default';
-            this._widget.setHorizontalScrollbarSize(BreadcrumbsControl.SCROLLBAR_SIZES[sizing]);
+            this._widget.setHorizontalScrollbarSize(BreadcrumbsControl_1.SCROLLBAR_SIZES[sizing]);
         };
         updateScrollbarSizing();
         const updateScrollbarSizeListener = this._cfTitleScrollbarSizing.onDidChange(updateScrollbarSizing);
@@ -372,7 +374,7 @@ let BreadcrumbsControl = class BreadcrumbsControl {
                 const items = this._widget.getItems();
                 const idx = items.indexOf(event.item);
                 this._widget.setFocused(items[idx + 1]);
-                this._widget.setSelection(items[idx + 1], BreadcrumbsControl.Payload_Pick);
+                this._widget.setSelection(items[idx + 1], BreadcrumbsControl_1.Payload_Pick);
             }
         }
         else {
@@ -380,10 +382,10 @@ let BreadcrumbsControl = class BreadcrumbsControl {
         }
     }
     _getEditorGroup(data) {
-        if (data === BreadcrumbsControl.Payload_RevealAside) {
+        if (data === BreadcrumbsControl_1.Payload_RevealAside) {
             return SIDE_GROUP;
         }
-        else if (data === BreadcrumbsControl.Payload_Reveal) {
+        else if (data === BreadcrumbsControl_1.Payload_Reveal) {
             return ACTIVE_GROUP;
         }
         else {
@@ -391,7 +393,7 @@ let BreadcrumbsControl = class BreadcrumbsControl {
         }
     }
 };
-BreadcrumbsControl = ( __decorate([
+BreadcrumbsControl = BreadcrumbsControl_1 = ( __decorate([
     ( __param(3, IContextKeyService)),
     ( __param(4, IContextViewService)),
     ( __param(5, IInstantiationService)),

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

@@ -9,7 +9,6 @@ import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
 import { BreadcrumbsConfig } from './breadcrumbs.js';
 import { FileKind } from 'monaco-editor/esm/vs/platform/files/common/files.js';
-import { withNullAsUndefined } from 'monaco-editor/esm/vs/base/common/types.js';
 import { IOutlineService } from '../../../services/outline/browser/outline.js';
 import { matchesSomeScheme } from 'monaco-editor/esm/vs/platform/opener/common/opener.js';
 class FileElement {
@@ -89,7 +88,7 @@ let BreadcrumbsModel = class BreadcrumbsModel {
             };
         }
         const info = {
-            folder: withNullAsUndefined(this._workspaceService.getWorkspaceFolder(uri)),
+            folder: this._workspaceService.getWorkspaceFolder(uri) ?? undefined,
             path: []
         };
         let uriPrefix = uri;