@codingame/monaco-vscode-api 1.83.16 → 1.85.0-next.1

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

@@ -1,11 +1,11 @@
 import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
 import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { Extensions as Extensions$1 } from 'monaco-editor/esm/vs/platform/configuration/common/configurationRegistry.js';
+import { Extensions as Extensions$2 } from 'monaco-editor/esm/vs/platform/configuration/common/configurationRegistry.js';
 import { isMacintosh, isWeb, isNative, isWindows, isLinux } from 'monaco-editor/esm/vs/base/common/platform.js';
-import { DynamicWorkbenchConfigurationWorkbenchContribution, workbenchConfigurationNodeBase } from '../common/configuration.js';
+import { DynamicWorkbenchConfigurationWorkbenchContribution, workbenchConfigurationNodeBase, Extensions as Extensions$1 } from '../common/configuration.js';
 import { isStandalone } from 'monaco-editor/esm/vs/base/browser/browser.js';
 import { Extensions } from '../common/contributions.js';
-const registry = ( Registry.as(Extensions$1.Configuration));
+const registry = ( Registry.as(Extensions$2.Configuration));
 (function registerConfiguration() {
     ( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(DynamicWorkbenchConfigurationWorkbenchContribution, 2 );
     registry.registerConfiguration({
@@ -33,21 +33,66 @@ const registry = ( Registry.as(Extensions$1.Configuration));
                 )),
                 default: 'default',
             },
-            'workbench.editor.showTabs': {
-                'type': 'boolean',
+            ["workbench.editor.showTabs" ]: {
+                'type': 'string',
+                'enum': ["multiple" , "single" , "none" ],
+                'enumDescriptions': [
+                    ( localizeWithPath(
+                        'vs/workbench/browser/workbench.contribution',
+                        'workbench.editor.showTabs.multiple',
+                        "Each editor is displayed as a tab in the editor title area."
+                    )),
+                    ( localizeWithPath(
+                        'vs/workbench/browser/workbench.contribution',
+                        'workbench.editor.showTabs.single',
+                        "The active editor is displayed as a single large tab in the editor title area."
+                    )),
+                    ( localizeWithPath(
+                        'vs/workbench/browser/workbench.contribution',
+                        'workbench.editor.showTabs.none',
+                        "The editor title area is not displayed."
+                    )),
+                ],
                 'description': ( localizeWithPath(
                     'vs/workbench/browser/workbench.contribution',
                     'showEditorTabs',
-                    "Controls whether opened editors should show in tabs or not."
+                    "Controls whether opened editors should show as individual tabs, one single large tab or if the title area should not be shown."
                 )),
-                'default': true
+                'default': 'multiple'
+            },
+            'workbench.editor.editorActionsLocation': {
+                'type': 'string',
+                'enum': ['default', 'titleBar', 'hidden'],
+                'enumDescriptions': [
+                    ( localizeWithPath(
+                        'vs/workbench/browser/workbench.contribution',
+                        'workbench.editor.editorActionsLocation.default',
+                        "Show editor actions in the window title bar when `#workbench.editor.showTabs#` is set to `none`. Otherwise, editor actions are shown in the editor tab bar."
+                    )),
+                    ( localizeWithPath(
+                        'vs/workbench/browser/workbench.contribution',
+                        'workbench.editor.editorActionsLocation.titleBar',
+                        "Show editor actions in the window title bar. If `#window.titleBarStyle#` is set to `native`, editor actions are hidden."
+                    )),
+                    ( localizeWithPath(
+                        'vs/workbench/browser/workbench.contribution',
+                        'workbench.editor.editorActionsLocation.hidden',
+                        "Editor actions are not shown."
+                    )),
+                ],
+                'markdownDescription': ( localizeWithPath(
+                    'vs/workbench/browser/workbench.contribution',
+                    'editorActionsLocation',
+                    "Controls where the editor actions are shown."
+                )),
+                'default': 'default'
             },
             'workbench.editor.wrapTabs': {
                 'type': 'boolean',
                 'markdownDescription': ( localizeWithPath(
                     'vs/workbench/browser/workbench.contribution',
                     'wrapTabs',
-                    "Controls whether tabs should be wrapped over multiple lines when exceeding available space or whether a scrollbar should appear instead. This value is ignored when `#workbench.editor.showTabs#` is disabled."
+                    "Controls whether tabs should be wrapped over multiple lines when exceeding available space or whether a scrollbar should appear instead. This value is ignored when `#workbench.editor.showTabs#` is not set to `multiple`."
                 )),
                 'default': false
             },
@@ -56,7 +101,7 @@ const registry = ( Registry.as(Extensions$1.Configuration));
                 'markdownDescription': ( localizeWithPath(
                     'vs/workbench/browser/workbench.contribution',
                     { comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'scrollToSwitchTabs' },
-                    "Controls whether scrolling over tabs will open them or not. By default tabs will only reveal upon scrolling, but not open. You can press and hold the Shift-key while scrolling to change this behavior for that duration. This value is ignored when `#workbench.editor.showTabs#` is disabled."
+                    "Controls whether scrolling over tabs will open them or not. By default tabs will only reveal upon scrolling, but not open. You can press and hold the Shift-key while scrolling to change this behavior for that duration. This value is ignored when `#workbench.editor.showTabs#` is not set to `multiple`."
                 )),
                 'default': false
             },
@@ -65,7 +110,7 @@ const registry = ( Registry.as(Extensions$1.Configuration));
                 'markdownDescription': ( localizeWithPath(
                     'vs/workbench/browser/workbench.contribution',
                     'highlightModifiedTabs',
-                    "Controls whether a top border is drawn on tabs for editors that have unsaved changes. This value is ignored when `#workbench.editor.showTabs#` is disabled."
+                    "Controls whether a top border is drawn on tabs for editors that have unsaved changes. This value is ignored when `#workbench.editor.showTabs#` is not set to `multiple`."
                 )),
                 'default': false
             },
@@ -208,14 +253,32 @@ const registry = ( Registry.as(Extensions$1.Configuration));
                     }
                 }
             },
