@codingame/monaco-vscode-api 5.2.0 → 6.0.0

package/vscode/src/vs/workbench/browser/parts/editor/editorGroupView.js

@@ -1,8 +1,8 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/editorgroupview.css.js';
 import { isSerializedEditorGroupModel, EditorGroupModel, isGroupEditorCloseEvent, isGroupEditorOpenEvent } from '../../../common/editor/editorGroupModel.js';
-import { DEFAULT_EDITOR_ASSOCIATION, SideBySideEditor, EditorResourceAccessor, EditorCloseContext } from '../../../common/editor.js';
-import { ResourceContextKey, ActiveEditorDirtyContext, ActiveEditorPinnedContext, ActiveEditorFirstInGroupContext, ActiveEditorLastInGroupContext, ActiveEditorStickyContext, EditorGroupEditorsCountContext, ActiveEditorGroupLockedContext, ActiveEditorAvailableEditorIdsContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, applyAvailableEditorIds } from '../../../common/contextkeys.js';
+import { DEFAULT_EDITOR_ASSOCIATION, GroupModelChangeKind, SideBySideEditor, EditorResourceAccessor, EditorsOrder, EditorInputCapabilities, EditorCloseContext, CloseDirection, TEXT_DIFF_EDITOR_ID, SaveReason } from '../../../common/editor.js';
+import { ResourceContextKey, ActiveEditorDirtyContext, ActiveEditorPinnedContext, ActiveEditorFirstInGroupContext, ActiveEditorLastInGroupContext, ActiveEditorStickyContext, EditorGroupEditorsCountContext, ActiveEditorGroupLockedContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, ActiveEditorContext, ActiveEditorReadonlyContext, ActiveEditorCanRevertContext, ActiveEditorCanToggleReadonlyContext, ActiveCompareEditorCanSwapContext, TextCompareEditorVisibleContext, TextCompareEditorActiveContext, ActiveEditorAvailableEditorIdsContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, applyAvailableEditorIds } from '../../../common/contextkeys.js';
 import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
 import { Emitter, Relay } from '../../../../base/common/event.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -24,6 +24,7 @@ import '../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
 import { EDITOR_GROUP_EMPTY_BACKGROUND, EDITOR_GROUP_HEADER_BORDER, EDITOR_GROUP_HEADER_TABS_BACKGROUND, EDITOR_GROUP_HEADER_NO_TABS_BACKGROUND } from '../../../common/theme.js';
+import { GroupsOrder } from '../../../services/editor/common/editorGroupsService.js';
 import { EditorPanes } from './editorPanes.js';
 import { IEditorProgressService } from '../../../../platform/progress/common/progress.service.js';
 import { EditorProgressIndicator } from '../../../services/progress/browser/progressIndicator.js';
@@ -47,7 +48,9 @@ import { getMimeTypes } from '../../../../editor/common/services/languagesAssoci
 import { extname, isEqual } from '../../../../base/common/resources.js';
 import { Schemas } from '../../../../base/common/network.js';
 import { EditorActivation } from '../../../../platform/editor/common/editor.js';
+import { ConfirmResult } from '../../../../platform/dialogs/common/dialogs.js';
 import { IFileDialogService, IDialogService } from '../../../../platform/dialogs/common/dialogs.service.js';
+import { AutoSaveMode } from '../../../services/filesConfiguration/common/filesConfigurationService.js';
 import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.service.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.service.js';
@@ -60,19 +63,22 @@ import { EditorTitleControl } from './editorTitleControl.js';
 import { EditorPane } from './editorPane.js';
 import { IEditorResolverService } from '../../../services/editor/common/editorResolverService.service.js';
 import { IHostService } from '../../../services/host/browser/host.service.js';
