@codingame/monaco-vscode-workbench-service-override 22.1.9 → 23.0.1

package/index.js

@@ -26,10 +26,10 @@ import { onLayout, onRenderWorkbench } from '@codingame/monaco-vscode-api/lifecy
 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-a8d3bd74-e63e-5327-96e8-4f931661e329-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
-export { ConfirmResult } from '@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common/vscode/vs/platform/dialogs/common/dialogs';
+export { ConfirmResult } from '@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-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-caeb744c-8e3f-5c11-80fb-0f057d24d544-common/vscode/vs/workbench/common/editor/resourceEditorInput';
-export { AbstractTextResourceEditorInput } from '@codingame/monaco-vscode-caeb744c-8e3f-5c11-80fb-0f057d24d544-common/vscode/vs/workbench/common/editor/textResourceEditorInput';
+export { AbstractResourceEditorInput } from '@codingame/monaco-vscode-16b9b017-9377-5198-9904-c344b3b2ad14-common/vscode/vs/workbench/common/editor/resourceEditorInput';
+export { AbstractTextResourceEditorInput } from '@codingame/monaco-vscode-16b9b017-9377-5198-9904-c344b3b2ad14-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": "22.1.9",
+  "version": "23.0.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - workbench service-override",
   "keywords": [],
@@ -15,24 +15,24 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-1021b67c-93e5-5c78-a270-cbdb2574d980-common": "22.1.9",
-    "@codingame/monaco-vscode-256d5b78-0649-50e9-8354-2807f95f68f4-common": "22.1.9",
-    "@codingame/monaco-vscode-494be54c-bd37-5b3c-af70-02f086e28768-common": "22.1.9",
-    "@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common": "22.1.9",
-    "@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common": "22.1.9",
-    "@codingame/monaco-vscode-85886bdb-61c5-52f1-8eb7-d1d32f6f8cbd-common": "22.1.9",
-    "@codingame/monaco-vscode-9c84f943-bcb5-5bcf-92a6-91f66a732f26-common": "22.1.9",
-    "@codingame/monaco-vscode-9efc1f50-c7de-55d6-8b28-bcc88bd49b5a-common": "22.1.9",
-    "@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common": "22.1.9",
-    "@codingame/monaco-vscode-api": "22.1.9",
-    "@codingame/monaco-vscode-caeb744c-8e3f-5c11-80fb-0f057d24d544-common": "22.1.9",
-    "@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common": "22.1.9",
-    "@codingame/monaco-vscode-keybindings-service-override": "22.1.9",
-    "@codingame/monaco-vscode-quickaccess-service-override": "22.1.9",
-    "@codingame/monaco-vscode-view-banner-service-override": "22.1.9",
-    "@codingame/monaco-vscode-view-common-service-override": "22.1.9",
-    "@codingame/monaco-vscode-view-status-bar-service-override": "22.1.9",
-    "@codingame/monaco-vscode-view-title-bar-service-override": "22.1.9"
+    "@codingame/monaco-vscode-1021b67c-93e5-5c78-a270-cbdb2574d980-common": "23.0.1",
+    "@codingame/monaco-vscode-16b9b017-9377-5198-9904-c344b3b2ad14-common": "23.0.1",
+    "@codingame/monaco-vscode-256d5b78-0649-50e9-8354-2807f95f68f4-common": "23.0.1",
+    "@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common": "23.0.1",
+    "@codingame/monaco-vscode-494be54c-bd37-5b3c-af70-02f086e28768-common": "23.0.1",
+    "@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common": "23.0.1",
+    "@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common": "23.0.1",
+    "@codingame/monaco-vscode-85886bdb-61c5-52f1-8eb7-d1d32f6f8cbd-common": "23.0.1",
+    "@codingame/monaco-vscode-9c84f943-bcb5-5bcf-92a6-91f66a732f26-common": "23.0.1",
+    "@codingame/monaco-vscode-9efc1f50-c7de-55d6-8b28-bcc88bd49b5a-common": "23.0.1",
+    "@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common": "23.0.1",
+    "@codingame/monaco-vscode-api": "23.0.1",
+    "@codingame/monaco-vscode-keybindings-service-override": "23.0.1",
+    "@codingame/monaco-vscode-quickaccess-service-override": "23.0.1",
+    "@codingame/monaco-vscode-view-banner-service-override": "23.0.1",
+    "@codingame/monaco-vscode-view-common-service-override": "23.0.1",
+    "@codingame/monaco-vscode-view-status-bar-service-override": "23.0.1",
+    "@codingame/monaco-vscode-view-title-bar-service-override": "23.0.1"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -12,9 +12,9 @@ import type { IEditorOptions, IResourceEditorInput } from "@codingame/monaco-vsc
 import { EditorPane } from "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-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-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common/vscode/vs/platform/dialogs/common/dialogs";
