@codingame/monaco-vscode-api 36.2.7 → 37.1.0

package/vscode/src/vs/workbench/common/configuration.d.ts

@@ -24,6 +24,7 @@ export type ConfigurationMigrationFn = (value: any, valueAccessor: (key: string)
 export type ConfigurationMigration = {
     key: string;
     migrateFn: ConfigurationMigrationFn;
+    includeApplication?: boolean;
 };
 export interface IConfigurationMigrationRegistry {
     registerConfigurationMigrations(configurationMigrations: ConfigurationMigration[]): void;

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

@@ -18,26 +18,26 @@ import { IUserDataProfilesService } from '../../platform/userDataProfile/common/
 const workbenchConfigurationNodeBase = ( Object.freeze({
     "id": "workbench",
     "order": 7,
-    "title": ( localize(4282, "Workbench")),
+    "title": ( localize(4578, "Workbench")),
     "type": "object"
 }));
 const securityConfigurationNodeBase = ( Object.freeze({
     "id": "security",
     "scope": ConfigurationScope.APPLICATION,
-    "title": ( localize(4283, "Security")),
+    "title": ( localize(4579, "Security")),
     "type": "object",
     "order": 7
 }));
 const problemsConfigurationNodeBase = ( Object.freeze({
     "id": "problems",
-    "title": ( localize(4284, "Problems")),
+    "title": ( localize(4580, "Problems")),
     "type": "object",
     "order": 101
 }));
 const windowConfigurationNodeBase = ( Object.freeze({
     "id": "window",
     "order": 8,
-    "title": ( localize(4285, "Window")),
+    "title": ( localize(4581, "Window")),
     "type": "object"
 }));
 const Extensions = {
@@ -100,6 +100,9 @@ let ConfigurationMigrationWorkbenchContribution = class ConfigurationMigrationWo
             ["userRemote", ConfigurationTarget.USER_REMOTE],
             ["workspace", ConfigurationTarget.WORKSPACE]
         ];
+        if (migration.includeApplication) {
+            targetPairs.unshift(["application", ConfigurationTarget.APPLICATION]);
+        }
         for (const [dataKey, target] of targetPairs) {
             const inspectValue = inspectData[dataKey];
             if (!inspectValue) {
@@ -190,11 +193,11 @@ let DynamicWorkbenchSecurityConfiguration = class DynamicWorkbenchSecurityConfig
                     "items": {
                         "type": "string",
                         "pattern": "^[^\\\\]+$",
-                        "patternErrorMessage": ( localize(4286, "UNC host names must not contain backslashes."))
+                        "patternErrorMessage": ( localize(4582, "UNC host names must not contain backslashes."))
                     },
                     "default": [],
                     "markdownDescription": ( localize(
-                        4287,
+                        4583,
                         "A set of UNC host names (without leading or trailing backslash, for example `192.168.0.1` or `my-server`) to allow without user confirmation. If a UNC host is being accessed that is not allowed via this setting or has not been acknowledged via user confirmation, an error will occur and the operation stopped. A restart is required when changing this setting. Find out more about this setting at https://aka.ms/vscode-windows-unc."
                     )),
                     "scope": ConfigurationScope.APPLICATION_MACHINE
@@ -203,7 +206,7 @@ let DynamicWorkbenchSecurityConfiguration = class DynamicWorkbenchSecurityConfig
                     "type": "boolean",
                     "default": true,
                     "markdownDescription": ( localize(
-                        4288,
+                        4584,
                         "If enabled, only allows access to UNC host names that are allowed by the `#security.allowedUNCHosts#` setting or after user confirmation. Find out more about this setting at https://aka.ms/vscode-windows-unc."
                     )),
                     "scope": ConfigurationScope.APPLICATION_MACHINE
@@ -246,9 +249,9 @@ let DynamicWindowConfiguration = class DynamicWindowConfiguration extends Dispos
                     "type": ["string", "null"],
                     "default": null,
                     "enum": [...( this.userDataProfilesService.profiles.map(profile => profile.name)), null],
-                    "enumItemLabels": [...( this.userDataProfilesService.profiles.map(() => "")), ( localize(4289, "Active Window"))],
+                    "enumItemLabels": [...( this.userDataProfilesService.profiles.map(() => "")), ( localize(4585, "Active Window"))],
                     "description": ( localize(
-                        4290,
+                        4586,
                         "Specifies the profile to use when opening a new window. If a profile name is provided, the new window will use that profile. If no profile name is provided, the new window will use the profile of the active window or the Default profile if no active window exists."
                     )),
                     "scope": ConfigurationScope.APPLICATION

package/vscode/src/vs/workbench/common/contextkeys.d.ts

@@ -24,6 +24,8 @@ export declare const IsMainWindowFullscreenContext: RawContextKey<boolean>;
 export declare const IsAuxiliaryWindowFocusedContext: RawContextKey<boolean>;
 export declare const IsWindowAlwaysOnTopContext: RawContextKey<boolean>;
 export declare const IsAuxiliaryWindowContext: RawContextKey<boolean>;
+export declare const MenuBarVisibleContext: import("../../platform/contextkey/common/contextkey.js").ContextKeyExpression;
+export declare const CustomMenuBarVisibleContext: import("../../platform/contextkey/common/contextkey.js").ContextKeyExpression;
 export declare const ActiveEditorDirtyContext: RawContextKey<boolean>;
 export declare const ActiveEditorPinnedContext: RawContextKey<boolean>;
 export declare const ActiveEditorFirstInGroupContext: RawContextKey<boolean>;
@@ -34,6 +36,7 @@ export declare const ActiveCompareEditorCanSwapContext: RawContextKey<boolean>;
 export declare const ActiveEditorCanToggleReadonlyContext: RawContextKey<boolean>;
 export declare const ActiveEditorCanRevertContext: RawContextKey<boolean>;
 export declare const ActiveEditorCanSplitInGroupContext: RawContextKey<boolean>;
+export declare const ActiveEditorCannotCloseContext: RawContextKey<boolean>;
 export declare const ActiveEditorContext: RawContextKey<string | null>;
 export declare const ActiveEditorAvailableEditorIdsContext: RawContextKey<string>;
 export declare const TextCompareEditorVisibleContext: RawContextKey<boolean>;
@@ -53,9 +56,9 @@ export declare const MultipleEditorsSelectedInGroupContext: RawContextKey<boolea
 export declare const TwoEditorsSelectedInGroupContext: RawContextKey<boolean>;
 export declare const SelectedEditorsInGroupFileOrUntitledResourceContextKey: RawContextKey<boolean>;
 export declare const EditorPartMultipleEditorGroupsContext: RawContextKey<boolean>;
-export declare const EditorPartSingleEditorGroupsContext: import("../../platform/contextkey/common/contextkey.js").ContextKeyExpression;
 export declare const EditorPartMaximizedEditorGroupContext: RawContextKey<boolean>;
 export declare const EditorPartModalContext: RawContextKey<boolean>;
+export declare const EditorPartModalVisibleContext: RawContextKey<boolean>;
 export declare const EditorPartModalMaximizedContext: RawContextKey<boolean>;
 export declare const EditorPartModalNavigationContext: RawContextKey<boolean>;
 export declare const EditorPartModalSidebarContext: RawContextKey<boolean>;
@@ -81,6 +84,7 @@ export declare const NotificationsToastsVisibleContext: RawContextKey<boolean>;
 export declare const ActiveAuxiliaryContext: RawContextKey<string>;
 export declare const AuxiliaryBarFocusContext: RawContextKey<boolean>;
 export declare const AuxiliaryBarVisibleContext: RawContextKey<boolean>;
+export declare const SecondarySideBarVisibleContext: RawContextKey<boolean>;
 export declare const AuxiliaryBarMaximizedContext: RawContextKey<boolean>;
 export declare const ActivePanelContext: RawContextKey<string>;
 export declare const PanelFocusContext: RawContextKey<boolean>;

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

@@ -2,139 +2,152 @@
 import { __decorate, __param } from '../../../../../external/tslib/tslib.es6.js';
 import { DisposableStore } from '../../base/common/lifecycle.js';
 import { localize } from '../../nls.js';
-import { RawContextKey } from '../../platform/contextkey/common/contextkey.js';
+import { RawContextKey, ContextKeyExpr } from '../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../platform/contextkey/common/contextkey.service.js';
+import { IsMacNativeContext } from '../../platform/contextkey/common/contextkeys.js';
 import { isEqual, basename, dirname, extname } from '../../base/common/resources.js';
 import { ILanguageService } from '../../editor/common/languages/language.service.js';
 import { IFileService } from '../../platform/files/common/files.service.js';
 import { IModelService } from '../../editor/common/services/model.service.js';
 import { Schemas } from '../../base/common/network.js';
-import { DEFAULT_EDITOR_ASSOCIATION, isDiffEditorInput } from './editor.js';
+import { MenuSettings } from '../../platform/window/common/window.js';
+import { DEFAULT_EDITOR_ASSOCIATION, isDiffEditorInput, EditorResourceAccessor } from './editor.js';
 
 var AbstractResourceContextKey_1;
 const WorkbenchStateContext = ( new RawContextKey("workbenchState", undefined, {
     type: "string",
     description: ( localize(
-        4291,
+        4587,
         "The kind of workspace opened in the window, either 'empty' (no workspace), 'folder' (single folder) or 'workspace' (multi-root workspace)"
     ))
 }));
-const WorkspaceFolderCountContext = ( new RawContextKey("workspaceFolderCount", 0, ( localize(4292, "The number of root folders in the workspace"))));
+const WorkspaceFolderCountContext = ( new RawContextKey("workspaceFolderCount", 0, ( localize(4588, "The number of root folders in the workspace"))));
 const OpenFolderWorkspaceSupportContext = ( new RawContextKey("openFolderWorkspaceSupport", true, true));
 const EnterMultiRootWorkspaceSupportContext = ( new RawContextKey("enterMultiRootWorkspaceSupport", true, true));
 const EmptyWorkspaceSupportContext = ( new RawContextKey("emptyWorkspaceSupport", true, true));
-const DirtyWorkingCopiesContext = ( new RawContextKey("dirtyWorkingCopies", false, ( localize(4293, "Whether there are any working copies with unsaved changes"))));
+const DirtyWorkingCopiesContext = ( new RawContextKey("dirtyWorkingCopies", false, ( localize(4589, "Whether there are any working copies with unsaved changes"))));
 const RemoteNameContext = ( new RawContextKey("remoteName", "", ( localize(
-    4294,
+    4590,
     "The name of the remote the window is connected to or an empty string if not connected to any remote"
 ))));
 const VirtualWorkspaceContext = ( new RawContextKey("virtualWorkspace", "", ( localize(
-    4295,
+    4591,
     "The scheme of the current workspace is from a virtual file system or an empty string."
 ))));
 const TemporaryWorkspaceContext = ( new RawContextKey("temporaryWorkspace", false, ( localize(
-    4296,
+    4592,
     "The scheme of the current workspace is from a temporary file system."
 ))));
-const IsSessionsWindowContext = ( new RawContextKey("isSessionsWindow", false, ( localize(4297, "Whether the current window is a agent sessions window."))));
+const IsSessionsWindowContext = ( new RawContextKey("isSessionsWindow", false, ( localize(4593, "Whether the current window is a agent sessions window."))));
 const HasWebFileSystemAccess = ( new RawContextKey("hasWebFileSystemAccess", false, true));
 const EmbedderIdentifierContext = ( new RawContextKey("embedderIdentifier", undefined, ( localize(
-    4298,
+    4594,
     "The identifier of the embedder according to the product service, if one is defined"
 ))));
-const InAutomationContext = ( new RawContextKey("inAutomation", false, ( localize(4299, "Whether VS Code is running under automation/smoke test"))));
+const InAutomationContext = ( new RawContextKey("inAutomation", false, ( localize(4595, "Whether VS Code is running under automation/smoke test"))));
 const IsSandboxWorkspaceContext = ( new RawContextKey("isSandboxWorkspace", false, true));
-const IsMainWindowFullscreenContext = ( new RawContextKey("isFullscreen", false, ( localize(4300, "Whether the main window is in fullscreen mode"))));
-const IsAuxiliaryWindowFocusedContext = ( new RawContextKey("isAuxiliaryWindowFocusedContext", false, ( localize(4301, "Whether an auxiliary window is focused"))));
-const IsAuxiliaryWindowContext = ( new RawContextKey("isAuxiliaryWindow", false, ( localize(4302, "Window is an auxiliary window"))));
-const ActiveEditorDirtyContext = ( new RawContextKey("activeEditorIsDirty", false, ( localize(4303, "Whether the active editor has unsaved changes"))));
-const ActiveEditorPinnedContext = ( new RawContextKey("activeEditorIsNotPreview", false, ( localize(4304, "Whether the active editor is not in preview mode"))));
-const ActiveEditorFirstInGroupContext = ( new RawContextKey("activeEditorIsFirstInGroup", false, ( localize(4305, "Whether the active editor is the first one in its group"))));
-const ActiveEditorLastInGroupContext = ( new RawContextKey("activeEditorIsLastInGroup", false, ( localize(4306, "Whether the active editor is the last one in its group"))));
-const ActiveEditorStickyContext = ( new RawContextKey("activeEditorIsPinned", false, ( localize(4307, "Whether the active editor is pinned"))));
-const ActiveEditorReadonlyContext = ( new RawContextKey("activeEditorIsReadonly", false, ( localize(4308, "Whether the active editor is read-only"))));
-const ActiveCompareEditorCanSwapContext = ( new RawContextKey("activeCompareEditorCanSwap", false, ( localize(4309, "Whether the active compare editor can swap sides"))));
+const IsMainWindowFullscreenContext = ( new RawContextKey("isFullscreen", false, ( localize(4596, "Whether the main window is in fullscreen mode"))));
+const IsAuxiliaryWindowFocusedContext = ( new RawContextKey("isAuxiliaryWindowFocusedContext", false, ( localize(4597, "Whether an auxiliary window is focused"))));
+const IsAuxiliaryWindowContext = ( new RawContextKey("isAuxiliaryWindow", false, ( localize(4598, "Window is an auxiliary window"))));
+const MenuBarVisibleContext = ( ContextKeyExpr.or(IsMacNativeContext, ( ContextKeyExpr.and(( ContextKeyExpr.notEquals(`config.${MenuSettings.MenuBarVisibility}`, "hidden")), ( ContextKeyExpr.notEquals(`config.${MenuSettings.MenuBarVisibility}`, "toggle")), ( ContextKeyExpr.notEquals(`config.${MenuSettings.MenuBarVisibility}`, "compact"))))));
+const CustomMenuBarVisibleContext = ( ContextKeyExpr.and(( IsMacNativeContext.negate()), MenuBarVisibleContext));
+const ActiveEditorDirtyContext = ( new RawContextKey("activeEditorIsDirty", false, ( localize(4599, "Whether the active editor has unsaved changes"))));
+const ActiveEditorPinnedContext = ( new RawContextKey("activeEditorIsNotPreview", false, ( localize(4600, "Whether the active editor is not in preview mode"))));
+const ActiveEditorFirstInGroupContext = ( new RawContextKey("activeEditorIsFirstInGroup", false, ( localize(4601, "Whether the active editor is the first one in its group"))));
+const ActiveEditorLastInGroupContext = ( new RawContextKey("activeEditorIsLastInGroup", false, ( localize(4602, "Whether the active editor is the last one in its group"))));
+const ActiveEditorStickyContext = ( new RawContextKey("activeEditorIsPinned", false, ( localize(4603, "Whether the active editor is pinned"))));
+const ActiveEditorReadonlyContext = ( new RawContextKey("activeEditorIsReadonly", false, ( localize(4604, "Whether the active editor is read-only"))));
+const ActiveCompareEditorCanSwapContext = ( new RawContextKey("activeCompareEditorCanSwap", false, ( localize(4605, "Whether the active compare editor can swap sides"))));
 const ActiveEditorCanToggleReadonlyContext = ( new RawContextKey("activeEditorCanToggleReadonly", true, ( localize(
-    4310,
+    4606,
     "Whether the active editor can toggle between being read-only or writeable"
 ))));
-const ActiveEditorCanRevertContext = ( new RawContextKey("activeEditorCanRevert", false, ( localize(4311, "Whether the active editor can revert"))));
+const ActiveEditorCanRevertContext = ( new RawContextKey("activeEditorCanRevert", false, ( localize(4607, "Whether the active editor can revert"))));
 const ActiveEditorCanSplitInGroupContext = ( new RawContextKey("activeEditorCanSplitInGroup", true));
+const ActiveEditorCannotCloseContext = ( new RawContextKey("activeEditorCannotClose", false, ( localize(
+    4608,
+    "Whether the active editor cannot be closed through standard user actions"
+))));
 const ActiveEditorContext = ( new RawContextKey("activeEditor", null, {
     type: "string",
-    description: ( localize(4312, "The identifier of the active editor"))
+    description: ( localize(4609, "The identifier of the active editor"))
 }));
 const ActiveEditorAvailableEditorIdsContext = ( new RawContextKey("activeEditorAvailableEditorIds", "", ( localize(
-    4313,
+    4610,
     "The available editor identifiers that are usable for the active editor"
 ))));
-const TextCompareEditorVisibleContext = ( new RawContextKey("textCompareEditorVisible", false, ( localize(4314, "Whether a text compare editor is visible"))));
-const TextCompareEditorActiveContext = ( new RawContextKey("textCompareEditorActive", false, ( localize(4315, "Whether a text compare editor is active"))));
-const SideBySideEditorActiveContext = ( new RawContextKey("sideBySideEditorActive", false, ( localize(4316, "Whether a side by side editor is active"))));
+const TextCompareEditorVisibleContext = ( new RawContextKey("textCompareEditorVisible", false, ( localize(4611, "Whether a text compare editor is visible"))));
+const TextCompareEditorActiveContext = ( new RawContextKey("textCompareEditorActive", false, ( localize(4612, "Whether a text compare editor is active"))));
+const SideBySideEditorActiveContext = ( new RawContextKey("sideBySideEditorActive", false, ( localize(4613, "Whether a side by side editor is active"))));
 const ActiveCustomEditorDiffCanToggleLayoutContext = ( new RawContextKey("activeCustomEditorDiffCanToggleLayout", false, ( localize(
-    4317,
+    4614,
     "Whether the active custom editor diff can toggle between inline and side by side layout"
 ))));
-const ActiveCustomEditorTextDiffContext = ( new RawContextKey("activeCustomEditorTextDiff", false, ( localize(4318, "Whether the active custom editor diff is backed by text documents"))));
-const EditorGroupEditorsCountContext = ( new RawContextKey("groupEditorsCount", 0, ( localize(4319, "The number of opened editor groups"))));
+const ActiveCustomEditorTextDiffContext = ( new RawContextKey("activeCustomEditorTextDiff", false, ( localize(4615, "Whether the active custom editor diff is backed by text documents"))));
+const EditorGroupEditorsCountContext = ( new RawContextKey("groupEditorsCount", 0, ( localize(4616, "The number of opened editor groups"))));
 const IsTopRightEditorGroupContext = ( new RawContextKey("isTopRightEditorGroup", false, ( localize(
-    4320,
+    4617,
     "Whether the editor group is the top right editor group in the editor part"
 ))));
-const ActiveEditorGroupEmptyContext = ( new RawContextKey("activeEditorGroupEmpty", false, ( localize(4321, "Whether the active editor group is empty"))));
-const ActiveEditorGroupIndexContext = ( new RawContextKey("activeEditorGroupIndex", 0, ( localize(4322, "The index of the active editor group"))));
-const ActiveEditorGroupLastContext = ( new RawContextKey("activeEditorGroupLast", false, ( localize(4323, "Whether the active editor group is the last group"))));
-const ActiveEditorGroupLockedContext = ( new RawContextKey("activeEditorGroupLocked", false, ( localize(4324, "Whether the active editor group is locked"))));
-const MultipleEditorGroupsContext = ( new RawContextKey("multipleEditorGroups", false, ( localize(4325, "Whether there are multiple editor groups opened"))));
-const MultipleEditorsSelectedInGroupContext = ( new RawContextKey("multipleEditorsSelectedInGroup", false, ( localize(4326, "Whether multiple editors have been selected in an editor group"))));
-const TwoEditorsSelectedInGroupContext = ( new RawContextKey("twoEditorsSelectedInGroup", false, ( localize(4327, "Whether exactly two editors have been selected in an editor group"))));
+const ActiveEditorGroupEmptyContext = ( new RawContextKey("activeEditorGroupEmpty", false, ( localize(4618, "Whether the active editor group is empty"))));
+const ActiveEditorGroupIndexContext = ( new RawContextKey("activeEditorGroupIndex", 0, ( localize(4619, "The index of the active editor group"))));
+const ActiveEditorGroupLastContext = ( new RawContextKey("activeEditorGroupLast", false, ( localize(4620, "Whether the active editor group is the last group"))));
+const ActiveEditorGroupLockedContext = ( new RawContextKey("activeEditorGroupLocked", false, ( localize(4621, "Whether the active editor group is locked"))));
+const MultipleEditorGroupsContext = ( new RawContextKey("multipleEditorGroups", false, ( localize(4622, "Whether there are multiple editor groups opened"))));
+const MultipleEditorsSelectedInGroupContext = ( new RawContextKey("multipleEditorsSelectedInGroup", false, ( localize(4623, "Whether multiple editors have been selected in an editor group"))));
+const TwoEditorsSelectedInGroupContext = ( new RawContextKey("twoEditorsSelectedInGroup", false, ( localize(4624, "Whether exactly two editors have been selected in an editor group"))));
 const SelectedEditorsInGroupFileOrUntitledResourceContextKey = ( new RawContextKey(
     "SelectedEditorsInGroupFileOrUntitledResourceContextKey",
     true,
     ( localize(
-    4328,
+    4625,
     "Whether all selected editors in a group have a file or untitled resource associated"
 ))
 ));
-const EditorPartMultipleEditorGroupsContext = ( new RawContextKey("editorPartMultipleEditorGroups", false, ( localize(4329, "Whether there are multiple editor groups opened in an editor part"))));
-const EditorPartMaximizedEditorGroupContext = ( new RawContextKey("editorPartMaximizedEditorGroup", false, ( localize(4330, "Editor Part has a maximized group"))));
-const EditorPartModalContext = ( new RawContextKey("editorPartModal", false, ( localize(4331, "Whether focus is in a modal editor part"))));
-const EditorPartModalMaximizedContext = ( new RawContextKey("editorPartModalMaximized", false, ( localize(4332, "Whether the modal editor part is maximized"))));
-const EditorPartModalNavigationContext = ( new RawContextKey("editorPartModalNavigation", false, ( localize(4333, "Whether the modal editor part has navigation context"))));
-const EditorPartModalSidebarContext = ( new RawContextKey("editorPartModalSidebar", false, ( localize(4334, "Whether the modal editor part has a sidebar"))));
-const EditorPartModalSidebarVisibleContext = ( new RawContextKey("editorPartModalSidebarVisible", false, ( localize(4335, "Whether the modal editor part sidebar is visible"))));
-const EditorsVisibleContext = ( new RawContextKey("editorIsOpen", false, ( localize(4336, "Whether an editor is open"))));
-const EditorAreaFocusContext = ( new RawContextKey("editorAreaFocus", false, ( localize(4337, "Whether the editor area (any editor part) has keyboard focus"))));
-const InEditorZenModeContext = ( new RawContextKey("inZenMode", false, ( localize(4338, "Whether Zen mode is enabled"))));
-const IsMainEditorCenteredLayoutContext = ( new RawContextKey("isCenteredLayout", false, ( localize(4339, "Whether centered layout is enabled for the main editor"))));
-const SplitEditorsVertically = ( new RawContextKey("splitEditorsVertically", false, ( localize(4340, "Whether editors split vertically"))));
-const MainEditorAreaVisibleContext = ( new RawContextKey("mainEditorAreaVisible", true, ( localize(4341, "Whether the editor area in the main window is visible"))));
-const EditorTabsVisibleContext = ( new RawContextKey("editorTabsVisible", true, ( localize(4342, "Whether editor tabs are visible"))));
-const SideBarVisibleContext = ( new RawContextKey("sideBarVisible", false, ( localize(4343, "Whether the sidebar is visible"))));
-const SidebarFocusContext = ( new RawContextKey("sideBarFocus", false, ( localize(4344, "Whether the sidebar has keyboard focus"))));
-const ActiveViewletContext = ( new RawContextKey("activeViewlet", "", ( localize(4345, "The identifier of the active viewlet"))));
-const StatusBarFocused = ( new RawContextKey("statusBarFocused", false, ( localize(4346, "Whether the status bar has keyboard focus"))));
-const TitleBarStyleContext = ( new RawContextKey("titleBarStyle", "custom", ( localize(4347, "Style of the window title bar"))));
-const TitleBarVisibleContext = ( new RawContextKey("titleBarVisible", false, ( localize(4348, "Whether the title bar is visible"))));
-const IsCompactTitleBarContext = ( new RawContextKey("isCompactTitleBar", false, ( localize(4349, "Title bar is in compact mode"))));
-const BannerFocused = ( new RawContextKey("bannerFocused", false, ( localize(4350, "Whether the banner has keyboard focus"))));
-const NotificationFocusedContext = ( new RawContextKey("notificationFocus", true, ( localize(4351, "Whether a notification has keyboard focus"))));
-const NotificationsCenterVisibleContext = ( new RawContextKey("notificationCenterVisible", false, ( localize(4352, "Whether the notifications center is visible"))));
-const NotificationsToastsVisibleContext = ( new RawContextKey("notificationToastsVisible", false, ( localize(4353, "Whether a notification toast is visible"))));
-const ActiveAuxiliaryContext = ( new RawContextKey("activeAuxiliary", "", ( localize(4354, "The identifier of the active auxiliary panel"))));
-const AuxiliaryBarFocusContext = ( new RawContextKey("auxiliaryBarFocus", false, ( localize(4355, "Whether the auxiliary bar has keyboard focus"))));
-const AuxiliaryBarVisibleContext = ( new RawContextKey("auxiliaryBarVisible", false, ( localize(4356, "Whether the auxiliary bar is visible"))));
-const AuxiliaryBarMaximizedContext = ( new RawContextKey("auxiliaryBarMaximized", false, ( localize(4357, "Whether the auxiliary bar is maximized"))));
-const ActivePanelContext = ( new RawContextKey("activePanel", "", ( localize(4358, "The identifier of the active panel"))));
-const PanelFocusContext = ( new RawContextKey("panelFocus", false, ( localize(4359, "Whether the panel has keyboard focus"))));
-const PanelPositionContext = ( new RawContextKey("panelPosition", "bottom", ( localize(4360, "The position of the panel, always 'bottom'"))));
+const EditorPartMultipleEditorGroupsContext = ( new RawContextKey("editorPartMultipleEditorGroups", false, ( localize(4626, "Whether there are multiple editor groups opened in an editor part"))));
+const EditorPartMaximizedEditorGroupContext = ( new RawContextKey("editorPartMaximizedEditorGroup", false, ( localize(4627, "Editor Part has a maximized group"))));
+const EditorPartModalContext = ( new RawContextKey("editorPartModal", false, ( localize(4628, "Whether focus is in a modal editor part"))));
+const EditorPartModalVisibleContext = ( new RawContextKey("editorPartModalVisible", false, ( localize(4629, "Whether a modal editor part is visible"))));
+const EditorPartModalMaximizedContext = ( new RawContextKey("editorPartModalMaximized", false, ( localize(4630, "Whether the modal editor part is maximized"))));
+const EditorPartModalNavigationContext = ( new RawContextKey("editorPartModalNavigation", false, ( localize(4631, "Whether the modal editor part has navigation context"))));
+const EditorPartModalSidebarContext = ( new RawContextKey("editorPartModalSidebar", false, ( localize(4632, "Whether the modal editor part has a sidebar"))));
+const EditorPartModalSidebarVisibleContext = ( new RawContextKey("editorPartModalSidebarVisible", false, ( localize(4633, "Whether the modal editor part sidebar is visible"))));
+const EditorsVisibleContext = ( new RawContextKey("editorIsOpen", false, ( localize(4634, "Whether an editor is open"))));
+const EditorAreaFocusContext = ( new RawContextKey("editorAreaFocus", false, ( localize(4635, "Whether the editor area (any editor part) has keyboard focus"))));
+const InEditorZenModeContext = ( new RawContextKey("inZenMode", false, ( localize(4636, "Whether Zen mode is enabled"))));
+const IsMainEditorCenteredLayoutContext = ( new RawContextKey("isCenteredLayout", false, ( localize(4637, "Whether centered layout is enabled for the main editor"))));
+const SplitEditorsVertically = ( new RawContextKey("splitEditorsVertically", false, ( localize(4638, "Whether editors split vertically"))));
+const MainEditorAreaVisibleContext = ( new RawContextKey("mainEditorAreaVisible", true, ( localize(4639, "Whether the editor area in the main window is visible"))));
+const EditorTabsVisibleContext = ( new RawContextKey("editorTabsVisible", true, ( localize(4640, "Whether editor tabs are visible"))));
+const SideBarVisibleContext = ( new RawContextKey("sideBarVisible", false, ( localize(4641, "Whether the sidebar is visible"))));
+const SidebarFocusContext = ( new RawContextKey("sideBarFocus", false, ( localize(4642, "Whether the sidebar has keyboard focus"))));
+const ActiveViewletContext = ( new RawContextKey("activeViewlet", "", ( localize(4643, "The identifier of the active viewlet"))));
+const StatusBarFocused = ( new RawContextKey("statusBarFocused", false, ( localize(4644, "Whether the status bar has keyboard focus"))));
+const TitleBarStyleContext = ( new RawContextKey("titleBarStyle", "custom", ( localize(4645, "Style of the window title bar"))));
+const TitleBarVisibleContext = ( new RawContextKey("titleBarVisible", false, ( localize(4646, "Whether the title bar is visible"))));
+const IsCompactTitleBarContext = ( new RawContextKey("isCompactTitleBar", false, ( localize(4647, "Title bar is in compact mode"))));
+const BannerFocused = ( new RawContextKey("bannerFocused", false, ( localize(4648, "Whether the banner has keyboard focus"))));
+const NotificationFocusedContext = ( new RawContextKey("notificationFocus", true, ( localize(4649, "Whether a notification has keyboard focus"))));
+const NotificationsCenterVisibleContext = ( new RawContextKey("notificationCenterVisible", false, ( localize(4650, "Whether the notifications center is visible"))));
+const NotificationsToastsVisibleContext = ( new RawContextKey("notificationToastsVisible", false, ( localize(4651, "Whether a notification toast is visible"))));
+const ActiveAuxiliaryContext = ( new RawContextKey("activeAuxiliary", "", ( localize(4652, "The identifier of the active auxiliary panel"))));
+const AuxiliaryBarFocusContext = ( new RawContextKey("auxiliaryBarFocus", false, ( localize(4653, "Whether the auxiliary bar has keyboard focus"))));
+const AuxiliaryBarVisibleContext = ( new RawContextKey("auxiliaryBarVisible", false, ( localize(4654, "Whether the auxiliary bar is visible"))));
+const SecondarySideBarVisibleContext = ( new RawContextKey("secondarySideBarVisible", false, ( localize(
+    4655,
+    "Whether the layout surface representing the secondary side bar is visible"
+))));
+const AuxiliaryBarMaximizedContext = ( new RawContextKey("auxiliaryBarMaximized", false, ( localize(4656, "Whether the auxiliary bar is maximized"))));
+const ActivePanelContext = ( new RawContextKey("activePanel", "", ( localize(4657, "The identifier of the active panel"))));
+const PanelFocusContext = ( new RawContextKey("panelFocus", false, ( localize(4658, "Whether the panel has keyboard focus"))));
+const PanelPositionContext = ( new RawContextKey("panelPosition", "bottom", ( localize(4659, "The position of the panel, always 'bottom'"))));
 const PanelAlignmentContext = ( new RawContextKey("panelAlignment", "center", ( localize(
-    4361,
+    4660,
     "The alignment of the panel, either 'center', 'left', 'right' or 'justify'"
 ))));
-const PanelVisibleContext = ( new RawContextKey("panelVisible", false, ( localize(4362, "Whether the panel is visible"))));
-const PanelMaximizedContext = ( new RawContextKey("panelMaximized", false, ( localize(4363, "Whether the panel is maximized"))));
-const FocusedViewContext = ( new RawContextKey("focusedView", "", ( localize(4364, "The identifier of the view that has keyboard focus"))));
+const PanelVisibleContext = ( new RawContextKey("panelVisible", false, ( localize(4661, "Whether the panel is visible"))));
+const PanelMaximizedContext = ( new RawContextKey("panelMaximized", false, ( localize(4662, "Whether the panel is maximized"))));
+const FocusedViewContext = ( new RawContextKey("focusedView", "", ( localize(4663, "The identifier of the view that has keyboard focus"))));
 function getVisbileViewContextKey(viewId) {
     return `view.${viewId}.visible`;
 }
@@ -145,55 +158,55 @@ let AbstractResourceContextKey = class AbstractResourceContextKey {
     static {
         this.Scheme = ( new RawContextKey("resourceScheme", undefined, {
             type: "string",
-            description: ( localize(4365, "The scheme of the resource"))
+            description: ( localize(4664, "The scheme of the resource"))
         }));
     }
     static {
         this.Filename = ( new RawContextKey("resourceFilename", undefined, {
             type: "string",
-            description: ( localize(4366, "The file name of the resource"))
+            description: ( localize(4665, "The file name of the resource"))
         }));
     }
     static {
         this.Dirname = ( new RawContextKey("resourceDirname", undefined, {
             type: "string",
-            description: ( localize(4367, "The folder name the resource is contained in"))
+            description: ( localize(4666, "The folder name the resource is contained in"))
         }));
     }
     static {
         this.Path = ( new RawContextKey("resourcePath", undefined, {
             type: "string",
-            description: ( localize(4368, "The full path of the resource"))
+            description: ( localize(4667, "The full path of the resource"))
         }));
     }
     static {
         this.LangId = ( new RawContextKey("resourceLangId", undefined, {
             type: "string",
-            description: ( localize(4369, "The language identifier of the resource"))
+            description: ( localize(4668, "The language identifier of the resource"))
         }));
     }
     static {
         this.Resource = ( new RawContextKey("resource", undefined, {
             type: "URI",
-            description: ( localize(4370, "The full value of the resource including scheme and path"))
+            description: ( localize(4669, "The full value of the resource including scheme and path"))
         }));
     }
     static {
         this.Extension = ( new RawContextKey("resourceExtname", undefined, {
             type: "string",
-            description: ( localize(4371, "The extension name of the resource"))
+            description: ( localize(4670, "The extension name of the resource"))
         }));
     }
     static {
         this.HasResource = ( new RawContextKey("resourceSet", undefined, {
             type: "boolean",
-            description: ( localize(4372, "Whether a resource is present or not"))
+            description: ( localize(4671, "Whether a resource is present or not"))
         }));
     }
     static {
         this.IsFileSystemResource = ( new RawContextKey("isFileSystemResource", undefined, {
             type: "boolean",
-            description: ( localize(4373, "Whether the resource is backed by a file system provider"))
+            description: ( localize(4672, "Whether the resource is backed by a file system provider"))
         }));
     }
     constructor(_contextKeyService, _fileService, _languageService, _modelService) {
@@ -305,10 +318,11 @@ function getAvailableEditorIds(editor, editorResolverService) {
         const modified = ( new Set(getAvailableEditorIds(editor.modified, editorResolverService)));
         return original.filter(editor => ( modified.has(editor)));
     }
-    if (editor.resource) {
-        return ( editorResolverService.getEditors(editor.resource).map(editor => editor.id));
+    const resource = EditorResourceAccessor.getOriginalUri(editor);
+    if (resource) {
+        return ( editorResolverService.getEditors(resource).map(editor => editor.id));
     }
     return [];
 }
 
-export { ActiveAuxiliaryContext, ActiveCompareEditorCanSwapContext, ActiveCustomEditorDiffCanToggleLayoutContext, ActiveCustomEditorTextDiffContext, ActiveEditorAvailableEditorIdsContext, ActiveEditorCanRevertContext, ActiveEditorCanSplitInGroupContext, ActiveEditorCanToggleReadonlyContext, ActiveEditorContext, ActiveEditorDirtyContext, ActiveEditorFirstInGroupContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, ActiveEditorLastInGroupContext, ActiveEditorPinnedContext, ActiveEditorReadonlyContext, ActiveEditorStickyContext, ActivePanelContext, ActiveViewletContext, AuxiliaryBarFocusContext, AuxiliaryBarMaximizedContext, AuxiliaryBarVisibleContext, BannerFocused, DirtyWorkingCopiesContext, EditorAreaFocusContext, EditorGroupEditorsCountContext, EditorPartMaximizedEditorGroupContext, EditorPartModalContext, EditorPartModalMaximizedContext, EditorPartModalNavigationContext, EditorPartModalSidebarContext, EditorPartModalSidebarVisibleContext, EditorPartMultipleEditorGroupsContext, EditorTabsVisibleContext, EditorsVisibleContext, EmbedderIdentifierContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, FocusedViewContext, HasWebFileSystemAccess, InAutomationContext, InEditorZenModeContext, IsAuxiliaryWindowContext, IsAuxiliaryWindowFocusedContext, IsCompactTitleBarContext, IsMainEditorCenteredLayoutContext, IsMainWindowFullscreenContext, IsSandboxWorkspaceContext, IsSessionsWindowContext, IsTopRightEditorGroupContext, MainEditorAreaVisibleContext, MultipleEditorGroupsContext, MultipleEditorsSelectedInGroupContext, NotificationFocusedContext, NotificationsCenterVisibleContext, NotificationsToastsVisibleContext, OpenFolderWorkspaceSupportContext, PanelAlignmentContext, PanelFocusContext, PanelMaximizedContext, PanelPositionContext, PanelVisibleContext, RemoteNameContext, ResourceContextKey, SelectedEditorsInGroupFileOrUntitledResourceContextKey, SideBarVisibleContext, SideBySideEditorActiveContext, SidebarFocusContext, SplitEditorsVertically, StaticResourceContextKey, StatusBarFocused, TemporaryWorkspaceContext, TextCompareEditorActiveContext, TextCompareEditorVisibleContext, TitleBarStyleContext, TitleBarVisibleContext, TwoEditorsSelectedInGroupContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, applyAvailableEditorIds, getVisbileViewContextKey };
+export { ActiveAuxiliaryContext, ActiveCompareEditorCanSwapContext, ActiveCustomEditorDiffCanToggleLayoutContext, ActiveCustomEditorTextDiffContext, ActiveEditorAvailableEditorIdsContext, ActiveEditorCanRevertContext, ActiveEditorCanSplitInGroupContext, ActiveEditorCanToggleReadonlyContext, ActiveEditorCannotCloseContext, ActiveEditorContext, ActiveEditorDirtyContext, ActiveEditorFirstInGroupContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, ActiveEditorLastInGroupContext, ActiveEditorPinnedContext, ActiveEditorReadonlyContext, ActiveEditorStickyContext, ActivePanelContext, ActiveViewletContext, AuxiliaryBarFocusContext, AuxiliaryBarMaximizedContext, AuxiliaryBarVisibleContext, BannerFocused, CustomMenuBarVisibleContext, DirtyWorkingCopiesContext, EditorAreaFocusContext, EditorGroupEditorsCountContext, EditorPartMaximizedEditorGroupContext, EditorPartModalContext, EditorPartModalMaximizedContext, EditorPartModalNavigationContext, EditorPartModalSidebarContext, EditorPartModalSidebarVisibleContext, EditorPartModalVisibleContext, EditorPartMultipleEditorGroupsContext, EditorTabsVisibleContext, EditorsVisibleContext, EmbedderIdentifierContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, FocusedViewContext, HasWebFileSystemAccess, InAutomationContext, InEditorZenModeContext, IsAuxiliaryWindowContext, IsAuxiliaryWindowFocusedContext, IsCompactTitleBarContext, IsMainEditorCenteredLayoutContext, IsMainWindowFullscreenContext, IsSandboxWorkspaceContext, IsSessionsWindowContext, IsTopRightEditorGroupContext, MainEditorAreaVisibleContext, MenuBarVisibleContext, MultipleEditorGroupsContext, MultipleEditorsSelectedInGroupContext, NotificationFocusedContext, NotificationsCenterVisibleContext, NotificationsToastsVisibleContext, OpenFolderWorkspaceSupportContext, PanelAlignmentContext, PanelFocusContext, PanelMaximizedContext, PanelPositionContext, PanelVisibleContext, RemoteNameContext, ResourceContextKey, SecondarySideBarVisibleContext, SelectedEditorsInGroupFileOrUntitledResourceContextKey, SideBarVisibleContext, SideBySideEditorActiveContext, SidebarFocusContext, SplitEditorsVertically, StaticResourceContextKey, StatusBarFocused, TemporaryWorkspaceContext, TextCompareEditorActiveContext, TextCompareEditorVisibleContext, TitleBarStyleContext, TitleBarVisibleContext, TwoEditorsSelectedInGroupContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, applyAvailableEditorIds, getVisbileViewContextKey };

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

@@ -54,7 +54,7 @@ let DiffEditorInput = class DiffEditorInput extends SideBySideEditorInput {
         } else {
             const originalName = this.original.getName();
             const modifiedName = this.modified.getName();
-            name = ( localize(4378, "{0} ↔ {1}", originalName, modifiedName));
+            name = ( localize(4677, "{0} ↔ {1}", originalName, modifiedName));
             forceDescription = originalName === modifiedName;
         }
         let shortDescription;
@@ -75,6 +75,7 @@ let DiffEditorInput = class DiffEditorInput extends SideBySideEditorInput {
             );
             const originalMediumDescription = this.original.getDescription(Verbosity.MEDIUM);
             const modifiedMediumDescription = this.modified.getDescription(Verbosity.MEDIUM);
+            forceDescription = forceDescription && !!originalMediumDescription && !!modifiedMediumDescription && originalMediumDescription !== modifiedMediumDescription;
             if (
             (typeof originalMediumDescription === "string" && typeof modifiedMediumDescription === "string") && (originalMediumDescription || modifiedMediumDescription)) {
                 const [shortenedOriginalMediumDescription, shortenedModifiedMediumDescription] = shorten([originalMediumDescription, modifiedMediumDescription]);

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

@@ -75,7 +75,7 @@ let SideBySideEditorInput = class SideBySideEditorInput extends EditorInput {
         if (this.hasIdenticalSides) {
             return this.primary.getName();
         }
-        return localize(4379, "{0} - {1}", this.secondary.getName(), this.primary.getName());
+        return localize(4678, "{0} - {1}", this.secondary.getName(), this.primary.getName());
     }
     getPreferredName() {
         return this.preferredName;

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

@@ -111,7 +111,7 @@ let BaseTextEditorModel = class BaseTextEditorModel extends EditorModel {
             this.setLanguageIdInternal(lang, LanguageDetectionLanguageEventSource);
             const languageName = this.languageService.getLanguageName(lang);
             this.accessibilityService.alert(( localize(
-                4380,
+                4679,
                 "Language {0} was automatically detected and set as the language mode.",
                 languageName ?? lang
             )));

package/vscode/src/vs/workbench/common/editor.d.ts

@@ -144,6 +144,8 @@ export interface IEditorPane extends IComposite {
      * `IEditorOptions.viewState` to be applied when opening.
      */
     getViewState(): object | undefined;
+    /** An optional instantiation service scoped to the editor pane. */
+    readonly scopedInstantiationService?: IInstantiationService;
     /**
      * An optional method to return the current selection in
      * the editor pane in case the editor pane has a selection
@@ -632,7 +634,20 @@ export declare enum EditorInputCapabilities {
      * part. This is honored unless the user has explicitly opted
      * out of modal editors via `workbench.editor.useModal: 'off'`.
      */
-    RequiresModal = 2048
+    RequiresModal = 2048,
+    /**
+     * Signals that the editor is exempt from the opened editors
+     * limit (`workbench.editor.limit`): it never counts towards the
+     * limit and is never auto-closed to satisfy it.
+     */
+    ExcludeFromEditorLimit = 4096,
+    /**
+     * Signals that the editor cannot be closed through standard user
+     * initiated close actions, such as the tab close button, middle
+     * click, or close commands. Callers with an explicit lifecycle
+     * requirement can force the editor to close.
+     */
+    CannotClose = 8192
 }
 export type IUntypedEditorInput = IResourceEditorInput | ITextResourceEditorInput | IUntitledTextResourceEditorInput | IResourceDiffEditorInput | IResourceMultiDiffEditorInput | IResourceSideBySideEditorInput | IResourceMergeEditorInput;
 export declare abstract class AbstractEditorInput extends Disposable {
@@ -680,6 +695,13 @@ export interface IDiffEditorInput extends EditorInput {
     original: EditorInput;
 }
 export declare function isDiffEditorInput(editor: unknown): editor is IDiffEditorInput;
+export interface IEditorInputWithDiffResources extends EditorInput {
+    readonly diffResources: {
+        readonly original: URI;
+        readonly modified: URI;
+    };
+}
+export declare function isEditorInputWithDiffResources(editor: unknown): editor is IEditorInputWithDiffResources;
 export interface IUntypedFileEditorInput extends ITextResourceEditorInput {
     /**
      * A marker to create a `IFileEditorInput` from this untyped input.
@@ -899,6 +921,7 @@ interface IEditorPartConfiguration {
     scrollToSwitchTabs?: boolean;
     highlightModifiedTabs?: boolean;
     tabActionLocation?: "left" | "right";
+    tabActionReserveSpace?: boolean;
     tabActionCloseVisibility?: boolean;
     tabActionUnpinVisibility?: boolean;
     showTabIndex?: boolean;
@@ -940,6 +963,7 @@ interface IEditorPartConfiguration {
 }
 export interface IEditorPartOptions extends DeepRequiredNonNullable<IEditorPartConfiguration> {
     hasIcons: boolean;
+    showBreadcrumbs?: boolean;
 }
 export interface IEditorPartOptionsChangeEvent {
     oldPartOptions: IEditorPartOptions;