@codingame/monaco-vscode-workbench-service-override 10.1.3 → 11.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-workbench-service-override",
-  "version": "10.1.3",
+  "version": "11.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,12 +26,14 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@10.1.3",
-    "@codingame/monaco-vscode-keybindings-service-override": "10.1.3",
-    "@codingame/monaco-vscode-quickaccess-service-override": "10.1.3",
-    "@codingame/monaco-vscode-view-title-bar-service-override": "10.1.3",
-    "@codingame/monaco-vscode-view-status-bar-service-override": "10.1.3",
-    "@codingame/monaco-vscode-view-banner-service-override": "10.1.3",
-    "@codingame/monaco-vscode-view-common-service-override": "10.1.3"
+    "vscode": "npm:@codingame/monaco-vscode-api@11.0.0",
+    "@codingame/monaco-vscode-view-common-views-workbench-common": "11.0.0",
+    "@codingame/monaco-vscode-keybindings-service-override": "11.0.0",
+    "@codingame/monaco-vscode-quickaccess-service-override": "11.0.0",
+    "@codingame/monaco-vscode-view-title-bar-service-override": "11.0.0",
+    "@codingame/monaco-vscode-view-status-bar-service-override": "11.0.0",
+    "@codingame/monaco-vscode-view-banner-service-override": "11.0.0",
+    "@codingame/monaco-vscode-view-common-service-override": "11.0.0",
+    "@codingame/monaco-vscode-notifications-workbench-common": "11.0.0"
   }
 }

package/vscode/src/vs/workbench/browser/layout.js