-            'workbench.editor.tabCloseButton': {
-                'type': 'string',
-                'enum': ['left', 'right', 'off'],
-                'default': 'right',
-                'markdownDescription': ( localizeWithPath(
+            'workbench.editor.tabActionLocation': {
+                type: 'string',
+                enum: ['left', 'right'],
+                default: 'right',
+                markdownDescription: ( localizeWithPath(
+                    'vs/workbench/browser/workbench.contribution',
+                    { comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'tabActionLocation' },
+                    "Controls the position of the editor's tabs action buttons (close, unpin). This value is ignored when `#workbench.editor.showTabs#` is not set to `multiple`."
+                ))
+            },
+            'workbench.editor.tabActionCloseVisibility': {
+                type: 'boolean',
+                default: true,
+                description: ( localizeWithPath(
+                    'vs/workbench/browser/workbench.contribution',
+                    'workbench.editor.tabActionCloseVisibility',
+                    "Controls the visibility of the tab close action button."
+                ))
+            },
+            'workbench.editor.tabActionUnpinVisibility': {
+                type: 'boolean',
+                default: true,
+                description: ( localizeWithPath(
                     'vs/workbench/browser/workbench.contribution',
-                    { comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'editorTabCloseButton' },
-                    "Controls the position of the editor's tabs close buttons, or disables them when set to 'off'. This value is ignored when `#workbench.editor.showTabs#` is disabled."
+                    'workbench.editor.tabActionUnpinVisibility',
+                    "Controls the visibility of the tab unpin action button."
                 ))
             },
             'workbench.editor.tabSizing': {
@@ -242,7 +305,7 @@ const registry = ( Registry.as(Extensions$1.Configuration));
                 'markdownDescription': ( localizeWithPath(
                     'vs/workbench/browser/workbench.contribution',
                     { comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'tabSizing' },
-                    "Controls the size of editor tabs. This value is ignored when `#workbench.editor.showTabs#` is disabled."
+                    "Controls the size of editor tabs. This value is ignored when `#workbench.editor.showTabs#` is not set to `multiple`."
                 ))
             },
             'workbench.editor.tabSizingFixedMinWidth': {
@@ -272,7 +335,7 @@ const registry = ( Registry.as(Extensions$1.Configuration));
                 'markdownDescription': ( localizeWithPath(
                     'vs/workbench/browser/workbench.contribution',
                     { comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.editor.tabHeight' },
-                    "Controls the height of editor tabs. Also applies to the title control bar when `#workbench.editor.showTabs#` is disabled."
+                    "Controls the height of editor tabs. Also applies to the title control bar when `#workbench.editor.showTabs#` is not set to `multiple`."
                 ))
             },
             'workbench.editor.pinnedTabSizing': {
@@ -299,7 +362,7 @@ const registry = ( Registry.as(Extensions$1.Configuration));
                 'markdownDescription': ( localizeWithPath(
                     'vs/workbench/browser/workbench.contribution',
                     { comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'pinnedTabSizing' },
-                    "Controls the size of pinned editor tabs. Pinned tabs are sorted to the beginning of all opened tabs and typically do not close until unpinned. This value is ignored when `#workbench.editor.showTabs#` is disabled."
+                    "Controls the size of pinned editor tabs. Pinned tabs are sorted to the beginning of all opened tabs and typically do not close until unpinned. This value is ignored when `#workbench.editor.showTabs#` is not set to `multiple`."
                 ))
             },
             'workbench.editor.pinnedTabsOnSeparateRow': {
@@ -308,7 +371,7 @@ const registry = ( Registry.as(Extensions$1.Configuration));
                 'markdownDescription': ( localizeWithPath(
                     'vs/workbench/browser/workbench.contribution',
                     'workbench.editor.pinnedTabsOnSeparateRow',
-                    "When enabled, displays pinned tabs in a separate row above all other tabs. This value is ignored when `#workbench.editor.showTabs#` is disabled."
+                    "When enabled, displays pinned tabs in a separate row above all other tabs. This value is ignored when `#workbench.editor.showTabs#` is not set to `multiple`."
                 )),
             },
             'workbench.editor.preventPinnedEditorClose': {
@@ -379,6 +442,15 @@ const registry = ( Registry.as(Extensions$1.Configuration));
                     "Controls if editor groups can be split from drag and drop operations by dropping an editor or file on the edges of the editor area."
                 ))
             },
+            'workbench.editor.dragToOpenWindow': {
+                'type': 'boolean',
+                'default': true,
+                'markdownDescription': ( localizeWithPath(
+                    'vs/workbench/browser/workbench.contribution',
+                    'dragToOpenWindow',
+                    "Controls if editors can be dragged out of the window to open them in a new window. Press and hold `Alt`-key while dragging to toggle this dynamically."
+                ))
+            },
             'workbench.editor.focusRecentEditorAfterClose': {
                 'type': 'boolean',
                 'description': ( localizeWithPath(
@@ -568,13 +640,31 @@ const registry = ( Registry.as(Extensions$1.Configuration));
                 ))
             },
             'workbench.editor.doubleClickTabToToggleEditorGroupSizes': {
-                'type': 'boolean',
-                'default': true,
+                'type': 'string',
+                'enum': ['maximize', 'expand', 'off'],
+                'default': 'expand',
                 'markdownDescription': ( localizeWithPath(
                     'vs/workbench/browser/workbench.contribution',
                     { comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'doubleClickTabToToggleEditorGroupSizes' },
-                    "Controls whether to maximize/restore the editor group when double clicking on a tab. This value is ignored when `#workbench.editor.showTabs#` is disabled."
-                ))
+                    "Controls how the editor group is resized when double clicking on a tab. This value is ignored when `#workbench.editor.showTabs#` is not set to `multiple`."
+                )),
+                'enumDescriptions': [
+                    ( localizeWithPath(
+                        'vs/workbench/browser/workbench.contribution',
+                        'workbench.editor.doubleClickTabToToggleEditorGroupSizes.maximize',
+                        "All other editor groups are hidden and the current editor group is maximized to take up the entire editor area."
+                    )),
+                    ( localizeWithPath(
+                        'vs/workbench/browser/workbench.contribution',
+                        'workbench.editor.doubleClickTabToToggleEditorGroupSizes.expand',
+                        "The editor group takes as much space as possible by making all other editor groups as small as possible."
+                    )),
+                    ( localizeWithPath(
+                        'vs/workbench/browser/workbench.contribution',
+                        'workbench.editor.doubleClickTabToToggleEditorGroupSizes.off',
+                        "No editor group is resized when double clicking on a tab."
+                    ))
+                ]
             },
             'workbench.editor.limit.enabled': {
                 'type': 'boolean',
@@ -832,14 +922,34 @@ const registry = ( Registry.as(Extensions$1.Configuration));
                     "Controls the visibility of the status bar at the bottom of the workbench."
                 ))
             },
