@codingame/monaco-vscode-api 2.0.3 → 2.1.0-update-vscode-1.86.1

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

@@ -5,17 +5,19 @@ import { KeybindingsRegistry } from '../../../../platform/keybinding/common/keyb
 import { KeyChord } from '../../../../base/common/keyCodes.js';
 import { isNotificationViewItem } from '../../../common/notifications.js';
 import { MenuRegistry, MenuId } from '../../../../platform/actions/common/actions.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
 import { IListService, WorkbenchList } from '../../../../platform/list/browser/listService.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { notificationToMetrics } from './notificationsTelemetry.js';
 import { NotificationsCenterVisibleContext, NotificationFocusedContext, NotificationsToastsVisibleContext } from '../../../common/contextkeys.js';
-import { INotificationService, NotificationPriority } from '../../../../platform/notification/common/notification.js';
+import { INotificationService, NotificationsFilter, NotificationPriority } from '../../../../platform/notification/common/notification.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ActionRunner } from '../../../../base/common/actions.js';
 import { hash } from '../../../../base/common/hash.js';
 import { firstOrDefault } from '../../../../base/common/arrays.js';
-import { IAccessibleNotificationService } from '../../../../platform/accessibility/common/accessibility.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { IAudioCueService, AudioCue } from '../../../../platform/audioCues/browser/audioCueService.js';
 const SHOW_NOTIFICATIONS_CENTER = 'notifications.showList';
 const HIDE_NOTIFICATIONS_CENTER = 'notifications.hideList';
 const TOGGLE_NOTIFICATIONS_CENTER = 'notifications.toggleList';
@@ -32,6 +34,7 @@ const TOGGLE_NOTIFICATION = 'notification.toggle';
 const CLEAR_NOTIFICATION = 'notification.clear';
 const CLEAR_ALL_NOTIFICATIONS = 'notifications.clearAll';
 const TOGGLE_DO_NOT_DISTURB_MODE = 'notifications.toggleDoNotDisturbMode';
+const TOGGLE_DO_NOT_DISTURB_MODE_BY_SOURCE = 'notifications.toggleDoNotDisturbModeBySource';
 function getNotificationFromContext(listService, context) {
     if (isNotificationViewItem(context)) {
         return context;
@@ -93,11 +96,11 @@ function registerNotificationCommands(center, toasts, model) {
             primary: 2048  | 1
         },
         handler: (accessor, args) => {
-            const accessibleNotificationService = accessor.get(IAccessibleNotificationService);
+            const audioCueService = accessor.get(IAudioCueService);
             const notification = getNotificationFromContext(accessor.get(IListService), args);
             if (notification && !notification.hasProgress) {
                 notification.close();
-                accessibleNotificationService.notify("clear" );
+                audioCueService.playAudioCue(AudioCue.clear);
             }
         }
     });
