@codingame/monaco-vscode-api 5.2.0 → 6.0.0

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

@@ -7,6 +7,7 @@ import { isEditorOpenError } from '../../../common/editor.js';
 import { EditorPane } from './editorPane.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 import { DomScrollableElement } from '../../../../base/browser/ui/scrollbar/scrollableElement.js';
+import { ScrollbarVisibility } from '../../../../base/common/scrollable.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
 import { clearNode, $, EventHelper, size } from '../../../../base/browser/dom.js';
 import { MutableDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
@@ -20,6 +21,7 @@ import { computeEditorAriaLabel, EditorPaneDescriptor } from '../../editor.js';
 import { ButtonBar } from '../../../../base/browser/ui/button/button.js';
 import { defaultButtonStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { SimpleIconLabel } from '../../../../base/browser/ui/iconLabel/simpleIconLabel.js';
+import { FileChangeType, FileOperationResult } from '../../../../platform/files/common/files.js';
 import { IFileService } from '../../../../platform/files/common/files.service.js';
 import { toErrorMessage } from '../../../../base/common/errorMessage.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.service.js';
@@ -39,7 +41,7 @@ let EditorPlaceholder = class EditorPlaceholder extends EditorPane {
         this.container.tabIndex = 0;
         this.scrollbar = this._register(( (new DomScrollableElement(
             this.container,
-            { horizontal: 1 , vertical: 1  }
+            { horizontal: ScrollbarVisibility.Auto, vertical: ScrollbarVisibility.Auto }
         ))));
         parent.appendChild(this.scrollbar.getDomNode());
     }
@@ -167,7 +169,7 @@ let ErrorPlaceholderEditor = class ErrorPlaceholderEditor extends EditorPlacehol
     async getContents(input, options, disposables) {
         const resource = input.resource;
         const error = options.error;
-        const isFileNotFound = error?.fileOperationResult === 1 ;
+        const isFileNotFound = error?.fileOperationResult === FileOperationResult.FILE_NOT_FOUND;
         let label;
         if (isFileNotFound) {
             label = ( localizeWithPath(
@@ -223,7 +225,7 @@ let ErrorPlaceholderEditor = class ErrorPlaceholderEditor extends EditorPlacehol
         }
         if (isFileNotFound && resource && this.fileService.hasProvider(resource)) {
             disposables.add(this.fileService.onDidFilesChange(e => {
-                if (e.contains(resource, 1 , 0 )) {
+                if (e.contains(resource, FileChangeType.ADDED, FileChangeType.UPDATED)) {
                     this.group.openEditor(input, options);
                 }
             }));

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

@@ -3,8 +3,9 @@ import './media/editorquickaccess.css.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { quickPickItemScorerAccessor } from '../../../../platform/quickinput/common/quickInput.js';
 import { PickerQuickAccessProvider, TriggerAction } from '../../../../platform/quickinput/browser/pickerQuickAccess.js';
+import { GroupsOrder } from '../../../services/editor/common/editorGroupsService.js';
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.service.js';
-import { EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
+import { EditorsOrder, EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { IModelService } from '../../../../editor/common/services/model.js';
 import { ILanguageService } from '../../../../editor/common/languages/language.js';
@@ -58,7 +59,7 @@ let BaseEditorQuickAccessProvider = class BaseEditorQuickAccessProvider extends
             return true;
         });
         if (query.normalized) {
-            const groups = ( (this.editorGroupService.getGroups(2 ).map(group => group.id)));
+            const groups = ( (this.editorGroupService.getGroups(GroupsOrder.GRID_APPEARANCE).map(group => group.id)));
             filteredEditorEntries.sort((entryA, entryB) => {
                 if (entryA.groupId !== entryB.groupId) {
                     return groups.indexOf(entryA.groupId) - groups.indexOf(entryB.groupId);
@@ -169,7 +170,7 @@ let ActiveGroupEditorsByMostRecentlyUsedQuickAccess = class ActiveGroupEditorsBy
     doGetEditors() {
         const group = this.editorGroupService.activeGroup;
         return (
-             (group.getEditors(0 ).map(editor => ({ editor, groupId: group.id })))
+             (group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).map(editor => ({ editor, groupId: group.id })))
         );
     }
 };
@@ -187,8 +188,8 @@ let AllEditorsByAppearanceQuickAccess = class AllEditorsByAppearanceQuickAccess
     }
     doGetEditors() {
         const entries = [];
-        for (const group of this.editorGroupService.getGroups(2 )) {
-            for (const editor of group.getEditors(1 )) {
+        for (const group of this.editorGroupService.getGroups(GroupsOrder.GRID_APPEARANCE)) {
+            for (const editor of group.getEditors(EditorsOrder.SEQUENTIAL)) {
                 entries.push({ editor, groupId: group.id });
             }
         }
@@ -209,7 +210,7 @@ let AllEditorsByMostRecentlyUsedQuickAccess = class AllEditorsByMostRecentlyUsed
     }
     doGetEditors() {
         const entries = [];
-        for (const editor of this.editorService.getEditors(0 )) {
+        for (const editor of this.editorService.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)) {
             entries.push(editor);
         }
         return entries;

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

@@ -11,6 +11,7 @@ import { Language } from '../../../../base/common/platform.js';
 import { UntitledTextEditorInput } from '../../../services/untitled/common/untitledTextEditorInput.js';
 import { EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
 import { Disposable, MutableDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { EndOfLineSequence } from '../../../../editor/common/model.js';
 import { TrimTrailingWhitespaceAction } from '../../../../editor/contrib/linesOperations/browser/linesOperations.js';
 import { IndentUsingSpaces, IndentUsingTabs, ChangeTabDisplaySize, DetectIndentation, IndentationToSpacesAction, IndentationToTabsAction } from '../../../../editor/contrib/indentation/browser/indentation.js';
 import { BaseBinaryResourceEditor } from './binaryEditor.js';
@@ -25,9 +26,12 @@ import { Selection } from '../../../../editor/common/core/selection.js';
 import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
 import { IExtensionGalleryService } from '../../../../platform/extensionManagement/common/extensionManagement.service.js';
+import { EncodingMode } from '../../../services/textfile/common/textfiles.js';
 import { ITextFileService } from '../../../services/textfile/common/textfiles.service.js';
 import { SUPPORTED_ENCODINGS } from '../../../services/textfile/common/encoding.js';
+import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
 import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { deepClone } from '../../../../base/common/objects.js';
 import { getCodeEditor } from '../../../../editor/browser/editorBrowser.js';
@@ -37,6 +41,7 @@ import { IQuickInputService } from '../../../../platform/quickinput/common/quick
 import { getIconClassesForLanguageId } from '../../../../editor/common/services/getIconClasses.js';
 import { Promises, timeout } from '../../../../base/common/async.js';
 import { Event, Emitter } from '../../../../base/common/event.js';
+import { StatusbarAlignment } from '../../../services/statusbar/browser/statusbar.js';
 import { IStatusbarService } from '../../../services/statusbar/browser/statusbar.service.js';
 import { IMarkerData, MarkerSeverity } from '../../../../platform/markers/common/markers.js';
 import { IMarkerService } from '../../../../platform/markers/common/markers.service.js';
@@ -46,7 +51,8 @@ import { AutomaticLanguageDetectionLikelyWrongId } from '../../../services/langu
 import { ILanguageDetectionService } from '../../../services/languageDetection/common/languageDetectionWorkerService.service.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { Action2 } from '../../../../platform/actions/common/actions.js';
-import { KeyChord } from '../../../../base/common/keyCodes.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeyChord, KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
 import { TabFocus } from '../../../../editor/browser/config/tabFocus.js';
 import { mainWindow } from '../../../../base/browser/window.js';
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.service.js';
@@ -330,7 +336,7 @@ let EditorStatus = class EditorStatus extends Disposable {
                     tooltip: ( localizeWithPath(_moduleId, 13, "Disable Accessibility Mode")),
                     command: 'editor.action.toggleTabFocusMode',
                     kind: 'prominent'
-                }, 'status.editor.tabFocusMode', 1 , 100.7);
+                }, 'status.editor.tabFocusMode', StatusbarAlignment.RIGHT, 100.7);
             }
         }
         else {
@@ -348,7 +354,7 @@ let EditorStatus = class EditorStatus extends Disposable {
                     tooltip: ( localizeWithPath(_moduleId, 16, "Disable Column Selection Mode")),
                     command: 'editor.action.toggleColumnSelection',
                     kind: 'prominent'
-                }, 'status.editor.columnSelectionMode', 1 , 100.8);
+                }, 'status.editor.columnSelectionMode', StatusbarAlignment.RIGHT, 100.8);
             }
         }
         else {
@@ -372,7 +378,7 @@ let EditorStatus = class EditorStatus extends Disposable {
             tooltip: ( localizeWithPath(_moduleId, 18, "Go to Line/Column")),
             command: 'workbench.action.gotoLine'
         };
-        this.updateElement(this.selectionElement, props, 'status.editor.selection', 1 , 100.5);
+        this.updateElement(this.selectionElement, props, 'status.editor.selection', StatusbarAlignment.RIGHT, 100.5);
     }
     updateIndentationElement(text) {
         if (!text) {
@@ -391,7 +397,7 @@ let EditorStatus = class EditorStatus extends Disposable {
             tooltip: ( localizeWithPath(_moduleId, 20, "Select Indentation")),
             command: `changeEditorIndentation${this.targetWindowId}`
         };
-        this.updateElement(this.indentationElement, props, 'status.editor.indentation', 1 , 100.4);
+        this.updateElement(this.indentationElement, props, 'status.editor.indentation', StatusbarAlignment.RIGHT, 100.4);
     }
     updateEncodingElement(text) {
         if (!text) {
@@ -405,7 +411,7 @@ let EditorStatus = class EditorStatus extends Disposable {
             tooltip: ( localizeWithPath(_moduleId, 22, "Select Encoding")),
             command: 'workbench.action.editor.changeEncoding'
         };
-        this.updateElement(this.encodingElement, props, 'status.editor.encoding', 1 , 100.3);
+        this.updateElement(this.encodingElement, props, 'status.editor.encoding', StatusbarAlignment.RIGHT, 100.3);
     }
     updateEOLElement(text) {
         if (!text) {
@@ -419,7 +425,7 @@ let EditorStatus = class EditorStatus extends Disposable {
             tooltip: ( localizeWithPath(_moduleId, 24, "Select End of Line Sequence")),
             command: 'workbench.action.editor.changeEOL'
         };
-        this.updateElement(this.eolElement, props, 'status.editor.eol', 1 , 100.2);
+        this.updateElement(this.eolElement, props, 'status.editor.eol', StatusbarAlignment.RIGHT, 100.2);
     }
     updateLanguageIdElement(text) {
         if (!text) {
@@ -433,7 +439,7 @@ let EditorStatus = class EditorStatus extends Disposable {
             tooltip: ( localizeWithPath(_moduleId, 26, "Select Language Mode")),
             command: 'workbench.action.editor.changeLanguageMode'
         };
-        this.updateElement(this.languageElement, props, 'status.editor.mode', 1 , 100.1);
+        this.updateElement(this.languageElement, props, 'status.editor.mode', StatusbarAlignment.RIGHT, 100.1);
     }
     updateMetadataElement(text) {
         if (!text) {
@@ -446,7 +452,7 @@ let EditorStatus = class EditorStatus extends Disposable {
             ariaLabel: text,
             tooltip: ( localizeWithPath(_moduleId, 28, "File Information"))
         };
-        this.updateElement(this.metadataElement, props, 'status.editor.info', 1 , 100);
+        this.updateElement(this.metadataElement, props, 'status.editor.info', StatusbarAlignment.RIGHT, 100);
     }
     updateElement(element, props, id, alignment, priority) {
         if (!element.value) {
@@ -524,7 +530,7 @@ let EditorStatus = class EditorStatus extends Disposable {
         }
         if (activeCodeEditor) {
             this.activeEditorListeners.add(activeCodeEditor.onDidChangeConfiguration((event) => {
-                if (event.hasChanged(22 )) {
+                if (event.hasChanged(EditorOption.columnSelection)) {
                     this.onColumnSelectionModeChange(activeCodeEditor);
                 }
             }));
@@ -620,7 +626,7 @@ let EditorStatus = class EditorStatus extends Disposable {
     }
     onColumnSelectionModeChange(editorWidget) {
         const info = { type: 'columnSelectionMode', columnSelectionMode: false };
-        if (editorWidget?.getOption(22 )) {
+        if (editorWidget?.getOption(EditorOption.columnSelection)) {
             info.columnSelectionMode = true;
         }
         this.updateState(info);
@@ -654,7 +660,7 @@ let EditorStatus = class EditorStatus extends Disposable {
     }
     onEOLChange(editorWidget) {
         const info = { type: 'EOL', EOL: undefined };
-        if (editorWidget && !editorWidget.getOption(91 )) {
+        if (editorWidget && !editorWidget.getOption(EditorOption.readOnly)) {
             const codeEditorModel = editorWidget.getModel();
             if (codeEditorModel) {
                 info.EOL = codeEditorModel.getEOL();
@@ -714,7 +720,7 @@ let EditorStatusContribution = class EditorStatusContribution extends Disposable
     static { this.ID = 'workbench.contrib.editorStatus'; }
     constructor(instantiationService, editorGroupService, editorService) {
         super();
-        const mainInstantiationService = instantiationService.createChild(( (new ServiceCollection([IEditorService, editorService.createScoped('main', this._store)]))));
+        const mainInstantiationService = this._register(instantiationService.createChild(( (new ServiceCollection([IEditorService, editorService.createScoped('main', this._store)])))));
         this._register(mainInstantiationService.createInstance(EditorStatus, mainWindow.vscodeWindowId));
         this._register(editorGroupService.onDidCreateAuxiliaryEditorPart(({ part, instantiationService, disposables }) => {
             disposables.add(instantiationService.createInstance(EditorStatus, part.windowId));
@@ -752,7 +758,7 @@ let ShowCurrentMarkerInStatusbarContribution = class ShowCurrentMarkerInStatusba
                 const line = splitLines(this.currentMarker.message)[0];
                 const text = `${this.getType(this.currentMarker)} ${line}`;
                 if (!this.statusBarEntryAccessor.value) {
-                    this.statusBarEntryAccessor.value = this.statusbarService.addEntry({ name: ( localizeWithPath(_moduleId, 32, "Current Problem")), text: '', ariaLabel: '' }, 'statusbar.currentProblem', 0 );
+                    this.statusBarEntryAccessor.value = this.statusbarService.addEntry({ name: ( localizeWithPath(_moduleId, 32, "Current Problem")), text: '', ariaLabel: '' }, 'statusbar.currentProblem', StatusbarAlignment.LEFT);
                 }
                 this.statusBarEntryAccessor.value.update({ name: ( localizeWithPath(_moduleId, 32, "Current Problem")), text, ariaLabel: text });
             }
@@ -869,8 +875,8 @@ class ChangeLanguageAction extends Action2 {
             title: ( localize2WithPath(_moduleId, 34, 'Change Language Mode')),
             f1: true,
             keybinding: {
-                weight: 200 ,
-                primary: KeyChord(2048  | 41 , 43 )
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyChord(KeyMod$1.CtrlCmd | KeyCode.KeyK, KeyCode.KeyM)
             },
             precondition: ContextKeyExpr.not('notebookEditorFocused')
         });
@@ -1045,11 +1051,11 @@ class ChangeLanguageAction extends Action2 {
                 else {
                     associationKey = base;
                 }
-                let target = 2 ;
+                let target = ConfigurationTarget.USER;
                 if (fileAssociationsConfig.workspaceValue && !!fileAssociationsConfig.workspaceValue[associationKey]) {
-                    target = 5 ;
+                    target = ConfigurationTarget.WORKSPACE;
                 }
-                const currentAssociations = deepClone(((target === 5) ) ? fileAssociationsConfig.workspaceValue : fileAssociationsConfig.userValue) || Object.create(null);
+                const currentAssociations = deepClone((target === ConfigurationTarget.WORKSPACE) ? fileAssociationsConfig.workspaceValue : fileAssociationsConfig.userValue) || Object.create(null);
                 currentAssociations[associationKey] = language.id;
                 configurationService.updateValue(FILES_ASSOCIATIONS_CONFIG, currentAssociations, target);
             }
@@ -1078,8 +1084,8 @@ class ChangeEOLAction extends Action2 {
         }
         let textModel = activeTextEditorControl.getModel();
         const EOLOptions = [
-            { label: nlsEOLLF, eol: 0  },
-            { label: nlsEOLCRLF, eol: 1  },
+            { label: nlsEOLLF, eol: EndOfLineSequence.LF },
+            { label: nlsEOLCRLF, eol: EndOfLineSequence.CRLF },
         ];
         const selectedIndex = (textModel?.getEOL() === '\n') ? 0 : 1;
         const eol = await quickInputService.pick(EOLOptions, { placeHolder: ( localizeWithPath(_moduleId, 45, "Select End of Line Sequence")), activeItem: EOLOptions[selectedIndex] });
@@ -1205,7 +1211,7 @@ class ChangeEncodingAction extends Action2 {
         }
         const activeEncodingSupport = toEditorWithEncodingSupport(editorService.activeEditorPane.input);
         if (typeof encoding.id !== 'undefined' && activeEncodingSupport) {
-            await activeEncodingSupport.setEncoding(encoding.id, isReopenWithEncoding ? 1  : 0 );
+            await activeEncodingSupport.setEncoding(encoding.id, isReopenWithEncoding ? EncodingMode.Decode : EncodingMode.Encode);
         }
         activeTextEditorControl.focus();
     }

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

@@ -4,7 +4,7 @@ import { localizeWithPath } from '../../../../nls.js';
 import { DataTransfers, applyDragImage } from '../../../../base/browser/dnd.js';
 import { getActiveWindow, isMouseEvent, getWindow } from '../../../../base/browser/dom.js';
 import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
-import { prepareActions } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { ActionsOrientation, prepareActions } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { ActionRunner } from '../../../../base/common/actions.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { createActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
@@ -30,8 +30,9 @@ import { Themable } from '../../../../platform/theme/common/themeService.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
 import { DraggedEditorGroupIdentifier, isWindowDraggedOver, fillEditorsDragData } from '../../dnd.js';
 import { EditorPane } from './editorPane.js';
-import { EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
+import { EditorsOrder, EditorInputCapabilities, EditorResourceAccessor, SideBySideEditor, Verbosity } from '../../../common/editor.js';
 import { ResourceContextKey, ActiveEditorPinnedContext, ActiveEditorFirstInGroupContext, ActiveEditorLastInGroupContext, ActiveEditorStickyContext, ActiveEditorAvailableEditorIdsContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, ActiveEditorGroupLockedContext, applyAvailableEditorIds } from '../../../common/contextkeys.js';
+import { AnchorAlignment } from '../../../../base/browser/ui/contextview/contextview.js';
 import { assertIsDefined } from '../../../../base/common/types.js';
 import { isFirefox } from '../../../../base/browser/browser.js';
 import { isCancellationError } from '../../../../base/common/errors.js';
@@ -40,6 +41,7 @@ import { WorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.j
 import { LocalSelectionTransfer } from '../../../../platform/dnd/browser/dnd.js';
 import { IEditorResolverService } from '../../../services/editor/common/editorResolverService.service.js';
 import { EDITOR_CORE_NAVIGATION_COMMANDS } from './editorCommands.js';
+import { MergeGroupMode } from '../../../services/editor/common/editorGroupsService.js';
 import { isMacintosh } from '../../../../base/common/platform.js';
 import { IHostService } from '../../../services/host/browser/host.service.js';
 import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
@@ -89,7 +91,7 @@ let EditorTabsControl = class EditorTabsControl extends Themable {
         this.editorActionsToolbarDisposables = this._register(( (new DisposableStore())));
         this.editorActionsDisposables = this._register(( (new DisposableStore())));
         this.contextMenuContextKeyService = this._register(this.contextKeyService.createScoped(parent));
-        const scopedInstantiationService = this.instantiationService.createChild(( (new ServiceCollection([IContextKeyService, this.contextMenuContextKeyService]))));
+        const scopedInstantiationService = this._register(this.instantiationService.createChild(( (new ServiceCollection([IContextKeyService, this.contextMenuContextKeyService])))));
         this.resourceContext = this._register(scopedInstantiationService.createInstance(ResourceContextKey));
         this.editorPinnedContext = ActiveEditorPinnedContext.bindTo(this.contextMenuContextKeyService);
         this.editorIsFirstContext = ActiveEditorFirstInGroupContext.bindTo(this.contextMenuContextKeyService);
@@ -133,11 +135,11 @@ let EditorTabsControl = class EditorTabsControl extends Themable {
         const context = { groupId: this.groupView.id };
         this.editorActionsToolbar = this.editorActionsToolbarDisposables.add(this.instantiationService.createInstance(WorkbenchToolBar, container, {
             actionViewItemProvider: (action, options) => this.actionViewItemProvider(action, options),
-            orientation: 0 ,
+            orientation: ActionsOrientation.HORIZONTAL,
             ariaLabel: ( localizeWithPath(_moduleId, 0, "Editor actions")),
             getKeyBinding: action => this.getKeybinding(action),
             actionRunner: this.editorActionsToolbarDisposables.add(( (new EditorCommandsContextActionRunner(context)))),
-            anchorAlignmentProvider: () => 1 ,
+            anchorAlignmentProvider: () => AnchorAlignment.RIGHT,
             renderDropdownAsChildElement: this.renderDropdownAsChildElement,
             telemetrySource: 'editorPart',
             resetMenu: MenuId.EditorTitle,
@@ -193,7 +195,7 @@ let EditorTabsControl = class EditorTabsControl extends Themable {
         }
         let hasDataTransfer = false;
         if (this.groupsView.partOptions.showTabs === 'multiple') {
-            hasDataTransfer = this.doFillResourceDataTransfers(this.groupView.getEditors(1 ), e, isNewWindowOperation);
+            hasDataTransfer = this.doFillResourceDataTransfers(this.groupView.getEditors(EditorsOrder.SEQUENTIAL), e, isNewWindowOperation);
         }
         else {
             if (this.groupView.activeEditor) {
@@ -225,7 +227,7 @@ let EditorTabsControl = class EditorTabsControl extends Themable {
         }
         const targetGroup = auxiliaryEditorPart.activeGroup;
         this.groupsView.mergeGroup(this.groupView, targetGroup.id, {
-            mode: this.isMoveOperation(previousDragEvent ?? e, targetGroup.id) ? 1  : 0
+            mode: this.isMoveOperation(previousDragEvent ?? e, targetGroup.id) ? MergeGroupMode.MOVE_EDITORS : MergeGroupMode.COPY_EDITORS
         });
         targetGroup.focus();
     }
@@ -260,7 +262,7 @@ let EditorTabsControl = class EditorTabsControl extends Themable {
         return e.altKey;
     }
     isMoveOperation(e, sourceGroup, sourceEditor) {
-        if (sourceEditor?.hasCapability(8 )) {
+        if (sourceEditor?.hasCapability(EditorInputCapabilities.Singleton)) {
             return true;
         }
         const isCopy = (e.ctrlKey && !isMacintosh) || (e.altKey && isMacintosh);
@@ -280,7 +282,7 @@ let EditorTabsControl = class EditorTabsControl extends Themable {
         this.editorIsLastContext.set(this.tabsModel.isLast(editor));
         this.editorStickyContext.set(this.tabsModel.isSticky(editor));
         this.groupLockedContext.set(this.tabsModel.isLocked);
-        this.editorCanSplitInGroupContext.set(editor.hasCapability(32 ));
+        this.editorCanSplitInGroupContext.set(editor.hasCapability(EditorInputCapabilities.CanSplitInGroup));
         this.sideBySideEditorContext.set(editor.typeId === SideBySideEditorInput.ID);
         applyAvailableEditorIds(this.editorAvailableEditorIds, editor, this.editorResolverService);
         let anchor = node;
@@ -308,7 +310,7 @@ let EditorTabsControl = class EditorTabsControl extends Themable {
         return this.groupsView.partOptions.tabHeight !== 'compact' ? EditorTabsControl_1.EDITOR_TAB_HEIGHT.normal : EditorTabsControl_1.EDITOR_TAB_HEIGHT.compact;
     }
     getHoverTitle(editor) {
-        return editor.getTitle(2 );
+        return editor.getTitle(Verbosity.LONG);
     }
     getHoverDelegate() {
         return this.tabsHoverDelegate;

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

@@ -106,6 +106,9 @@ let EditorTitleControl = class EditorTitleControl extends Themable {
     setActive(isActive) {
         return this.editorTabsControl.setActive(isActive);
     }
+    updateEditorSelections() {
+        this.editorTabsControl.updateEditorSelections();
+    }
     updateEditorLabel(editor) {
         return this.editorTabsControl.updateEditorLabel(editor);
     }

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

@@ -1,13 +1,15 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { EditorExtensions } from '../../../common/editor.js';
+import { EditorsOrder, GroupModelChangeKind, EditorInputCapabilities, EditorExtensions } from '../../../common/editor.js';
 import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
 import { Disposable, dispose, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
+import { GroupsOrder } from '../../../services/editor/common/editorGroupsService.js';
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.service.js';
 import { coalesce } from '../../../../base/common/arrays.js';
-import { LinkedMap, ResourceMap } from '../../../../base/common/map.js';
+import { LinkedMap, ResourceMap, Touch } from '../../../../base/common/map.js';
 import { equals } from '../../../../base/common/objects.js';
 var EditorsObserver_1;
 let EditorsObserver = class EditorsObserver extends Disposable {
@@ -55,7 +57,7 @@ let EditorsObserver = class EditorsObserver extends Disposable {
         this._register(this.storageService.onWillSaveState(() => this.saveState()));
     }
     onGroupAdded(group) {
-        const groupEditorsMru = group.getEditors(0 );
+        const groupEditorsMru = group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE);
         for (let i = groupEditorsMru.length - 1; i >= 0; i--) {
             this.addMostRecentEditor(group, groupEditorsMru[i], false , true );
         }
@@ -68,13 +70,13 @@ let EditorsObserver = class EditorsObserver extends Disposable {
         const groupDisposables = ( new DisposableStore());
         groupDisposables.add(group.onDidModelChange(e => {
             switch (e.kind) {
-                case 0 : {
+                case GroupModelChangeKind.GROUP_ACTIVE: {
                     if (this.editorGroupsContainer.activeGroup === group && group.activeEditor) {
                         this.addMostRecentEditor(group, group.activeEditor, true , false );
                     }
                     break;
                 }
-                case 4 : {
+                case GroupModelChangeKind.EDITOR_OPEN: {
                     if (e.editor) {
                         this.addMostRecentEditor(group, e.editor, false , true );
                         this.ensureOpenedEditorsLimit({ groupId: group.id, editor: e.editor }, group.id);
@@ -107,11 +109,11 @@ let EditorsObserver = class EditorsObserver extends Disposable {
         const key = this.ensureKey(group, editor);
         const mostRecentEditor = this.mostRecentEditorsMap.first;
         if (isActive || !mostRecentEditor) {
-            this.mostRecentEditorsMap.set(key, key, mostRecentEditor ? 1  : undefined);
+            this.mostRecentEditorsMap.set(key, key, mostRecentEditor ? Touch.AsOld  : undefined);
         }
         else {
-            this.mostRecentEditorsMap.set(key, key, 1 );
-            this.mostRecentEditorsMap.set(mostRecentEditor, mostRecentEditor, 1 );
+            this.mostRecentEditorsMap.set(key, key, Touch.AsOld );
+            this.mostRecentEditorsMap.set(mostRecentEditor, mostRecentEditor, Touch.AsOld );
         }
         if (isNew) {
             this.updateEditorResourcesMap(editor, true);
@@ -203,7 +205,7 @@ let EditorsObserver = class EditorsObserver extends Disposable {
             if (typeof groupId === 'number') {
                 const group = this.editorGroupsContainer.getGroup(groupId);
                 if (group) {
-                    await this.doEnsureOpenedEditorsLimit(limit, ( group.getEditors(0 ).map(editor => ({ editor, groupId }))), exclude);
+                    await this.doEnsureOpenedEditorsLimit(limit, ( group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).map(editor => ({ editor, groupId }))), exclude);
                 }
             }
             else {
@@ -220,7 +222,7 @@ let EditorsObserver = class EditorsObserver extends Disposable {
         let mostRecentEditorsCountingForLimit;
         if (this.editorGroupService.partOptions.limit?.excludeDirty) {
             mostRecentEditorsCountingForLimit = mostRecentEditors.filter(({ editor }) => {
-                if ((editor.isDirty() && !editor.isSaving()) || editor.hasCapability(512 )) {
+                if ((editor.isDirty() && !editor.isSaving()) || editor.hasCapability(EditorInputCapabilities.Scratchpad)) {
                     return false;
                 }
                 return true;
@@ -233,7 +235,7 @@ let EditorsObserver = class EditorsObserver extends Disposable {
             return;
         }
         const leastRecentlyClosableEditors = mostRecentEditorsCountingForLimit.reverse().filter(({ editor, groupId }) => {
-            if ((editor.isDirty() && !editor.isSaving()) || editor.hasCapability(512 )) {
+            if ((editor.isDirty() && !editor.isSaving()) || editor.hasCapability(EditorInputCapabilities.Scratchpad)) {
                 return false;
             }
             if (exclude && editor === exclude.editor && groupId === exclude.groupId) {
@@ -270,10 +272,10 @@ let EditorsObserver = class EditorsObserver extends Disposable {
             return;
         }
         if (this.mostRecentEditorsMap.isEmpty()) {
-            this.storageService.remove(EditorsObserver_1.STORAGE_KEY, 1 );
+            this.storageService.remove(EditorsObserver_1.STORAGE_KEY, StorageScope.WORKSPACE);
         }
         else {
-            this.storageService.store(EditorsObserver_1.STORAGE_KEY, JSON.stringify(this.serialize()), 1 , 1 );
+            this.storageService.store(EditorsObserver_1.STORAGE_KEY, JSON.stringify(this.serialize()), StorageScope.WORKSPACE, StorageTarget.MACHINE);
         }
     }
     serialize() {
@@ -288,7 +290,7 @@ let EditorsObserver = class EditorsObserver extends Disposable {
                 }
                 let serializableEditorsOfGroup = mapGroupToSerializableEditorsOfGroup.get(group);
                 if (!serializableEditorsOfGroup) {
-                    serializableEditorsOfGroup = group.getEditors(1 ).filter(editor => {
+                    serializableEditorsOfGroup = group.getEditors(EditorsOrder.SEQUENTIAL).filter(editor => {
                         const editorSerializer = registry.getEditorSerializer(editor);
                         return editorSerializer?.canSerialize(editor);
                     });
@@ -308,17 +310,17 @@ let EditorsObserver = class EditorsObserver extends Disposable {
         }
         let hasRestorableState = false;
         if (!this.isScoped) {
-            const serialized = this.storageService.get(EditorsObserver_1.STORAGE_KEY, 1 );
+            const serialized = this.storageService.get(EditorsObserver_1.STORAGE_KEY, StorageScope.WORKSPACE);
             if (serialized) {
                 hasRestorableState = true;
                 this.deserialize(JSON.parse(serialized));
             }
         }
         if (!hasRestorableState) {
-            const groups = this.editorGroupsContainer.getGroups(1 );
+            const groups = this.editorGroupsContainer.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE);
             for (let i = groups.length - 1; i >= 0; i--) {
                 const group = groups[i];
-                const groupEditorsMru = group.getEditors(0 );
+                const groupEditorsMru = group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE);
                 for (let i = groupEditorsMru.length - 1; i >= 0; i--) {
                     this.addMostRecentEditor(group, groupEditorsMru[i], true , true );
                 }

package/vscode/src/vs/workbench/browser/parts/editor/media/editortabscontrol.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-workbench .part.editor>.content .editor-group-container>.title{cursor:pointer}.monaco-workbench .part.editor>.content .editor-group-container>.title .tabs-container>.tab .tab-label,.monaco-workbench .part.editor>.content .editor-group-container>.title .title-label{flex:1;white-space:nowrap}.monaco-workbench .part.editor>.content .editor-group-container>.title .tabs-container>.tab .tab-label a,.monaco-workbench .part.editor>.content .editor-group-container>.title .title-label a{font-size:13px}.monaco-workbench .part.editor>.content .editor-group-container>.title .monaco-icon-label:before,.monaco-workbench .part.editor>.content .editor-group-container>.title .tabs-container>.tab .monaco-icon-label:before,.monaco-workbench .part.editor>.content .editor-group-container>.title .tabs-container>.tab .tab-label a,.monaco-workbench .part.editor>.content .editor-group-container>.title .tabs-container>.tab .tab-label span,.monaco-workbench .part.editor>.content .editor-group-container>.title .title-label a,.monaco-workbench .part.editor>.content .editor-group-container>.title .title-label h2{cursor:pointer}.monaco-workbench .part.editor>.content .editor-group-container>.title .monaco-icon-label:before{height:var(--editor-group-tab-height)}.monaco-workbench .part.editor>.content .editor-group-container>.title.breadcrumbs .monaco-icon-label:after,.monaco-workbench .part.editor>.content .editor-group-container>.title.tabs .monaco-icon-label:after{margin-right:0}.monaco-editor-group-drag-image{border-radius:10px;display:inline-block;font-size:12px;padding:1px 7px;position:absolute}";
+var css = ".monaco-workbench .part.editor>.content .editor-group-container>.title{cursor:pointer}.monaco-workbench .part.editor>.content .editor-group-container>.title .tabs-container>.tab .tab-label,.monaco-workbench .part.editor>.content .editor-group-container>.title .title-label{flex:1;white-space:nowrap}.monaco-workbench .part.editor>.content .editor-group-container>.title .tabs-container>.tab .tab-label a,.monaco-workbench .part.editor>.content .editor-group-container>.title .title-label a{font-size:13px}.monaco-workbench .part.editor>.content .editor-group-container>.title .monaco-icon-label:before,.monaco-workbench .part.editor>.content .editor-group-container>.title .tabs-container>.tab .monaco-icon-label:before,.monaco-workbench .part.editor>.content .editor-group-container>.title .tabs-container>.tab .tab-label a,.monaco-workbench .part.editor>.content .editor-group-container>.title .tabs-container>.tab .tab-label span,.monaco-workbench .part.editor>.content .editor-group-container>.title .title-label a,.monaco-workbench .part.editor>.content .editor-group-container>.title .title-label h2{cursor:pointer}.monaco-workbench .part.editor>.content .editor-group-container>.title .monaco-icon-label:before{height:var(--editor-group-tab-height)}.monaco-workbench .part.editor>.content .editor-group-container>.title.breadcrumbs .monaco-icon-label:after,.monaco-workbench .part.editor>.content .editor-group-container>.title.tabs .monaco-icon-label:after{margin-right:0}.monaco-editor-group-drag-image{border-radius:10px;display:inline-block;font-size:12px;max-width:120px;overflow:hidden;padding:1px 7px;position:absolute;text-overflow:ellipsis;white-space:nowrap}";
 n(css,{});
 export { css, css as default };