@codingame/monaco-vscode-api 5.3.0 → 6.0.1

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

@@ -1,15 +1,18 @@
 import { __decorate, __param } from '../../../../../external/tslib/tslib.es6.js';
 import { localizeWithPath } from '../../nls.js';
-import { Extensions as Extensions$1 } from '../../platform/configuration/common/configurationRegistry.js';
+import { ConfigurationScope, Extensions as Extensions$1 } from '../../platform/configuration/common/configurationRegistry.js';
 import { Registry } from '../../platform/registry/common/platform.js';
+import { WorkbenchState } from '../../platform/workspace/common/workspace.js';
 import { IWorkspaceContextService } from '../../platform/workspace/common/workspace.service.js';
+import { ConfigurationTarget } from '../../platform/configuration/common/configuration.js';
 import { IConfigurationService } from '../../platform/configuration/common/configuration.service.js';
 import { Disposable } from '../../base/common/lifecycle.js';
 import { Emitter } from '../../base/common/event.js';
 import { IRemoteAgentService } from '../services/remote/common/remoteAgentService.service.js';
-import { isWindows } from '../../base/common/platform.js';
+import { isWindows, OperatingSystem } from '../../base/common/platform.js';
 import { equals } from '../../base/common/objects.js';
 import { DeferredPromise } from '../../base/common/async.js';