@@ -214,43 +217,80 @@ function registerNotificationCommands(center, toasts, model) {
     CommandsRegistry.registerCommand(CLEAR_ALL_NOTIFICATIONS, () => center.clearAll());
     CommandsRegistry.registerCommand(TOGGLE_DO_NOT_DISTURB_MODE, accessor => {
         const notificationService = accessor.get(INotificationService);
-        notificationService.doNotDisturbMode = !notificationService.doNotDisturbMode;
+        notificationService.setFilter(notificationService.getFilter() === NotificationsFilter.ERROR ? NotificationsFilter.OFF : NotificationsFilter.ERROR);
     });
-    const category = { value: ( localizeWithPath(
+    CommandsRegistry.registerCommand(TOGGLE_DO_NOT_DISTURB_MODE_BY_SOURCE, accessor => {
+        const notificationService = accessor.get(INotificationService);
+        const quickInputService = accessor.get(IQuickInputService);
+        const sortedFilters = notificationService.getFilters().sort((a, b) => a.label.localeCompare(b.label));
+        const disposables = ( new DisposableStore());
+        const picker = disposables.add(quickInputService.createQuickPick());
+        picker.items = ( sortedFilters.map(source => ({
+            id: source.id,
+            label: source.label,
+            tooltip: `${source.label} (${source.id})`,
+            filter: source.filter
+        })));
+        picker.canSelectMany = true;
+        picker.placeholder = ( localizeWithPath(
+            'vs/workbench/browser/parts/notifications/notificationsCommands',
+            'selectSources',
+            "Select sources to enable notifications for"
+        ));
+        picker.selectedItems = picker.items.filter(item => item.filter === NotificationsFilter.OFF);
+        picker.show();
+        disposables.add(picker.onDidAccept(async () => {
+            for (const item of picker.items) {
+                notificationService.setFilter({
+                    id: item.id,
+                    label: item.label,
+                    filter: picker.selectedItems.includes(item) ? NotificationsFilter.OFF : NotificationsFilter.ERROR
+                });
+            }
+            picker.hide();
+        }));
+        disposables.add(picker.onDidHide(() => disposables.dispose()));
+    });
+    const category = ( localize2WithPath(
         'vs/workbench/browser/parts/notifications/notificationsCommands',
         'notifications',
-        "Notifications"
-    )), original: 'Notifications' };
-    MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: SHOW_NOTIFICATIONS_CENTER, title: { value: ( localizeWithPath(
+        'Notifications'
+    ));
+    MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: SHOW_NOTIFICATIONS_CENTER, title: ( localize2WithPath(
         'vs/workbench/browser/parts/notifications/notificationsCommands',
         'showNotifications',
-        "Show Notifications"
-    )), original: 'Show Notifications' }, category } });
-    MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: HIDE_NOTIFICATIONS_CENTER, title: { value: ( localizeWithPath(
+        'Show Notifications'
+    )), category } });
+    MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: HIDE_NOTIFICATIONS_CENTER, title: ( localize2WithPath(
         'vs/workbench/browser/parts/notifications/notificationsCommands',
         'hideNotifications',
-        "Hide Notifications"
-    )), original: 'Hide Notifications' }, category }, when: NotificationsCenterVisibleContext });
-    MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: CLEAR_ALL_NOTIFICATIONS, title: { value: ( localizeWithPath(
+        'Hide Notifications'
+    )), category }, when: NotificationsCenterVisibleContext });
+    MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: CLEAR_ALL_NOTIFICATIONS, title: ( localize2WithPath(
         'vs/workbench/browser/parts/notifications/notificationsCommands',
         'clearAllNotifications',
-        "Clear All Notifications"
-    )), original: 'Clear All Notifications' }, category } });
-    MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: ACCEPT_PRIMARY_ACTION_NOTIFICATION, title: { value: ( localizeWithPath(
+        'Clear All Notifications'
+    )), category } });
+    MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: ACCEPT_PRIMARY_ACTION_NOTIFICATION, title: ( localize2WithPath(
         'vs/workbench/browser/parts/notifications/notificationsCommands',
         'acceptNotificationPrimaryAction',
-        "Accept Notification Primary Action"
-    )), original: 'Accept Notification Primary Action' }, category } });
-    MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: TOGGLE_DO_NOT_DISTURB_MODE, title: { value: ( localizeWithPath(
+        'Accept Notification Primary Action'
+    )), category } });
+    MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: TOGGLE_DO_NOT_DISTURB_MODE, title: ( localize2WithPath(
         'vs/workbench/browser/parts/notifications/notificationsCommands',
         'toggleDoNotDisturbMode',
-        "Toggle Do Not Disturb Mode"
-    )), original: 'Toggle Do Not Disturb Mode' }, category } });
-    MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: FOCUS_NOTIFICATION_TOAST, title: { value: ( localizeWithPath(
+        'Toggle Do Not Disturb Mode'
+    )), category } });
+    MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: TOGGLE_DO_NOT_DISTURB_MODE_BY_SOURCE, title: ( localize2WithPath(
+        'vs/workbench/browser/parts/notifications/notificationsCommands',
+        'toggleDoNotDisturbModeBySource',
+        'Toggle Do Not Disturb Mode By Source...'
+    )), category } });
+    MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: FOCUS_NOTIFICATION_TOAST, title: ( localize2WithPath(
         'vs/workbench/browser/parts/notifications/notificationsCommands',
         'focusNotificationToasts',
-        "Focus Notification Toast"
-    )), original: 'Focus Notification Toast' }, category }, when: NotificationsToastsVisibleContext });
+        'Focus Notification Toast'
+    )), category }, when: NotificationsToastsVisibleContext });
 }
 let NotificationActionRunner = class NotificationActionRunner extends ActionRunner {
     constructor(telemetryService, notificationService) {
@@ -280,4 +320,4 @@ NotificationActionRunner = ( __decorate([
     ( __param(0, ITelemetryService)),
     ( __param(1, INotificationService))
 ], NotificationActionRunner));
-export { ACCEPT_PRIMARY_ACTION_NOTIFICATION, CLEAR_ALL_NOTIFICATIONS, CLEAR_NOTIFICATION, COLLAPSE_NOTIFICATION, EXPAND_NOTIFICATION, HIDE_NOTIFICATIONS_CENTER, HIDE_NOTIFICATION_TOAST, NotificationActionRunner, SHOW_NOTIFICATIONS_CENTER, TOGGLE_DO_NOT_DISTURB_MODE, getNotificationFromContext, registerNotificationCommands };
+export { ACCEPT_PRIMARY_ACTION_NOTIFICATION, CLEAR_ALL_NOTIFICATIONS, CLEAR_NOTIFICATION, COLLAPSE_NOTIFICATION, EXPAND_NOTIFICATION, HIDE_NOTIFICATIONS_CENTER, HIDE_NOTIFICATION_TOAST, NotificationActionRunner, SHOW_NOTIFICATIONS_CENTER, TOGGLE_DO_NOT_DISTURB_MODE, TOGGLE_DO_NOT_DISTURB_MODE_BY_SOURCE, getNotificationFromContext, registerNotificationCommands };

package/vscode/src/vs/workbench/browser/parts/panel/media/panelpart.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-workbench.nopanel .part.panel{display:none!important;visibility:hidden!important}.monaco-workbench .part.panel.bottom .composite.title{border-top-style:solid;border-top-width:1px}.monaco-workbench.nomaineditorarea .part.panel.bottom .composite.title{border-top-width:0}.monaco-workbench .part.panel.right{border-left-style:solid;border-left-width:1px}.monaco-workbench.nomaineditorarea .part.panel.right{border-left-width:0}.monaco-workbench .part.panel.left{border-right-style:solid;border-right-width:1px}.monaco-workbench.nomaineditorarea .part.panel.left{border-right-width:0}.monaco-workbench .part.panel>.content .monaco-editor,.monaco-workbench .part.panel>.content .monaco-editor .margin,.monaco-workbench .part.panel>.content .monaco-editor .monaco-editor-background{background-color:var(--vscode-panel-background)}.monaco-workbench .part.panel>.content .suggest-input-container .monaco-editor,.monaco-workbench .part.panel>.content .suggest-input-container .monaco-editor .margin,.monaco-workbench .part.panel>.content .suggest-input-container .monaco-editor .monaco-editor-background{background-color:inherit}.monaco-workbench .part.panel>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .action-label,.monaco-workbench .part.panel>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label{color:var(--vscode-panelTitle-activeForeground)!important}.monaco-workbench .part.panel .monaco-inputbox{border-color:var(--vscode-panelInput-border,transparent)!important}.monaco-workbench .part.panel>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus{outline:none}.monaco-workbench .part.basepanel.right .global-actions .codicon-panel-maximize:before,.monaco-workbench .part.basepanel.right .global-actions .codicon-panel-restore:before,.monaco-workbench .part.basepanel.right .title-actions .codicon-split-horizontal:before{display:inline-block;transform:rotate(-90deg)}.monaco-workbench .part.basepanel.left .global-actions .codicon-panel-maximize:before,.monaco-workbench .part.basepanel.left .global-actions .codicon-panel-restore:before,.monaco-workbench .part.basepanel.left .title-actions .codicon-split-horizontal:before{display:inline-block;transform:rotate(90deg)}";
+var css = ".monaco-workbench.nopanel .part.panel{display:none!important;visibility:hidden!important}.monaco-workbench .part.panel.bottom .composite.title{border-top-style:solid;border-top-width:1px}.monaco-workbench.nomaineditorarea .part.panel.bottom .composite.title{border-top-width:0}.monaco-workbench .part.panel.right{border-left-style:solid;border-left-width:1px}.monaco-workbench.nomaineditorarea .part.panel.right{border-left-width:0}.monaco-workbench .part.panel.left{border-right-style:solid;border-right-width:1px}.monaco-workbench.nomaineditorarea .part.panel.left{border-right-width:0}.monaco-workbench .part.panel>.content .monaco-editor,.monaco-workbench .part.panel>.content .monaco-editor .margin,.monaco-workbench .part.panel>.content .monaco-editor .monaco-editor-background{background-color:var(--vscode-panel-background)}.monaco-workbench .part.panel>.content .suggest-input-container .monaco-editor,.monaco-workbench .part.panel>.content .suggest-input-container .monaco-editor .margin,.monaco-workbench .part.panel>.content .suggest-input-container .monaco-editor .monaco-editor-background{background-color:inherit}.monaco-workbench .part.panel>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before,.monaco-workbench .part.panel>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator:before{border-top-color:var(--vscode-panelTitle-activeBorder)!important}.monaco-workbench .part.panel>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .action-label,.monaco-workbench .part.panel>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label{color:var(--vscode-panelTitle-activeForeground)!important}.monaco-workbench .part.panel .monaco-inputbox{border-color:var(--vscode-panelInput-border,transparent)!important}.monaco-workbench .part.panel>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus{outline:none}.monaco-workbench .part.basepanel.right .global-actions .codicon-panel-maximize:before,.monaco-workbench .part.basepanel.right .global-actions .codicon-panel-restore:before,.monaco-workbench .part.basepanel.right .title-actions .codicon-split-horizontal:before{display:inline-block;transform:rotate(-90deg)}.monaco-workbench .part.basepanel.left .global-actions .codicon-panel-maximize:before,.monaco-workbench .part.basepanel.left .global-actions .codicon-panel-restore:before,.monaco-workbench .part.basepanel.left .title-actions .codicon-split-horizontal:before{display:inline-block;transform:rotate(90deg)}";
 n(css,{});
 export { css, css as default };

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

@@ -1,5 +1,5 @@
 import './media/panelpart.css.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
 import { Action2, MenuId, registerAction2, MenuRegistry } from '../../../../platform/actions/common/actions.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
 import { IWorkbenchLayoutService, positionToString } from '../../../services/layout/browser/layoutService.js';
@@ -7,7 +7,8 @@ import { PanelVisibleContext, PanelAlignmentContext, PanelPositionContext, Panel
 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, IViewDescriptorService, IViewsService } from '../../../common/views.js';
+import { ViewContainerLocationToString, IViewDescriptorService } from '../../../common/views.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
 import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.js';
 const maximizeIcon = registerIcon('panel-maximize', Codicon.chevronUp, ( localizeWithPath(
@@ -87,11 +88,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.focusPanel',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/browser/parts/panel/panelActions',
                 'focusPanel',
                 "Focus into Panel"
-            )), original: 'Focus into Panel' },
+            )),
             category: Categories.View,
             f1: true,
         });