-import { AbstractResourceEditorInput } from "@codingame/monaco-vscode-caeb744c-8e3f-5c11-80fb-0f057d24d544-common/vscode/vs/workbench/common/editor/resourceEditorInput";
-import { AbstractTextResourceEditorInput } from "@codingame/monaco-vscode-caeb744c-8e3f-5c11-80fb-0f057d24d544-common/vscode/vs/workbench/common/editor/textResourceEditorInput";
+import { ConfirmResult } from "@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/platform/dialogs/common/dialogs";
+import { AbstractResourceEditorInput } from "@codingame/monaco-vscode-16b9b017-9377-5198-9904-c344b3b2ad14-common/vscode/vs/workbench/common/editor/resourceEditorInput";
+import { AbstractTextResourceEditorInput } from "@codingame/monaco-vscode-16b9b017-9377-5198-9904-c344b3b2ad14-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

@@ -2239,7 +2239,13 @@ class LayoutStateModel extends Disposable {
         this.storageService.store(`${LayoutStateModel.STORAGE_PREFIX}${key.name}`, typeof value === 'object' ? JSON.stringify(value) : value, key.scope, key.target);
     }
     loadKeyFromStorage(key) {
-        const value = this.storageService.get(`${LayoutStateModel.STORAGE_PREFIX}${key.name}`, key.scope);
+        let value = this.storageService.get(`${LayoutStateModel.STORAGE_PREFIX}${key.name}`, key.scope);
+        if (key.scope === StorageScope.WORKSPACE &&
+            key.name === LayoutStateKeys.AUXILIARYBAR_HIDDEN.name &&
+            this.configurationService.getValue('workbench.secondarySideBar.enableDefaultVisibilityInOldWorkspace') === true &&
+            this.storageService.get('workbench.panel.chat.numberOfVisibleViews', StorageScope.WORKSPACE) === undefined) {
+            value = undefined;
+        }
         if (value !== undefined) {
             this.isNew[key.scope] = false;
             switch (typeof key.defaultValue) {

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

@@ -55,7 +55,7 @@ class NotificationAccessibleView {
                 if (!notification || !message) {
                     return;
                 }
-                return withSeverityPrefix(notification.source ? ( localize(3441, '{0} Source: {1}', message, notification.source)) : message, notification.severity);
+                return withSeverityPrefix(notification.source ? ( localize(3461, '{0} Source: {1}', message, notification.source)) : message, notification.severity);
             }
             const content = getContentForNotification();
             if (!content) {
@@ -118,7 +118,7 @@ function getActionsFromNotification(notification, accessibilitySignalService) {
     }
     if (actions) {
         actions.push({
-            id: 'clearNotification', label: ( localize(3442, "Clear Notification")), tooltip: ( localize(3442, "Clear Notification")), run: () => {
+            id: 'clearNotification', label: ( localize(3462, "Clear Notification")), tooltip: ( localize(3462, "Clear Notification")), run: () => {
                 notification.close();
                 accessibilitySignalService.playSignal(AccessibilitySignal.clear);
             }, enabled: true, class: ThemeIcon.asClassName(Codicon.clearAll)

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

@@ -23,7 +23,7 @@ import { registerNotificationCommands } from '@codingame/monaco-vscode-494be54c-
 import { NotificationsToasts } from '@codingame/monaco-vscode-494be54c-bd37-5b3c-af70-02f086e28768-common/vscode/vs/workbench/browser/parts/notifications/notificationsToasts';
 import { setARIAContainer } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/aria/aria';
 import { FontMeasurements } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/config/fontMeasurements';
-import { BareFontInfo } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/config/fontInfo';
+import { createBareFontInfoFromRawSettings } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/config/fontInfoFromSettings';
 import { toErrorMessage } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errorMessage';
 import { coalesce } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
 import { InstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiationService';
@@ -33,9 +33,11 @@ import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 import { mainWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/window';
 import { PixelRatio } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/pixelRatio';
 import { AccessibilityProgressSignalScheduler } from '@codingame/monaco-vscode-1021b67c-93e5-5c78-a270-cbdb2574d980-common/vscode/vs/platform/accessibilitySignal/browser/progressAccessibilitySignalScheduler';
-import { setProgressAcccessibilitySignalScheduler } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/progressbar/progressAccessibilitySignal';
+import { setProgressAccessibilitySignalScheduler } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/progressbar/progressAccessibilitySignal';
 import { AccessibleViewRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleViewRegistry';
 import { NotificationAccessibleView } from './parts/notifications/notificationAccessibleView.js';
+import { IMarkdownRendererService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service';
+import { EditorMarkdownCodeBlockRenderer } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/widget/markdownRenderer/browser/editorMarkdownCodeBlockRenderer';
 
 class Workbench extends Layout {
     constructor(parent, options, serviceCollection, logService) {
@@ -82,6 +84,8 @@ class Workbench extends Layout {
                 const hostService = accessor.get(IHostService);
                 const dialogService = accessor.get(IDialogService);
                 const notificationService = accessor.get(INotificationService);
+                const markdownRendererService = accessor.get(IMarkdownRendererService);
+                markdownRendererService.setDefaultCodeBlockRenderer(instantiationService.createInstance(EditorMarkdownCodeBlockRenderer));
                 this.initLayout(accessor);
                 this.registerListeners(lifecycleService, storageService, configurationService, hostService, dialogService);
                 this.renderWorkbench(instantiationService, notificationService, storageService, configurationService);
@@ -106,7 +110,7 @@ class Workbench extends Layout {
         instantiationService.invokeFunction(accessor => {
             const lifecycleService = accessor.get(ILifecycleService);
             const configurationService = accessor.get(IConfigurationService);
-            if (typeof configurationService.acquireInstantiationService === 'function') {
+            if (configurationService && 'acquireInstantiationService' in configurationService) {
                 configurationService.acquireInstantiationService(instantiationService);
             }
             lifecycleService.phase = LifecyclePhase.Ready;
@@ -168,7 +172,7 @@ class Workbench extends Layout {
             catch (err) {
             }
         }
-        FontMeasurements.readFontInfo(mainWindow, BareFontInfo.createFromRawSettings(configurationService.getValue('editor'), PixelRatio.getInstance(mainWindow).value));
+        FontMeasurements.readFontInfo(mainWindow, createBareFontInfoFromRawSettings(configurationService.getValue('editor'), PixelRatio.getInstance(mainWindow).value));
     }
     storeFontInfo(storageService) {
         const serializedFontInfo = FontMeasurements.serializeFontInfo(mainWindow);
@@ -178,7 +182,7 @@ class Workbench extends Layout {
     }
     renderWorkbench(instantiationService, notificationService, storageService, configurationService) {
         setARIAContainer(this.mainContainer);
-        setProgressAcccessibilitySignalScheduler((msDelayTime, msLoopTime) => instantiationService.createInstance(AccessibilityProgressSignalScheduler, msDelayTime, msLoopTime));
+        setProgressAccessibilitySignalScheduler((msDelayTime, msLoopTime) => instantiationService.createInstance(AccessibilityProgressSignalScheduler, msDelayTime, msLoopTime));
         const platformClass = isWindows ? 'windows' : isLinux ? 'linux' : 'mac';
         const workbenchClasses = coalesce([
             'monaco-workbench',