-            'workbench.activityBar.visible': {
-                'type': 'boolean',
-                'default': true,
-                'description': ( localizeWithPath(
+            ["workbench.activityBar.location" ]: {
+                'type': 'string',
+                'enum': ['side', 'top', 'hidden'],
+                'default': 'side',
+                'markdownDescription': ( localizeWithPath(
                     'vs/workbench/browser/workbench.contribution',
-                    'activityBarVisibility',
-                    "Controls the visibility of the activity bar in the workbench."
-                ))
+                    { comment: ['This is the description for a setting'], key: 'activityBarLocation' },
+                    "Controls the location of the activity bar. It can either show to the `side` or `top` (requires {0} set to {1}) of the primary side bar or `hidden`.",
+                    '`#window.titleBarStyle#`',
+                    '`custom`'
+                )),
+                'enumDescriptions': [
+                    ( localizeWithPath(
+                        'vs/workbench/browser/workbench.contribution',
+                        'workbench.activityBar.location.side',
+                        "Show the activity bar to the side of the primary side bar."
+                    )),
+                    ( localizeWithPath(
+                        'vs/workbench/browser/workbench.contribution',
+                        'workbench.activityBar.location.top',
+                        "Show the activity bar on top of the primary side bar."
+                    )),
+                    ( localizeWithPath(
+                        'vs/workbench/browser/workbench.contribution',
+                        'workbench.activityBar.location.hide',
+                        "Hide the activity bar."
+                    ))
+                ]
             },
             'workbench.activityBar.iconClickBehavior': {
                 'type': 'string',
@@ -1147,7 +1257,7 @@ const registry = ( Registry.as(Extensions$1.Configuration));
                     '`#window.title#`'
                 ))
             },
