@codingame/monaco-vscode-workbench-service-override 17.2.1 → 18.0.0

package/index.js

@@ -25,11 +25,11 @@ 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-e67a0dae-5b2c-54e6-8d61-90102c78362d-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
-export { ConfirmResult } from '@codingame/monaco-vscode-0f262ee3-cace-5644-818e-eba5fe007685-common/vscode/vs/platform/dialogs/common/dialogs';
+export { ViewPaneContainer } from '@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
+export { ConfirmResult } from '@codingame/monaco-vscode-f24b7f0a-ceeb-5877-9148-81eb98a4f5d7-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 { AbstractResourceEditorInput } from '@codingame/monaco-vscode-4ee27008-17b4-593f-9c09-19e8e3077f51-common/vscode/vs/workbench/common/editor/resourceEditorInput';
+export { AbstractTextResourceEditorInput } from '@codingame/monaco-vscode-4ee27008-17b4-593f-9c09-19e8e3077f51-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-api/vscode/vs/workbench/services/layout/browser/layoutService';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-workbench-service-override",
-  "version": "17.2.1",
+  "version": "18.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - workbench service-override",
   "keywords": [],
@@ -15,25 +15,25 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-0f262ee3-cace-5644-818e-eba5fe007685-common": "17.2.1",
-    "@codingame/monaco-vscode-1021b67c-93e5-5c78-a270-cbdb2574d980-common": "17.2.1",
-    "@codingame/monaco-vscode-256d5b78-0649-50e9-8354-2807f95f68f4-common": "17.2.1",
-    "@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common": "17.2.1",
-    "@codingame/monaco-vscode-494be54c-bd37-5b3c-af70-02f086e28768-common": "17.2.1",
-    "@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common": "17.2.1",
-    "@codingame/monaco-vscode-85886bdb-61c5-52f1-8eb7-d1d32f6f8cbd-common": "17.2.1",
-    "@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common": "17.2.1",
-    "@codingame/monaco-vscode-9c72783f-914c-50be-b9ef-da16356d81a8-common": "17.2.1",
-    "@codingame/monaco-vscode-9c84f943-bcb5-5bcf-92a6-91f66a732f26-common": "17.2.1",
-    "@codingame/monaco-vscode-9efc1f50-c7de-55d6-8b28-bcc88bd49b5a-common": "17.2.1",
-    "@codingame/monaco-vscode-api": "17.2.1",
-    "@codingame/monaco-vscode-e67a0dae-5b2c-54e6-8d61-90102c78362d-common": "17.2.1",
-    "@codingame/monaco-vscode-keybindings-service-override": "17.2.1",
-    "@codingame/monaco-vscode-quickaccess-service-override": "17.2.1",
-    "@codingame/monaco-vscode-view-banner-service-override": "17.2.1",
-    "@codingame/monaco-vscode-view-common-service-override": "17.2.1",
-    "@codingame/monaco-vscode-view-status-bar-service-override": "17.2.1",
-    "@codingame/monaco-vscode-view-title-bar-service-override": "17.2.1"
+    "@codingame/monaco-vscode-1021b67c-93e5-5c78-a270-cbdb2574d980-common": "18.0.0",
+    "@codingame/monaco-vscode-256d5b78-0649-50e9-8354-2807f95f68f4-common": "18.0.0",
+    "@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common": "18.0.0",
+    "@codingame/monaco-vscode-494be54c-bd37-5b3c-af70-02f086e28768-common": "18.0.0",
+    "@codingame/monaco-vscode-4ee27008-17b4-593f-9c09-19e8e3077f51-common": "18.0.0",
+    "@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common": "18.0.0",
+    "@codingame/monaco-vscode-85886bdb-61c5-52f1-8eb7-d1d32f6f8cbd-common": "18.0.0",
+    "@codingame/monaco-vscode-9c72783f-914c-50be-b9ef-da16356d81a8-common": "18.0.0",
+    "@codingame/monaco-vscode-9c84f943-bcb5-5bcf-92a6-91f66a732f26-common": "18.0.0",
+    "@codingame/monaco-vscode-9efc1f50-c7de-55d6-8b28-bcc88bd49b5a-common": "18.0.0",
+    "@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common": "18.0.0",
+    "@codingame/monaco-vscode-api": "18.0.0",
+    "@codingame/monaco-vscode-f24b7f0a-ceeb-5877-9148-81eb98a4f5d7-common": "18.0.0",
+    "@codingame/monaco-vscode-keybindings-service-override": "18.0.0",
+    "@codingame/monaco-vscode-quickaccess-service-override": "18.0.0",
+    "@codingame/monaco-vscode-view-banner-service-override": "18.0.0",
+    "@codingame/monaco-vscode-view-common-service-override": "18.0.0",
+    "@codingame/monaco-vscode-view-status-bar-service-override": "18.0.0",
+    "@codingame/monaco-vscode-view-title-bar-service-override": "18.0.0"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -2,19 +2,19 @@ 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-e67a0dae-5b2c-54e6-8d61-90102c78362d-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer";
+import { ViewPaneContainer } from "@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-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";
 import { EditorInput, type IEditorCloseHandler } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/editorInput";
 import { EditorInputCapabilities, type IEditorOpenContext, type IEditorSerializer, Verbosity } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
 import type { IEditorOptions, IResourceEditorInput } from "@codingame/monaco-vscode-api/vscode/vs/platform/editor/common/editor";