+import { DiffEditorInput } from '../../../common/editor/diffEditorInput.js';
+import { FileSystemProviderCapabilities } from '../../../../platform/files/common/files.js';
+import { IFileService } from '../../../../platform/files/common/files.service.js';
 var EditorGroupView_1;
 const _moduleId = "vs/workbench/browser/parts/editor/editorGroupView";
 let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable {
-    static createNew(editorPartsView, groupsView, groupsLabel, groupIndex, instantiationService) {
-        return instantiationService.createInstance(EditorGroupView_1, null, editorPartsView, groupsView, groupsLabel, groupIndex);
+    static createNew(editorPartsView, groupsView, groupsLabel, groupIndex, instantiationService, options) {
+        return instantiationService.createInstance(EditorGroupView_1, null, editorPartsView, groupsView, groupsLabel, groupIndex, options);
     }
-    static createFromSerialized(serialized, editorPartsView, groupsView, groupsLabel, groupIndex, instantiationService) {
-        return instantiationService.createInstance(EditorGroupView_1, serialized, editorPartsView, groupsView, groupsLabel, groupIndex);
+    static createFromSerialized(serialized, editorPartsView, groupsView, groupsLabel, groupIndex, instantiationService, options) {
+        return instantiationService.createInstance(EditorGroupView_1, serialized, editorPartsView, groupsView, groupsLabel, groupIndex, options);
     }
-    static createCopy(copyFrom, editorPartsView, groupsView, groupsLabel, groupIndex, instantiationService) {
-        return instantiationService.createInstance(EditorGroupView_1, copyFrom, editorPartsView, groupsView, groupsLabel, groupIndex);
+    static createCopy(copyFrom, editorPartsView, groupsView, groupsLabel, groupIndex, instantiationService, options) {
+        return instantiationService.createInstance(EditorGroupView_1, copyFrom, editorPartsView, groupsView, groupsLabel, groupIndex, options);
     }
-    constructor(from, editorPartsView, groupsView, groupsLabel, _index, instantiationService, contextKeyService, themeService, telemetryService, keybindingService, menuService, contextMenuService, fileDialogService, editorService, filesConfigurationService, uriIdentityService, logService, editorResolverService, hostService, dialogService) {
+    constructor(from, editorPartsView, groupsView, groupsLabel, _index, options, instantiationService, contextKeyService, themeService, telemetryService, keybindingService, menuService, contextMenuService, fileDialogService, editorService, filesConfigurationService, uriIdentityService, logService, editorResolverService, hostService, dialogService, fileService) {
         super(themeService);
         this.editorPartsView = editorPartsView;
         this.groupsView = groupsView;
@@ -92,6 +98,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         this.editorResolverService = editorResolverService;
         this.hostService = hostService;
         this.dialogService = dialogService;
+        this.fileService = fileService;
         this._onDidFocus = this._register(( (new Emitter())));
         this.onDidFocus = this._onDidFocus.event;
         this._onWillDispose = this._register(( (new Emitter())));
@@ -137,10 +144,10 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
             this._register(this.instantiationService.createInstance(EditorGroupWatermark, this.element));
             this.progressBar = this._register(( (new ProgressBar(this.element, defaultProgressBarStyles))));
             this.progressBar.hide();
-            this.scopedInstantiationService = this.instantiationService.createChild(( (new ServiceCollection(
+            this.scopedInstantiationService = this._register(this.instantiationService.createChild(( (new ServiceCollection(
                 [IContextKeyService, this.scopedContextKeyService],
                 [IEditorProgressService, this._register(( (new EditorProgressIndicator(this.progressBar, this))))]
-            ))));
+            )))));
             this.resourceContext = this._register(this.scopedInstantiationService.createInstance(ResourceContextKey));
             this.handleGroupContextKeys();
             this.titleContainer = document.createElement('div');
@@ -157,78 +164,115 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
             this.updateContainer();
             this.updateStyles();
         }
-        const restoreEditorsPromise = this.restoreEditors(from) ?? Promise.resolve();
+        const restoreEditorsPromise = this.restoreEditors(from, options) ?? Promise.resolve();
         restoreEditorsPromise.finally(() => {
             this.whenRestoredPromise.complete();
         });
         this.registerListeners();
     }
     handleGroupContextKeys() {
-        const groupActiveEditorDirtyContext = ActiveEditorDirtyContext.bindTo(this.scopedContextKeyService);
-        const groupActiveEditorPinnedContext = ActiveEditorPinnedContext.bindTo(this.scopedContextKeyService);
-        const groupActiveEditorFirstContext = ActiveEditorFirstInGroupContext.bindTo(this.scopedContextKeyService);
-        const groupActiveEditorLastContext = ActiveEditorLastInGroupContext.bindTo(this.scopedContextKeyService);
-        const groupActiveEditorStickyContext = ActiveEditorStickyContext.bindTo(this.scopedContextKeyService);
-        const groupEditorsCountContext = EditorGroupEditorsCountContext.bindTo(this.scopedContextKeyService);
-        const groupLockedContext = ActiveEditorGroupLockedContext.bindTo(this.scopedContextKeyService);
-        const groupActiveEditorAvailableEditorIds = ActiveEditorAvailableEditorIdsContext.bindTo(this.scopedContextKeyService);
-        const groupActiveEditorCanSplitInGroupContext = ActiveEditorCanSplitInGroupContext.bindTo(this.scopedContextKeyService);
-        const sideBySideEditorContext = SideBySideEditorActiveContext.bindTo(this.scopedContextKeyService);
+        const groupActiveEditorDirtyContext = this.editorPartsView.bind(ActiveEditorDirtyContext, this);
+        const groupActiveEditorPinnedContext = this.editorPartsView.bind(ActiveEditorPinnedContext, this);
+        const groupActiveEditorFirstContext = this.editorPartsView.bind(ActiveEditorFirstInGroupContext, this);
+        const groupActiveEditorLastContext = this.editorPartsView.bind(ActiveEditorLastInGroupContext, this);
+        const groupActiveEditorStickyContext = this.editorPartsView.bind(ActiveEditorStickyContext, this);
+        const groupEditorsCountContext = this.editorPartsView.bind(EditorGroupEditorsCountContext, this);
+        const groupLockedContext = this.editorPartsView.bind(ActiveEditorGroupLockedContext, this);
+        const multipleEditorsSelectedContext = MultipleEditorsSelectedInGroupContext.bindTo(this.scopedContextKeyService);
+        const twoEditorsSelectedContext = TwoEditorsSelectedInGroupContext.bindTo(this.scopedContextKeyService);
+        const groupActiveEditorContext = this.editorPartsView.bind(ActiveEditorContext, this);
+        const groupActiveEditorIsReadonly = this.editorPartsView.bind(ActiveEditorReadonlyContext, this);
+        const groupActiveEditorCanRevert = this.editorPartsView.bind(ActiveEditorCanRevertContext, this);
+        const groupActiveEditorCanToggleReadonly = this.editorPartsView.bind(ActiveEditorCanToggleReadonlyContext, this);
+        const groupActiveCompareEditorCanSwap = this.editorPartsView.bind(ActiveCompareEditorCanSwapContext, this);
+        const groupTextCompareEditorVisibleContext = this.editorPartsView.bind(TextCompareEditorVisibleContext, this);
+        const groupTextCompareEditorActiveContext = this.editorPartsView.bind(TextCompareEditorActiveContext, this);
+        const groupActiveEditorAvailableEditorIds = this.editorPartsView.bind(ActiveEditorAvailableEditorIdsContext, this);
+        const groupActiveEditorCanSplitInGroupContext = this.editorPartsView.bind(ActiveEditorCanSplitInGroupContext, this);
+        const groupActiveEditorIsSideBySideEditorContext = this.editorPartsView.bind(SideBySideEditorActiveContext, this);
         const activeEditorListener = this._register(( (new MutableDisposable())));
         const observeActiveEditor = () => {
             activeEditorListener.clear();
             this.scopedContextKeyService.bufferChangeEvents(() => {
                 const activeEditor = this.activeEditor;
+                const activeEditorPane = this.activeEditorPane;
                 this.resourceContext.set(EditorResourceAccessor.getOriginalUri(activeEditor, { supportSideBySide: SideBySideEditor.PRIMARY }));
                 applyAvailableEditorIds(groupActiveEditorAvailableEditorIds, activeEditor, this.editorResolverService);
-                groupActiveEditorCanSplitInGroupContext.set(activeEditor ? activeEditor.hasCapability(32 ) : false);
-                sideBySideEditorContext.set(activeEditor?.typeId === SideBySideEditorInput.ID);
                 if (activeEditor) {
+                    groupActiveEditorCanSplitInGroupContext.set(activeEditor.hasCapability(EditorInputCapabilities.CanSplitInGroup));
+                    groupActiveEditorIsSideBySideEditorContext.set(activeEditor.typeId === SideBySideEditorInput.ID);
                     groupActiveEditorDirtyContext.set(activeEditor.isDirty() && !activeEditor.isSaving());
                     activeEditorListener.value = activeEditor.onDidChangeDirty(() => {
                         groupActiveEditorDirtyContext.set(activeEditor.isDirty() && !activeEditor.isSaving());
                     });
                 }
                 else {
+                    groupActiveEditorCanSplitInGroupContext.set(false);
+                    groupActiveEditorIsSideBySideEditorContext.set(false);
                     groupActiveEditorDirtyContext.set(false);
                 }
+                if (activeEditorPane) {
+                    groupActiveEditorContext.set(activeEditorPane.getId());
+                    groupActiveEditorCanRevert.set(!activeEditorPane.input.hasCapability(EditorInputCapabilities.Untitled));
+                    groupActiveEditorIsReadonly.set(!!activeEditorPane.input.isReadonly());
+                    const primaryEditorResource = EditorResourceAccessor.getOriginalUri(activeEditorPane.input, { supportSideBySide: SideBySideEditor.PRIMARY });
+                    const secondaryEditorResource = EditorResourceAccessor.getOriginalUri(activeEditorPane.input, { supportSideBySide: SideBySideEditor.SECONDARY });
+                    groupActiveCompareEditorCanSwap.set(activeEditorPane.input instanceof DiffEditorInput && !activeEditorPane.input.original.isReadonly() && !!primaryEditorResource && (this.fileService.hasProvider(primaryEditorResource) || primaryEditorResource.scheme === Schemas.untitled) && !!secondaryEditorResource && (this.fileService.hasProvider(secondaryEditorResource) || secondaryEditorResource.scheme === Schemas.untitled));
+                    groupActiveEditorCanToggleReadonly.set(!!primaryEditorResource && this.fileService.hasProvider(primaryEditorResource) && !this.fileService.hasCapability(primaryEditorResource, FileSystemProviderCapabilities.Readonly));
+                    const activePaneDiffEditor = activeEditorPane?.getId() === TEXT_DIFF_EDITOR_ID;
+                    groupTextCompareEditorActiveContext.set(activePaneDiffEditor);
+                    groupTextCompareEditorVisibleContext.set(activePaneDiffEditor);
+                }
+                else {
+                    groupActiveEditorContext.reset();
+                    groupActiveEditorCanRevert.reset();
+                    groupActiveEditorIsReadonly.reset();
+                    groupActiveCompareEditorCanSwap.reset();
+                    groupActiveEditorCanToggleReadonly.reset();
+                }
             });
         };
         const updateGroupContextKeys = (e) => {
             switch (e.kind) {
-                case 3 :
+                case GroupModelChangeKind.GROUP_LOCKED:
                     groupLockedContext.set(this.isLocked);
                     break;
-                case 7 :
+                case GroupModelChangeKind.EDITOR_ACTIVE:
                     groupActiveEditorFirstContext.set(this.model.isFirst(this.model.activeEditor));
                     groupActiveEditorLastContext.set(this.model.isLast(this.model.activeEditor));
                     groupActiveEditorPinnedContext.set(this.model.activeEditor ? this.model.isPinned(this.model.activeEditor) : false);
                     groupActiveEditorStickyContext.set(this.model.activeEditor ? this.model.isSticky(this.model.activeEditor) : false);
                     break;
-                case 5 :
-                case 4 :
-                case 6 :
+                case GroupModelChangeKind.EDITOR_CLOSE:
+                    groupActiveEditorPinnedContext.set(this.model.activeEditor ? this.model.isPinned(this.model.activeEditor) : false);
+                    groupActiveEditorStickyContext.set(this.model.activeEditor ? this.model.isSticky(this.model.activeEditor) : false);
+                case GroupModelChangeKind.EDITOR_OPEN:
+                case GroupModelChangeKind.EDITOR_MOVE:
                     groupActiveEditorFirstContext.set(this.model.isFirst(this.model.activeEditor));
                     groupActiveEditorLastContext.set(this.model.isLast(this.model.activeEditor));
                     break;
-                case 10 :
+                case GroupModelChangeKind.EDITOR_PIN:
                     if (e.editor && e.editor === this.model.activeEditor) {
                         groupActiveEditorPinnedContext.set(this.model.isPinned(this.model.activeEditor));
                     }
                     break;
-                case 12 :
+                case GroupModelChangeKind.EDITOR_STICKY:
                     if (e.editor && e.editor === this.model.activeEditor) {
                         groupActiveEditorStickyContext.set(this.model.isSticky(this.model.activeEditor));
                     }
                     break;
+                case GroupModelChangeKind.EDITORS_SELECTION:
+                    multipleEditorsSelectedContext.set(this.model.selectedEditors.length > 1);
+                    twoEditorsSelectedContext.set(this.model.selectedEditors.length === 2);
+                    break;
             }
             groupEditorsCountContext.set(this.count);
         };
         this._register(this.onDidModelChange(e => updateGroupContextKeys(e)));
         this._register(this.onDidActiveEditorChange(() => observeActiveEditor()));
         observeActiveEditor();
-        updateGroupContextKeys({ kind: 7  });
-        updateGroupContextKeys({ kind: 3  });
+        updateGroupContextKeys({ kind: GroupModelChangeKind.EDITOR_ACTIVE });
+        updateGroupContextKeys({ kind: GroupModelChangeKind.GROUP_LOCKED });
     }
     registerContainerListeners() {
         this._register(addDisposableListener(this.element, EventType.DBLCLICK, e => {
@@ -341,7 +385,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         this.titleContainer.classList.toggle('tabs', this.groupsView.partOptions.showTabs === 'multiple');
         this.titleContainer.classList.toggle('show-file-icons', this.groupsView.partOptions.showIcons);
     }
-    restoreEditors(from) {
+    restoreEditors(from, groupViewOptions) {
         if (this.count === 0) {
             return;
         }
@@ -364,7 +408,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         };
         const activeElement = getActiveElement();
         return this.doShowEditor(activeEditor, { active: true, isNew: false  }, options, internalOptions).then(() => {
-            if (this.groupsView.activeGroup === this && activeElement && isActiveElement(activeElement)) {
+            if (this.groupsView.activeGroup === this && activeElement && isActiveElement(activeElement) && !groupViewOptions?.preserveFocus) {
                 this.focus();
             }
         });
@@ -377,33 +421,38 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
     }
     onDidGroupModelChange(e) {
         this._onDidModelChange.fire(e);
-        if (e.kind === 3 ) {
-            this.element.classList.toggle('locked', this.isLocked);
+        switch (e.kind) {
+            case GroupModelChangeKind.GROUP_LOCKED:
+                this.element.classList.toggle('locked', this.isLocked);
+                break;
+            case GroupModelChangeKind.EDITORS_SELECTION:
+                this.onDidChangeEditorSelection();
+                break;
         }
         if (!e.editor) {
             return;
         }
         switch (e.kind) {
-            case 4 :
+            case GroupModelChangeKind.EDITOR_OPEN:
                 if (isGroupEditorOpenEvent(e)) {
                     this.onDidOpenEditor(e.editor, e.editorIndex);
                 }
                 break;
-            case 5 :
+            case GroupModelChangeKind.EDITOR_CLOSE:
                 if (isGroupEditorCloseEvent(e)) {
                     this.handleOnDidCloseEditor(e.editor, e.editorIndex, e.context, e.sticky);
                 }
                 break;
-            case 14 :
+            case GroupModelChangeKind.EDITOR_WILL_DISPOSE:
                 this.onWillDisposeEditor(e.editor);
                 break;
-            case 13 :
+            case GroupModelChangeKind.EDITOR_DIRTY:
                 this.onDidChangeEditorDirty(e.editor);
                 break;
-            case 11 :
+            case GroupModelChangeKind.EDITOR_TRANSIENT:
                 this.onDidChangeEditorTransient(e.editor);
                 break;
-            case 8 :
+            case GroupModelChangeKind.EDITOR_LABEL:
                 this.onDidChangeEditorLabel(e.editor);
                 break;
         }
@@ -534,6 +583,9 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
     onDidChangeEditorLabel(editor) {
         this.titleControl.updateEditorLabel(editor);
     }
+    onDidChangeEditorSelection() {
+        this.titleControl.updateEditorSelections();
+    }
     onDidVisibilityChange(visible) {
         this.editorPane.setVisible(visible);
     }
@@ -580,6 +632,9 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
     }
     setActive(isActive) {
         this.active = isActive;
+        if (!isActive && this.activeEditor && this.selectedEditors.length > 1) {
+            this.setSelection(this.activeEditor, []);
+        }
         this.element.classList.toggle('active', isActive);
         this.element.classList.toggle('inactive', !isActive);
         this.titleControl.setActive(isActive);
@@ -593,7 +648,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         return this.groupsView.windowId;
     }
     get editors() {
-        return this.model.getEditors(1 );
+        return this.model.getEditors(EditorsOrder.SEQUENTIAL);
     }
     get count() {
         return this.model.count;
@@ -607,6 +662,9 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
     get activeEditor() {
         return this.model.activeEditor;
     }
+    get selectedEditors() {
+        return this.model.selectedEditors;
+    }
     get previewEditor() {
         return this.model.previewEditor;
     }
@@ -616,12 +674,23 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
     isSticky(editorOrIndex) {
         return this.model.isSticky(editorOrIndex);
     }
+    isSelected(editor) {
+        return this.model.isSelected(editor);
+    }
     isTransient(editorOrIndex) {
         return this.model.isTransient(editorOrIndex);
     }
     isActive(editor) {
         return this.model.isActive(editor);
     }
+    async setSelection(activeSelectedEditor, inactiveSelectedEditors) {
+        if (!this.isActive(activeSelectedEditor)) {
+            await this.openEditor(activeSelectedEditor, { activation: EditorActivation.ACTIVATE }, { inactiveSelection: inactiveSelectedEditors });
+        }
+        else {
+            this.model.setSelection(activeSelectedEditor, inactiveSelectedEditors);
+        }
+    }
     contains(candidate, options) {
         return this.model.contains(candidate, options);
     }
@@ -630,7 +699,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
     }
     findEditors(resource, options) {
         const canonicalResource = this.uriIdentityService.asCanonicalUri(resource);
-        return this.getEditors(1 ).filter(editor => {
+        return this.getEditors(EditorsOrder.SEQUENTIAL).filter(editor => {
             if (editor.resource && isEqual(editor.resource, canonicalResource)) {
                 return true;
             }
@@ -719,12 +788,13 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
             || editor.isDirty()
             || ((options?.pinned ?? typeof options?.index === 'number') )
             || (typeof options?.index === 'number' && this.model.isSticky(options.index))
-            || editor.hasCapability(512 );
+            || editor.hasCapability(EditorInputCapabilities.Scratchpad);
         const openEditorOptions = {
             index: options ? options.index : undefined,
             pinned,
             sticky: options?.sticky || (typeof options?.index === 'number' && this.model.isSticky(options.index)),
             transient: !!options?.transient,
+            inactiveSelection: internalOptions?.inactiveSelection,
             active: this.count === 0 || !options || !options.inactive,
             supportSideBySide: internalOptions?.supportSideBySide
         };
@@ -877,7 +947,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
     }
     doMoveOrCopyEditorAcrossGroups(editor, target, openOptions, internalOptions) {
         const keepCopy = internalOptions?.keepCopy;
-        if (!keepCopy || editor.hasCapability(8 ) ) {
+        if (!keepCopy || editor.hasCapability(EditorInputCapabilities.Singleton) ) {
             const canMoveVeto = editor.canMove(this.id, target.id);
             if (typeof canMoveVeto === 'string') {
                 this.dialogService.error(canMoveVeto, ( localizeWithPath(
@@ -959,7 +1029,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         const restoreFocus = !preserveFocus && this.shouldRestoreFocus(this.element);
         const closeEmptyGroup = this.groupsView.partOptions.closeEmptyGroups;
         if (closeEmptyGroup && this.active && this.count === 1) {
-            const mostRecentlyActiveGroups = this.groupsView.getGroups(1 );
+            const mostRecentlyActiveGroups = this.groupsView.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE);
             const nextActiveGroup = mostRecentlyActiveGroups[1];
             if (nextActiveGroup) {
                 if (restoreFocus) {
@@ -1056,19 +1126,19 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         })))) {
             return false;
         }
-        let confirmation = 2 ;
-        let saveReason = 1 ;
+        let confirmation = ConfirmResult.CANCEL;
+        let saveReason = SaveReason.EXPLICIT;
         let autoSave = false;
-        if (!editor.hasCapability(4 ) && !options?.skipAutoSave && !editor.closeHandler) {
-            if (this.filesConfigurationService.getAutoSaveMode(editor).mode === 3 ) {
+        if (!editor.hasCapability(EditorInputCapabilities.Untitled) && !options?.skipAutoSave && !editor.closeHandler) {
+            if (this.filesConfigurationService.getAutoSaveMode(editor).mode === AutoSaveMode.ON_FOCUS_CHANGE) {
                 autoSave = true;
-                confirmation = 0 ;
-                saveReason = 3 ;
+                confirmation = ConfirmResult.SAVE;
+                saveReason = SaveReason.FOCUS_CHANGE;
             }
-            else if ((isNative && (isWindows || isLinux)) && this.filesConfigurationService.getAutoSaveMode(editor).mode === 4 ) {
+            else if ((isNative && (isWindows || isLinux)) && this.filesConfigurationService.getAutoSaveMode(editor).mode === AutoSaveMode.ON_WINDOW_CHANGE) {
                 autoSave = true;
-                confirmation = 0 ;
-                saveReason = 4 ;
+                confirmation = ConfirmResult.SAVE;
+                saveReason = SaveReason.WINDOW_CHANGE;
             }
         }
         if (!autoSave) {
@@ -1091,17 +1161,17 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
             }
         }
         if (!editor.closeHandler && !this.shouldConfirmClose(editor)) {
-            return confirmation === 2  ? true : false;
+            return confirmation === ConfirmResult.CANCEL ? true : false;
         }
         switch (confirmation) {
-            case 0 : {
+            case ConfirmResult.SAVE: {
                 const result = await editor.save(this.id, { reason: saveReason });
                 if (!result && autoSave) {
                     return this.doHandleCloseConfirmation(editor, { skipAutoSave: true });
                 }
                 return editor.isDirty();
             }
-            case 1 :
+            case ConfirmResult.DONT_SAVE:
                 try {
                     await editor.revert(this.id);
                     return editor.isDirty();
@@ -1111,7 +1181,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
                     await editor.revert(this.id, { soft: true });
                     return editor.isDirty();
                 }
-            case 2 :
+            case ConfirmResult.CANCEL:
                 return true;
         }
     }
@@ -1139,12 +1209,12 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         }
         const filter = args;
         const hasDirection = typeof filter.direction === 'number';
-        let editorsToClose = this.model.getEditors(hasDirection ? 1  : 0 , filter);
+        let editorsToClose = this.model.getEditors(hasDirection ? EditorsOrder.SEQUENTIAL : EditorsOrder.MOST_RECENTLY_ACTIVE, filter);
         if (filter.savedOnly) {
             editorsToClose = editorsToClose.filter(editor => !editor.isDirty() || editor.isSaving());
         }
         else if (hasDirection && filter.except) {
-            editorsToClose = ((filter.direction === 0) ) ?
+            editorsToClose = (filter.direction === CloseDirection.LEFT) ?
                 editorsToClose.slice(0, this.model.indexOf(filter.except, editorsToClose)) :
                 editorsToClose.slice(this.model.indexOf(filter.except, editorsToClose) + 1);
         }
@@ -1177,7 +1247,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
             }
             return true;
         }
-        let editors = this.model.getEditors(0 , options);
+        let editors = this.model.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE, options);
         if (options?.excludeConfirming) {
             editors = editors.filter(editor => !this.shouldConfirmClose(editor));
         }
@@ -1189,7 +1259,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         return true;
     }
     doCloseAllEditors(options) {
-        let editors = this.model.getEditors(1 , options);
+        let editors = this.model.getEditors(EditorsOrder.SEQUENTIAL, options);
         if (options?.excludeConfirming) {
             editors = editors.filter(editor => !this.shouldConfirmClose(editor));
         }
@@ -1347,20 +1417,21 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
     }
 };
 EditorGroupView = EditorGroupView_1 = ( (__decorate([
-    ( (__param(5, IInstantiationService))),
-    ( (__param(6, IContextKeyService))),
-    ( (__param(7, IThemeService))),
-    ( (__param(8, ITelemetryService))),
-    ( (__param(9, IKeybindingService))),
-    ( (__param(10, IMenuService))),
-    ( (__param(11, IContextMenuService))),
-    ( (__param(12, IFileDialogService))),
-    ( (__param(13, IEditorService))),
-    ( (__param(14, IFilesConfigurationService))),
-    ( (__param(15, IUriIdentityService))),
-    ( (__param(16, ILogService))),
-    ( (__param(17, IEditorResolverService))),
-    ( (__param(18, IHostService))),
-    ( (__param(19, IDialogService)))
+    ( (__param(6, IInstantiationService))),
+    ( (__param(7, IContextKeyService))),
+    ( (__param(8, IThemeService))),
+    ( (__param(9, ITelemetryService))),
+    ( (__param(10, IKeybindingService))),
+    ( (__param(11, IMenuService))),
+    ( (__param(12, IContextMenuService))),
+    ( (__param(13, IFileDialogService))),
+    ( (__param(14, IEditorService))),
+    ( (__param(15, IFilesConfigurationService))),
+    ( (__param(16, IUriIdentityService))),
+    ( (__param(17, ILogService))),
+    ( (__param(18, IEditorResolverService))),
+    ( (__param(19, IHostService))),
+    ( (__param(20, IDialogService))),
+    ( (__param(21, IFileService)))
 ], EditorGroupView)));
 export { EditorGroupView };

package/vscode/src/vs/workbench/browser/parts/editor/editorGroupWatermark.js

@@ -3,6 +3,7 @@ import { localizeWithPath } from '../../../../nls.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { isMacintosh, isWeb, OS } from '../../../../base/common/platform.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
+import { WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.service.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { h, append, $, clearNode } from '../../../../base/browser/dom.js';
@@ -62,6 +63,7 @@ let EditorGroupWatermark = class EditorGroupWatermark extends Disposable {
         this.configurationService = configurationService;
         this.transientDisposables = this._register(( (new DisposableStore())));
         this.enabled = false;
+        this.keybindingLabels = ( (new Set()));
         const elements = h('.editor-group-watermark', [
             h('.letterpress'),
             h('.shortcuts@shortcuts'),
@@ -105,7 +107,7 @@ let EditorGroupWatermark = class EditorGroupWatermark extends Disposable {
             return;
         }
         const box = append(this.shortcuts, $('.watermark-box'));
-        const folder = this.workbenchState !== 1 ;
+        const folder = this.workbenchState !== WorkbenchState.EMPTY;
         const selected = (folder ? folderEntries : noFolderEntries)
             .filter(entry => !('when' in entry) || this.contextKeyService.contextMatchesRules(entry.when))
             .filter(entry => !('mac' in entry) || entry.mac === (isMacintosh && !isWeb))
@@ -113,6 +115,8 @@ let EditorGroupWatermark = class EditorGroupWatermark extends Disposable {
             .filter(entry => !!this.keybindingService.lookupKeybinding(entry.id));
         const update = () => {
             clearNode(box);
+            this.keybindingLabels.forEach(label => label.dispose());
+            this.keybindingLabels.clear();
             for (const entry of selected) {
                 const keys = this.keybindingService.lookupKeybinding(entry.id);
                 if (!keys) {
@@ -122,13 +126,13 @@ let EditorGroupWatermark = class EditorGroupWatermark extends Disposable {
                 const dt = append(dl, $('dt'));
                 dt.textContent = entry.text;
                 const dd = append(dl, $('dd'));
-                this.keybindingLabel?.dispose();
-                this.keybindingLabel = ( (new KeybindingLabel(
+                const label = ( (new KeybindingLabel(
                     dd,
                     OS,
                     { renderUnboundKeybindings: true, ...defaultKeybindingLabelStyles }
                 )));
-                this.keybindingLabel.set(keys);
+                label.set(keys);
+                this.keybindingLabels.add(label);
             }
         };
         update();
@@ -141,7 +145,7 @@ let EditorGroupWatermark = class EditorGroupWatermark extends Disposable {
     dispose() {
         super.dispose();
         this.clear();
-        this.keybindingLabel?.dispose();
+        this.keybindingLabels.forEach(label => label.dispose());
     }
 };
 EditorGroupWatermark = ( (__decorate([

package/vscode/src/vs/workbench/browser/parts/editor/editorPane.js

@@ -1,6 +1,7 @@
 import { Composite } from '../../composite.js';
 import { isEditorInput } from '../../../common/editor.js';
-import { LRUCache } from '../../../../base/common/map.js';
+import { StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { Touch, LRUCache } from '../../../../base/common/map.js';
 import { URI } from '../../../../base/common/uri.js';
 import { Event, Emitter } from '../../../../base/common/event.js';
 import { isEmptyObject } from '../../../../base/common/types.js';
@@ -56,7 +57,7 @@ class EditorPane extends Composite {
             editorMemento = this._register(( new EditorMemento(
                 this.getId(),
                 key,
-                this.getMemento(1 , 1 ),
+                this.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE),
                 limit,
                 editorGroupService,
                 configurationService
@@ -190,7 +191,7 @@ class EditorMemento extends Disposable {
                 const index = indexOfPath(resource.path, source.path);
                 targetResource = joinPath(target, resource.path.substr(index + source.path.length + 1));
             }
-            const value = cache.get(cacheKey, 0 );
+            const value = cache.get(cacheKey, Touch.None);
             if (value) {
                 cache.delete(cacheKey);
                 cache.set(( targetResource.toString()), value);

package/vscode/src/vs/workbench/browser/parts/editor/editorPanes.js

@@ -3,7 +3,7 @@ import { localizeWithPath } from '../../../../nls.js';
 import { Emitter } from '../../../../base/common/event.js';
 import Severity$1 from '../../../../base/common/severity.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
-import { EditorExtensions, isEditorOpenError } from '../../../common/editor.js';
+import { EditorExtensions, EditorInputCapabilities, isEditorOpenError } from '../../../common/editor.js';
 import { getActiveElement, getWindowById, isAncestor, show, Dimension, hide } from '../../../../base/browser/dom.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.service.js';
@@ -56,7 +56,7 @@ let EditorPanes = class EditorPanes extends Disposable {
     onDidChangeWorkspaceTrust() {
         const editor = this._activeEditorPane?.input;
         const options = this._activeEditorPane?.options;
-        if (editor?.hasCapability(16 )) {
+        if (editor?.hasCapability(EditorInputCapabilities.RequiresTrust)) {
             this.groupView.openEditor(editor, options);
         }
     }
@@ -185,7 +185,7 @@ let EditorPanes = class EditorPanes extends Disposable {
         return false;
     }
     getEditorPaneDescriptor(editor) {
-        if (editor.hasCapability(16 ) && !this.workspaceTrustService.isWorkspaceTrusted()) {
+        if (editor.hasCapability(EditorInputCapabilities.RequiresTrust) && !this.workspaceTrustService.isWorkspaceTrusted()) {
             return WorkspaceTrustRequiredPlaceholderEditor.DESCRIPTOR;
         }
         return assertIsDefined(this.editorPanesRegistry.getEditorPane(editor));