@@ -332,11 +333,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.toggleMaximizedPanel',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/browser/parts/panel/panelActions',
                 'toggleMaximizedPanel',
-                "Toggle Maximized Panel"
-            )), original: 'Toggle Maximized Panel' },
+                'Toggle Maximized Panel'
+            )),
             tooltip: ( localizeWithPath(
                 'vs/workbench/browser/parts/panel/panelActions',
                 'maximizePanel',
@@ -385,11 +386,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.closePanel',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/browser/parts/panel/panelActions',
                 'closePanel',
-                "Close Panel"
-            )), original: 'Close Panel' },
+                'Close Panel'
+            )),
             category: Categories.View,
             icon: closeIcon,
             menu: [{
@@ -410,11 +411,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.closeAuxiliaryBar',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/browser/parts/panel/panelActions',
                 'closeSecondarySideBar',
-                "Close Secondary Side Bar"
-            )), original: 'Close Secondary Side Bar' },
+                'Close Secondary Side Bar'
+            )),
             category: Categories.View,
             icon: closeIcon,
             menu: [{
@@ -455,7 +456,7 @@ MenuRegistry.appendMenuItems([
             group: '3_workbench_layout_move',
             command: {
                 id: TogglePanelAction.ID,
-                title: { value: ( localizeWithPath('vs/workbench/browser/parts/panel/panelActions', 'hidePanel', "Hide Panel")), original: 'Hide Panel' },
+                title: ( localize2WithPath('vs/workbench/browser/parts/panel/panelActions', 'hidePanel', 'Hide Panel')),
             },
             when: ( ContextKeyExpr.and(PanelVisibleContext, ( ContextKeyExpr.equals(
                 'viewLocation',

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

@@ -1,8 +1,8 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/menubarControl.css.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
 import { MenuRegistry, MenuId, SubmenuItemAction, registerAction2, MenuItemAction, Action2, IMenuService } from '../../../../platform/actions/common/actions.js';
-import { getMenuBarVisibility, getTitleBarStyle } from '../../../../platform/window/common/window.js';
+import { getMenuBarVisibility, hasNativeTitlebar } from '../../../../platform/window/common/window.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { Separator, toAction, ActionRunner, Action, SubmenuAction } from '../../../../base/common/actions.js';
 import { addDisposableListener, EventType, Dimension } from '../../../../base/browser/dom.js';
@@ -23,8 +23,7 @@ import { MenuBar } from '../../../../base/browser/ui/menu/menubar.js';
 import { Direction } from '../../../../base/browser/ui/menu/menu.js';
 import { unmnemonicLabel, mnemonicMenuLabel } from '../../../../base/common/labels.js';
 import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
-import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
-import { isFullscreen } from '../../../../base/browser/browser.js';
+import { isFullscreen, onDidChangeFullscreen } from '../../../../base/browser/browser.js';
 import { IHostService } from '../../../services/host/browser/host.js';
 import { BrowserFeatures } from '../../../../base/browser/canIUse.js';
 import { IsMacNativeContext, IsWebContext } from '../../../../platform/contextkey/common/contextkeys.js';
@@ -295,7 +294,7 @@ class MenubarControl extends Disposable {
             return;
         }
         const hasBeenNotified = this.storageService.getBoolean('menubar/accessibleMenubarNotified', -1 , false);
-        const usingCustomMenubar = getTitleBarStyle(this.configurationService) === 'custom';
+        const usingCustomMenubar = !hasNativeTitlebar(this.configurationService);
         if (hasBeenNotified || usingCustomMenubar || !this.accessibilityService.isScreenReaderOptimized()) {
             return;
         }
@@ -312,7 +311,7 @@ class MenubarControl extends Disposable {
                     "Open Settings"
                 )),
                 run: () => {
-                    return this.preferencesService.openUserSettings({ query: 'window.titleBarStyle' });
+                    return this.preferencesService.openUserSettings({ query: "window.titleBarStyle"  });
                 }
             }
         ]);
@@ -320,9 +319,8 @@ class MenubarControl extends Disposable {
     }
 }
 let CustomMenubarControl = class CustomMenubarControl extends MenubarControl {
-    constructor(menuService, workspacesService, contextKeyService, keybindingService, configurationService, labelService, updateService, storageService, notificationService, preferencesService, environmentService, accessibilityService, layoutService, telemetryService, hostService, commandService) {
+    constructor(menuService, workspacesService, contextKeyService, keybindingService, configurationService, labelService, updateService, storageService, notificationService, preferencesService, environmentService, accessibilityService, telemetryService, hostService, commandService) {
         super(menuService, workspacesService, contextKeyService, keybindingService, configurationService, labelService, updateService, storageService, notificationService, preferencesService, environmentService, accessibilityService, hostService, commandService);
-        this.layoutService = layoutService;
         this.telemetryService = telemetryService;
         this.alwaysOnMnemonics = false;
         this.focusInsideMenubar = false;
@@ -357,11 +355,11 @@ let CustomMenubarControl = class CustomMenubarControl extends MenubarControl {
                 constructor() {
                     super({
                         id: `workbench.actions.menubar.focus`,
-                        title: { value: ( localizeWithPath(
+                        title: ( localize2WithPath(
                             'vs/workbench/browser/parts/titlebar/menubarControl',
                             'focusMenu',
-                            "Focus Application Menu"
-                        )), original: 'Focus Application Menu' },
+                            'Focus Application Menu'
+                        )),
                         keybinding: {
                             primary: 512  | 68 ,
                             weight: 200 ,
@@ -458,7 +456,7 @@ let CustomMenubarControl = class CustomMenubarControl extends MenubarControl {
         if (typeof enableMenuBarMnemonics !== 'boolean') {
             enableMenuBarMnemonics = true;
         }
-        return enableMenuBarMnemonics && (!isWeb || isFullscreen());
+        return enableMenuBarMnemonics && (!isWeb || isFullscreen(mainWindow));
     }
     get currentCompactMenuMode() {
         if (this.currentMenubarVisibility !== 'compact') {
@@ -681,7 +679,11 @@ let CustomMenubarControl = class CustomMenubarControl extends MenubarControl {
             }
         }));
         if (isWeb) {
-            this._register(this.layoutService.onDidChangeFullscreen(e => this.updateMenubar()));
+            this._register(onDidChangeFullscreen(windowId => {
+                if (windowId === mainWindow.vscodeWindowId) {
+                    this.updateMenubar();
+                }
+            }));
             this._register(this.webNavigationMenu.onDidChange(() => this.updateMenubar()));
         }
     }
@@ -724,9 +726,8 @@ CustomMenubarControl = ( __decorate([
     ( __param(9, IPreferencesService)),
     ( __param(10, IWorkbenchEnvironmentService)),
     ( __param(11, IAccessibilityService)),
-    ( __param(12, IWorkbenchLayoutService)),
-    ( __param(13, ITelemetryService)),
-    ( __param(14, IHostService)),
-    ( __param(15, ICommandService))
+    ( __param(12, ITelemetryService)),
+    ( __param(13, IHostService)),
+    ( __param(14, ICommandService))
 ], CustomMenubarControl));
 export { CustomMenubarControl, MenubarControl };

package/vscode/src/vs/workbench/browser/parts/titlebar/windowTitle.js

@@ -17,7 +17,7 @@ import { IProductService } from '../../../../platform/product/common/productServ
 import { Schemas } from '../../../../base/common/network.js';
 import { getVirtualWorkspaceLocation } from '../../../../platform/workspace/common/virtualWorkspace.js';
 import { IUserDataProfileService } from '../../../services/userDataProfile/common/userDataProfile.js';
-import { IViewsService } from '../../../common/views.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
 import { isCodeEditor, isDiffEditor } from '../../../../editor/browser/editorBrowser.js';
 var WindowTitle_1;
 let WindowTitle = class WindowTitle extends Disposable {

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

@@ -1,4 +1,4 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".file-icon-themable-tree .align-icon-with-twisty .monaco-tl-twistie:not(.force-twistie):not(.collapsible),.file-icon-themable-tree .monaco-tl-twistie.force-no-twistie,.file-icon-themable-tree.align-icons-and-twisties .monaco-tl-twistie:not(.force-twistie):not(.collapsible),.file-icon-themable-tree.hide-arrows .monaco-tl-twistie:not(.force-twistie){background-image:none!important;padding-right:0!important;visibility:hidden;width:0!important}.file-icon-themable-tree .monaco-list-row .content .monaco-highlighted-label .highlight,.monaco-tl-contents .monaco-highlighted-label .highlight{background-color:var(--vscode-list-filterMatchBackground);color:unset!important;outline:1px dotted var(--vscode-list-filterMatchBorder);outline-offset:-1px}.monaco-workbench .tree-explorer-viewlet-tree-view{height:100%}.monaco-workbench .tree-explorer-viewlet-tree-view .message{display:flex;padding:4px 12px 4px 18px;user-select:text;-webkit-user-select:text}.monaco-workbench .tree-explorer-viewlet-tree-view .message p{margin-bottom:0;margin-top:0;padding-bottom:4px}.monaco-workbench .tree-explorer-viewlet-tree-view .message ul{padding-left:24px}.monaco-workbench .tree-explorer-viewlet-tree-view .message a{color:var(--vscode-textLink-foreground)}.monaco-workbench .tree-explorer-viewlet-tree-view .message.hide{display:none}.monaco-workbench .tree-explorer-viewlet-tree-view .customview-tree{height:100%}.monaco-workbench .tree-explorer-viewlet-tree-view .customview-tree.hide{display:none}.monaco-workbench .pane>.pane-body>.welcome-view{box-sizing:border-box;display:flex;flex-direction:column;height:100%;width:100%}.monaco-workbench .pane>.pane-body.welcome>:not(.welcome-view),.monaco-workbench .pane>.pane-body:not(.welcome)>.welcome-view{display:none}.monaco-workbench .pane>.pane-body .welcome-view-content{align-items:center;box-sizing:border-box;display:flex;flex-direction:column;padding:0 20px 1em}.monaco-workbench .pane>.pane-body .welcome-view-content>.button-container{max-width:300px;width:100%}.monaco-workbench:not(.reduce-motion) .pane>.pane-body .welcome-view-content>.button-container{transition:max-width .2s ease-out}.monaco-workbench .pane>.pane-body .welcome-view-content.wide>.button-container{max-width:100%}.monaco-workbench .pane>.pane-body .welcome-view-content>.button-container>.monaco-button{max-width:300px}.monaco-workbench .pane>.pane-body .welcome-view-content>p{width:100%}.monaco-workbench .pane>.pane-body .welcome-view-content>*{margin-block-end:0;margin-block-start:1em;margin-inline-end:0;margin-inline-start:0}.customview-tree .monaco-list-row .monaco-tl-contents.align-icon-with-twisty:before{display:none}.customview-tree .monaco-list-row .monaco-tl-contents:not(.align-icon-with-twisty):before{display:inline-block}.customview-tree .monaco-list .monaco-list-row{padding-left:0;padding-right:12px}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item{display:flex;flex:1;flex-wrap:nowrap;height:22px;line-height:22px;overflow:hidden;padding-left:3px;text-overflow:ellipsis}.customview-tree .monaco-list .monaco-list-row.selected .custom-view-tree-node-item .custom-view-tree-node-item-checkbox{background-color:var(--vscode-checkbox-selectBackground);border:1px solid var(--vscode-checkbox-selectBorder)}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .custom-view-tree-node-item-checkbox{background-color:var(--vscode-checkbox-background);border:1px solid var(--vscode-checkbox-border);height:16px;margin:3px 6px 3px 0;opacity:1;padding:0;width:16px}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .custom-view-tree-node-item-checkbox.codicon{font-size:13px;line-height:15px}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .monaco-inputbox{flex:1;line-height:normal}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .custom-view-tree-node-item-resourceLabel{flex:1;overflow:hidden;text-overflow:ellipsis}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .monaco-icon-label-container:after{content:\"\";display:block}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item>.custom-view-tree-node-item-resourceLabel>.custom-view-tree-node-item-icon,.timeline-tree-view .monaco-list .monaco-list-row .custom-view-tree-node-item>.custom-view-tree-node-item-icon{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;align-items:center;background-position:0;background-repeat:no-repeat;background-size:16px;display:flex;height:22px;justify-content:center;padding-right:6px;width:16px}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item>.custom-view-tree-node-item-resourceLabel>.custom-view-tree-node-item-icon.disabled{opacity:.6}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item>.custom-view-tree-node-item-resourceLabel>.custom-view-tree-node-item-icon.codicon.codicon-modifier-spin{margin-left:-6px;padding-left:6px}.customview-tree .monaco-list .monaco-list-row.selected .custom-view-tree-node-item>.custom-view-tree-node-item-resourceLabel>.custom-view-tree-node-item-icon.codicon{color:currentColor!important}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .custom-view-tree-node-item-resourceLabel .monaco-icon-label-container>.monaco-icon-name-container{flex:1}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .custom-view-tree-node-item-resourceLabel:after{margin-right:4px;padding-right:0}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .actions{display:none}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .actions .action-label{padding:2px}.customview-tree .monaco-list .monaco-list-row.focused .custom-view-tree-node-item .actions,.customview-tree .monaco-list .monaco-list-row.selected .custom-view-tree-node-item .actions,.customview-tree .monaco-list .monaco-list-row:hover .custom-view-tree-node-item .actions{display:block}.viewpane-filter-container{cursor:default;display:flex}.viewpane-filter-container.grow{flex:1}.viewpane-filter-container>.viewpane-filter{align-items:center;display:flex;flex:1;position:relative}.viewpane-filter-container>.viewpane-filter .monaco-inputbox{flex:1;font-size:12px;height:24px}.pane-header .viewpane-filter-container>.viewpane-filter .monaco-inputbox .monaco-inputbox{height:20px;line-height:18px}.monaco-workbench.vs .viewpane-filter-container>.viewpane-filter .monaco-inputbox{height:25px}.viewpane-filter-container>.viewpane-filter>.viewpane-filter-controls{align-items:center;bottom:0;display:flex;position:absolute;right:0;top:0}.viewpane-filter-container>.viewpane-filter>.viewpane-filter-controls>.viewpane-filter-badge{border-radius:2px;margin:4px 0;padding:0 8px}.viewpane-filter.small>.viewpane-filter-controls>.viewpane-filter-badge,.viewpane-filter>.viewpane-filter-controls>.viewpane-filter-badge.hidden{display:none}.viewpane-filter>.viewpane-filter-controls>.monaco-action-bar .action-item .action-label.codicon.filter{padding:2px}.panel>.title .monaco-action-bar .action-item.viewpane-filter-container{margin-right:10px;max-width:400px;min-width:150px}.pane-body .viewpane-filter-container:not(:empty){flex:1;height:auto;margin:10px 20px}.pane-body .viewpane-filter-container>.viewpane-filter>.viewpane-filter-controls .monaco-action-bar .action-item{margin-right:4px}.viewpane-filter>.viewpane-filter-controls .monaco-action-bar .action-label.codicon.codicon-filter.checked{background-color:var(--vscode-inputOption-activeBackground);border-color:var(--vscode-inputOption-activeBorder);color:var(--vscode-inputOption-activeForeground)}";
+var css = ".file-icon-themable-tree .align-icon-with-twisty .monaco-tl-twistie:not(.force-twistie):not(.collapsible),.file-icon-themable-tree .monaco-tl-twistie.force-no-twistie,.file-icon-themable-tree.align-icons-and-twisties .monaco-tl-twistie:not(.force-twistie):not(.collapsible),.file-icon-themable-tree.hide-arrows .monaco-tl-twistie:not(.force-twistie){background-image:none!important;padding-right:0!important;visibility:hidden;width:0!important}.file-icon-themable-tree .monaco-list-row .content .monaco-highlighted-label .highlight,.monaco-tl-contents .monaco-highlighted-label .highlight{background-color:var(--vscode-list-filterMatchBackground);color:unset!important;outline:1px dotted var(--vscode-list-filterMatchBorder);outline-offset:-1px}.monaco-workbench .tree-explorer-viewlet-tree-view{height:100%}.monaco-workbench .tree-explorer-viewlet-tree-view .message{display:flex;padding:4px 12px 4px 18px;user-select:text;-webkit-user-select:text}.monaco-workbench .tree-explorer-viewlet-tree-view .message p{margin-bottom:0;margin-top:0;padding-bottom:4px}.monaco-workbench .tree-explorer-viewlet-tree-view .message ul{padding-left:24px}.monaco-workbench .tree-explorer-viewlet-tree-view .message a{color:var(--vscode-textLink-foreground)}.monaco-workbench .tree-explorer-viewlet-tree-view .message.hide{display:none}.monaco-workbench .tree-explorer-viewlet-tree-view .customview-tree{height:100%}.monaco-workbench .tree-explorer-viewlet-tree-view .customview-tree.hide{display:none}.monaco-workbench .pane>.pane-body>.welcome-view{box-sizing:border-box;display:flex;flex-direction:column;height:100%;width:100%}.monaco-workbench .pane>.pane-body.welcome>:not(.welcome-view),.monaco-workbench .pane>.pane-body:not(.welcome)>.welcome-view{display:none}.monaco-workbench .pane>.pane-body .welcome-view-content{align-items:center;box-sizing:border-box;display:flex;flex-direction:column;padding:0 20px 1em}.monaco-workbench .pane>.pane-body .welcome-view-content>.button-container{max-width:300px;width:100%}.monaco-workbench:not(.reduce-motion) .pane>.pane-body .welcome-view-content>.button-container{transition:max-width .2s ease-out}.monaco-workbench .pane>.pane-body .welcome-view-content.wide>.button-container{max-width:100%}.monaco-workbench .pane>.pane-body .welcome-view-content>.button-container>.monaco-button{max-width:300px}.monaco-workbench .pane>.pane-body .welcome-view-content>p{width:100%}.monaco-workbench .pane>.pane-body .welcome-view-content>*{margin-block-end:0;margin-block-start:1em;margin-inline-end:0;margin-inline-start:0}.customview-tree .monaco-list-row .monaco-tl-contents.align-icon-with-twisty:before{display:none}.customview-tree .monaco-list-row .monaco-tl-contents:not(.align-icon-with-twisty):before{display:inline-block}.customview-tree .monaco-list .monaco-list-row{padding-left:0;padding-right:12px}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item{display:flex;flex:1;flex-wrap:nowrap;height:22px;line-height:22px;overflow:hidden;padding-left:3px;text-overflow:ellipsis}.customview-tree .monaco-list .monaco-list-row.selected .custom-view-tree-node-item .custom-view-tree-node-item-checkbox{background-color:var(--vscode-checkbox-selectBackground);border:1px solid var(--vscode-checkbox-selectBorder)}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .custom-view-tree-node-item-checkbox{background-color:var(--vscode-checkbox-background);border:1px solid var(--vscode-checkbox-border);height:16px;margin:3px 6px 3px 0;opacity:1;padding:0;width:16px}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .custom-view-tree-node-item-checkbox.codicon{font-size:13px;line-height:15px}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .monaco-inputbox{flex:1;line-height:normal}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .custom-view-tree-node-item-resourceLabel{flex:1;overflow:hidden;text-overflow:ellipsis}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .monaco-icon-label-container:after{content:\"\";display:block}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item>.custom-view-tree-node-item-resourceLabel>.custom-view-tree-node-item-icon,.timeline-tree-view .monaco-list .monaco-list-row .custom-view-tree-node-item>.custom-view-tree-node-item-icon{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;align-items:center;background-position:0;background-repeat:no-repeat;background-size:16px;display:flex;height:22px;justify-content:center;padding-right:6px;width:16px}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item>.custom-view-tree-node-item-resourceLabel>.custom-view-tree-node-item-icon.disabled{opacity:.6}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item>.custom-view-tree-node-item-resourceLabel>.custom-view-tree-node-item-icon.codicon.codicon-modifier-spin{margin-left:-6px;padding-left:6px}.customview-tree .monaco-list .monaco-list-row.selected .custom-view-tree-node-item>.custom-view-tree-node-item-resourceLabel>.custom-view-tree-node-item-icon.codicon{color:currentColor!important}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .custom-view-tree-node-item-resourceLabel .monaco-icon-label-container>.monaco-icon-name-container{flex:1}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .custom-view-tree-node-item-resourceLabel:after{margin-right:4px;padding-right:0}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .actions{display:none}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .actions .action-label{padding:2px}.customview-tree .monaco-list .monaco-list-row.focused .custom-view-tree-node-item .actions,.customview-tree .monaco-list .monaco-list-row.selected .custom-view-tree-node-item .actions,.customview-tree .monaco-list .monaco-list-row:hover .custom-view-tree-node-item .actions{display:block}.monaco-workbench .auxiliarybar.pane-composite-part>.title.has-composite-bar>.title-actions .monaco-action-bar .action-item.viewpane-filter-container{max-width:inherit}.viewpane-filter-container{cursor:default;display:flex}.viewpane-filter-container.grow{flex:1}.viewpane-filter-container>.viewpane-filter{align-items:center;display:flex;flex:1;position:relative}.viewpane-filter-container>.viewpane-filter .monaco-inputbox{flex:1;font-size:12px;height:24px}.pane-header .viewpane-filter-container>.viewpane-filter .monaco-inputbox .monaco-inputbox{height:20px;line-height:18px}.monaco-workbench.vs .viewpane-filter-container>.viewpane-filter .monaco-inputbox{height:25px}.viewpane-filter-container>.viewpane-filter>.viewpane-filter-controls{align-items:center;bottom:0;display:flex;position:absolute;right:0;top:0}.viewpane-filter-container>.viewpane-filter>.viewpane-filter-controls>.viewpane-filter-badge{border-radius:2px;margin:4px 0;padding:0 8px}.viewpane-filter.small>.viewpane-filter-controls>.viewpane-filter-badge,.viewpane-filter>.viewpane-filter-controls>.viewpane-filter-badge.hidden{display:none}.viewpane-filter>.viewpane-filter-controls>.monaco-action-bar .action-item .action-label.codicon.filter{padding:2px}.panel>.title .monaco-action-bar .action-item.viewpane-filter-container{margin-right:10px;max-width:400px;min-width:150px}.pane-body .viewpane-filter-container:not(:empty){flex:1;height:auto;margin:10px 20px}.pane-body .viewpane-filter-container>.viewpane-filter>.viewpane-filter-controls .monaco-action-bar .action-item{margin-right:4px}.viewpane-filter>.viewpane-filter-controls .monaco-action-bar .action-label.codicon.codicon-filter.checked{background-color:var(--vscode-inputOption-activeBackground);border-color:var(--vscode-inputOption-activeBorder);color:var(--vscode-inputOption-activeForeground)}";
 n(css,{});
 export { css, css as default };

package/vscode/src/vs/workbench/browser/parts/views/treeView.js

@@ -52,7 +52,7 @@ import { PANEL_BACKGROUND, SIDE_BAR_BACKGROUND } from '../../../common/theme.js'
 import { ResolvableTreeItem, TreeItemCollapsibleState, Extensions, IViewDescriptorService } from '../../../common/views.js';
 import { IActivityService, NumberBadge } from '../../../services/activity/common/activity.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
-import { IHoverService } from '../../../services/hover/browser/hover.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 import { ITreeViewsService } from '../../../services/views/browser/treeViewsService.js';
 import { LocalSelectionTransfer, CodeDataTransfers } from '../../../../platform/dnd/browser/dnd.js';
 import { toExternalVSDataTransfer } from '../../../../editor/browser/dnd.js';
@@ -61,7 +61,7 @@ import { setTimeout0 } from '../../../../base/common/platform.js';
 import { TelemetryTrustedValue } from '../../../../platform/telemetry/common/telemetryUtils.js';
 import { ITreeViewsDnDService } from '../../../../editor/common/services/treeViewsDndService.js';
 import { DraggedTreeItemsIdentifier } from '../../../../editor/common/services/treeViewsDnd.js';
-import { MarkdownRenderer } from '../../../../editor/contrib/markdownRenderer/browser/markdownRenderer.js';
+import { MarkdownRenderer } from '../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
 var TreeRenderer_1;
 let TreeViewPane = class TreeViewPane extends ViewPane {
     constructor(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, notificationService) {
@@ -1099,7 +1099,7 @@ let TreeRenderer = class TreeRenderer extends Disposable {
             templateData.actionBar.actionRunner = this._actionRunner;
         }
         this.setAlignment(templateData.container, node);
-        this.treeViewsService.addRenderedTreeItemElement(node, templateData.container);
+        this.treeViewsService.addRenderedTreeItemElement(node.handle, templateData.container);
         const renderedItems = this._renderedElements.get(element.element.handle) ?? [];
         this._renderedElements.set(element.element.handle, [...renderedItems, { original: element, rendered: templateData }]);
     }
@@ -1236,16 +1236,13 @@ let TreeRenderer = class TreeRenderer extends Disposable {
         templateData.elementDisposable.clear();
         const itemRenders = this._renderedElements.get(resource.element.handle) ?? [];
         const renderedIndex = itemRenders.findIndex(renderedItem => templateData === renderedItem.rendered);
-        if (renderedIndex < 0) {
-            throw new Error('Disposing unknown element');
-        }
         if (itemRenders.length === 1) {
             this._renderedElements.delete(resource.element.handle);
         }
-        else {
+        else if (itemRenders.length > 0) {
             itemRenders.splice(renderedIndex, 1);
         }
-        this.treeViewsService.removeRenderedTreeItemElement(resource.element);
+        this.treeViewsService.removeRenderedTreeItemElement(resource.element.handle);
         templateData.checkbox?.dispose();
         templateData.checkbox = undefined;
     }
@@ -1521,7 +1518,7 @@ let CustomTreeViewDragAndDrop = class CustomTreeViewDragAndDrop {
             this.logService.debug(`TreeView dragged with no supported mime types.`);
         }
     }
-    onDragOver(data, targetElement, targetIndex, originalEvent) {
+    onDragOver(data, targetElement, targetIndex, targetSector, originalEvent) {
         const dataTransfer = toExternalVSDataTransfer(originalEvent.dataTransfer);
         const types = ( new Set(Array.from(dataTransfer, x => x[0])));
         if (originalEvent.dataTransfer) {
@@ -1566,7 +1563,7 @@ let CustomTreeViewDragAndDrop = class CustomTreeViewDragAndDrop {
         const element = elements[0];
         return element.label ? element.label.label : (element.resourceUri ? this.labelService.getUriLabel(URI.revive(element.resourceUri)) : undefined);
     }
-    async drop(data, targetNode, targetIndex, originalEvent) {
+    async drop(data, targetNode, targetIndex, targetSector, originalEvent) {
         const dndController = this.dndController;
         if (!originalEvent.dataTransfer || !dndController) {
             return;

package/vscode/src/vs/workbench/browser/parts/views/viewPane.js

@@ -16,7 +16,8 @@ import { IThemeService } from '../../../../platform/theme/common/themeService.js
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { Pane } from '../../../../base/browser/ui/splitview/paneview.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { ViewContainerLocationToString, defaultViewIcon, Extensions, IViewDescriptorService, IViewsService } from '../../../common/views.js';
+import { ViewContainerLocationToString, defaultViewIcon, Extensions, IViewDescriptorService } from '../../../common/views.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { assertIsDefined } from '../../../../base/common/types.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';

package/vscode/src/vs/workbench/browser/parts/views/viewPaneContainer.d.ts

@@ -4,6 +4,7 @@ import { IBoundarySashes } from '../../../../base/browser/ui/sash/sash.js';
 import { IPaneViewOptions } from '../../../../base/browser/ui/splitview/paneview.js';
 import { IAction } from '../../../../base/common/actions.js';
 import { Event } from '../../../../base/common/event.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
@@ -46,7 +47,6 @@ declare class ViewPaneContainer extends Component implements IViewPaneContainer
     private readonly visibleViewsCountFromCache;
     private readonly visibleViewsStorageId;
     protected readonly viewContainerModel: IViewContainerModel;
-    private viewDisposables;
     private readonly _onTitleAreaUpdate;
     readonly onTitleAreaUpdate: Event<void>;
     private readonly _onDidChangeVisibility;
@@ -82,6 +82,7 @@ declare class ViewPaneContainer extends Component implements IViewPaneContainer
         pane: ViewPane;
         size: number;
         index?: number;
+        disposable: IDisposable;
     }[]): void;
     setVisible(visible: boolean): void;
     isVisible(): boolean;

package/vscode/src/vs/workbench/browser/parts/views/viewPaneContainer.js

@@ -1,12 +1,12 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { DragAndDropObserver, addDisposableListener, EventType, getWindow, isAncestor, focusWindow } from '../../../../base/browser/dom.js';
+import { DragAndDropObserver, addDisposableListener, EventType, getWindow, isAncestor } from '../../../../base/browser/dom.js';
 import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
 import { Gesture, EventType as EventType$1 } from '../../../../base/browser/touch.js';
 import { PaneView } from '../../../../base/browser/ui/splitview/paneview.js';
 import { RunOnceScheduler } from '../../../../base/common/async.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { KeyChord } from '../../../../base/common/keyCodes.js';
-import { toDisposable, combinedDisposable, DisposableStore, dispose } from '../../../../base/common/lifecycle.js';
+import { toDisposable, combinedDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { assertIsDefined } from '../../../../base/common/types.js';
 import './media/paneviewlet.css.js';
 import { localizeWithPath } from '../../../../nls.js';
@@ -25,7 +25,8 @@ import { CompositeMenuActions } from '../../actions.js';
 import { CompositeDragAndDropObserver, toggleDropEffect } from '../../dnd.js';
 import { Component } from '../../../common/component.js';
 import { PANEL_SECTION_DRAG_AND_DROP_BACKGROUND, SIDE_BAR_DRAG_AND_DROP_BACKGROUND, PANEL_SECTION_HEADER_FOREGROUND, SIDE_BAR_SECTION_HEADER_FOREGROUND, PANEL_SECTION_HEADER_BACKGROUND, SIDE_BAR_SECTION_HEADER_BACKGROUND, PANEL_SECTION_HEADER_BORDER, SIDE_BAR_SECTION_HEADER_BORDER, PANEL_SECTION_BORDER } from '../../../common/theme.js';
-import { ViewContainerLocationToString, IViewDescriptorService, ViewVisibilityState, IViewsService } from '../../../common/views.js';
+import { ViewContainerLocationToString, IViewDescriptorService, ViewVisibilityState } from '../../../common/views.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
 import { FocusedViewContext } from '../../../common/contextkeys.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
@@ -237,7 +238,6 @@ let ViewPaneContainer = class ViewPaneContainer extends Component {
         this.visible = false;
         this.areExtensionsReady = false;
         this.didLayout = false;
-        this.viewDisposables = [];
         this._onTitleAreaUpdate = this._register(( new Emitter()));
         this.onTitleAreaUpdate = this._onTitleAreaUpdate.event;
         this._onDidChangeVisibility = this._register(( new Emitter()));
@@ -259,7 +259,6 @@ let ViewPaneContainer = class ViewPaneContainer extends Component {
         this.viewContainer = container;
         this.visibleViewsStorageId = `${id}.numberOfVisibleViews`;
         this.visibleViewsCountFromCache = this.storageService.getNumber(this.visibleViewsStorageId, 1 , undefined);
-        this._register(toDisposable(() => this.viewDisposables = dispose(this.viewDisposables)));
         this.viewContainerModel = this.viewDescriptorService.getViewContainerModel(container);
     }
     create(parent) {
@@ -454,7 +453,6 @@ let ViewPaneContainer = class ViewPaneContainer extends Component {
             }
         }
         if (paneToFocus) {
-            focusWindow(paneToFocus.element);
             paneToFocus.focus();
         }
     }
@@ -495,8 +493,8 @@ let ViewPaneContainer = class ViewPaneContainer extends Component {
     }
     addPanes(panes) {
         const wasMerged = this.isViewMergedWithContainer();
-        for (const { pane: pane, size, index } of panes) {
-            this.addPane(pane, size, index);
+        for (const { pane: pane, size, index, disposable } of panes) {
+            this.addPane(pane, size, disposable, index);
         }
         this.updateViewHeaders();
         if (this.isViewMergedWithContainer() !== wasMerged) {
@@ -606,8 +604,7 @@ let ViewPaneContainer = class ViewPaneContainer extends Component {
             const collapseDisposable = Event.latch(( Event.map(pane.onDidChange, () => !pane.isExpanded())))(collapsed => {
                 this.viewContainerModel.setCollapsed(viewDescriptor.id, collapsed);
             });
-            this.viewDisposables.splice(index, 0, combinedDisposable(contextMenuDisposable, collapseDisposable));
-            panesToAdd.push({ pane, size: size || pane.minimumSize, index });
+            panesToAdd.push({ pane, size: size || pane.minimumSize, index, disposable: combinedDisposable(contextMenuDisposable, collapseDisposable) });
         }
         this.addPanes(panesToAdd);
         this.restoreViewSizes();
@@ -622,13 +619,16 @@ let ViewPaneContainer = class ViewPaneContainer extends Component {
         removed = removed.sort((a, b) => b.index - a.index);
         const panesToRemove = [];
         for (const { index } of removed) {
-            const [disposable] = this.viewDisposables.splice(index, 1);
-            disposable.dispose();
-            panesToRemove.push(this.panes[index]);
+            const paneItem = this.paneItems[index];
+            if (paneItem) {
+                panesToRemove.push(this.paneItems[index].pane);
+            }
         }
-        this.removePanes(panesToRemove);
-        for (const pane of panesToRemove) {
-            pane.setVisible(false);
+        if (panesToRemove.length) {
+            this.removePanes(panesToRemove);
+            for (const pane of panesToRemove) {
+                pane.setVisible(false);
+            }
         }
     }
     toggleViewVisibility(viewId) {
@@ -637,7 +637,7 @@ let ViewPaneContainer = class ViewPaneContainer extends Component {
             this.viewContainerModel.setVisible(viewId, visible);
         }
     }
-    addPane(pane, size, index = this.paneItems.length - 1) {
+    addPane(pane, size, disposable, index = this.paneItems.length - 1) {
         const onDidFocus = pane.onDidFocus(() => {
             this._onDidFocusView.fire(pane);
             this.lastFocusedPane = pane;
@@ -663,6 +663,7 @@ let ViewPaneContainer = class ViewPaneContainer extends Component {
             leftBorder: isPanel ? asCssVariable(PANEL_SECTION_BORDER) : undefined
         });
         const store = ( new DisposableStore());
+        store.add(disposable);
         store.add(combinedDisposable(pane, onDidFocus, onDidBlur, onDidChangeTitleArea, onDidChange, onDidChangeVisibility));
         const paneItem = { pane, disposable: store };
         this.paneItems.splice(index, 0, paneItem);