@codingame/monaco-vscode-api 5.3.0 → 6.0.1

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

@@ -1,8 +1,8 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
-import { KeybindingsRegistry } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
-import { KeyChord } from '../../../../base/common/keyCodes.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeyChord, KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
 import { isNotificationViewItem } from '../../../common/notifications.js';
 import { MenuRegistry, MenuId } from '../../../../platform/actions/common/actions.js';
 import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
@@ -60,8 +60,8 @@ function getNotificationFromContext(listService, context) {
 function registerNotificationCommands(center, toasts, model) {
     KeybindingsRegistry.registerCommandAndKeybindingRule({
         id: SHOW_NOTIFICATIONS_CENTER,
-        weight: 200 ,
-        primary: KeyChord(2048  | 41 , 2048  | 1024  | 44 ),
+        weight: KeybindingWeight.WorkbenchContrib,
+        primary: KeyChord(KeyMod$1.CtrlCmd | KeyCode.KeyK, KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.KeyN),
         handler: () => {
             toasts.hide();
             center.show();
@@ -69,9 +69,9 @@ function registerNotificationCommands(center, toasts, model) {
     });
     KeybindingsRegistry.registerCommandAndKeybindingRule({
         id: HIDE_NOTIFICATIONS_CENTER,
-        weight: 200  + 50,
+        weight: KeybindingWeight.WorkbenchContrib + 50,
         when: NotificationsCenterVisibleContext,
-        primary: 9 ,
+        primary: KeyCode.Escape,
         handler: accessor => {
             const telemetryService = accessor.get(ITelemetryService);
             for (const notification of model.notifications) {
@@ -93,11 +93,11 @@ function registerNotificationCommands(center, toasts, model) {
     });
     KeybindingsRegistry.registerCommandAndKeybindingRule({
         id: CLEAR_NOTIFICATION,
-        weight: 200 ,
+        weight: KeybindingWeight.WorkbenchContrib,
         when: NotificationFocusedContext,
-        primary: 20 ,
+        primary: KeyCode.Delete,
         mac: {
-            primary: 2048  | 1
+            primary: KeyMod$1.CtrlCmd | KeyCode.Backspace
         },
         handler: (accessor, args) => {
             const accessibilitySignalService = accessor.get(IAccessibilitySignalService);
@@ -110,9 +110,9 @@ function registerNotificationCommands(center, toasts, model) {
     });
     KeybindingsRegistry.registerCommandAndKeybindingRule({
         id: EXPAND_NOTIFICATION,
-        weight: 200 ,
+        weight: KeybindingWeight.WorkbenchContrib,
         when: NotificationFocusedContext,
-        primary: 17 ,
+        primary: KeyCode.RightArrow,
         handler: (accessor, args) => {
             const notification = getNotificationFromContext(accessor.get(IListService), args);
             notification?.expand();
@@ -120,9 +120,9 @@ function registerNotificationCommands(center, toasts, model) {
     });
     KeybindingsRegistry.registerCommandAndKeybindingRule({
         id: ACCEPT_PRIMARY_ACTION_NOTIFICATION,
-        weight: 200 ,
+        weight: KeybindingWeight.WorkbenchContrib,
         when: ( (ContextKeyExpr.or(NotificationFocusedContext, NotificationsToastsVisibleContext))),
-        primary: 2048  | 1024  | 31 ,
+        primary: KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.KeyA,
         handler: (accessor) => {
             const actionRunner = accessor.get(IInstantiationService).createInstance(NotificationActionRunner);
             const notification = getNotificationFromContext(accessor.get(IListService)) || firstOrDefault(model.notifications);
@@ -139,9 +139,9 @@ function registerNotificationCommands(center, toasts, model) {
     });
     KeybindingsRegistry.registerCommandAndKeybindingRule({
         id: COLLAPSE_NOTIFICATION,
-        weight: 200 ,
+        weight: KeybindingWeight.WorkbenchContrib,
         when: NotificationFocusedContext,
-        primary: 15 ,
+        primary: KeyCode.LeftArrow,
         handler: (accessor, args) => {
             const notification = getNotificationFromContext(accessor.get(IListService), args);
             notification?.collapse();
@@ -149,10 +149,10 @@ function registerNotificationCommands(center, toasts, model) {
     });
     KeybindingsRegistry.registerCommandAndKeybindingRule({
         id: TOGGLE_NOTIFICATION,
-        weight: 200 ,
+        weight: KeybindingWeight.WorkbenchContrib,
         when: NotificationFocusedContext,
-        primary: 10 ,
-        secondary: [3 ],
+        primary: KeyCode.Space,
+        secondary: [KeyCode.Enter],
         handler: accessor => {
             const notification = getNotificationFromContext(accessor.get(IListService));
             notification?.toggle();
@@ -169,51 +169,51 @@ function registerNotificationCommands(center, toasts, model) {
     });
     KeybindingsRegistry.registerKeybindingRule({
         id: HIDE_NOTIFICATION_TOAST,
-        weight: 200  - 50,
+        weight: KeybindingWeight.WorkbenchContrib - 50,
         when: NotificationsToastsVisibleContext,
-        primary: 9
+        primary: KeyCode.Escape
     });
     KeybindingsRegistry.registerKeybindingRule({
         id: HIDE_NOTIFICATION_TOAST,
-        weight: 200  + 100,
+        weight: KeybindingWeight.WorkbenchContrib + 100,
         when: ( (ContextKeyExpr.and(NotificationsToastsVisibleContext, NotificationFocusedContext))),
-        primary: 9
+        primary: KeyCode.Escape
     });
     CommandsRegistry.registerCommand(FOCUS_NOTIFICATION_TOAST, () => toasts.focus());
     KeybindingsRegistry.registerCommandAndKeybindingRule({
         id: FOCUS_NEXT_NOTIFICATION_TOAST,
-        weight: 200 ,
+        weight: KeybindingWeight.WorkbenchContrib,
         when: ( (ContextKeyExpr.and(NotificationFocusedContext, NotificationsToastsVisibleContext))),
-        primary: 18 ,
+        primary: KeyCode.DownArrow,
         handler: () => {
             toasts.focusNext();
         }
     });
     KeybindingsRegistry.registerCommandAndKeybindingRule({
         id: FOCUS_PREVIOUS_NOTIFICATION_TOAST,
-        weight: 200 ,
+        weight: KeybindingWeight.WorkbenchContrib,
         when: ( (ContextKeyExpr.and(NotificationFocusedContext, NotificationsToastsVisibleContext))),
-        primary: 16 ,
+        primary: KeyCode.UpArrow,
         handler: () => {
             toasts.focusPrevious();
         }
     });
     KeybindingsRegistry.registerCommandAndKeybindingRule({
         id: FOCUS_FIRST_NOTIFICATION_TOAST,
-        weight: 200 ,
+        weight: KeybindingWeight.WorkbenchContrib,
         when: ( (ContextKeyExpr.and(NotificationFocusedContext, NotificationsToastsVisibleContext))),
-        primary: 11 ,
-        secondary: [14 ],
+        primary: KeyCode.PageUp,
+        secondary: [KeyCode.Home],
         handler: () => {
             toasts.focusFirst();
         }
     });
     KeybindingsRegistry.registerCommandAndKeybindingRule({
         id: FOCUS_LAST_NOTIFICATION_TOAST,
-        weight: 200 ,
+        weight: KeybindingWeight.WorkbenchContrib,
         when: ( (ContextKeyExpr.and(NotificationFocusedContext, NotificationsToastsVisibleContext))),
-        primary: 12 ,
-        secondary: [13 ],
+        primary: KeyCode.PageDown,
+        secondary: [KeyCode.End],
         handler: () => {
             toasts.focusLast();
         }
@@ -236,7 +236,7 @@ function registerNotificationCommands(center, toasts, model) {
             filter: source.filter
         }))));
         picker.canSelectMany = true;
-        picker.placeholder = ( localizeWithPath(_moduleId, 0, "Select sources to enable notifications for"));
+        picker.placeholder = ( localizeWithPath(_moduleId, 0, "Select sources to enable all notifications from"));
         picker.selectedItems = picker.items.filter(item => item.filter === NotificationsFilter.OFF);
         picker.show();
         disposables.add(picker.onDidAccept(async () => {

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

@@ -1,4 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { NotificationChangeType, StatusMessageChangeType } from '../../../common/notifications.js';
+import { StatusbarAlignment } from '../../../services/statusbar/browser/statusbar.js';
 import { IStatusbarService } from '../../../services/statusbar/browser/statusbar.service.js';
 import { Disposable, dispose } from '../../../../base/common/lifecycle.js';
 import { HIDE_NOTIFICATIONS_CENTER, SHOW_NOTIFICATIONS_CENTER } from './notificationsCommands.js';
@@ -28,10 +30,10 @@ let NotificationsStatus = class NotificationsStatus extends Disposable {
     }
     onDidChangeNotification(e) {
         if (!this.isNotificationsCenterVisible) {
-            if (e.kind === 0 ) {
+            if (e.kind === NotificationChangeType.ADD) {
                 this.newNotificationsCount++;
             }
-            else if (e.kind === 3  && this.newNotificationsCount > 0) {
+            else if (e.kind === NotificationChangeType.REMOVE && this.newNotificationsCount > 0) {
                 this.newNotificationsCount--;
             }
         }
@@ -63,7 +65,7 @@ let NotificationsStatus = class NotificationsStatus extends Disposable {
             };
         }
         if (!this.notificationsCenterStatusItem) {
-            this.notificationsCenterStatusItem = this.statusbarService.addEntry(statusProperties, 'status.notifications', 1 , -Number.MAX_VALUE );
+            this.notificationsCenterStatusItem = this.statusbarService.addEntry(statusProperties, 'status.notifications', StatusbarAlignment.RIGHT, -Number.MAX_VALUE );
         }
         else {
             this.notificationsCenterStatusItem.update(statusProperties);
@@ -127,10 +129,10 @@ let NotificationsStatus = class NotificationsStatus extends Disposable {
     onDidChangeStatusMessage(e) {
         const statusItem = e.item;
         switch (e.kind) {
-            case 0 :
+            case StatusMessageChangeType.ADD:
                 this.doSetStatusMessage(statusItem);
                 break;
-            case 1 :
+            case StatusMessageChangeType.REMOVE:
                 if (this.currentStatusMessage && this.currentStatusMessage[0] === statusItem) {
                     dispose(this.currentStatusMessage[1]);
                     this.currentStatusMessage = undefined;
@@ -151,7 +153,7 @@ let NotificationsStatus = class NotificationsStatus extends Disposable {
                 name: ( localizeWithPath(_moduleId, 11, "Status Message")),
                 text: message,
                 ariaLabel: message
-            }, 'status.message', 0 , -Number.MAX_VALUE );
+            }, 'status.message', StatusbarAlignment.LEFT, -Number.MAX_VALUE );
             showHandle = null;
         }, showAfter);
         let hideHandle;

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

@@ -1,11 +1,13 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/notificationsToasts.css.js';
 import { localizeWithPath } from '../../../../nls.js';
+import { NotificationChangeType, NotificationViewItemContentChangeKind } from '../../../common/notifications.js';
 import { toDisposable, dispose, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { Dimension, scheduleAtNextAnimationFrame, getWindow, addDisposableListener, isAncestorOfActiveElement, EventType } from '../../../../base/browser/dom.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { NotificationsList } from './notificationsList.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
+import { Parts } from '../../../services/layout/browser/layoutService.js';
 import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.service.js';
 import { NOTIFICATIONS_BACKGROUND, NOTIFICATIONS_TOAST_BORDER } from '../../../common/theme.js';
 import { Themable } from '../../../../platform/theme/common/themeService.js';
@@ -24,6 +26,8 @@ import '../../../../platform/theme/common/colors/searchColors.js';
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.service.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { NotificationsFilter, NotificationPriority } from '../../../../platform/notification/common/notification.js';
+import { ScrollbarVisibility } from '../../../../base/common/scrollable.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
 import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.service.js';
 import { IHostService } from '../../../services/host/browser/host.service.js';
 import { IntervalCounter } from '../../../../base/common/async.js';
@@ -74,7 +78,7 @@ let NotificationsToasts = class NotificationsToasts extends Themable {
     }
     registerListeners() {
         this._register(this.layoutService.onDidLayoutMainContainer(dimension => this.layout(Dimension.lift(dimension))));
-        this.lifecycleService.when(3 ).then(() => {
+        this.lifecycleService.when(LifecyclePhase.Restored).then(() => {
             this.model.notifications.forEach(notification => this.addToast(notification));
             this._register(this.model.onDidChangeNotification(e => this.onDidChangeNotification(e)));
         });
@@ -93,9 +97,9 @@ let NotificationsToasts = class NotificationsToasts extends Themable {
     }
     onDidChangeNotification(e) {
         switch (e.kind) {
-            case 0 :
+            case NotificationChangeType.ADD:
                 return this.addToast(e.item);
-            case 3 :
+            case NotificationChangeType.REMOVE:
                 return this.removeToast(e.item);
         }
     }
@@ -134,7 +138,7 @@ let NotificationsToasts = class NotificationsToasts extends Themable {
         notificationToast.classList.add('notification-toast');
         notificationToastContainer.appendChild(notificationToast);
         const notificationList = this.instantiationService.createInstance(NotificationsList, notificationToast, {
-            verticalScrollMode: 2 ,
+            verticalScrollMode: ScrollbarVisibility.Hidden,
             widgetAriaLabel: (() => {
                 if (!item.source) {
                     return ( localizeWithPath(_moduleId, 0, "{0}, notification", item.message.raw));
@@ -162,10 +166,10 @@ let NotificationsToasts = class NotificationsToasts extends Themable {
         }));
         itemDisposables.add(item.onDidChangeContent(e => {
             switch (e.kind) {
-                case 2 :
+                case NotificationViewItemContentChangeKind.ACTIONS:
                     notificationList.updateNotificationsList(0, 1, [item]);
                     break;
-                case 1 :
+                case NotificationViewItemContentChangeKind.MESSAGE:
                     if (item.expanded) {
                         notificationList.updateNotificationHeight(item);
                     }
@@ -376,10 +380,10 @@ let NotificationsToasts = class NotificationsToasts extends Themable {
             availableWidth = this.workbenchDimensions.width;
             availableWidth -= (2 * 8);
             availableHeight = this.workbenchDimensions.height;
-            if (this.layoutService.isVisible("workbench.parts.statusbar" , mainWindow)) {
+            if (this.layoutService.isVisible(Parts.STATUSBAR_PART, mainWindow)) {
                 availableHeight -= 22;
             }
-            if (this.layoutService.isVisible("workbench.parts.titlebar" , mainWindow)) {
+            if (this.layoutService.isVisible(Parts.TITLEBAR_PART, mainWindow)) {
                 availableHeight -= 22;
             }
             availableHeight -= (2 * 12);

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

@@ -9,7 +9,7 @@ import { toAction, Separator, ActionRunner } from '../../../../base/common/actio
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { DisposableStore, dispose, Disposable } from '../../../../base/common/lifecycle.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
-import { NotificationViewItem, ChoiceAction } from '../../../common/notifications.js';
+import { NotificationViewItem, NotificationViewItemContentChangeKind, ChoiceAction } from '../../../common/notifications.js';
 import { ConfigureNotificationAction, ClearNotificationAction, ExpandNotificationAction, CollapseNotificationAction } from './notificationsActions.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 import { ProgressBar } from '../../../../base/browser/ui/progressbar/progressbar.js';
@@ -23,6 +23,7 @@ import { DomEmitter } from '../../../../base/browser/event.js';
 import { Gesture, EventType as EventType$1 } from '../../../../base/browser/touch.js';
 import { Event } from '../../../../base/common/event.js';
 import { defaultProgressBarStyles, defaultButtonStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
 import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
@@ -117,7 +118,7 @@ class NotificationMessageRenderer {
                     const onKeydown = actionHandler.toDispose.add(( (new DomEmitter(anchor, EventType.KEY_DOWN)))).event;
                     const onSpaceOrEnter = Event.chain(onKeydown, $ => $.filter(e => {
                         const event = ( (new StandardKeyboardEvent(e)));
-                        return event.equals(10 ) || event.equals(3 );
+                        return event.equals(KeyCode.Space) || event.equals(KeyCode.Enter);
                     }));
                     actionHandler.toDispose.add(Gesture.addTarget(anchor));
                     const onTap = actionHandler.toDispose.add(( (new DomEmitter(anchor, EventType$1.Tap)))).event;
@@ -167,7 +168,12 @@ let NotificationRenderer = class NotificationRenderer {
                                 const isSourceFiltered = that.notificationService.getFilter(source) === NotificationsFilter.ERROR;
                                 actions.push(toAction({
                                     id: source.id,
-                                    label: isSourceFiltered ? ( localizeWithPath(_moduleId, 2, "Turn On Notifications from '{0}'", source.label)) : ( localizeWithPath(_moduleId, 3, "Turn Off Notifications from '{0}'", source.label)),
+                                    label: isSourceFiltered ? ( localizeWithPath(_moduleId, 2, "Turn On All Notifications from '{0}'", source.label)) : ( localizeWithPath(
+                                        _moduleId,
+                                        3,
+                                        "Turn Off Info and Warning Notifications from '{0}'",
+                                        source.label
+                                    )),
                                     run: () => that.notificationService.setFilter({ ...source, filter: isSourceFiltered ? NotificationsFilter.OFF : NotificationsFilter.ERROR })
                                 }));
                                 if (action.notification.actions?.secondary?.length) {
@@ -268,13 +274,13 @@ let NotificationTemplateRenderer = class NotificationTemplateRenderer extends Di
         this.renderProgress(notification);
         this.inputDisposables.add(notification.onDidChangeContent(event => {
             switch (event.kind) {
-                case 0 :
+                case NotificationViewItemContentChangeKind.SEVERITY:
                     this.renderSeverity(notification);
                     break;
-                case 3 :
+                case NotificationViewItemContentChangeKind.PROGRESS:
                     this.renderProgress(notification);
                     break;
-                case 1 :
+                case NotificationViewItemContentChangeKind.MESSAGE:
                     this.renderMessage(notification, messageCustomHover);
                     break;
             }

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

@@ -121,7 +121,7 @@ declare abstract class AbstractPaneCompositePart extends CompositePart<PaneCompo
     getActivePaneComposite(): IPaneComposite | undefined;
     getLastActivePaneCompositeId(): string;
     hideActivePaneComposite(): void;
-    protected focusComositeBar(): void;
+    protected focusCompositeBar(): void;
     layout(width: number, height: number, top: number, left: number): void;
     private layoutCompositeBar;
     private layoutEmptyMessage;

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

@@ -1,18 +1,20 @@
 import './media/panelpart.css.js';
 import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
+import { KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
 import { Action2, MenuId, registerAction2, MenuRegistry } from '../../../../platform/actions/common/actions.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
-import { positionToString } from '../../../services/layout/browser/layoutService.js';
+import { Parts, Position, LayoutSettings, ActivityBarPosition, positionToString } from '../../../services/layout/browser/layoutService.js';
 import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.service.js';
 import { PanelVisibleContext, PanelAlignmentContext, PanelPositionContext, PanelMaximizedContext, AuxiliaryBarVisibleContext } from '../../../common/contextkeys.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
-import { ViewContainerLocationToString } from '../../../common/views.js';
+import { ViewContainerLocation, ViewContainerLocationToString } from '../../../common/views.js';
 import { IViewDescriptorService } from '../../../common/views.service.js';
 import { IViewsService } from '../../../services/views/common/viewsService.service.js';
 import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.service.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 const _moduleId = "vs/workbench/browser/parts/panel/panelActions";
 const maximizeIcon = registerIcon('panel-maximize', Codicon.chevronUp, ( localizeWithPath(_moduleId, 0, 'Icon to maximize a panel.')));
 const restoreIcon = registerIcon('panel-restore', Codicon.chevronDown, ( localizeWithPath(_moduleId, 1, 'Icon to restore a panel.')));
@@ -33,7 +35,7 @@ class TogglePanelAction extends Action2 {
             },
             f1: true,
             category: Categories.View,
-            keybinding: { primary: 2048  | 40 , weight: 200  },
+            keybinding: { primary: KeyMod$1.CtrlCmd | KeyCode.KeyJ, weight: KeybindingWeight.WorkbenchContrib },
             menu: [
                 {
                     id: MenuId.MenubarAppearanceMenu,
@@ -49,7 +51,7 @@ class TogglePanelAction extends Action2 {
     }
     async run(accessor) {
         const layoutService = accessor.get(IWorkbenchLayoutService);
-        layoutService.setPartHidden(layoutService.isVisible("workbench.parts.panel" ), "workbench.parts.panel" );
+        layoutService.setPartHidden(layoutService.isVisible(Parts.PANEL_PART), Parts.PANEL_PART);
     }
 }
 registerAction2(TogglePanelAction);
@@ -67,10 +69,10 @@ registerAction2(class extends Action2 {
     async run(accessor) {
         const layoutService = accessor.get(IWorkbenchLayoutService);
         const paneCompositeService = accessor.get(IPaneCompositePartService);
-        if (!layoutService.isVisible("workbench.parts.panel" )) {
-            layoutService.setPartHidden(false, "workbench.parts.panel" );
+        if (!layoutService.isVisible(Parts.PANEL_PART)) {
+            layoutService.setPartHidden(false, Parts.PANEL_PART);
         }
-        const panel = paneCompositeService.getActivePaneComposite(1 );
+        const panel = paneCompositeService.getActivePaneComposite(ViewContainerLocation.Panel);
         panel?.focus();
     }
 });
@@ -101,9 +103,9 @@ function createAlignmentPanelActionConfig(id, title, shortLabel, alignment) {
     return createPanelActionConfig(id, title, shortLabel, alignment, ( (PanelAlignmentContext.notEqualsTo(alignment))));
 }
 const PositionPanelActionConfigs = [
-    createPositionPanelActionConfig(PositionPanelActionId.LEFT, ( localize2WithPath(_moduleId, 9, "Move Panel Left")), ( localizeWithPath(_moduleId, 10, "Left")), 0 ),
-    createPositionPanelActionConfig(PositionPanelActionId.RIGHT, ( localize2WithPath(_moduleId, 11, "Move Panel Right")), ( localizeWithPath(_moduleId, 12, "Right")), 1 ),
-    createPositionPanelActionConfig(PositionPanelActionId.BOTTOM, ( localize2WithPath(_moduleId, 13, "Move Panel To Bottom")), ( localizeWithPath(_moduleId, 14, "Bottom")), 2 ),
+    createPositionPanelActionConfig(PositionPanelActionId.LEFT, ( localize2WithPath(_moduleId, 9, "Move Panel Left")), ( localizeWithPath(_moduleId, 10, "Left")), Position.LEFT),
+    createPositionPanelActionConfig(PositionPanelActionId.RIGHT, ( localize2WithPath(_moduleId, 11, "Move Panel Right")), ( localizeWithPath(_moduleId, 12, "Right")), Position.RIGHT),
+    createPositionPanelActionConfig(PositionPanelActionId.BOTTOM, ( localize2WithPath(_moduleId, 13, "Move Panel To Bottom")), ( localizeWithPath(_moduleId, 14, "Bottom")), Position.BOTTOM),
 ];
 const AlignPanelActionConfigs = [
     createAlignmentPanelActionConfig(AlignPanelActionId.LEFT, ( localize2WithPath(_moduleId, 15, "Set Panel Alignment to Left")), ( localizeWithPath(_moduleId, 16, "Left")), 'left'),
@@ -130,7 +132,7 @@ PositionPanelActionConfigs.forEach(positionPanelAction => {
         }
         run(accessor) {
             const layoutService = accessor.get(IWorkbenchLayoutService);
-            layoutService.setPanelPosition(value === undefined ? 2  : value);
+            layoutService.setPanelPosition(value === undefined ? Position.BOTTOM : value);
         }
     });
     MenuRegistry.appendMenuItem(MenuId.PanelPositionMenu, {
@@ -185,8 +187,8 @@ class SwitchPanelViewAction extends Action2 {
     }
     async run(accessor, offset) {
         const paneCompositeService = accessor.get(IPaneCompositePartService);
-        const pinnedPanels = paneCompositeService.getVisiblePaneCompositeIds(1 );
-        const activePanel = paneCompositeService.getActivePaneComposite(1 );
+        const pinnedPanels = paneCompositeService.getVisiblePaneCompositeIds(ViewContainerLocation.Panel);
+        const activePanel = paneCompositeService.getActivePaneComposite(ViewContainerLocation.Panel);
         if (!activePanel) {
             return;
         }
@@ -198,7 +200,7 @@ class SwitchPanelViewAction extends Action2 {
             }
         }
         if (typeof targetPanelId === 'string') {
-            await paneCompositeService.openPaneComposite(targetPanelId, 1 , true);
+            await paneCompositeService.openPaneComposite(targetPanelId, ViewContainerLocation.Panel, true);
         }
     }
 }
@@ -246,7 +248,7 @@ registerAction2(class extends Action2 {
     run(accessor) {
         const layoutService = accessor.get(IWorkbenchLayoutService);
         const notificationService = accessor.get(INotificationService);
-        if (layoutService.getPanelAlignment() !== 'center' && layoutService.getPanelPosition() === 2 ) {
+        if (layoutService.getPanelAlignment() !== 'center' && layoutService.getPanelPosition() === Position.BOTTOM) {
             notificationService.warn(( localizeWithPath(
                 _moduleId,
                 30,
@@ -254,8 +256,8 @@ registerAction2(class extends Action2 {
             )));
             return;
         }
-        if (!layoutService.isVisible("workbench.parts.panel" )) {
-            layoutService.setPartHidden(false, "workbench.parts.panel" );
+        if (!layoutService.isVisible(Parts.PANEL_PART)) {
+            layoutService.setPartHidden(false, Parts.PANEL_PART);
             if (!layoutService.isPanelMaximized()) {
                 layoutService.toggleMaximizedPanel();
             }
@@ -283,7 +285,7 @@ registerAction2(class extends Action2 {
         });
     }
     run(accessor) {
-        accessor.get(IWorkbenchLayoutService).setPartHidden(true, "workbench.parts.panel" );
+        accessor.get(IWorkbenchLayoutService).setPartHidden(true, Parts.PANEL_PART);
     }
 });
 registerAction2(class extends Action2 {
@@ -300,22 +302,16 @@ registerAction2(class extends Action2 {
                     id: MenuId.AuxiliaryBarTitle,
                     group: 'navigation',
                     order: 2,
-                    when: ( (ContextKeyExpr.notEquals(
-                        `config.${"workbench.activityBar.location" }`,
-                        "top"
-                    )))
+                    when: ( (ContextKeyExpr.notEquals(`config.${LayoutSettings.ACTIVITY_BAR_LOCATION}`, ActivityBarPosition.TOP)))
                 }, {
                     id: MenuId.AuxiliaryBarHeader,
                     group: 'navigation',
-                    when: ( (ContextKeyExpr.equals(
-                        `config.${"workbench.activityBar.location" }`,
-                        "top"
-                    )))
+                    when: ( (ContextKeyExpr.equals(`config.${LayoutSettings.ACTIVITY_BAR_LOCATION}`, ActivityBarPosition.TOP)))
                 }]
         });
     }
     run(accessor) {
-        accessor.get(IWorkbenchLayoutService).setPartHidden(true, "workbench.parts.auxiliarybar" );
+        accessor.get(IWorkbenchLayoutService).setPartHidden(true, Parts.AUXILIARYBAR_PART);
     }
 });
 MenuRegistry.appendMenuItems([
@@ -343,10 +339,10 @@ MenuRegistry.appendMenuItems([
                 id: TogglePanelAction.ID,
                 title: ( localize2WithPath(_moduleId, 34, 'Hide Panel')),
             },
-            when: ( (ContextKeyExpr.and(PanelVisibleContext,  (ContextKeyExpr.equals(
-                'viewLocation',
-                ViewContainerLocationToString(1 )
-            ))))),
+            when: ( (ContextKeyExpr.and(
+                PanelVisibleContext,
+                 (ContextKeyExpr.equals('viewLocation', ViewContainerLocationToString(ViewContainerLocation.Panel)))
+            ))),
             order: 2
         }
     }
@@ -366,7 +362,7 @@ class MoveViewsBetweenPanelsAction extends Action2 {
         if (srcContainers.length) {
             const activeViewContainer = viewsService.getVisibleViewContainer(this.source);
             srcContainers.forEach(viewContainer => viewDescriptorService.moveViewContainerToLocation(viewContainer, this.destination, undefined, this.desc.id));
-            layoutService.setPartHidden(false, this.destination === 1  ? "workbench.parts.panel"  : "workbench.parts.auxiliarybar" );
+            layoutService.setPartHidden(false, this.destination === ViewContainerLocation.Panel ? Parts.PANEL_PART : Parts.AUXILIARYBAR_PART);
             if (activeViewContainer && destContainers.length === 0) {
                 viewsService.openViewContainer(activeViewContainer.id, true);
             }
@@ -376,7 +372,7 @@ class MoveViewsBetweenPanelsAction extends Action2 {
 class MovePanelToSidePanelAction extends MoveViewsBetweenPanelsAction {
     static { this.ID = 'workbench.action.movePanelToSidePanel'; }
     constructor() {
-        super(1 , 2 , {
+        super(ViewContainerLocation.Panel, ViewContainerLocation.AuxiliaryBar, {
             id: MovePanelToSidePanelAction.ID,
             title: ( localize2WithPath(_moduleId, 35, "Move Panel Views To Secondary Side Bar")),
             category: Categories.View,
@@ -387,7 +383,7 @@ class MovePanelToSidePanelAction extends MoveViewsBetweenPanelsAction {
 class MovePanelToSecondarySideBarAction extends MoveViewsBetweenPanelsAction {
     static { this.ID = 'workbench.action.movePanelToSecondarySideBar'; }
     constructor() {
-        super(1 , 2 , {
+        super(ViewContainerLocation.Panel, ViewContainerLocation.AuxiliaryBar, {
             id: MovePanelToSecondarySideBarAction.ID,
             title: ( localize2WithPath(_moduleId, 35, "Move Panel Views To Secondary Side Bar")),
             category: Categories.View,
@@ -400,7 +396,7 @@ registerAction2(MovePanelToSecondarySideBarAction);
 class MoveSidePanelToPanelAction extends MoveViewsBetweenPanelsAction {
     static { this.ID = 'workbench.action.moveSidePanelToPanel'; }
     constructor() {
-        super(2 , 1 , {
+        super(ViewContainerLocation.AuxiliaryBar, ViewContainerLocation.Panel, {
             id: MoveSidePanelToPanelAction.ID,
             title: ( localize2WithPath(_moduleId, 36, "Move Secondary Side Bar Views To Panel")),
             category: Categories.View,
@@ -411,7 +407,7 @@ class MoveSidePanelToPanelAction extends MoveViewsBetweenPanelsAction {
 class MoveSecondarySideBarToPanelAction extends MoveViewsBetweenPanelsAction {
     static { this.ID = 'workbench.action.moveSecondarySideBarToPanel'; }
     constructor() {
-        super(2 , 1 , {
+        super(ViewContainerLocation.AuxiliaryBar, ViewContainerLocation.Panel, {
             id: MoveSecondarySideBarToPanelAction.ID,
             title: ( localize2WithPath(_moduleId, 36, "Move Secondary Side Bar Views To Panel")),
             category: Categories.View,

package/vscode/src/vs/workbench/browser/parts/sidebar/sidebarPart.d.ts

@@ -27,7 +27,7 @@ declare class SidebarPart extends AbstractPaneCompositePart {
     get snap(): boolean;
     readonly priority: LayoutPriority;
     get preferredWidth(): number | undefined;
-    private readonly acitivityBarPart;
+    private readonly activityBarPart;
     constructor(notificationService: INotificationService, storageService: IStorageService, contextMenuService: IContextMenuService, layoutService: IWorkbenchLayoutService, keybindingService: IKeybindingService, hoverService: IHoverService, instantiationService: IInstantiationService, themeService: IThemeService, viewDescriptorService: IViewDescriptorService, contextKeyService: IContextKeyService, extensionService: IExtensionService, configurationService: IConfigurationService, menuService: IMenuService);
     private onDidChangeActivityBarLocation;
     updateStyles(): void;

package/vscode/src/vs/workbench/browser/parts/titlebar/media/menubarControl.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-workbench .menubar .toolbar-toggle-more,.monaco-workbench .menubar>.menubar-menu-button{color:var(--vscode-titleBar-activeForeground)}.monaco-workbench .activitybar .menubar.compact .toolbar-toggle-more,.monaco-workbench .activitybar .menubar.compact>.menubar-menu-button{color:var(--vscode-activityBar-inactiveForeground)}.monaco-workbench .activitybar .menubar.compact:not(:focus-within)>.menubar-menu-button:hover,.monaco-workbench .activitybar .menubar.compact:not(:focus-within)>.menubar-menu-button:hover .toolbar-toggle-more,.monaco-workbench .activitybar .menubar.compact>.menubar-menu-button.open,.monaco-workbench .activitybar .menubar.compact>.menubar-menu-button.open .toolbar-toggle-more,.monaco-workbench .activitybar .menubar.compact>.menubar-menu-button:focus,.monaco-workbench .activitybar .menubar.compact>.menubar-menu-button:focus .toolbar-toggle-more{color:var(--vscode-activityBar-foreground)}.monaco-workbench .menubar.inactive:not(.compact)>.menubar-menu-button,.monaco-workbench .menubar.inactive:not(.compact)>.menubar-menu-button .toolbar-toggle-more{color:var(--vscode-titleBar-inactiveForeground)}.monaco-workbench .menubar:not(.compact)>.menubar-menu-button.open,.monaco-workbench .menubar:not(.compact)>.menubar-menu-button.open .toolbar-toggle-more,.monaco-workbench .menubar:not(.compact)>.menubar-menu-button:focus,.monaco-workbench .menubar:not(.compact)>.menubar-menu-button:focus .toolbar-toggle-more,.monaco-workbench .menubar:not(:focus-within):not(.compact)>.menubar-menu-button:hover,.monaco-workbench .menubar:not(:focus-within):not(.compact)>.menubar-menu-button:hover .toolbar-toggle-more{color:var(--vscode-menubar-selectionForeground)}.monaco-workbench .menubar:not(.compact)>.menubar-menu-button.open .menubar-menu-title,.monaco-workbench .menubar:not(.compact)>.menubar-menu-button:focus .menubar-menu-title,.monaco-workbench .menubar:not(:focus-within):not(.compact)>.menubar-menu-button:hover .menubar-menu-title{background-color:var(--vscode-menubar-selectionBackground)}.monaco-workbench .menubar>.menubar-menu-button:hover .menubar-menu-title{outline:dashed 1px var(--vscode-menubar-selectionBorder)}.monaco-workbench .menubar>.menubar-menu-button.open .menubar-menu-title,.monaco-workbench .menubar>.menubar-menu-button:focus .menubar-menu-title{outline:solid 1px var(--vscode-menubar-selectionBorder)}.monaco-workbench .menubar>.menubar-menu-button.open .menubar-menu-title,.monaco-workbench .menubar>.menubar-menu-button:focus .menubar-menu-title,.monaco-workbench .menubar>.menubar-menu-button:hover .menubar-menu-title{outline-color:var(--vscode-menubar-selectionBorder);outline-offset:-1px}";
+var css = ".monaco-workbench .menubar .toolbar-toggle-more,.monaco-workbench .menubar>.menubar-menu-button{color:var(--vscode-titleBar-activeForeground)}.monaco-workbench .activitybar .menubar.compact .toolbar-toggle-more,.monaco-workbench .activitybar .menubar.compact>.menubar-menu-button{color:var(--vscode-activityBar-inactiveForeground)}.monaco-workbench .activitybar .menubar.compact:not(:focus-within)>.menubar-menu-button:hover,.monaco-workbench .activitybar .menubar.compact:not(:focus-within)>.menubar-menu-button:hover .toolbar-toggle-more,.monaco-workbench .activitybar .menubar.compact>.menubar-menu-button.open,.monaco-workbench .activitybar .menubar.compact>.menubar-menu-button.open .toolbar-toggle-more,.monaco-workbench .activitybar .menubar.compact>.menubar-menu-button:focus,.monaco-workbench .activitybar .menubar.compact>.menubar-menu-button:focus .toolbar-toggle-more{color:var(--vscode-activityBar-foreground)}.monaco-workbench .activitybar .menubar.compact>.menubar-menu-button:focus{background-color:var(--vscode-menubar-selectionBackground)}.monaco-workbench .menubar.inactive:not(.compact)>.menubar-menu-button,.monaco-workbench .menubar.inactive:not(.compact)>.menubar-menu-button .toolbar-toggle-more{color:var(--vscode-titleBar-inactiveForeground)}.monaco-workbench .menubar:not(.compact)>.menubar-menu-button.open,.monaco-workbench .menubar:not(.compact)>.menubar-menu-button.open .toolbar-toggle-more,.monaco-workbench .menubar:not(.compact)>.menubar-menu-button:focus,.monaco-workbench .menubar:not(.compact)>.menubar-menu-button:focus .toolbar-toggle-more,.monaco-workbench .menubar:not(:focus-within):not(.compact)>.menubar-menu-button:hover,.monaco-workbench .menubar:not(:focus-within):not(.compact)>.menubar-menu-button:hover .toolbar-toggle-more{color:var(--vscode-menubar-selectionForeground)}.monaco-workbench .menubar:not(.compact)>.menubar-menu-button.open .menubar-menu-title,.monaco-workbench .menubar:not(.compact)>.menubar-menu-button:focus .menubar-menu-title,.monaco-workbench .menubar:not(:focus-within):not(.compact)>.menubar-menu-button:hover .menubar-menu-title{background-color:var(--vscode-menubar-selectionBackground)}.monaco-workbench .menubar>.menubar-menu-button:hover .menubar-menu-title{outline:dashed 1px var(--vscode-menubar-selectionBorder)}.monaco-workbench .menubar>.menubar-menu-button.open .menubar-menu-title,.monaco-workbench .menubar>.menubar-menu-button:focus .menubar-menu-title{outline:solid 1px var(--vscode-menubar-selectionBorder)}.monaco-workbench .menubar>.menubar-menu-button.open .menubar-menu-title,.monaco-workbench .menubar>.menubar-menu-button:focus .menubar-menu-title,.monaco-workbench .menubar>.menubar-menu-button:hover .menubar-menu-title{outline-color:var(--vscode-menubar-selectionBorder);outline-offset:-1px}";
 n(css,{});
 export { css, css as default };