-            'window.commandCenter': {
+            ["window.commandCenter" ]: {
                 type: 'boolean',
                 default: true,
                 markdownDescription: isWeb ?
@@ -1361,7 +1471,7 @@ const registry = ( Registry.as(Extensions$1.Configuration));
                     ( localizeWithPath(
                         'vs/workbench/browser/workbench.contribution',
                         'confirmBeforeClose',
-                        "Controls whether to show a confirmation dialog before closing the window or quitting the application."
+                        "Controls whether to show a confirmation dialog before closing a window or quitting the application."
                     )),
                 'scope': 1
             }
@@ -1395,14 +1505,32 @@ const registry = ( Registry.as(Extensions$1.Configuration));
                     "Controls whether turning on Zen Mode also centers the layout."
                 ))
             },
-            'zenMode.hideTabs': {
-                'type': 'boolean',
-                'default': true,
+            'zenMode.showTabs': {
+                'type': 'string',
+                'enum': ['multiple', 'single', 'none'],
                 'description': ( localizeWithPath(
                     'vs/workbench/browser/workbench.contribution',
-                    'zenMode.hideTabs',
-                    "Controls whether turning on Zen Mode also hides workbench tabs."
-                ))
+                    'zenMode.showTabs',
+                    "Controls whether turning on Zen Mode should show multiple editor tabs, a single editor tab or hide the editor title area completely."
+                )),
+                'enumDescriptions': [
+                    ( localizeWithPath(
+                        'vs/workbench/browser/workbench.contribution',
+                        'zenMode.showTabs.multiple',
+                        "Each editor is displayed as a tab in the editor title area."
+                    )),
+                    ( localizeWithPath(
+                        'vs/workbench/browser/workbench.contribution',
+                        'zenMode.showTabs.single',
+                        "The active editor is displayed as a single large tab in the editor title area."
+                    )),
+                    ( localizeWithPath(
+                        'vs/workbench/browser/workbench.contribution',
+                        'zenMode.showTabs.none',
+                        "The editor title area is not displayed."
+                    )),
+                ],
+                'default': 'multiple'
             },
             'zenMode.hideStatusBar': {
                 'type': 'boolean',
@@ -1452,3 +1580,55 @@ const registry = ( Registry.as(Extensions$1.Configuration));
         }
     });
 })();