@@ -5,8 +5,8 @@ import { onDidChangeFullscreen, isFullscreen, isWCOEnabled } from 'vscode/vscode
 import { IWorkingCopyBackupService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyBackup.service';
 import { isWindows, isLinux, isWeb, isIOS, isMacintosh } from 'vscode/vscode/vs/base/common/platform';
 import { pathsToEditors, isResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor';
-import { SidebarPart } from '@codingame/monaco-vscode-view-common-service-override/vscode/vs/workbench/browser/parts/sidebar/sidebarPart';
-import { PanelPart } from '@codingame/monaco-vscode-view-common-service-override/vscode/vs/workbench/browser/parts/panel/panelPart';
+import { SidebarPart } from '@codingame/monaco-vscode-view-common-views-workbench-common/vscode/vs/workbench/browser/parts/sidebar/sidebarPart';
+import { PanelPart } from '@codingame/monaco-vscode-view-common-views-workbench-common/vscode/vs/workbench/browser/parts/panel/panelPart';
 import { shouldShowCustomTitleBar, isHorizontal, panelOpensMaximizedFromString, positionToString, positionFromString } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 import { isTemporaryWorkspace } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
@@ -19,7 +19,7 @@ import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/h
 import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
-import { SerializableGrid, Sizing } from '@codingame/monaco-vscode-view-common-service-override/vscode/vs/base/browser/ui/grid/grid';
+import { SerializableGrid, Sizing } from '@codingame/monaco-vscode-view-common-views-workbench-common/vscode/vs/base/browser/ui/grid/grid';
 import { Part } from 'vscode/vscode/vs/workbench/browser/part';
 import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
@@ -39,7 +39,7 @@ import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { DeferredPromise, Promises } from 'vscode/vscode/vs/base/common/async';
 import { IBannerService } from 'vscode/vscode/vs/workbench/services/banner/browser/bannerService.service';
 import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
-import { AuxiliaryBarPart } from '@codingame/monaco-vscode-view-common-service-override/vscode/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart';
+import { AuxiliaryBarPart } from '@codingame/monaco-vscode-view-common-views-workbench-common/vscode/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IAuxiliaryWindowService } from 'vscode/vscode/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.service';
 import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
@@ -244,10 +244,10 @@ class Layout extends Disposable {
             this.state.runtime.menuBar.toggled = visible;
             const menuBarVisibility = getMenuBarVisibility(this.configurationService);
             if (isWeb && menuBarVisibility === 'toggle') {
-                this.workbenchGrid.setViewVisible(this.titleBarPartView, shouldShowCustomTitleBar(this.configurationService, mainWindow, this.state.runtime.menuBar.toggled, this.isZenModeActive()));
+                this.workbenchGrid.setViewVisible(this.titleBarPartView, shouldShowCustomTitleBar(this.configurationService, mainWindow, this.state.runtime.menuBar.toggled));
             }
             else if (this.state.runtime.mainWindowFullscreen && (menuBarVisibility === 'toggle' || menuBarVisibility === 'classic')) {
-                this.workbenchGrid.setViewVisible(this.titleBarPartView, shouldShowCustomTitleBar(this.configurationService, mainWindow, this.state.runtime.menuBar.toggled, this.isZenModeActive()));
+                this.workbenchGrid.setViewVisible(this.titleBarPartView, shouldShowCustomTitleBar(this.configurationService, mainWindow, this.state.runtime.menuBar.toggled));
             }
             this.handleContainerDidLayout(this.mainContainer, this._mainContainerDimension);
         }
@@ -278,7 +278,7 @@ class Layout extends Disposable {
         }
         this.workbenchGrid.edgeSnapping = this.state.runtime.mainWindowFullscreen;
         {
-            this.workbenchGrid.setViewVisible(this.titleBarPartView, shouldShowCustomTitleBar(this.configurationService, mainWindow, this.state.runtime.menuBar.toggled, this.isZenModeActive()));
+            this.workbenchGrid.setViewVisible(this.titleBarPartView, shouldShowCustomTitleBar(this.configurationService, mainWindow, this.state.runtime.menuBar.toggled));
             this.updateWindowsBorder(true);
         }
     }
@@ -423,8 +423,6 @@ class Layout extends Disposable {
             initialization: initialLayoutState,
             runtime: layoutRuntimeState,
         };
-        const isNewWindow = lifecycleService.startupKind === 1 ;
-        const activityBarNotDefault = this.configurationService.getValue("workbench.activityBar.location" ) !== "default" ;
         if (this.isVisible("workbench.parts.sidebar" )) {
             let viewContainerToRestore;
             if (!this.environmentService.isBuilt ||
@@ -442,13 +440,6 @@ class Layout extends Disposable {
                 this.stateModel.setRuntimeValue(LayoutStateKeys.SIDEBAR_HIDDEN, true);
             }
         }
-        else if (isNewWindow && activityBarNotDefault) {
-            const viewContainerToRestore = this.storageService.get(SidebarPart.activeViewletSettingsKey, 1 , this.viewDescriptorService.getDefaultViewContainer(0 )?.id);
-            if (viewContainerToRestore) {
-                this.state.initialization.views.containerToRestore.sideBar = viewContainerToRestore;
-                this.stateModel.setRuntimeValue(LayoutStateKeys.SIDEBAR_HIDDEN, false);
-            }
-        }
         if (this.isVisible("workbench.parts.panel" )) {
             const viewContainerToRestore = this.storageService.get(PanelPart.activePanelSettingsKey, 1 , this.viewDescriptorService.getDefaultViewContainer(1 )?.id);
             if (viewContainerToRestore) {
@@ -459,8 +450,11 @@ class Layout extends Disposable {
             }
         }
         if (this.isVisible("workbench.parts.auxiliarybar" )) {
-            const viewContainerToRestore = this.storageService.get(AuxiliaryBarPart.activePanelSettingsKey, 1 , this.viewDescriptorService.getDefaultViewContainer(2 )?.id);
+            let viewContainerToRestore = this.storageService.get(AuxiliaryBarPart.activePanelSettingsKey, 1 , this.viewDescriptorService.getDefaultViewContainer(2 )?.id);
             if (viewContainerToRestore) {
+                if (viewContainerToRestore === 'workbench.panel.chatSidebar') {
+                    viewContainerToRestore = 'workbench.panel.chat';
+                }
                 this.state.initialization.views.containerToRestore.auxiliaryBar = viewContainerToRestore;
             }
             else {
@@ -820,7 +814,7 @@ class Layout extends Disposable {
         }
         switch (part) {
             case "workbench.parts.titlebar" :
-                return shouldShowCustomTitleBar(this.configurationService, mainWindow, this.state.runtime.menuBar.toggled, this.isZenModeActive());
+                return shouldShowCustomTitleBar(this.configurationService, mainWindow, this.state.runtime.menuBar.toggled);
             case "workbench.parts.sidebar" :
                 return !this.stateModel.getRuntimeValue(LayoutStateKeys.SIDEBAR_HIDDEN);
             case "workbench.parts.panel" :
@@ -1428,13 +1422,13 @@ class Layout extends Disposable {
         return this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_ALIGNMENT);
     }
     updateMenubarVisibility(skipLayout) {
-        const shouldShowTitleBar = shouldShowCustomTitleBar(this.configurationService, mainWindow, this.state.runtime.menuBar.toggled, this.isZenModeActive());
+        const shouldShowTitleBar = shouldShowCustomTitleBar(this.configurationService, mainWindow, this.state.runtime.menuBar.toggled);
         if (!skipLayout && this.workbenchGrid && shouldShowTitleBar !== this.isVisible("workbench.parts.titlebar" , mainWindow)) {
             this.workbenchGrid.setViewVisible(this.titleBarPartView, shouldShowTitleBar);
         }
     }
     updateCustomTitleBarVisibility() {
-        const shouldShowTitleBar = shouldShowCustomTitleBar(this.configurationService, mainWindow, this.state.runtime.menuBar.toggled, this.isZenModeActive());
+        const shouldShowTitleBar = shouldShowCustomTitleBar(this.configurationService, mainWindow, this.state.runtime.menuBar.toggled);
         const titlebarVisible = this.isVisible("workbench.parts.titlebar" );
         if (shouldShowTitleBar !== titlebarVisible) {
             this.workbenchGrid.setViewVisible(this.titleBarPartView, shouldShowTitleBar);
@@ -1556,7 +1550,7 @@ class Layout extends Disposable {
         if (bannerFirst !== shouldBannerBeFirst) {
             this.workbenchGrid.moveView(this.bannerPartView, Sizing.Distribute, this.titleBarPartView, shouldBannerBeFirst ? 0  : 1 );
         }
-        this.workbenchGrid.setViewVisible(this.titleBarPartView, shouldShowCustomTitleBar(this.configurationService, mainWindow, this.state.runtime.menuBar.toggled, this.isZenModeActive()));
+        this.workbenchGrid.setViewVisible(this.titleBarPartView, shouldShowCustomTitleBar(this.configurationService, mainWindow, this.state.runtime.menuBar.toggled));
     }
     arrangeEditorNodes(nodes, availableHeight, availableWidth) {
         if (!nodes.sideBar && !nodes.auxiliaryBar) {

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

@@ -8,7 +8,7 @@ import { IAccessibilitySignalService } from 'vscode/vscode/vs/platform/accessibi
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { WorkbenchList } from 'vscode/vscode/vs/platform/list/browser/listService';
 import { IListService } from 'vscode/vscode/vs/platform/list/browser/listService.service';
-import { getNotificationFromContext } from 'vscode/vscode/vs/workbench/browser/parts/notifications/notificationsCommands';
+import { getNotificationFromContext } from '@codingame/monaco-vscode-notifications-workbench-common/vscode/vs/workbench/browser/parts/notifications/notificationsCommands';
 import { NotificationFocusedContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
 
 class NotificationAccessibleView {
@@ -53,7 +53,7 @@ class NotificationAccessibleView {
                 if (!notification) {
                     return;
                 }
-                return notification.source ? ( localize(8789, '{0} Source: {1}', message, notification.source)) : ( localize(8790, '{0}', message));
+                return notification.source ? ( localize(8842, '{0} Source: {1}', message, notification.source)) : ( localize(8843, '{0}', message));
             }
             const content = getContentForNotification();
             if (!content) {
@@ -118,7 +118,7 @@ function getActionsFromNotification(notification, accessibilitySignalService) {
     }
     if (actions) {
         actions.push({
-            id: 'clearNotification', label: ( localize(8791, "Clear Notification")), tooltip: ( localize(8791, "Clear Notification")), run: () => {
+            id: 'clearNotification', label: ( localize(8844, "Clear Notification")), tooltip: ( localize(8844, "Clear Notification")), run: () => {
                 notification.close();
                 accessibilitySignalService.playSignal(AccessibilitySignal.clear);
             }, enabled: true, class: ThemeIcon.asClassName(Codicon.clearAll)

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

@@ -1,5 +1,4 @@
-import '@codingame/monaco-vscode-view-common-service-override/vscode/vs/workbench/browser/style';
-import 'vscode/vscode/vs/nls';
+import 'vscode/vscode/vs/workbench/browser/style';
 import { runWhenWindowIdle } from 'vscode/vscode/vs/base/browser/dom';
 import { Emitter, setGlobalLeakWarningThreshold, Event } from 'vscode/vscode/vs/base/common/event';
 import { timeout, RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
@@ -15,12 +14,12 @@ import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storag
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
-import { NotificationsCenter } from 'vscode/vscode/vs/workbench/browser/parts/notifications/notificationsCenter';
-import { NotificationsAlerts } from 'vscode/vscode/vs/workbench/browser/parts/notifications/notificationsAlerts';
-import { NotificationsStatus } from 'vscode/vscode/vs/workbench/browser/parts/notifications/notificationsStatus';
-import { NotificationsTelemetry } from 'vscode/vscode/vs/workbench/browser/parts/notifications/notificationsTelemetry';
-import { registerNotificationCommands } from 'vscode/vscode/vs/workbench/browser/parts/notifications/notificationsCommands';
-import { NotificationsToasts } from 'vscode/vscode/vs/workbench/browser/parts/notifications/notificationsToasts';
+import { NotificationsCenter } from '@codingame/monaco-vscode-notifications-workbench-common/vscode/vs/workbench/browser/parts/notifications/notificationsCenter';
+import { NotificationsAlerts } from '@codingame/monaco-vscode-notifications-workbench-common/vscode/vs/workbench/browser/parts/notifications/notificationsAlerts';
+import { NotificationsStatus } from '@codingame/monaco-vscode-notifications-workbench-common/vscode/vs/workbench/browser/parts/notifications/notificationsStatus';
+import { NotificationsTelemetry } from '@codingame/monaco-vscode-notifications-workbench-common/vscode/vs/workbench/browser/parts/notifications/notificationsTelemetry';
+import { registerNotificationCommands } from '@codingame/monaco-vscode-notifications-workbench-common/vscode/vs/workbench/browser/parts/notifications/notificationsCommands';
+import { NotificationsToasts } from '@codingame/monaco-vscode-notifications-workbench-common/vscode/vs/workbench/browser/parts/notifications/notificationsToasts';
 import { setARIAContainer } from 'vscode/vscode/vs/base/browser/ui/aria/aria';
 import { FontMeasurements } from 'vscode/vscode/vs/editor/browser/config/fontMeasurements';
 import { BareFontInfo } from 'vscode/vscode/vs/editor/common/config/fontInfo';

package/workbench.js

@@ -8,7 +8,7 @@ import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/d
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { EditorService } from 'vscode/vscode/vs/workbench/services/editor/browser/editorService';
-import { EditorParts } from '@codingame/monaco-vscode-view-common-service-override/vscode/vs/workbench/browser/parts/editor/editorParts';
+import { EditorParts } from '@codingame/monaco-vscode-view-common-views-workbench-common/vscode/vs/workbench/browser/parts/editor/editorParts';
 import { setUnexpectedErrorHandler, onUnexpectedError } from 'vscode/vscode/vs/base/common/errors';
 import { BrowserWindow } from 'vscode/vscode/vs/workbench/browser/window';
 import { detectFullscreen } from 'vscode/vscode/vs/base/browser/dom';