@codingame/monaco-vscode-workbench-service-override 8.0.3 → 9.0.0

package/package.json

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

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

@@ -16,7 +16,7 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
 import { ITitleService } from 'vscode/vscode/vs/workbench/services/title/browser/titleService.service';
 import { StartupKind } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
-import { TitleBarSetting, CustomTitleBarVisibility, hasNativeTitlebar, getMenuBarVisibility } from 'vscode/vscode/vs/platform/window/common/window';
+import { TitleBarSetting, CustomTitleBarVisibility, hasNativeTitlebar, getMenuBarVisibility, useWindowControlsOverlay } from 'vscode/vscode/vs/platform/window/common/window';
 import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
 import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
@@ -341,6 +341,7 @@ class Layout extends Disposable {
     updateWindowsBorder(skipLayout = false) {
         if (isWeb ||
             isWindows ||
+            useWindowControlsOverlay(this.configurationService) ||
             hasNativeTitlebar(this.configurationService)) {
             return;
         }
@@ -398,7 +399,7 @@ class Layout extends Disposable {
         }));
         const initialEditorsState = this.getInitialEditorsState();
         if (initialEditorsState) {
-            this.logService.info('Initial editor state', initialEditorsState);
+            this.logService.trace('Initial editor state', initialEditorsState);
         }
         const initialLayoutState = {
             layout: {

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

@@ -53,7 +53,7 @@ class NotificationAccessibleView {
                 if (!notification) {
                     return;
                 }
-                return notification.source ? ( localize(8671, '{0} Source: {1}', message, notification.source)) : ( localize(8672, '{0}', message));
+                return notification.source ? ( localize(8686, '{0} Source: {1}', message, notification.source)) : ( localize(8687, '{0}', message));
             }
             const content = getContentForNotification();
             if (!content) {
@@ -118,7 +118,7 @@ function getActionsFromNotification(notification, accessibilitySignalService) {
     }
     if (actions) {
         actions.push({
-            id: 'clearNotification', label: ( localize(8673, "Clear Notification")), tooltip: ( localize(8673, "Clear Notification")), run: () => {
+            id: 'clearNotification', label: ( localize(8688, "Clear Notification")), tooltip: ( localize(8688, "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,5 @@
 import '@codingame/monaco-vscode-view-common-service-override/vscode/vs/workbench/browser/style';
-import { localize } from 'vscode/vscode/vs/nls';
+import 'vscode/vscode/vs/nls';
 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';
@@ -37,15 +37,16 @@ import { AccessibilityProgressSignalScheduler } from 'vscode/vscode/vs/platform/
 import { setProgressAcccessibilitySignalScheduler } from 'vscode/vscode/vs/base/browser/ui/progressbar/progressAccessibilitySignal';
 import { AccessibleViewRegistry } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleViewRegistry';
 import { NotificationAccessibleView } from './parts/notifications/notificationAccessibleView.js';
+import 'vscode/vscode/vs/base/common/amd';
 
 class Workbench extends Layout {
     constructor(parent, options, serviceCollection, logService) {
         super(parent);
         this.options = options;
         this.serviceCollection = serviceCollection;
-        this._onWillShutdown = this._register(( (new Emitter())));
+        this._onWillShutdown = this._register(( new Emitter()));
         this.onWillShutdown = this._onWillShutdown.event;
-        this._onDidShutdown = this._register(( (new Emitter())));
+        this._onDidShutdown = this._register(( new Emitter()));
         this.onDidShutdown = this._onDidShutdown.event;
         this.previousUnexpectedError = { message: undefined, time: 0 };
         mark('code/willStartWorkbench');
@@ -57,20 +58,6 @@ class Workbench extends Layout {
             event.preventDefault();
         });
         setUnexpectedErrorHandler(error => this.handleUnexpectedError(error, logService));
-        if (typeof mainWindow.require?.config === 'function') {
-            mainWindow.require.config({
-                onError: (err) => {
-                    if (err.phase === 'loading') {
-                        onUnexpectedError(( (new Error(( localize(
-                            3534,
-                            "Failed to load a required file. Please restart the application to try again. Details: {0}",
-                            JSON.stringify(err)
-                        ))))));
-                    }
-                    console.error(err);
-                }
-            });
-        }
     }
     handleUnexpectedError(error, logService) {
         const message = toErrorMessage(error, true);
@@ -116,7 +103,7 @@ class Workbench extends Layout {
         for (const [id, descriptor] of contributedServices) {
             serviceCollection.set(id, descriptor);
         }
-        const instantiationService = ( (new InstantiationService(serviceCollection, true)));
+        const instantiationService = ( new InstantiationService(serviceCollection, true));
         instantiationService.invokeFunction(accessor => {
             const lifecycleService = accessor.get(ILifecycleService);
             const configurationService = accessor.get(IConfigurationService);
@@ -165,8 +152,8 @@ class Workbench extends Layout {
         }
         this.fontAliasing = aliasing;
         const fontAliasingValues = ['antialiased', 'none', 'auto'];
-        this.mainContainer.classList.remove(...( (fontAliasingValues.map(value => `monaco-font-aliasing-${value}`))));
-        if (( (fontAliasingValues.some(option => option === aliasing)))) {
+        this.mainContainer.classList.remove(...( fontAliasingValues.map(value => `monaco-font-aliasing-${value}`)));
+        if (( fontAliasingValues.some(option => option === aliasing))) {
             this.mainContainer.classList.add(`monaco-font-aliasing-${aliasing}`);
         }
     }
@@ -251,12 +238,12 @@ class Workbench extends Layout {
             notificationsStatus.update(notificationsCenter.isVisible, notificationsToasts.isVisible);
         }));
         registerNotificationCommands(notificationsCenter, notificationsToasts, notificationService.model);
-        AccessibleViewRegistry.register(( (new NotificationAccessibleView())));
+        AccessibleViewRegistry.register(( new NotificationAccessibleView()));
         this.registerNotifications({
-            onDidChangeNotificationsVisibility: ( (Event.map(
+            onDidChangeNotificationsVisibility: ( Event.map(
                 Event.any(notificationsToasts.onDidChangeVisibility, notificationsCenter.onDidChangeVisibility),
                 () => notificationsToasts.isVisible || notificationsCenter.isVisible
-            )))
+            ))
         });
     }
     restore(lifecycleService) {
@@ -281,9 +268,9 @@ class Workbench extends Layout {
                 this.whenRestored.finally(() => markDidStartWorkbench());
             }
             lifecycleService.phase = LifecyclePhase.Restored;
-            const eventuallyPhaseScheduler = this._register(( (new RunOnceScheduler(() => {
+            const eventuallyPhaseScheduler = this._register(( new RunOnceScheduler(() => {
                 this._register(runWhenWindowIdle(mainWindow, () => lifecycleService.phase = LifecyclePhase.Eventually, 2500));
-            }, 2500))));
+            }, 2500)));
             eventuallyPhaseScheduler.schedule();
         }));
     }