+( Registry.as(Extensions$1.ConfigurationMigration))
+    .registerConfigurationMigrations([{
+        key: 'workbench.activityBar.visible', migrateFn: (value) => {
+            const result = [];
+            if (value !== undefined) {
+                result.push(['workbench.activityBar.visible', { value: undefined }]);
+            }
+            if (value === false) {
+                result.push(["workbench.activityBar.location" , { value: "hidden"  }]);
+            }
+            return result;
+        }
+    }]);
+( Registry.as(Extensions$1.ConfigurationMigration))
+    .registerConfigurationMigrations([{
+        key: 'workbench.editor.doubleClickTabToToggleEditorGroupSizes', migrateFn: (value) => {
+            const results = [];
+            if (typeof value === 'boolean') {
+                value = value ? 'expand' : 'off';
+                results.push(['workbench.editor.doubleClickTabToToggleEditorGroupSizes', { value }]);
+            }
+            return results;
+        }
+    }, {
+        key: "workbench.editor.showTabs" , migrateFn: (value) => {
+            const results = [];
+            if (typeof value === 'boolean') {
+                value = value ? "multiple"  : "single" ;
+                results.push(["workbench.editor.showTabs" , { value }]);
+            }
+            return results;
+        }
+    }, {
+        key: 'workbench.editor.tabCloseButton', migrateFn: (value) => {
+            const result = [];
+            if (value === 'left' || value === 'right') {
+                result.push(['workbench.editor.tabActionLocation', { value }]);
+            }
+            else if (value === 'off') {
+                result.push(['workbench.editor.tabActionCloseVisibility', { value: false }]);
+            }
+            return result;
+        }
+    }, {
+        key: 'zenMode.hideTabs', migrateFn: (value) => {
+            const result = [['zenMode.hideTabs', { value: undefined }]];
+            if (value === true) {
+                result.push(['zenMode.showTabs', { value: 'single' }]);
+            }
+            return result;
+        }
+    }]);

package/vscode/src/vs/workbench/common/activity.js

@@ -0,0 +1,3 @@
+const GLOBAL_ACTIVITY_ID = 'workbench.actions.manage';
+const ACCOUNTS_ACTIVITY_ID = 'workbench.actions.accounts';
+export { ACCOUNTS_ACTIVITY_ID, GLOBAL_ACTIVITY_ID };

package/vscode/src/vs/workbench/common/contextkeys.js

@@ -8,6 +8,7 @@ import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.j
 import { IModelService } from 'monaco-editor/esm/vs/editor/common/services/model.js';
 import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
 import { DEFAULT_EDITOR_ASSOCIATION } from './editor.js';