+import { IUserDataProfilesService } from '../../platform/userDataProfile/common/userDataProfile.service.js';
 const _moduleId = "vs/workbench/common/configuration";
 const applicationConfigurationNodeBase = ( (Object.freeze({
     'id': 'application',
@@ -25,7 +28,7 @@ const workbenchConfigurationNodeBase = ( (Object.freeze({
 })));
 const securityConfigurationNodeBase = ( (Object.freeze({
     'id': 'security',
-    'scope': 1 ,
+    'scope': ConfigurationScope.APPLICATION,
     'title': ( localizeWithPath(_moduleId, 2, "Security")),
     'type': 'object',
     'order': 7
@@ -36,6 +39,12 @@ const problemsConfigurationNodeBase = ( (Object.freeze({
     'type': 'object',
     'order': 101
 })));
+const windowConfigurationNodeBase = ( (Object.freeze({
+    'id': 'window',
+    'order': 8,
+    'title': ( localizeWithPath(_moduleId, 4, "Window")),
+    'type': 'object',
+})));
 const Extensions = {
     ConfigurationMigration: 'base.contributions.configuration.migration'
 };
@@ -78,17 +87,17 @@ let ConfigurationMigrationWorkbenchContribution = class ConfigurationMigrationWo
     }
     async migrateConfigurationsForFolderAndOverride(migration, resource) {
         const inspectData = this.configurationService.inspect(migration.key, { resource });
-        const targetPairs = this.workspaceService.getWorkbenchState() === 3  ? [
-            ['user', 2 ],
-            ['userLocal', 3 ],
-            ['userRemote', 4 ],
-            ['workspace', 5 ],
-            ['workspaceFolder', 6 ],
+        const targetPairs = this.workspaceService.getWorkbenchState() === WorkbenchState.WORKSPACE ? [
+            ['user', ConfigurationTarget.USER],
+            ['userLocal', ConfigurationTarget.USER_LOCAL],
+            ['userRemote', ConfigurationTarget.USER_REMOTE],
+            ['workspace', ConfigurationTarget.WORKSPACE],
+            ['workspaceFolder', ConfigurationTarget.WORKSPACE_FOLDER],
         ] : [
-            ['user', 2 ],
-            ['userLocal', 3 ],
-            ['userRemote', 4 ],
-            ['workspace', 5 ],
+            ['user', ConfigurationTarget.USER],
+            ['userLocal', ConfigurationTarget.USER_LOCAL],
+            ['userRemote', ConfigurationTarget.USER_REMOTE],
+            ['workspace', ConfigurationTarget.WORKSPACE],
         ];
         for (const [dataKey, target] of targetPairs) {
             const inspectValue = inspectData[dataKey];
@@ -157,7 +166,7 @@ let DynamicWorkbenchSecurityConfiguration = class DynamicWorkbenchSecurityConfig
     async doCreate() {
         if (!isWindows) {
             const remoteEnvironment = await this.remoteAgentService.getEnvironment();
-            if (remoteEnvironment?.os !== 1 ) {
+            if (remoteEnvironment?.os !== OperatingSystem.Windows) {
                 return;
             }
         }
@@ -170,25 +179,25 @@ let DynamicWorkbenchSecurityConfiguration = class DynamicWorkbenchSecurityConfig
                     'items': {
                         'type': 'string',
                         'pattern': '^[^\\\\]+$',
-                        'patternErrorMessage': ( localizeWithPath(_moduleId, 4, 'UNC host names must not contain backslashes.'))
+                        'patternErrorMessage': ( localizeWithPath(_moduleId, 5, 'UNC host names must not contain backslashes.'))
                     },
                     'default': [],
                     'markdownDescription': ( localizeWithPath(
                         _moduleId,
-                        5,
+                        6,
                         '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': 2
+                    'scope': ConfigurationScope.MACHINE
                 },
                 'security.restrictUNCAccess': {
                     'type': 'boolean',
                     'default': true,
                     'markdownDescription': ( localizeWithPath(
                         _moduleId,
-                        6,
+                        7,
                         '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': 2
+                    'scope': ConfigurationScope.MACHINE
                 }
             }
         });
@@ -197,4 +206,69 @@ let DynamicWorkbenchSecurityConfiguration = class DynamicWorkbenchSecurityConfig
 DynamicWorkbenchSecurityConfiguration = ( (__decorate([
     ( (__param(0, IRemoteAgentService)))
 ], DynamicWorkbenchSecurityConfiguration)));
-export { ConfigurationMigrationWorkbenchContribution, DynamicWorkbenchSecurityConfiguration, Extensions, applicationConfigurationNodeBase, problemsConfigurationNodeBase, securityConfigurationNodeBase, workbenchConfigurationNodeBase };
+const CONFIG_NEW_WINDOW_PROFILE = 'window.newWindowProfile';
+let DynamicWindowConfiguration = class DynamicWindowConfiguration extends Disposable {
+    static { this.ID = 'workbench.contrib.dynamicWindowConfiguration'; }
+    constructor(userDataProfilesService, configurationService) {
+        super();
+        this.userDataProfilesService = userDataProfilesService;
+        this.configurationService = configurationService;
+        this.registerNewWindowProfileConfiguration();
+        this._register(this.userDataProfilesService.onDidChangeProfiles((e) => this.registerNewWindowProfileConfiguration()));
+        this.setNewWindowProfile();
+        this.checkAndResetNewWindowProfileConfig();
+        this._register(configurationService.onDidChangeConfiguration(e => {
+            if (e.source !== ConfigurationTarget.DEFAULT && e.affectsConfiguration(CONFIG_NEW_WINDOW_PROFILE)) {
+                this.setNewWindowProfile();
+            }
+        }));
+        this._register(this.userDataProfilesService.onDidChangeProfiles(() => this.checkAndResetNewWindowProfileConfig()));
+    }
+    registerNewWindowProfileConfiguration() {
+        const registry = ( (Registry.as(Extensions$1.Configuration)));
+        const configurationNode = {
+            ...windowConfigurationNodeBase,
+            'properties': {
+                [CONFIG_NEW_WINDOW_PROFILE]: {
+                    'type': ['string', 'null'],
+                    'default': null,
+                    'enum': [...( (this.userDataProfilesService.profiles.map(profile => profile.name))), null],
+                    'enumItemLabels': [...( (this.userDataProfilesService.profiles.map(p => ''))), ( localizeWithPath(_moduleId, 8, "Active Window"))],
+                    'description': ( localizeWithPath(
+                        _moduleId,
+                        9,
+                        "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,
+                }
+            }
+        };
+        if (this.configurationNode) {
+            registry.updateConfigurations({ add: [configurationNode], remove: [this.configurationNode] });
+        }
+        else {
+            registry.registerConfiguration(configurationNode);
+        }
+        this.configurationNode = configurationNode;
+    }
+    setNewWindowProfile() {
+        const newWindowProfileName = this.configurationService.getValue(CONFIG_NEW_WINDOW_PROFILE);
+        this.newWindowProfile = newWindowProfileName ? this.userDataProfilesService.profiles.find(profile => profile.name === newWindowProfileName) : undefined;
+    }
+    checkAndResetNewWindowProfileConfig() {
+        const newWindowProfileName = this.configurationService.getValue(CONFIG_NEW_WINDOW_PROFILE);
+        if (!newWindowProfileName) {
+            return;
+        }
+        const profile = this.newWindowProfile ? this.userDataProfilesService.profiles.find(profile => profile.id === this.newWindowProfile.id) : undefined;
+        if (newWindowProfileName === profile?.name) {
+            return;
+        }
+        this.configurationService.updateValue(CONFIG_NEW_WINDOW_PROFILE, profile?.name);
+    }
+};
+DynamicWindowConfiguration = ( (__decorate([
+    ( (__param(0, IUserDataProfilesService))),
+    ( (__param(1, IConfigurationService)))
+], DynamicWindowConfiguration)));
+export { ConfigurationMigrationWorkbenchContribution, DynamicWindowConfiguration, DynamicWorkbenchSecurityConfiguration, Extensions, applicationConfigurationNodeBase, problemsConfigurationNodeBase, securityConfigurationNodeBase, windowConfigurationNodeBase, workbenchConfigurationNodeBase };

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

@@ -74,70 +74,80 @@ const ActiveEditorGroupIndexContext = ( (new RawContextKey('activeEditorGroupInd
 const ActiveEditorGroupLastContext = ( (new RawContextKey('activeEditorGroupLast', false, ( localizeWithPath(_moduleId, 26, "Whether the active editor group is the last group")))));
 const ActiveEditorGroupLockedContext = ( (new RawContextKey('activeEditorGroupLocked', false, ( localizeWithPath(_moduleId, 27, "Whether the active editor group is locked")))));
 const MultipleEditorGroupsContext = ( (new RawContextKey('multipleEditorGroups', false, ( localizeWithPath(_moduleId, 28, "Whether there are multiple editor groups opened")))));
-const EditorPartMultipleEditorGroupsContext = ( (new RawContextKey('editorPartMultipleEditorGroups', false, ( localizeWithPath(
+const MultipleEditorsSelectedInGroupContext = ( (new RawContextKey('multipleEditorsSelectedInGroup', false, ( localizeWithPath(
     _moduleId,
     29,
+    "Whether multiple editors have been selected in an editor group"
+)))));
+const TwoEditorsSelectedInGroupContext = ( (new RawContextKey('twoEditorsSelectedInGroup', false, ( localizeWithPath(
+    _moduleId,
+    30,
+    "Whether exactly two editors have been selected in an editor group"
+)))));
+const EditorPartMultipleEditorGroupsContext = ( (new RawContextKey('editorPartMultipleEditorGroups', false, ( localizeWithPath(
+    _moduleId,
+    31,
     "Whether there are multiple editor groups opened in an editor part"
 )))));
-const EditorPartMaximizedEditorGroupContext = ( (new RawContextKey('editorPartMaximizedEditorGroup', false, ( localizeWithPath(_moduleId, 30, "Editor Part has a maximized group")))));
-const IsAuxiliaryEditorPartContext = ( (new RawContextKey('isAuxiliaryEditorPart', false, ( localizeWithPath(_moduleId, 31, "Editor Part is in an auxiliary window")))));
-const EditorsVisibleContext = ( (new RawContextKey('editorIsOpen', false, ( localizeWithPath(_moduleId, 32, "Whether an editor is open")))));
-const InEditorZenModeContext = ( (new RawContextKey('inZenMode', false, ( localizeWithPath(_moduleId, 33, "Whether Zen mode is enabled")))));
-const IsMainEditorCenteredLayoutContext = ( (new RawContextKey('isCenteredLayout', false, ( localizeWithPath(_moduleId, 34, "Whether centered layout is enabled for the main editor")))));
-const SplitEditorsVertically = ( (new RawContextKey('splitEditorsVertically', false, ( localizeWithPath(_moduleId, 35, "Whether editors split vertically")))));
-const MainEditorAreaVisibleContext = ( (new RawContextKey('mainEditorAreaVisible', true, ( localizeWithPath(_moduleId, 36, "Whether the editor area in the main window is visible")))));
-const EditorTabsVisibleContext = ( (new RawContextKey('editorTabsVisible', true, ( localizeWithPath(_moduleId, 37, "Whether editor tabs are visible")))));
-const SideBarVisibleContext = ( (new RawContextKey('sideBarVisible', false, ( localizeWithPath(_moduleId, 38, "Whether the sidebar is visible")))));
-const SidebarFocusContext = ( (new RawContextKey('sideBarFocus', false, ( localizeWithPath(_moduleId, 39, "Whether the sidebar has keyboard focus")))));
-const ActiveViewletContext = ( (new RawContextKey('activeViewlet', '', ( localizeWithPath(_moduleId, 40, "The identifier of the active viewlet")))));
-const StatusBarFocused = ( (new RawContextKey('statusBarFocused', false, ( localizeWithPath(_moduleId, 41, "Whether the status bar has keyboard focus")))));
-const TitleBarStyleContext = ( (new RawContextKey('titleBarStyle', isLinux ? 'native' : 'custom', ( localizeWithPath(_moduleId, 42, "Style of the window title bar")))));
-const TitleBarVisibleContext = ( (new RawContextKey('titleBarVisible', false, ( localizeWithPath(_moduleId, 43, "Whether the title bar is visible")))));
-const BannerFocused = ( (new RawContextKey('bannerFocused', false, ( localizeWithPath(_moduleId, 44, "Whether the banner has keyboard focus")))));
-const NotificationFocusedContext = ( (new RawContextKey('notificationFocus', true, ( localizeWithPath(_moduleId, 45, "Whether a notification has keyboard focus")))));
-const NotificationsCenterVisibleContext = ( (new RawContextKey('notificationCenterVisible', false, ( localizeWithPath(_moduleId, 46, "Whether the notifications center is visible")))));
-const NotificationsToastsVisibleContext = ( (new RawContextKey('notificationToastsVisible', false, ( localizeWithPath(_moduleId, 47, "Whether a notification toast is visible")))));
-const ActiveAuxiliaryContext = ( (new RawContextKey('activeAuxiliary', '', ( localizeWithPath(_moduleId, 48, "The identifier of the active auxiliary panel")))));
-const AuxiliaryBarFocusContext = ( (new RawContextKey('auxiliaryBarFocus', false, ( localizeWithPath(_moduleId, 49, "Whether the auxiliary bar has keyboard focus")))));
-const AuxiliaryBarVisibleContext = ( (new RawContextKey('auxiliaryBarVisible', false, ( localizeWithPath(_moduleId, 50, "Whether the auxiliary bar is visible")))));
-const ActivePanelContext = ( (new RawContextKey('activePanel', '', ( localizeWithPath(_moduleId, 51, "The identifier of the active panel")))));
-const PanelFocusContext = ( (new RawContextKey('panelFocus', false, ( localizeWithPath(_moduleId, 52, "Whether the panel has keyboard focus")))));
-const PanelPositionContext = ( (new RawContextKey('panelPosition', 'bottom', ( localizeWithPath(_moduleId, 53, "The position of the panel, always 'bottom'")))));
+const EditorPartMaximizedEditorGroupContext = ( (new RawContextKey('editorPartMaximizedEditorGroup', false, ( localizeWithPath(_moduleId, 32, "Editor Part has a maximized group")))));
+const IsAuxiliaryEditorPartContext = ( (new RawContextKey('isAuxiliaryEditorPart', false, ( localizeWithPath(_moduleId, 33, "Editor Part is in an auxiliary window")))));
+const EditorsVisibleContext = ( (new RawContextKey('editorIsOpen', false, ( localizeWithPath(_moduleId, 34, "Whether an editor is open")))));
+const InEditorZenModeContext = ( (new RawContextKey('inZenMode', false, ( localizeWithPath(_moduleId, 35, "Whether Zen mode is enabled")))));
+const IsMainEditorCenteredLayoutContext = ( (new RawContextKey('isCenteredLayout', false, ( localizeWithPath(_moduleId, 36, "Whether centered layout is enabled for the main editor")))));
+const SplitEditorsVertically = ( (new RawContextKey('splitEditorsVertically', false, ( localizeWithPath(_moduleId, 37, "Whether editors split vertically")))));
+const MainEditorAreaVisibleContext = ( (new RawContextKey('mainEditorAreaVisible', true, ( localizeWithPath(_moduleId, 38, "Whether the editor area in the main window is visible")))));
+const EditorTabsVisibleContext = ( (new RawContextKey('editorTabsVisible', true, ( localizeWithPath(_moduleId, 39, "Whether editor tabs are visible")))));
+const SideBarVisibleContext = ( (new RawContextKey('sideBarVisible', false, ( localizeWithPath(_moduleId, 40, "Whether the sidebar is visible")))));
+const SidebarFocusContext = ( (new RawContextKey('sideBarFocus', false, ( localizeWithPath(_moduleId, 41, "Whether the sidebar has keyboard focus")))));
+const ActiveViewletContext = ( (new RawContextKey('activeViewlet', '', ( localizeWithPath(_moduleId, 42, "The identifier of the active viewlet")))));
+const StatusBarFocused = ( (new RawContextKey('statusBarFocused', false, ( localizeWithPath(_moduleId, 43, "Whether the status bar has keyboard focus")))));
+const TitleBarStyleContext = ( (new RawContextKey('titleBarStyle', isLinux ? 'native' : 'custom', ( localizeWithPath(_moduleId, 44, "Style of the window title bar")))));
+const TitleBarVisibleContext = ( (new RawContextKey('titleBarVisible', false, ( localizeWithPath(_moduleId, 45, "Whether the title bar is visible")))));
+const BannerFocused = ( (new RawContextKey('bannerFocused', false, ( localizeWithPath(_moduleId, 46, "Whether the banner has keyboard focus")))));
+const NotificationFocusedContext = ( (new RawContextKey('notificationFocus', true, ( localizeWithPath(_moduleId, 47, "Whether a notification has keyboard focus")))));
+const NotificationsCenterVisibleContext = ( (new RawContextKey('notificationCenterVisible', false, ( localizeWithPath(_moduleId, 48, "Whether the notifications center is visible")))));
+const NotificationsToastsVisibleContext = ( (new RawContextKey('notificationToastsVisible', false, ( localizeWithPath(_moduleId, 49, "Whether a notification toast is visible")))));
+const ActiveAuxiliaryContext = ( (new RawContextKey('activeAuxiliary', '', ( localizeWithPath(_moduleId, 50, "The identifier of the active auxiliary panel")))));
+const AuxiliaryBarFocusContext = ( (new RawContextKey('auxiliaryBarFocus', false, ( localizeWithPath(_moduleId, 51, "Whether the auxiliary bar has keyboard focus")))));
+const AuxiliaryBarVisibleContext = ( (new RawContextKey('auxiliaryBarVisible', false, ( localizeWithPath(_moduleId, 52, "Whether the auxiliary bar is visible")))));
+const ActivePanelContext = ( (new RawContextKey('activePanel', '', ( localizeWithPath(_moduleId, 53, "The identifier of the active panel")))));
+const PanelFocusContext = ( (new RawContextKey('panelFocus', false, ( localizeWithPath(_moduleId, 54, "Whether the panel has keyboard focus")))));
+const PanelPositionContext = ( (new RawContextKey('panelPosition', 'bottom', ( localizeWithPath(_moduleId, 55, "The position of the panel, always 'bottom'")))));
 const PanelAlignmentContext = ( (new RawContextKey('panelAlignment', 'center', ( localizeWithPath(
     _moduleId,
-    54,
+    56,
     "The alignment of the panel, either 'center', 'left', 'right' or 'justify'"
 )))));
-const PanelVisibleContext = ( (new RawContextKey('panelVisible', false, ( localizeWithPath(_moduleId, 55, "Whether the panel is visible")))));
-const PanelMaximizedContext = ( (new RawContextKey('panelMaximized', false, ( localizeWithPath(_moduleId, 56, "Whether the panel is maximized")))));
-const FocusedViewContext = ( (new RawContextKey('focusedView', '', ( localizeWithPath(_moduleId, 57, "The identifier of the view that has keyboard focus")))));
+const PanelVisibleContext = ( (new RawContextKey('panelVisible', false, ( localizeWithPath(_moduleId, 57, "Whether the panel is visible")))));
+const PanelMaximizedContext = ( (new RawContextKey('panelMaximized', false, ( localizeWithPath(_moduleId, 58, "Whether the panel is maximized")))));
+const FocusedViewContext = ( (new RawContextKey('focusedView', '', ( localizeWithPath(_moduleId, 59, "The identifier of the view that has keyboard focus")))));
 function getVisbileViewContextKey(viewId) { return `view.${viewId}.visible`; }
 let ResourceContextKey = class ResourceContextKey {
     static { ResourceContextKey_1 = this; }
-    static { this.Scheme = ( (new RawContextKey('resourceScheme', undefined, { type: 'string', description: ( localizeWithPath(_moduleId, 58, "The scheme of the resource")) }))); }
+    static { this.Scheme = ( (new RawContextKey('resourceScheme', undefined, { type: 'string', description: ( localizeWithPath(_moduleId, 60, "The scheme of the resource")) }))); }
     static { this.Filename = ( (new RawContextKey(
         'resourceFilename',
         undefined,
-        { type: 'string', description: ( localizeWithPath(_moduleId, 59, "The file name of the resource")) }
+        { type: 'string', description: ( localizeWithPath(_moduleId, 61, "The file name of the resource")) }
     ))); }
     static { this.Dirname = ( (new RawContextKey(
         'resourceDirname',
         undefined,
-        { type: 'string', description: ( localizeWithPath(_moduleId, 60, "The folder name the resource is contained in")) }
+        { type: 'string', description: ( localizeWithPath(_moduleId, 62, "The folder name the resource is contained in")) }
     ))); }
-    static { this.Path = ( (new RawContextKey('resourcePath', undefined, { type: 'string', description: ( localizeWithPath(_moduleId, 61, "The full path of the resource")) }))); }
-    static { this.LangId = ( (new RawContextKey('resourceLangId', undefined, { type: 'string', description: ( localizeWithPath(_moduleId, 62, "The language identifier of the resource")) }))); }
-    static { this.Resource = ( (new RawContextKey('resource', undefined, { type: 'URI', description: ( localizeWithPath(_moduleId, 63, "The full value of the resource including scheme and path")) }))); }
+    static { this.Path = ( (new RawContextKey('resourcePath', undefined, { type: 'string', description: ( localizeWithPath(_moduleId, 63, "The full path of the resource")) }))); }
+    static { this.LangId = ( (new RawContextKey('resourceLangId', undefined, { type: 'string', description: ( localizeWithPath(_moduleId, 64, "The language identifier of the resource")) }))); }
+    static { this.Resource = ( (new RawContextKey('resource', undefined, { type: 'URI', description: ( localizeWithPath(_moduleId, 65, "The full value of the resource including scheme and path")) }))); }
     static { this.Extension = ( (new RawContextKey(
         'resourceExtname',
         undefined,
-        { type: 'string', description: ( localizeWithPath(_moduleId, 64, "The extension name of the resource")) }
+        { type: 'string', description: ( localizeWithPath(_moduleId, 66, "The extension name of the resource")) }
     ))); }
-    static { this.HasResource = ( (new RawContextKey('resourceSet', undefined, { type: 'boolean', description: ( localizeWithPath(_moduleId, 65, "Whether a resource is present or not")) }))); }
+    static { this.HasResource = ( (new RawContextKey('resourceSet', undefined, { type: 'boolean', description: ( localizeWithPath(_moduleId, 67, "Whether a resource is present or not")) }))); }
     static { this.IsFileSystemResource = ( (new RawContextKey(
         'isFileSystemResource',
         undefined,
-        { type: 'boolean', description: ( localizeWithPath(_moduleId, 66, "Whether the resource is backed by a file system provider")) }
+        { type: 'boolean', description: ( localizeWithPath(_moduleId, 68, "Whether the resource is backed by a file system provider")) }
     ))); }
     constructor(_contextKeyService, _fileService, _languageService, _modelService) {
         this._contextKeyService = _contextKeyService;
@@ -235,12 +245,12 @@ function applyAvailableEditorIds(contextKey, editor, editorResolverService) {
         return;
     }
     const editorResource = editor.resource;
-    const editors = editorResource ? ( (editorResolverService.getEditors(editorResource).map(editor => editor.id))) : [];
     if (editorResource?.scheme === Schemas.untitled && editor.editorId !== DEFAULT_EDITOR_ASSOCIATION.id) {
         contextKey.set('');
     }
     else {
+        const editors = editorResource ? ( (editorResolverService.getEditors(editorResource).map(editor => editor.id))) : [];
         contextKey.set(editors.join(','));
     }
 }
-export { ActiveAuxiliaryContext, ActiveCompareEditorCanSwapContext, ActiveEditorAvailableEditorIdsContext, ActiveEditorCanRevertContext, ActiveEditorCanSplitInGroupContext, ActiveEditorCanToggleReadonlyContext, ActiveEditorContext, ActiveEditorDirtyContext, ActiveEditorFirstInGroupContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, ActiveEditorLastInGroupContext, ActiveEditorPinnedContext, ActiveEditorReadonlyContext, ActiveEditorStickyContext, ActivePanelContext, ActiveViewletContext, AuxiliaryBarFocusContext, AuxiliaryBarVisibleContext, BannerFocused, DirtyWorkingCopiesContext, EditorGroupEditorsCountContext, EditorPartMaximizedEditorGroupContext, EditorPartMultipleEditorGroupsContext, EditorTabsVisibleContext, EditorsVisibleContext, EmbedderIdentifierContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, FocusedViewContext, HasWebFileSystemAccess, InEditorZenModeContext, IsAuxiliaryEditorPartContext, IsAuxiliaryWindowFocusedContext, IsMainEditorCenteredLayoutContext, IsMainWindowFullscreenContext, 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 };
+export { ActiveAuxiliaryContext, ActiveCompareEditorCanSwapContext, ActiveEditorAvailableEditorIdsContext, ActiveEditorCanRevertContext, ActiveEditorCanSplitInGroupContext, ActiveEditorCanToggleReadonlyContext, ActiveEditorContext, ActiveEditorDirtyContext, ActiveEditorFirstInGroupContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, ActiveEditorLastInGroupContext, ActiveEditorPinnedContext, ActiveEditorReadonlyContext, ActiveEditorStickyContext, ActivePanelContext, ActiveViewletContext, AuxiliaryBarFocusContext, AuxiliaryBarVisibleContext, BannerFocused, DirtyWorkingCopiesContext, EditorGroupEditorsCountContext, EditorPartMaximizedEditorGroupContext, EditorPartMultipleEditorGroupsContext, EditorTabsVisibleContext, EditorsVisibleContext, EmbedderIdentifierContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, FocusedViewContext, HasWebFileSystemAccess, InEditorZenModeContext, IsAuxiliaryEditorPartContext, IsAuxiliaryWindowFocusedContext, IsMainEditorCenteredLayoutContext, IsMainWindowFullscreenContext, MainEditorAreaVisibleContext, MultipleEditorGroupsContext, MultipleEditorsSelectedInGroupContext, NotificationFocusedContext, NotificationsCenterVisibleContext, NotificationsToastsVisibleContext, OpenFolderWorkspaceSupportContext, PanelAlignmentContext, PanelFocusContext, PanelMaximizedContext, PanelPositionContext, PanelVisibleContext, RemoteNameContext, ResourceContextKey, SideBarVisibleContext, SideBySideEditorActiveContext, SidebarFocusContext, SplitEditorsVertically, StatusBarFocused, TemporaryWorkspaceContext, TextCompareEditorActiveContext, TextCompareEditorVisibleContext, TitleBarStyleContext, TitleBarVisibleContext, TwoEditorsSelectedInGroupContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, applyAvailableEditorIds, getVisbileViewContextKey };

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

@@ -1,4 +1,5 @@
 import { IInstantiationService } from '../../platform/instantiation/common/instantiation.js';
+import { LifecyclePhase } from '../services/lifecycle/common/lifecycle.js';
 import { ILifecycleService } from '../services/lifecycle/common/lifecycle.service.js';
 import { Registry } from '../../platform/registry/common/platform.js';
 import { DeferredPromise, runWhenGlobalIdle } from '../../base/common/async.js';
@@ -25,22 +26,22 @@ function isOnEditorWorkbenchContributionInstantiation(obj) {
 }
 function toWorkbenchPhase(phase) {
     switch (phase) {
-        case 3 :
-            return 3 ;
-        case 4 :
-            return 4 ;
+        case LifecyclePhase.Restored:
+            return WorkbenchPhase.AfterRestored;
+        case LifecyclePhase.Eventually:
+            return WorkbenchPhase.Eventually;
     }
 }
 function toLifecyclePhase(instantiation) {
     switch (instantiation) {
-        case 1 :
-            return 1 ;
-        case 2 :
-            return 2 ;
-        case 3 :
-            return 3 ;
-        case 4 :
-            return 4 ;
+        case WorkbenchPhase.BlockStartup:
+            return LifecyclePhase.Starting;
+        case WorkbenchPhase.BlockRestore:
+            return LifecyclePhase.Ready;
+        case WorkbenchPhase.AfterRestored:
+            return LifecyclePhase.Restored;
+        case WorkbenchPhase.Eventually:
+            return LifecyclePhase.Eventually;
     }
 }
 class WorkbenchContributionsRegistry extends Disposable {
@@ -104,7 +105,7 @@ class WorkbenchContributionsRegistry extends Disposable {
                 `IWorkbenchContributionsRegistry#getContribution('${id}'): contribution with that identifier is unknown.`
             ));
         }
-        if (lifecycleService.phase < 3 ) {
+        if (lifecycleService.phase < LifecyclePhase.Restored) {
             logService.warn(`IWorkbenchContributionsRegistry#getContribution('${id}'): contribution instantiated before LifecyclePhase.Restored!`);
         }
         this.safeCreateContribution(instantiationService, logService, environmentService, contribution, lifecycleService.phase);
@@ -122,7 +123,7 @@ class WorkbenchContributionsRegistry extends Disposable {
         const logService = this.logService = accessor.get(ILogService);
         const environmentService = this.environmentService = accessor.get(IEnvironmentService);
         const editorPaneService = this.editorPaneService = accessor.get(IEditorPaneService);
-        for (const phase of [1 , 2 , 3 , 4 ]) {
+        for (const phase of [LifecyclePhase.Starting, LifecyclePhase.Ready, LifecyclePhase.Restored, LifecyclePhase.Eventually]) {
             this.instantiateByPhase(instantiationService, lifecycleService, logService, environmentService, phase);
         }
         for (const editorTypeId of ( this.contributionsByEditor.keys())) {
@@ -154,8 +155,8 @@ class WorkbenchContributionsRegistry extends Disposable {
         if (contributions) {
             this.contributionsByPhase.delete(phase);
             switch (phase) {
-                case 1 :
-                case 2 : {
+                case LifecyclePhase.Starting:
+                case LifecyclePhase.Ready: {
                     mark(`code/willCreateWorkbenchContributions/${phase}`);
                     for (const contribution of contributions) {
                         this.safeCreateContribution(instantiationService, logService, environmentService, contribution, phase);
@@ -163,9 +164,9 @@ class WorkbenchContributionsRegistry extends Disposable {
                     mark(`code/didCreateWorkbenchContributions/${phase}`);
                     break;
                 }
-                case 3 :
-                case 4 : {
-                    if (phase === 4 ) {
+                case LifecyclePhase.Restored:
+                case LifecyclePhase.Eventually: {
+                    if (phase === LifecyclePhase.Eventually) {
                         await this.pendingRestoredContributions.p;
                     }
                     this.doInstantiateWhenIdle(contributions, instantiationService, logService, environmentService, phase);
@@ -177,7 +178,7 @@ class WorkbenchContributionsRegistry extends Disposable {
     doInstantiateWhenIdle(contributions, instantiationService, logService, environmentService, phase) {
         mark(`code/willCreateWorkbenchContributions/${phase}`);
         let i = 0;
-        const forcedTimeout = phase === 4  ? 3000 : 500;
+        const forcedTimeout = phase === LifecyclePhase.Eventually ? 3000 : 500;
         const instantiateSome = (idle) => {
             while (i < contributions.length) {
                 const contribution = contributions[i++];
@@ -189,7 +190,7 @@ class WorkbenchContributionsRegistry extends Disposable {
             }
             if (i === contributions.length) {
                 mark(`code/didCreateWorkbenchContributions/${phase}`);
-                if (phase === 3 ) {
+                if (phase === LifecyclePhase.Restored) {
                     this.pendingRestoredContributions.complete();
                 }
             }
@@ -221,7 +222,7 @@ class WorkbenchContributionsRegistry extends Disposable {
         }
         if (typeof contribution.id === 'string' || !environmentService.isBuilt ) {
             const time = Date.now() - now;
-            if (time > (phase < 3  ? WorkbenchContributionsRegistry.BLOCK_BEFORE_RESTORE_WARN_THRESHOLD : WorkbenchContributionsRegistry.BLOCK_AFTER_RESTORE_WARN_THRESHOLD)) {
+            if (time > (phase < LifecyclePhase.Restored ? WorkbenchContributionsRegistry.BLOCK_BEFORE_RESTORE_WARN_THRESHOLD : WorkbenchContributionsRegistry.BLOCK_AFTER_RESTORE_WARN_THRESHOLD)) {
                 logService.warn(`Creation of workbench contribution '${contribution.id ?? contribution.ctor.name}' took ${time}ms.`);
             }
             if (typeof contribution.id === 'string') {

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

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import { localizeWithPath } from '../../../nls.js';
 import { SideBySideEditorInput, AbstractSideBySideEditorInputSerializer } from './sideBySideEditorInput.js';
-import { BINARY_DIFF_EDITOR_ID, TEXT_DIFF_EDITOR_ID, isResourceDiffEditorInput } from '../editor.js';
+import { Verbosity, BINARY_DIFF_EDITOR_ID, TEXT_DIFF_EDITOR_ID, isResourceDiffEditorInput, EditorInputCapabilities } from '../editor.js';
 import { BaseTextEditorModel } from './textEditorModel.js';
 import { DiffEditorModel } from './diffEditorModel.js';
 import { TextDiffEditorModel } from './textDiffEditorModel.js';
@@ -22,7 +22,7 @@ let DiffEditorInput = class DiffEditorInput extends SideBySideEditorInput {
     get capabilities() {
         let capabilities = super.capabilities;
         if (this.labels.forceDescription) {
-            capabilities |= 64 ;
+            capabilities |= EditorInputCapabilities.ForceDescription;
         }
         return capabilities;
     }
@@ -55,10 +55,10 @@ let DiffEditorInput = class DiffEditorInput extends SideBySideEditorInput {
             longDescription = this.preferredDescription;
         }
         else {
-            shortDescription = this.computeLabel(this.original.getDescription(0 ), this.modified.getDescription(0 ));
-            longDescription = this.computeLabel(this.original.getDescription(2 ), this.modified.getDescription(2 ));
-            const originalMediumDescription = this.original.getDescription(1 );
-            const modifiedMediumDescription = this.modified.getDescription(1 );
+            shortDescription = this.computeLabel(this.original.getDescription(Verbosity.SHORT), this.modified.getDescription(Verbosity.SHORT));
+            longDescription = this.computeLabel(this.original.getDescription(Verbosity.LONG), this.modified.getDescription(Verbosity.LONG));
+            const originalMediumDescription = this.original.getDescription(Verbosity.MEDIUM);
+            const modifiedMediumDescription = this.modified.getDescription(Verbosity.MEDIUM);
             if ((typeof originalMediumDescription === 'string' && typeof modifiedMediumDescription === 'string') &&
                 (originalMediumDescription || modifiedMediumDescription)
             ) {
@@ -66,9 +66,9 @@ let DiffEditorInput = class DiffEditorInput extends SideBySideEditorInput {
                 mediumDescription = this.computeLabel(shortenedOriginalMediumDescription, shortenedModifiedMediumDescription);
             }
         }
-        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(), ' ↔ ');
+        let shortTitle = this.computeLabel(this.original.getTitle(Verbosity.SHORT) ?? this.original.getName(), this.modified.getTitle(Verbosity.SHORT) ?? this.modified.getName(), ' ↔ ');
+        let mediumTitle = this.computeLabel(this.original.getTitle(Verbosity.MEDIUM) ?? this.original.getName(), this.modified.getTitle(Verbosity.MEDIUM) ?? this.modified.getName(), ' ↔ ');
+        let longTitle = this.computeLabel(this.original.getTitle(Verbosity.LONG) ?? this.original.getName(), this.modified.getTitle(Verbosity.LONG) ?? this.modified.getName(), ' ↔ ');
         const preferredTitle = this.getPreferredTitle();
         if (preferredTitle) {
             shortTitle = `${preferredTitle} (${shortTitle})`;
@@ -89,25 +89,25 @@ let DiffEditorInput = class DiffEditorInput extends SideBySideEditorInput {
     getName() {
         return this.labels.name;
     }
-    getDescription(verbosity = 1 ) {
+    getDescription(verbosity = Verbosity.MEDIUM) {
         switch (verbosity) {
-            case 0 :
+            case Verbosity.SHORT:
                 return this.labels.shortDescription;
-            case 2 :
+            case Verbosity.LONG:
                 return this.labels.longDescription;
-            case 1 :
+            case Verbosity.MEDIUM:
             default:
                 return this.labels.mediumDescription;
         }
     }
     getTitle(verbosity) {
         switch (verbosity) {
-            case 0 :
+            case Verbosity.SHORT:
                 return this.labels.shortTitle;
-            case 2 :
+            case Verbosity.LONG:
                 return this.labels.longTitle;
             default:
-            case 1 :
+            case Verbosity.MEDIUM:
                 return this.labels.mediumTitle;
         }
     }