@codingame/monaco-vscode-workbench-service-override 15.0.2 → 16.0.0

package/index.js

@@ -25,14 +25,14 @@ import { getWorkbenchContainer } from '@codingame/monaco-vscode-api/workbench';
 import { onLayout, onRenderWorkbench } from '@codingame/monaco-vscode-api/lifecycle';
 export { EditorPane, SimpleEditorInput, SimpleEditorPane, getPanelPosition, getSideBarPosition, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, setPartVisibility, viewContainerRegistry, viewRegistry } from '@codingame/monaco-vscode-9efc1f50-c7de-55d6-8b28-bcc88bd49b5a-common/service-override/tools/views';
 export { ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
-export { ViewPaneContainer } from '@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
+export { ViewPaneContainer } from '@codingame/monaco-vscode-b1110435-a331-5549-ab1e-aa3d763c3a1f-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 export { ConfirmResult } from '@codingame/monaco-vscode-2e69e120-617a-5258-95e0-3b8902f4e014-common/vscode/vs/platform/dialogs/common/dialogs';
 export { RegisteredEditorPriority } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService';
 export { AbstractResourceEditorInput } from '@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common/vscode/vs/workbench/common/editor/resourceEditorInput';
 export { AbstractTextResourceEditorInput } from '@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common/vscode/vs/workbench/common/editor/textResourceEditorInput';
 export { EditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/editorInput';
 export { EditorInputCapabilities } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
-export { Parts } from '@codingame/monaco-vscode-81f603ca-d6ea-5402-90dd-3014dffc63b4-common/vscode/vs/workbench/services/layout/browser/layoutService';
+export { Parts } from '@codingame/monaco-vscode-b1110435-a331-5549-ab1e-aa3d763c3a1f-common/vscode/vs/workbench/services/layout/browser/layoutService';
 export { SplitView } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/splitview/splitview';
 export { DomScrollableElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-workbench-service-override",
-  "version": "15.0.2",
+  "version": "16.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - workbench service-override",
   "keywords": [],
@@ -15,25 +15,24 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-1021b67c-93e5-5c78-a270-cbdb2574d980-common": "15.0.2",
-    "@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common": "15.0.2",
-    "@codingame/monaco-vscode-256d5b78-0649-50e9-8354-2807f95f68f4-common": "15.0.2",
-    "@codingame/monaco-vscode-2e69e120-617a-5258-95e0-3b8902f4e014-common": "15.0.2",
-    "@codingame/monaco-vscode-411e0589-fa79-504b-b32c-80a88847b23a-common": "15.0.2",
-    "@codingame/monaco-vscode-494be54c-bd37-5b3c-af70-02f086e28768-common": "15.0.2",
-    "@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common": "15.0.2",
-    "@codingame/monaco-vscode-81f603ca-d6ea-5402-90dd-3014dffc63b4-common": "15.0.2",
-    "@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common": "15.0.2",
-    "@codingame/monaco-vscode-9efc1f50-c7de-55d6-8b28-bcc88bd49b5a-common": "15.0.2",
-    "@codingame/monaco-vscode-api": "15.0.2",
-    "@codingame/monaco-vscode-d8236b3b-b91a-522d-89f4-94d70a546f6a-common": "15.0.2",
-    "@codingame/monaco-vscode-fdf643f9-94dd-5510-b97a-408abf26ad92-common": "15.0.2",
-    "@codingame/monaco-vscode-keybindings-service-override": "15.0.2",
-    "@codingame/monaco-vscode-quickaccess-service-override": "15.0.2",
-    "@codingame/monaco-vscode-view-banner-service-override": "15.0.2",
-    "@codingame/monaco-vscode-view-common-service-override": "15.0.2",
-    "@codingame/monaco-vscode-view-status-bar-service-override": "15.0.2",
-    "@codingame/monaco-vscode-view-title-bar-service-override": "15.0.2"
+    "@codingame/monaco-vscode-1021b67c-93e5-5c78-a270-cbdb2574d980-common": "16.0.0",
+    "@codingame/monaco-vscode-256d5b78-0649-50e9-8354-2807f95f68f4-common": "16.0.0",
+    "@codingame/monaco-vscode-2e69e120-617a-5258-95e0-3b8902f4e014-common": "16.0.0",
+    "@codingame/monaco-vscode-411e0589-fa79-504b-b32c-80a88847b23a-common": "16.0.0",
+    "@codingame/monaco-vscode-494be54c-bd37-5b3c-af70-02f086e28768-common": "16.0.0",
+    "@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common": "16.0.0",
+    "@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common": "16.0.0",
+    "@codingame/monaco-vscode-9efc1f50-c7de-55d6-8b28-bcc88bd49b5a-common": "16.0.0",
+    "@codingame/monaco-vscode-api": "16.0.0",
+    "@codingame/monaco-vscode-b1110435-a331-5549-ab1e-aa3d763c3a1f-common": "16.0.0",
+    "@codingame/monaco-vscode-d8236b3b-b91a-522d-89f4-94d70a546f6a-common": "16.0.0",
+    "@codingame/monaco-vscode-fdf643f9-94dd-5510-b97a-408abf26ad92-common": "16.0.0",
+    "@codingame/monaco-vscode-keybindings-service-override": "16.0.0",
+    "@codingame/monaco-vscode-quickaccess-service-override": "16.0.0",
+    "@codingame/monaco-vscode-view-banner-service-override": "16.0.0",
+    "@codingame/monaco-vscode-view-common-service-override": "16.0.0",
+    "@codingame/monaco-vscode-view-status-bar-service-override": "16.0.0",
+    "@codingame/monaco-vscode-view-title-bar-service-override": "16.0.0"
   },
   "main": "index.js",
   "module": "index.js",
@@ -42,6 +41,9 @@
     ".": {
       "default": "./index.js"
     },
+    "./vscode/*.css": {
+      "default": "./vscode/src/*.css"
+    },
     "./vscode/*": {
       "types": "./vscode/src/*.d.ts",
       "default": "./vscode/src/*.js"

package/service-override/tools/views.d.ts

@@ -2,7 +2,7 @@ import { type IViewContainerDescriptor, type IViewContainersRegistry, type IView
 import type { BrandedService, ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { type IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { Dimension } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/dom";
-import { ViewPaneContainer } from "@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer";
+import { ViewPaneContainer } from "@codingame/monaco-vscode-b1110435-a331-5549-ab1e-aa3d763c3a1f-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { Codicon } from "@codingame/monaco-vscode-api/vscode/vs/base/common/codicons";
 import { type EditorInputFactoryObject, type RegisteredEditorInfo, type RegisteredEditorOptions, RegisteredEditorPriority } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService";
@@ -15,7 +15,7 @@ import { DomScrollableElement } from "@codingame/monaco-vscode-api/vscode/vs/bas
 import { ConfirmResult } from "@codingame/monaco-vscode-2e69e120-617a-5258-95e0-3b8902f4e014-common/vscode/vs/platform/dialogs/common/dialogs";
 import { AbstractResourceEditorInput } from "@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common/vscode/vs/workbench/common/editor/resourceEditorInput";
 import { AbstractTextResourceEditorInput } from "@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common/vscode/vs/workbench/common/editor/textResourceEditorInput";
-import { Parts, Position } from "@codingame/monaco-vscode-81f603ca-d6ea-5402-90dd-3014dffc63b4-common/vscode/vs/workbench/services/layout/browser/layoutService";
+import { Parts, Position } from "@codingame/monaco-vscode-b1110435-a331-5549-ab1e-aa3d763c3a1f-common/vscode/vs/workbench/services/layout/browser/layoutService";
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { type IView, SplitView } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/splitview/splitview";
 import { type IEditorGroup } from "@codingame/monaco-vscode-api/services";

package/vscode/src/vs/workbench/browser/layout.d.ts

@@ -2,7 +2,7 @@ import { Disposable, DisposableMap, DisposableStore, IDisposable } from "@coding
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { IDimension } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/dom";
 import { IUntypedEditorInput } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
-import { Position, Parts, PanelAlignment, MULTI_WINDOW_PARTS, SINGLE_WINDOW_PARTS } from "@codingame/monaco-vscode-81f603ca-d6ea-5402-90dd-3014dffc63b4-common/vscode/vs/workbench/services/layout/browser/layoutService";
+import { Position, Parts, PanelAlignment, MULTI_WINDOW_PARTS, SINGLE_WINDOW_PARTS } from "@codingame/monaco-vscode-b1110435-a331-5549-ab1e-aa3d763c3a1f-common/vscode/vs/workbench/services/layout/browser/layoutService";
 import { IWorkbenchLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service";
 import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IPath } from "@codingame/monaco-vscode-api/vscode/vs/platform/window/common/window";
@@ -175,6 +175,7 @@ export declare abstract class Layout extends Disposable implements IWorkbenchLay
         onDidChangeNotificationsVisibility: Event<boolean>;
     }): void;
     hasFocus(part: Parts): boolean;
+    private _getFocusedPart;
     focusPart(part: MULTI_WINDOW_PARTS, targetWindow: Window): void;
     focusPart(part: SINGLE_WINDOW_PARTS): void;
     getContainer(targetWindow: Window): HTMLElement;

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

@@ -1,14 +1,14 @@
 
 import { Disposable, toDisposable, DisposableStore, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { Dimension, getActiveDocument, getWindows, getClientArea, getWindow, addDisposableListener, EventType, isActiveDocument, getWindowId, getActiveWindow, getActiveElement, isAncestorUsingFlowTo, position, size, computeScreenAwareSize } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { Dimension, getActiveDocument, getWindows, getClientArea, getWindow, addDisposableListener, EventType, isActiveDocument, getActiveWindow, getActiveElement, isAncestorUsingFlowTo, position, size, computeScreenAwareSize, getWindowId } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { onDidChangeFullscreen, isFullscreen, isWCOEnabled } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/browser';
 import { IWorkingCopyBackupService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyBackup.service';
 import { isWindows, isLinux, isWeb, isIOS, isMacintosh } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { pathsToEditors, isResourceEditorInput, EditorInputCapabilities } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { SidebarPart } from '@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common/vscode/vs/workbench/browser/parts/sidebar/sidebarPart';
 import { PanelPart } from '@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common/vscode/vs/workbench/browser/parts/panel/panelPart';
-import { LayoutSettings, Parts, EditorActionsLocation, ActivityBarPosition, shouldShowCustomTitleBar, Position, isHorizontal, ZenModeSettings, panelOpensMaximizedFromString, PanelOpensMaximizedOptions, positionToString, positionFromString } from '@codingame/monaco-vscode-81f603ca-d6ea-5402-90dd-3014dffc63b4-common/vscode/vs/workbench/services/layout/browser/layoutService';
+import { LayoutSettings, Parts, EditorActionsLocation, ActivityBarPosition, shouldShowCustomTitleBar, Position, isHorizontal, ZenModeSettings, isMultiWindowPart, panelOpensMaximizedFromString, PanelOpensMaximizedOptions, positionToString, positionFromString } from '@codingame/monaco-vscode-b1110435-a331-5549-ab1e-aa3d763c3a1f-common/vscode/vs/workbench/services/layout/browser/layoutService';
 import { isTemporaryWorkspace, WorkbenchState } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
@@ -366,9 +366,8 @@ class Layout extends Disposable {
         for (const container of this.containers) {
             const isMainContainer = container === this.mainContainer;
             const isActiveContainer = this.activeContainer === container;
-            const containerWindowId = getWindowId(getWindow(container));
             let windowBorder = false;
-            if (!this.state.runtime.mainWindowFullscreen && !( this.state.runtime.maximized.has(containerWindowId)) && (activeBorder || inactiveBorder)) {
+            if (!this.state.runtime.mainWindowFullscreen && (activeBorder || inactiveBorder)) {
                 windowBorder = true;
                 const borderColor = isActiveContainer && this.state.runtime.hasFocus ? activeBorder : inactiveBorder ?? activeBorder;
                 container.style.setProperty('--window-border-color', borderColor?.toString() ?? 'transparent');
@@ -750,6 +749,14 @@ class Layout extends Disposable {
         }
         return isAncestorUsingFlowTo(activeElement, container);
     }
+    _getFocusedPart() {
+        for (const part of ( this.parts.keys())) {
+            if (this.hasFocus(part)) {
+                return part;
+            }
+        }
+        return undefined;
+    }
     focusPart(part, targetWindow = mainWindow) {
         const container = this.getContainer(targetWindow, part) ?? this.mainContainer;
         switch (part) {
@@ -895,6 +902,7 @@ class Layout extends Disposable {
         this.stateModel.setRuntimeValue(LayoutStateKeys.ZEN_MODE_ACTIVE, active);
     }
     toggleZenMode(skipLayout, restoring = false) {
+        const focusedPartPreTransition = this._getFocusedPart();
         this.setZenModeActive(!this.isZenModeActive());
         this.state.runtime.zenMode.transitionDisposables.clearAndDisposeAll();
         const setLineNumbers = (lineNumbers) => {
@@ -998,7 +1006,6 @@ class Layout extends Disposable {
                 this.notificationService.setFilter(NotificationsFilter.OFF);
             }
             setLineNumbers();
-            this.focus();
             toggleMainWindowFullScreen = zenModeExitInfo.transitionedToFullScreen && this.state.runtime.mainWindowFullscreen;
         }
         if (!skipLayout) {
@@ -1007,6 +1014,17 @@ class Layout extends Disposable {
         if (toggleMainWindowFullScreen) {
             this.hostService.toggleFullScreen(mainWindow);
         }
+        if (focusedPartPreTransition && this.isVisible(focusedPartPreTransition, getWindow(this.activeContainer))) {
+            if (isMultiWindowPart(focusedPartPreTransition)) {
+                this.focusPart(focusedPartPreTransition, getWindow(this.activeContainer));
+            }
+            else {
+                this.focusPart(focusedPartPreTransition);
+            }
+        }
+        else {
+            this.focus();
+        }
         this._onDidChangeZenMode.fire(this.isZenModeActive());
     }
     setStatusBarHidden(hidden, skipLayout) {
@@ -1457,7 +1475,7 @@ class Layout extends Disposable {
         return this.state.runtime.mainWindowBorder;
     }
     getMainWindowBorderRadius() {
-        return this.state.runtime.mainWindowBorder && isMacintosh ? '5px' : undefined;
+        return this.state.runtime.mainWindowBorder && isMacintosh ? '10px' : undefined;
     }
     isPanelMaximized() {
         return (this.getPanelAlignment() === 'center' || !isHorizontal(this.getPanelPosition())) && !this.isVisible(Parts.EDITOR_PART, mainWindow);

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

@@ -54,7 +54,7 @@ class NotificationAccessibleView {
                 if (!notification) {
                     return;
                 }
-                return notification.source ? ( localize(3277, '{0} Source: {1}', message, notification.source)) : ( localize(3278, '{0}', message));
+                return notification.source ? ( localize(3318, '{0} Source: {1}', message, notification.source)) : ( localize(3319, '{0}', message));
             }
             const content = getContentForNotification();
             if (!content) {
@@ -117,7 +117,7 @@ function getActionsFromNotification(notification, accessibilitySignalService) {
     }
     if (actions) {
         actions.push({
-            id: 'clearNotification', label: ( localize(3279, "Clear Notification")), tooltip: ( localize(3279, "Clear Notification")), run: () => {
+            id: 'clearNotification', label: ( localize(3320, "Clear Notification")), tooltip: ( localize(3320, "Clear Notification")), run: () => {
                 notification.close();
                 accessibilitySignalService.playSignal(AccessibilitySignal.clear);
             }, enabled: true, class: ThemeIcon.asClassName(Codicon.clearAll)

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

@@ -8,7 +8,7 @@ import { mark } from '@codingame/monaco-vscode-api/vscode/vs/base/common/perform
 import { onUnexpectedError, setUnexpectedErrorHandler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { isNative, isMacintosh, isWindows, isLinux, isWeb } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { getSingletonServiceDescriptors } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
-import { Parts, positionToString, Position } from '@codingame/monaco-vscode-81f603ca-d6ea-5402-90dd-3014dffc63b4-common/vscode/vs/workbench/services/layout/browser/layoutService';
+import { Parts, positionToString, Position } from '@codingame/monaco-vscode-b1110435-a331-5549-ab1e-aa3d763c3a1f-common/vscode/vs/workbench/services/layout/browser/layoutService';
 import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
 import { WillSaveStateReason, StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';