+import { isLinux } from 'monaco-editor/esm/vs/base/common/platform.js';
 var ResourceContextKey_1;
 const WorkbenchStateContext = ( new RawContextKey('workbenchState', undefined, { type: 'string', description: ( localizeWithPath(
     'vs/workbench/common/contextkeys',
@@ -47,6 +48,11 @@ const IsFullscreenContext = ( new RawContextKey('isFullscreen', false, ( localiz
     'isFullscreen',
     "Whether the window is in fullscreen mode"
 ))));
+const IsAuxiliaryWindowFocusedContext = ( new RawContextKey('isAuxiliaryWindowFocusedContext', false, ( localizeWithPath(
+    'vs/workbench/common/contextkeys',
+    'isAuxiliaryWindowFocusedContext',
+    "Whether an auxiliary window is focused"
+))));
 const HasWebFileSystemAccess = ( new RawContextKey('hasWebFileSystemAccess', false, true));
 const EmbedderIdentifierContext = ( new RawContextKey('embedderIdentifier', undefined, ( localizeWithPath(
     'vs/workbench/common/contextkeys',
@@ -149,6 +155,21 @@ const MultipleEditorGroupsContext = ( new RawContextKey('multipleEditorGroups',
     'multipleEditorGroups',
     "Whether there are multiple editor groups opened"
 ))));
+const EditorPartMultipleEditorGroupsContext = ( new RawContextKey('editorPartMultipleEditorGroups', false, ( localizeWithPath(
+    'vs/workbench/common/contextkeys',
+    'editorPartMultipleEditorGroups',
+    "Whether there are multiple editor groups opened in an editor part"
+))));
+const EditorPartMaximizedEditorGroupContext = ( new RawContextKey('editorPartMaximizedEditorGroup', false, ( localizeWithPath(
+    'vs/workbench/common/contextkeys',
+    'editorPartEditorGroupMaximized',
+    "Editor Part has a maximized group"
+))));
+const IsAuxiliaryEditorPartContext = ( new RawContextKey('isAuxiliaryEditorPart', false, ( localizeWithPath(
+    'vs/workbench/common/contextkeys',
+    'isAuxiliaryEditorPart',
+    "Editor Part is in an auxiliary window"
+))));
 const EditorsVisibleContext = ( new RawContextKey('editorIsOpen', false, ( localizeWithPath(
     'vs/workbench/common/contextkeys',
     'editorIsOpen',
@@ -169,10 +190,10 @@ const SplitEditorsVertically = ( new RawContextKey('splitEditorsVertically', fal
     'splitEditorsVertically',
     "Whether editors split vertically"
 ))));
-const EditorAreaVisibleContext = ( new RawContextKey('editorAreaVisible', true, ( localizeWithPath(
+const MainEditorAreaVisibleContext = ( new RawContextKey('mainEditorAreaVisible', true, ( localizeWithPath(
     'vs/workbench/common/contextkeys',
-    'editorAreaVisible',
-    "Whether the editor area is visible"
+    'mainEditorAreaVisible',
+    "Whether the editor area in the main window is visible"
 ))));
 const EditorTabsVisibleContext = ( new RawContextKey('editorTabsVisible', true, ( localizeWithPath(
     'vs/workbench/common/contextkeys',
@@ -200,6 +221,16 @@ const StatusBarFocused = ( new RawContextKey('statusBarFocused', false, ( locali
     'statusBarFocused',
     "Whether the status bar has keyboard focus"
 ))));
+const TitleBarStyleContext = ( new RawContextKey('titleBarStyle', isLinux ? 'native' : 'custom', ( localizeWithPath(
+    'vs/workbench/common/contextkeys',
+    'titleBarStyle',
+    "Style of the window title bar"
+))));
+const TitleBarVisibleContext = ( new RawContextKey('titleBarVisible', false, ( localizeWithPath(
+    'vs/workbench/common/contextkeys',
+    'titleBarVisible',
+    "Whether the title bar is visible"
+))));
 const BannerFocused = ( new RawContextKey('bannerFocused', false, ( localizeWithPath(
     'vs/workbench/common/contextkeys',
     'bannerFocused',
@@ -271,7 +302,6 @@ const FocusedViewContext = ( new RawContextKey('focusedView', '', ( localizeWith
     "The identifier of the view that has keyboard focus"
 ))));
 function getVisbileViewContextKey(viewId) { return `view.${viewId}.visible`; }
-function getEnabledViewContainerContextKey(viewContainerId) { return `viewContainer.${viewContainerId}.enabled`; }
 let ResourceContextKey = class ResourceContextKey {
     static { ResourceContextKey_1 = this; }
     static { this.Scheme = ( new RawContextKey('resourceScheme', undefined, { type: 'string', description: ( localizeWithPath(
@@ -439,4 +469,4 @@ function applyAvailableEditorIds(contextKey, editor, editorResolverService) {
         contextKey.set(editors.join(','));
     }
 }
-export { ActiveAuxiliaryContext, ActiveEditorAvailableEditorIdsContext, ActiveEditorCanRevertContext, ActiveEditorCanSplitInGroupContext, ActiveEditorCanToggleReadonlyContext, ActiveEditorContext, ActiveEditorDirtyContext, ActiveEditorFirstInGroupContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, ActiveEditorLastInGroupContext, ActiveEditorPinnedContext, ActiveEditorReadonlyContext, ActiveEditorStickyContext, ActivePanelContext, ActiveViewletContext, AuxiliaryBarFocusContext, AuxiliaryBarVisibleContext, BannerFocused, DirtyWorkingCopiesContext, EditorAreaVisibleContext, EditorGroupEditorsCountContext, EditorPinnedAndUnpinnedTabsContext, EditorTabsVisibleContext, EditorsVisibleContext, EmbedderIdentifierContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, FocusedViewContext, HasWebFileSystemAccess, InEditorZenModeContext, IsCenteredLayoutContext, IsFullscreenContext, MultipleEditorGroupsContext, NotificationFocusedContext, NotificationsCenterVisibleContext, NotificationsToastsVisibleContext, OpenFolderWorkspaceSupportContext, PanelAlignmentContext, PanelFocusContext, PanelMaximizedContext, PanelPositionContext, PanelVisibleContext, RemoteNameContext, ResourceContextKey, SideBarVisibleContext, SideBySideEditorActiveContext, SidebarFocusContext, SplitEditorsVertically, StatusBarFocused, TemporaryWorkspaceContext, TextCompareEditorActiveContext, TextCompareEditorVisibleContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, applyAvailableEditorIds, getEnabledViewContainerContextKey, getVisbileViewContextKey };
+export { ActiveAuxiliaryContext, ActiveEditorAvailableEditorIdsContext, ActiveEditorCanRevertContext, ActiveEditorCanSplitInGroupContext, ActiveEditorCanToggleReadonlyContext, ActiveEditorContext, ActiveEditorDirtyContext, ActiveEditorFirstInGroupContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, ActiveEditorLastInGroupContext, ActiveEditorPinnedContext, ActiveEditorReadonlyContext, ActiveEditorStickyContext, ActivePanelContext, ActiveViewletContext, AuxiliaryBarFocusContext, AuxiliaryBarVisibleContext, BannerFocused, DirtyWorkingCopiesContext, EditorGroupEditorsCountContext, EditorPartMaximizedEditorGroupContext, EditorPartMultipleEditorGroupsContext, EditorPinnedAndUnpinnedTabsContext, EditorTabsVisibleContext, EditorsVisibleContext, EmbedderIdentifierContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, FocusedViewContext, HasWebFileSystemAccess, InEditorZenModeContext, IsAuxiliaryEditorPartContext, IsAuxiliaryWindowFocusedContext, IsCenteredLayoutContext, IsFullscreenContext, MainEditorAreaVisibleContext, MultipleEditorGroupsContext, NotificationFocusedContext, NotificationsCenterVisibleContext, NotificationsToastsVisibleContext, OpenFolderWorkspaceSupportContext, PanelAlignmentContext, PanelFocusContext, PanelMaximizedContext, PanelPositionContext, PanelVisibleContext, RemoteNameContext, ResourceContextKey, SideBarVisibleContext, SideBySideEditorActiveContext, SidebarFocusContext, SplitEditorsVertically, StatusBarFocused, TemporaryWorkspaceContext, TextCompareEditorActiveContext, TextCompareEditorVisibleContext, TitleBarStyleContext, TitleBarVisibleContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, applyAvailableEditorIds, getVisbileViewContextKey };

package/vscode/src/vs/workbench/common/contributions.js

@@ -1,7 +1,7 @@
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
 import { ILifecycleService } from '../services/lifecycle/common/lifecycle.js';
 import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
-import { DeferredPromise, runWhenIdle } from 'monaco-editor/esm/vs/base/common/async.js';
+import { DeferredPromise, runWhenGlobalIdle } from 'monaco-editor/esm/vs/base/common/async.js';
 import { mark } from 'monaco-editor/esm/vs/base/common/performance.js';
 import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
 import { IEnvironmentService } from 'monaco-editor/esm/vs/platform/environment/common/environment.js';
@@ -13,6 +13,7 @@ class WorkbenchContributionsRegistry {
     constructor() {
         this.contributions = ( new Map());
         this.pendingRestoredContributions = ( new DeferredPromise());
+        this.whenRestored = this.pendingRestoredContributions.p;
     }
     registerWorkbenchContribution(contribution, phase = 1 ) {
         if (this.instantiationService && this.lifecycleService && this.logService && this.environmentService && this.lifecycleService.phase >= phase) {
@@ -78,7 +79,7 @@ class WorkbenchContributionsRegistry {
                 const contribution = contributions[i++];
                 this.safeCreateContribution(instantiationService, logService, environmentService, contribution, phase);
                 if (idle.timeRemaining() < 1) {
-                    runWhenIdle(instantiateSome, forcedTimeout);
+                    runWhenGlobalIdle(instantiateSome, forcedTimeout);
                     break;
                 }
             }
@@ -89,7 +90,7 @@ class WorkbenchContributionsRegistry {
                 }
             }
         };
-        runWhenIdle(instantiateSome, forcedTimeout);
+        runWhenGlobalIdle(instantiateSome, forcedTimeout);
     }
     safeCreateContribution(instantiationService, logService, environmentService, contribution, phase) {
         const now = phase < 3  ? Date.now() : undefined;

package/vscode/src/vs/workbench/common/editor/diffEditorInput.js

@@ -7,6 +7,7 @@ import { DiffEditorModel } from './diffEditorModel.js';
 import { TextDiffEditorModel } from './textDiffEditorModel.js';
 import { IEditorService } from '../../services/editor/common/editorService.js';
 import { shorten } from 'monaco-editor/esm/vs/base/common/labels.js';
+import { isResolvedEditorModel } from 'monaco-editor/esm/vs/platform/editor/common/editor.js';
 var DiffEditorInput_1;
 let DiffEditorInput = class DiffEditorInput extends SideBySideEditorInput {
     static { DiffEditorInput_1 = this; }
@@ -70,9 +71,15 @@ let DiffEditorInput = class DiffEditorInput extends SideBySideEditorInput {
                 mediumDescription = this.computeLabel(shortenedOriginalMediumDescription, shortenedModifiedMediumDescription);
             }
         }
-        const shortTitle = this.computeLabel(this.original.getTitle(0 ) ?? this.original.getName(), this.modified.getTitle(0 ) ?? this.modified.getName(), ' ↔ ');
-        const mediumTitle = this.computeLabel(this.original.getTitle(1 ) ?? this.original.getName(), this.modified.getTitle(1 ) ?? this.modified.getName(), ' ↔ ');
-        const longTitle = this.computeLabel(this.original.getTitle(2 ) ?? this.original.getName(), this.modified.getTitle(2 ) ?? this.modified.getName(), ' ↔ ');
+        let shortTitle = this.computeLabel(this.original.getTitle(0 ) ?? this.original.getName(), this.modified.getTitle(0 ) ?? this.modified.getName(), ' ↔ ');
+        let mediumTitle = this.computeLabel(this.original.getTitle(1 ) ?? this.original.getName(), this.modified.getTitle(1 ) ?? this.modified.getName(), ' ↔ ');
+        let longTitle = this.computeLabel(this.original.getTitle(2 ) ?? this.original.getName(), this.modified.getTitle(2 ) ?? this.modified.getName(), ' ↔ ');
+        const preferredTitle = this.getPreferredTitle();
+        if (preferredTitle) {
+            shortTitle = `${preferredTitle} (${shortTitle})`;
+            mediumTitle = `${preferredTitle} (${mediumTitle})`;
+            longTitle = `${preferredTitle} (${longTitle})`;
+        }
         return { name, shortDescription, mediumDescription, longDescription, forceDescription, shortTitle, mediumTitle, longTitle };
     }
     computeLabel(originalLabel, modifiedLabel, separator = ' - ') {
@@ -129,7 +136,10 @@ let DiffEditorInput = class DiffEditorInput extends SideBySideEditorInput {
         if (modifiedEditorModel instanceof BaseTextEditorModel && originalEditorModel instanceof BaseTextEditorModel) {
             return ( new TextDiffEditorModel(originalEditorModel, modifiedEditorModel));
         }
-        return ( new DiffEditorModel(originalEditorModel ?? undefined, modifiedEditorModel ?? undefined));
+        return ( new DiffEditorModel(
+            isResolvedEditorModel(originalEditorModel) ? originalEditorModel : undefined,
+            isResolvedEditorModel(modifiedEditorModel) ? modifiedEditorModel : undefined
+        ));
     }
     toUntyped(options) {
         const untyped = super.toUntyped(options);

package/vscode/src/vs/workbench/common/editor/diffEditorModel.js

@@ -14,7 +14,7 @@ class DiffEditorModel extends EditorModel {
         ]);
     }
     isResolved() {
-        return !!(this.originalModel?.isResolved() && this.modifiedModel?.isResolved());
+        return !!(this._originalModel?.isResolved() && this._modifiedModel?.isResolved());
     }
     dispose() {
         super.dispose();