-import { EditorPane } from "@codingame/monaco-vscode-d0fb86d3-2a47-594e-955b-9a24631a7124-common/vscode/vs/workbench/browser/parts/editor/editorPane";
+import { EditorPane } from "@codingame/monaco-vscode-dcfc2191-2da1-54c7-8fb7-e92c5d11ecef-common/vscode/vs/workbench/browser/parts/editor/editorPane";
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { DomScrollableElement } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/scrollbar/scrollableElement";
-import { ConfirmResult } from "@codingame/monaco-vscode-0f262ee3-cace-5644-818e-eba5fe007685-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 { ConfirmResult } from "@codingame/monaco-vscode-f24b7f0a-ceeb-5877-9148-81eb98a4f5d7-common/vscode/vs/platform/dialogs/common/dialogs";
+import { AbstractResourceEditorInput } from "@codingame/monaco-vscode-4ee27008-17b4-593f-9c09-19e8e3077f51-common/vscode/vs/workbench/common/editor/resourceEditorInput";
+import { AbstractTextResourceEditorInput } from "@codingame/monaco-vscode-4ee27008-17b4-593f-9c09-19e8e3077f51-common/vscode/vs/workbench/common/editor/textResourceEditorInput";
 import { Parts, Position } from "@codingame/monaco-vscode-api/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";

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

@@ -17,7 +17,7 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { ITitleService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/title/browser/titleService.service';
 import { StartupKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { ILifecycleService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
-import { TitleBarSetting, DEFAULT_WINDOW_SIZE, CustomTitleBarVisibility, hasNativeTitlebar, getMenuBarVisibility, useWindowControlsOverlay } from '@codingame/monaco-vscode-api/vscode/vs/platform/window/common/window';
+import { MenuSettings, TitleBarSetting, DEFAULT_WINDOW_SIZE, CustomTitleBarVisibility, hasNativeTitlebar, getMenuBarVisibility, useWindowControlsOverlay, hasNativeMenu } from '@codingame/monaco-vscode-api/vscode/vs/platform/window/common/window';
 import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
 import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common/vscode/vs/workbench/services/environment/browser/environmentService.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
@@ -74,7 +74,7 @@ const TITLE_BAR_SETTINGS = [
     ...COMMAND_CENTER_SETTINGS,
     LayoutSettings.EDITOR_ACTIONS_LOCATION,
     LayoutSettings.LAYOUT_ACTIONS,
-    'window.menuBarVisibility',
+    MenuSettings.MenuBarVisibility,
     TitleBarSetting.TITLE_BAR_STYLE,
     TitleBarSetting.CUSTOM_TITLE_BAR_VISIBILITY,
 ];
@@ -188,8 +188,8 @@ class Layout extends Disposable {
         this.telemetryService = accessor.get(ITelemetryService);
         this.auxiliaryWindowService = accessor.get(IAuxiliaryWindowService);
         this.editorService = accessor.get(IEditorService);
-        this.mainPartEditorService = this.editorService.createScoped('main', this._store);
         this.editorGroupService = accessor.get(IEditorGroupsService);
+        this.mainPartEditorService = this.editorService.createScoped(this.editorGroupService.mainPart, this._store);
         this.paneCompositeService = accessor.get(IPaneCompositePartService);
         this.viewDescriptorService = accessor.get(IViewDescriptorService);
         this.titleService = accessor.get(ITitleService);
@@ -938,9 +938,10 @@ class Layout extends Disposable {
                 this.centerMainEditorLayout(true, true);
             }
             this.state.runtime.zenMode.transitionDisposables.set('configurationChange', this.configurationService.onDidChangeConfiguration(e => {
-                if (e.affectsConfiguration(ZenModeSettings.HIDE_ACTIVITYBAR)) {
+                if (e.affectsConfiguration(ZenModeSettings.HIDE_ACTIVITYBAR) || e.affectsConfiguration(LayoutSettings.ACTIVITY_BAR_LOCATION)) {
                     const zenModeHideActivityBar = this.configurationService.getValue(ZenModeSettings.HIDE_ACTIVITYBAR);
-                    this.setActivityBarHidden(zenModeHideActivityBar);
+                    const activityBarLocation = this.configurationService.getValue(LayoutSettings.ACTIVITY_BAR_LOCATION);
+                    this.setActivityBarHidden(zenModeHideActivityBar ? true : (activityBarLocation === ActivityBarPosition.TOP || activityBarLocation === ActivityBarPosition.BOTTOM));
                 }
                 if (e.affectsConfiguration(ZenModeSettings.HIDE_STATUSBAR)) {
                     const zenModeHideStatusBar = this.configurationService.getValue(ZenModeSettings.HIDE_STATUSBAR);
@@ -1479,12 +1480,12 @@ class Layout extends Disposable {
         }
         let newVisibilityValue;
         if (currentVisibilityValue === 'visible' || currentVisibilityValue === 'classic') {
-            newVisibilityValue = hasNativeTitlebar(this.configurationService) ? 'toggle' : 'compact';
+            newVisibilityValue = hasNativeMenu(this.configurationService) ? 'toggle' : 'compact';
         }
         else {
             newVisibilityValue = 'classic';
         }
-        this.configurationService.updateValue('window.menuBarVisibility', newVisibilityValue);
+        this.configurationService.updateValue(MenuSettings.MenuBarVisibility, newVisibilityValue);
     }
     getPanelPosition() {
         return this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_POSITION);

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

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