@codingame/monaco-vscode-api 9.0.2 → 10.0.0

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

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

@@ -1,4 +1,4 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-editor-pane-placeholder{align-items:center;box-sizing:border-box;display:flex;flex-direction:column;gap:10px;justify-content:center;padding:0 16px}.monaco-editor-pane-placeholder:focus{outline:none!important}.monaco-editor-pane-placeholder .editor-placeholder-icon-container .codicon{font-size:48px}.monaco-editor-pane-placeholder .editor-placeholder-icon-container .codicon.codicon-error{color:var(--vscode-editorError-foreground)}.monaco-editor-pane-placeholder .editor-placeholder-icon-container .codicon.codicon-warning{color:var(--vscode-editorWarning-foreground)}.monaco-editor-pane-placeholder .editor-placeholder-icon-container .codicon.codicon-info,.monaco-editor-pane-placeholder .editor-placeholder-icon-container .codicon.codicon-workspace-untrusted{color:var(--vscode-editorInfo-foreground)}.monaco-editor-pane-placeholder.max-height-200px .editor-placeholder-icon-container{display:none}.monaco-editor-pane-placeholder .editor-placeholder-label-container{font-size:14px;max-width:450px;text-align:center;user-select:text;-webkit-user-select:text;word-break:break-word}.monaco-editor-pane-placeholder .editor-placeholder-buttons-container{display:flex}.monaco-editor-pane-placeholder .editor-placeholder-buttons-container>.monaco-button{font-size:14px;margin:4px 5px;outline-offset:2px!important;padding:6px 11px;width:fit-content}";
+var css = ".monaco-editor-pane-placeholder{align-items:center;box-sizing:border-box;display:flex;flex-direction:column;gap:10px;justify-content:center;padding:0 16px}.monaco-editor-pane-placeholder:focus{outline:none!important}.monaco-editor-pane-placeholder .editor-placeholder-icon-container .codicon{font-size:48px!important}.monaco-editor-pane-placeholder .editor-placeholder-icon-container .codicon.codicon-error{color:var(--vscode-editorError-foreground)}.monaco-editor-pane-placeholder .editor-placeholder-icon-container .codicon.codicon-warning{color:var(--vscode-editorWarning-foreground)}.monaco-editor-pane-placeholder .editor-placeholder-icon-container .codicon.codicon-info,.monaco-editor-pane-placeholder .editor-placeholder-icon-container .codicon.codicon-workspace-untrusted{color:var(--vscode-editorInfo-foreground)}.monaco-editor-pane-placeholder.max-height-200px .editor-placeholder-icon-container{display:none}.monaco-editor-pane-placeholder .editor-placeholder-label-container{font-size:14px;max-width:450px;text-align:center;user-select:text;-webkit-user-select:text;word-break:break-word}.monaco-editor-pane-placeholder .editor-placeholder-buttons-container{display:flex}.monaco-editor-pane-placeholder .editor-placeholder-buttons-container>.monaco-button{font-size:14px;margin:4px 5px;outline-offset:2px!important;padding:6px 11px;width:fit-content}";
 n(css,{});
 export { css, css as default };

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;max-width:120px;overflow:hidden;padding:1px 7px;position:absolute;text-overflow:ellipsis;white-space:nowrap}";
+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}.monaco-workbench .part.editor>.content .editor-group-container>.title .tabs-container>.tab .tab-label .label-name,.monaco-workbench .part.editor>.content .editor-group-container>.title .title-label .label-name{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 };

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

@@ -2,11 +2,10 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import './media/multieditortabscontrol.css.js';
 import { isWindows, isLinux, isMacintosh } from '../../../../base/common/platform.js';
 import { shorten } from '../../../../base/common/labels.js';
-import { EditorsOrder, EditorInputCapabilities, Verbosity, EditorResourceAccessor, SideBySideEditor, DEFAULT_EDITOR_ASSOCIATION, preventEditorClose, EditorCloseMethod } from '../../../common/editor.js';
+import { EditorResourceAccessor, SideBySideEditor, DEFAULT_EDITOR_ASSOCIATION, preventEditorClose, EditorCloseMethod } from '../../../common/editor.js';
 import { computeEditorAriaLabel } from '../../editor.js';
 import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
 import { Gesture, EventType } from '../../../../base/browser/touch.js';
-import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { ResourceLabels, DEFAULT_LABELS_CONTAINER } from '../../labels.js';
 import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
@@ -18,7 +17,6 @@ import { EditorTabsControl, EditorCommandsContextActionRunner } from './editorTa
 import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.service.js';
 import { MutableDisposable, DisposableStore, dispose, combinedDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import { ScrollableElement } from '../../../../base/browser/ui/scrollbar/scrollableElement.js';
-import { ScrollbarVisibility } from '../../../../base/common/scrollable.js';
 import { getOrSet } from '../../../../base/common/map.js';
 import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
@@ -36,7 +34,6 @@ import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
 import { DraggedEditorIdentifier, DraggedEditorGroupIdentifier, isWindowDraggedOver, extractTreeDropData, ResourcesDropHandler } from '../../dnd.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
-import { MergeGroupMode } from '../../../services/editor/common/editorGroupsService.js';
 import { Dimension, addDisposableListener, EventType as EventType$1, DragAndDropObserver, clearNode, scheduleAtNextAnimationFrame, getWindow, isMouseEvent, findParentWithClass, EventHelper } from '../../../../base/browser/dom.js';
 import { localize } from '../../../../nls.js';
 import { CloseEditorTabAction, UnpinEditorAction } from './editorActions.js';
@@ -119,9 +116,9 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
     }
     createTabsScrollbar(scrollable) {
         const tabsScrollbar = this._register(( (new ScrollableElement(scrollable, {
-            horizontal: ScrollbarVisibility.Auto,
+            horizontal: 1 ,
             horizontalScrollbarSize: this.getTabsScrollbarSizing(),
-            vertical: ScrollbarVisibility.Hidden,
+            vertical: 2 ,
             scrollYToX: true,
             useShadows: false
         }))));
@@ -505,7 +502,7 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
         this.redraw();
     }
     forEachTab(fn, fromTabIndex, toTabIndex) {
-        this.tabsModel.getEditors(EditorsOrder.SEQUENTIAL).forEach((editor, tabIndex) => {
+        this.tabsModel.getEditors(1 ).forEach((editor, tabIndex) => {
             if (typeof fromTabIndex === 'number' && fromTabIndex > tabIndex) {
                 return;
             }
@@ -546,7 +543,7 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
             groupId: this.groupView.id,
             get editorIndex() { return that.toEditorIndex(tabIndex); }
         })));
-        const tabActionBar = ( (new ActionBar(tabActionsContainer, { ariaLabel: ( localize(11581, "Tab actions")), actionRunner: tabActionRunner })));
+        const tabActionBar = ( (new ActionBar(tabActionsContainer, { ariaLabel: ( localize(11724, "Tab actions")), actionRunner: tabActionRunner })));
         const tabActionListener = tabActionBar.onWillRun(e => {
             if (e.action.id === this.closeEditorAction.id) {
                 this.blockRevealActiveTabOnce();
@@ -650,7 +647,7 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
         }));
         disposables.add(addDisposableListener(tab, EventType$1.KEY_DOWN, e => {
             const event = ( (new StandardKeyboardEvent(e)));
-            if (event.shiftKey && event.keyCode === KeyCode.F10) {
+            if (event.shiftKey && event.keyCode === 68 ) {
                 showContextMenu(e);
             }
         }));
@@ -660,22 +657,22 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
         disposables.add(addDisposableListener(tab, EventType$1.KEY_UP, e => {
             const event = ( (new StandardKeyboardEvent(e)));
             let handled = false;
-            if (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) {
+            if (event.equals(3 ) || event.equals(10 )) {
                 handled = true;
                 const editor = this.tabsModel.getEditorByIndex(tabIndex);
                 if (editor) {
                     this.groupView.openEditor(editor);
                 }
             }
-            else if (( ([KeyCode.LeftArrow, KeyCode.RightArrow, KeyCode.UpArrow, KeyCode.DownArrow, KeyCode.Home, KeyCode.End].some(kb => event.equals(kb))))) {
+            else if (( ([15 , 17 , 16 , 18 , 14 , 13 ].some(kb => event.equals(kb))))) {
                 let editorIndex = this.toEditorIndex(tabIndex);
-                if (event.equals(KeyCode.LeftArrow) || event.equals(KeyCode.UpArrow)) {
+                if (event.equals(15 ) || event.equals(16 )) {
                     editorIndex = editorIndex - 1;
                 }
-                else if (event.equals(KeyCode.RightArrow) || event.equals(KeyCode.DownArrow)) {
+                else if (event.equals(17 ) || event.equals(18 )) {
                     editorIndex = editorIndex + 1;
                 }
-                else if (event.equals(KeyCode.Home)) {
+                else if (event.equals(14 )) {
                     editorIndex = 0;
                 }
                 else {
@@ -913,7 +910,7 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
         }
         const fromEditorIndex = anchorEditorIndex < editorIndex ? anchorEditorIndex : editorIndex;
         const toEditorIndex = anchorEditorIndex < editorIndex ? editorIndex : anchorEditorIndex;
-        const editorsToSelect = this.groupView.getEditors(EditorsOrder.SEQUENTIAL).slice(fromEditorIndex, toEditorIndex + 1);
+        const editorsToSelect = this.groupView.getEditors(1 ).slice(fromEditorIndex, toEditorIndex + 1);
         for (const editor of editorsToSelect) {
             if (!this.groupView.isSelected(editor)) {
                 selection.push(editor);
@@ -929,7 +926,7 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
         }
         let newActiveEditor = assertIsDefined(this.groupView.activeEditor);
         if (isUnselectingActiveEditor) {
-            const recentEditors = this.groupView.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE);
+            const recentEditors = this.groupView.getEditors(0 );
             for (let i = 1; i < recentEditors.length; i++) {
                 const recentEditor = recentEditors[i];
                 if (this.groupView.isSelected(recentEditor)) {
@@ -952,13 +949,13 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
         const { verbosity, shortenDuplicates } = this.getLabelConfigFlags(labelFormat);
         const labels = [];
         let activeEditorTabIndex = -1;
-        this.tabsModel.getEditors(EditorsOrder.SEQUENTIAL).forEach((editor, tabIndex) => {
+        this.tabsModel.getEditors(1 ).forEach((editor, tabIndex) => {
             labels.push({
                 editor,
                 name: editor.getName(),
                 description: editor.getDescription(verbosity),
-                forceDescription: editor.hasCapability(EditorInputCapabilities.ForceDescription),
-                title: editor.getTitle(Verbosity.LONG),
+                forceDescription: editor.hasCapability(64 ),
+                title: editor.getTitle(2 ),
                 ariaLabel: computeEditorAriaLabel(editor, tabIndex, this.groupView, this.editorPartsView.count)
             });
             if (editor === this.tabsModel.activeEditor) {
@@ -993,14 +990,14 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
             let useLongDescriptions = false;
             for (const [, duplicateLabels] of mapDescriptionToDuplicates) {
                 if (!useLongDescriptions && duplicateLabels.length > 1) {
-                    const [first, ...rest] = ( (duplicateLabels.map(({ editor }) => editor.getDescription(Verbosity.LONG))));
+                    const [first, ...rest] = ( (duplicateLabels.map(({ editor }) => editor.getDescription(2 ))));
                     useLongDescriptions = ( (rest.some(description => description !== first)));
                 }
             }
             if (useLongDescriptions) {
                 mapDescriptionToDuplicates.clear();
                 for (const duplicateLabel of duplicateLabels) {
-                    duplicateLabel.description = duplicateLabel.editor.getDescription(Verbosity.LONG);
+                    duplicateLabel.description = duplicateLabel.editor.getDescription(2 );
                     getOrSet(mapDescriptionToDuplicates, duplicateLabel.description, []).push(duplicateLabel);
                 }
             }
@@ -1027,13 +1024,13 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
     getLabelConfigFlags(value) {
         switch (value) {
             case 'short':
-                return { verbosity: Verbosity.SHORT, shortenDuplicates: false };
+                return { verbosity: 0 , shortenDuplicates: false };
             case 'medium':
-                return { verbosity: Verbosity.MEDIUM, shortenDuplicates: false };
+                return { verbosity: 1 , shortenDuplicates: false };
             case 'long':
-                return { verbosity: Verbosity.LONG, shortenDuplicates: false };
+                return { verbosity: 2 , shortenDuplicates: false };
             default:
-                return { verbosity: Verbosity.MEDIUM, shortenDuplicates: true };
+                return { verbosity: 1 , shortenDuplicates: true };
         }
     }
     redraw(options) {
@@ -1490,7 +1487,7 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
                 if (sourceGroup) {
                     const mergeGroupOptions = { index: targetEditorIndex };
                     if (!this.isMoveOperation(e, sourceGroup.id)) {
-                        mergeGroupOptions.mode = MergeGroupMode.COPY_EDITORS;
+                        mergeGroupOptions.mode = 0 ;
                     }
                     this.groupsView.mergeGroup(sourceGroup, this.groupView, mergeGroupOptions);
                 }

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

@@ -33,8 +33,15 @@ class NoEditorTabsControl extends EditorTabsControl {
         return false;
     }
     beforeCloseEditor(editor) { }
-    closeEditor(editor) { }
-    closeEditors(editors) { }
+    closeEditor(editor) {
+        this.handleClosedEditors();
+    }
+    closeEditors(editors) {
+        this.handleClosedEditors();
+    }
+    handleClosedEditors() {
+        this.activeEditor = this.tabsModel.activeEditor;
+    }
     moveEditor(editor, fromIndex, targetIndex) { }
     pinEditor(editor) { }
     stickEditor(editor) { }

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

@@ -3,7 +3,7 @@ import './media/sidebysideeditor.css.js';
 import { localize } from '../../../../nls.js';
 import { Dimension, $, multibyteAwareBtoa, clearNode } from '../../../../base/browser/dom.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
-import { SIDE_BY_SIDE_EDITOR_ID, SideBySideEditor as SideBySideEditor$1, EditorExtensions, isEditorPaneWithSelection, EditorPaneSelectionCompareResult } from '../../../common/editor.js';
+import { SIDE_BY_SIDE_EDITOR_ID, SideBySideEditor as SideBySideEditor$1, EditorExtensions, isEditorPaneWithSelection } from '../../../common/editor.js';
 import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -22,7 +22,6 @@ import { ITextResourceConfigurationService } from '../../../../editor/common/ser
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { isEqual } from '../../../../base/common/resources.js';
 import { URI } from '../../../../base/common/uri.js';
-import { Orientation } from '../../../../base/browser/ui/sash/sash.js';
 var SideBySideEditor_1;
 function isSideBySideEditorViewState(thing) {
     const candidate = thing;
@@ -61,7 +60,7 @@ let SideBySideEditor = class SideBySideEditor extends AbstractEditorWithViewStat
         this.secondaryEditorPane = undefined;
         this.splitviewDisposables = this._register(( (new DisposableStore())));
         this.editorDisposables = this._register(( (new DisposableStore())));
-        this.orientation = this.configurationService.getValue(SideBySideEditor_1.SIDE_BY_SIDE_LAYOUT_SETTING) === 'vertical' ? Orientation.VERTICAL : Orientation.HORIZONTAL;
+        this.orientation = this.configurationService.getValue(SideBySideEditor_1.SIDE_BY_SIDE_LAYOUT_SETTING) === 'vertical' ? 0  : 1 ;
         this.dimension = ( (new Dimension(0, 0)));
         this.lastFocusedSide = undefined;
         this.registerListeners();
@@ -71,7 +70,7 @@ let SideBySideEditor = class SideBySideEditor extends AbstractEditorWithViewStat
     }
     onConfigurationUpdated(event) {
         if (event.affectsConfiguration(SideBySideEditor_1.SIDE_BY_SIDE_LAYOUT_SETTING)) {
-            this.orientation = this.configurationService.getValue(SideBySideEditor_1.SIDE_BY_SIDE_LAYOUT_SETTING) === 'vertical' ? Orientation.VERTICAL : Orientation.HORIZONTAL;
+            this.orientation = this.configurationService.getValue(SideBySideEditor_1.SIDE_BY_SIDE_LAYOUT_SETTING) === 'vertical' ? 0  : 1 ;
             if (this.splitview) {
                 this.recreateSplitview();
             }
@@ -93,7 +92,7 @@ let SideBySideEditor = class SideBySideEditor extends AbstractEditorWithViewStat
             const leftViewSize = this.splitview.getViewSize(0);
             const rightViewSize = this.splitview.getViewSize(1);
             if (Math.abs(leftViewSize - rightViewSize) > 1) {
-                const totalSize = this.splitview.orientation === Orientation.HORIZONTAL ? this.dimension.width : this.dimension.height;
+                const totalSize = this.splitview.orientation === 1  ? this.dimension.width : this.dimension.height;
                 ratio = leftViewSize / totalSize;
             }
         }
@@ -108,7 +107,7 @@ let SideBySideEditor = class SideBySideEditor extends AbstractEditorWithViewStat
     createSplitView(parent, ratio) {
         this.splitview = this.splitviewDisposables.add(( (new SplitView(parent, { orientation: this.orientation }))));
         this.splitviewDisposables.add(this.splitview.onDidSashReset(() => this.splitview?.distributeViewSizes()));
-        if (this.orientation === Orientation.HORIZONTAL) {
+        if (this.orientation === 1 ) {
             this.splitview.orthogonalEndSash = this._boundarySashes?.bottom;
         }
         else {
@@ -118,16 +117,16 @@ let SideBySideEditor = class SideBySideEditor extends AbstractEditorWithViewStat
         let leftSizing = Sizing.Distribute;
         let rightSizing = Sizing.Distribute;
         if (ratio) {
-            const totalSize = this.splitview.orientation === Orientation.HORIZONTAL ? this.dimension.width : this.dimension.height;
+            const totalSize = this.splitview.orientation === 1  ? this.dimension.width : this.dimension.height;
             leftSizing = Math.round(totalSize * ratio);
             rightSizing = totalSize - leftSizing;
-            this.splitview.layout(this.orientation === Orientation.HORIZONTAL ? this.dimension.width : this.dimension.height);
+            this.splitview.layout(this.orientation === 1  ? this.dimension.width : this.dimension.height);
         }
         const secondaryEditorContainer = assertIsDefined(this.secondaryEditorContainer);
         this.splitview.addView({
             element: secondaryEditorContainer,
             layout: size => this.layoutPane(this.secondaryEditorPane, size),
-            minimumSize: this.orientation === Orientation.HORIZONTAL ? DEFAULT_EDITOR_MIN_DIMENSIONS.width : DEFAULT_EDITOR_MIN_DIMENSIONS.height,
+            minimumSize: this.orientation === 1  ? DEFAULT_EDITOR_MIN_DIMENSIONS.width : DEFAULT_EDITOR_MIN_DIMENSIONS.height,
             maximumSize: Number.POSITIVE_INFINITY,
             onDidChange: Event.None
         }, leftSizing);
@@ -135,7 +134,7 @@ let SideBySideEditor = class SideBySideEditor extends AbstractEditorWithViewStat
         this.splitview.addView({
             element: primaryEditorContainer,
             layout: size => this.layoutPane(this.primaryEditorPane, size),
-            minimumSize: this.orientation === Orientation.HORIZONTAL ? DEFAULT_EDITOR_MIN_DIMENSIONS.width : DEFAULT_EDITOR_MIN_DIMENSIONS.height,
+            minimumSize: this.orientation === 1  ? DEFAULT_EDITOR_MIN_DIMENSIONS.width : DEFAULT_EDITOR_MIN_DIMENSIONS.height,
             maximumSize: Number.POSITIVE_INFINITY,
             onDidChange: Event.None
         }, rightSizing);
@@ -145,7 +144,7 @@ let SideBySideEditor = class SideBySideEditor extends AbstractEditorWithViewStat
         if (this.input) {
             return this.input.getName();
         }
-        return ( localize(8726, "Side by Side Editor"));
+        return ( localize(8792, "Side by Side Editor"));
     }
     async setInput(input, options, context, token) {
         const oldInput = this.input;
@@ -159,7 +158,7 @@ let SideBySideEditor = class SideBySideEditor extends AbstractEditorWithViewStat
         const { primary, secondary, viewState } = this.loadViewState(input, options, context);
         this.lastFocusedSide = viewState?.focus;
         if (typeof viewState?.ratio === 'number' && this.splitview) {
-            const totalSize = this.splitview.orientation === Orientation.HORIZONTAL ? this.dimension.width : this.dimension.height;
+            const totalSize = this.splitview.orientation === 1  ? this.dimension.width : this.dimension.height;
             this.splitview.resizeView(0, Math.round(totalSize * viewState.ratio));
         }
         else {
@@ -267,7 +266,7 @@ let SideBySideEditor = class SideBySideEditor extends AbstractEditorWithViewStat
     layout(dimension) {
         this.dimension = dimension;
         const splitview = assertIsDefined(this.splitview);
-        splitview.layout(this.orientation === Orientation.HORIZONTAL ? dimension.width : dimension.height);
+        splitview.layout(this.orientation === 1  ? dimension.width : dimension.height);
     }
     setBoundarySashes(sashes) {
         this._boundarySashes = sashes;
@@ -276,7 +275,7 @@ let SideBySideEditor = class SideBySideEditor extends AbstractEditorWithViewStat
         }
     }
     layoutPane(pane, size) {
-        pane?.layout(this.orientation === Orientation.HORIZONTAL ? ( (new Dimension(size, this.dimension.height))) : ( (new Dimension(this.dimension.width, size))));
+        pane?.layout(this.orientation === 1  ? ( (new Dimension(size, this.dimension.height))) : ( (new Dimension(this.dimension.width, size))));
     }
     getControl() {
         return this.getLastFocusedEditorPane()?.getControl();
@@ -325,7 +324,7 @@ let SideBySideEditor = class SideBySideEditor extends AbstractEditorWithViewStat
     updateStyles() {
         super.updateStyles();
         if (this.primaryEditorContainer) {
-            if (this.orientation === Orientation.HORIZONTAL) {
+            if (this.orientation === 1 ) {
                 this.primaryEditorContainer.style.borderLeftWidth = '1px';
                 this.primaryEditorContainer.style.borderLeftStyle = 'solid';
                 this.primaryEditorContainer.style.borderLeftColor = this.getColor(SIDE_BY_SIDE_EDITOR_VERTICAL_BORDER) ?? '';
@@ -373,10 +372,10 @@ class SideBySideAwareEditorPaneSelection {
     }
     compare(other) {
         if (!(other instanceof SideBySideAwareEditorPaneSelection)) {
-            return EditorPaneSelectionCompareResult.DIFFERENT;
+            return 3 ;
         }
         if (this.side !== other.side) {
-            return EditorPaneSelectionCompareResult.DIFFERENT;
+            return 3 ;
         }
         return this.selection.compare(other.selection);
     }

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

@@ -1,5 +1,5 @@
 import './media/singleeditortabscontrol.css.js';
-import { preventEditorClose, EditorCloseMethod, EditorResourceAccessor, SideBySideEditor, Verbosity } from '../../../common/editor.js';
+import { preventEditorClose, EditorCloseMethod, EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
 import { EditorTabsControl } from './editorTabsControl.js';
 import { ResourceLabel } from '../../labels.js';
 import { TAB_ACTIVE_FOREGROUND, TAB_UNFOCUSED_ACTIVE_FOREGROUND } from '../../../common/theme.js';
@@ -227,9 +227,9 @@ class SingleEditorTabsControl extends EditorTabsControl {
     }
     getVerbosity(style) {
         switch (style) {
-            case 'short': return Verbosity.SHORT;
-            case 'long': return Verbosity.LONG;
-            default: return Verbosity.MEDIUM;
+            case 'short': return 0 ;
+            case 'long': return 2 ;
+            default: return 1 ;
         }
     }
     prepareEditorActions(editorActions) {

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

@@ -4,7 +4,6 @@ import { applyTextEditorOptions } from '../../../common/editor/editorOptions.js'
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { isEqual } from '../../../../base/common/resources.js';
 import { CodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
-import { ScrollType } from '../../../../editor/common/editorCommon.js';
 import '../../../../../../../override/vs/workbench/browser/parts/editor/textEditor.js';
 import { AbstractTextEditor } from './textEditor.js';
 class AbstractTextCodeEditor extends AbstractTextEditor {
@@ -19,7 +18,7 @@ class AbstractTextCodeEditor extends AbstractTextEditor {
         if (this.input) {
             return this.input.getName();
         }
-        return ( localize(10847, "Text Editor"));
+        return ( localize(10937, "Text Editor"));
     }
     createEditorControl(parent, initialOptions) {
         this.editorControl = this._register(this.instantiationService.createInstance(CodeEditorWidget, parent, initialOptions, this.getCodeEditorWidgetOptions()));
@@ -56,7 +55,7 @@ class AbstractTextCodeEditor extends AbstractTextEditor {
     setOptions(options) {
         super.setOptions(options);
         if (options) {
-            applyTextEditorOptions(options, assertIsDefined(this.editorControl), ScrollType.Smooth);
+            applyTextEditorOptions(options, assertIsDefined(this.editorControl), 0 );
         }
     }
     focus() {

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

@@ -12,8 +12,6 @@ import { IStorageService } from '../../../../platform/storage/common/storage.ser
 import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
-import { TextFileOperationResult } from '../../../services/textfile/common/textfiles.js';
-import { ScrollType } from '../../../../editor/common/editorCommon.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.service.js';
@@ -22,7 +20,7 @@ import { EditorActivation } from '../../../../platform/editor/common/editor.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { isEqual } from '../../../../base/common/resources.js';
 import { multibyteAwareBtoa } from '../../../../base/browser/dom.js';
-import { FileOperationResult, TooLargeFileOperationError, ByteSize } from '../../../../platform/files/common/files.js';
+import { TooLargeFileOperationError, ByteSize } from '../../../../platform/files/common/files.js';
 import { IFileService } from '../../../../platform/files/common/files.service.js';
 import { IPreferencesService } from '../../../services/preferences/common/preferences.service.js';
 import { StopWatch } from '../../../../base/common/stopwatch.js';
@@ -51,7 +49,7 @@ let TextDiffEditor = class TextDiffEditor extends AbstractTextEditor {
         if (this.input) {
             return this.input.getName();
         }
-        return ( localize(9562, "Text Diff Editor"));
+        return ( localize(9644, "Text Diff Editor"));
     }
     createEditorControl(parent, configuration) {
         this.diffEditorControl = this._register(this.instantiationService.createInstance(DiffEditorWidget, parent, configuration, {}));
@@ -90,7 +88,7 @@ let TextDiffEditor = class TextDiffEditor extends AbstractTextEditor {
             }
             let optionsGotApplied = false;
             if (options) {
-                optionsGotApplied = applyTextEditorOptions(options, control, ScrollType.Immediate);
+                optionsGotApplied = applyTextEditorOptions(options, control, 1 );
             }
             if (!optionsGotApplied && !hasPreviousViewState) {
                 control.revealFirstDiff();
@@ -110,18 +108,18 @@ let TextDiffEditor = class TextDiffEditor extends AbstractTextEditor {
         if (this.isFileBinaryError(error)) {
             return this.openAsBinary(input, options);
         }
-        if (error.fileOperationResult === FileOperationResult.FILE_TOO_LARGE) {
+        if (error.fileOperationResult === 7 ) {
             let message;
             if (error instanceof TooLargeFileOperationError) {
                 message = ( localize(
-                    9563,
+                    9645,
                     "At least one file is not displayed in the text compare editor because it is very large ({0}).",
                     ByteSize.formatSize(error.size)
                 ));
             }
             else {
                 message = ( localize(
-                    9564,
+                    9646,
                     "At least one file is not displayed in the text compare editor because it is very large."
                 ));
             }
@@ -168,7 +166,7 @@ let TextDiffEditor = class TextDiffEditor extends AbstractTextEditor {
     setOptions(options) {
         super.setOptions(options);
         if (options) {
-            applyTextEditorOptions(options, assertIsDefined(this.diffEditorControl), ScrollType.Smooth);
+            applyTextEditorOptions(options, assertIsDefined(this.diffEditorControl), 0 );
         }
     }
     shouldHandleConfigurationChangeEvent(e, resource) {
@@ -217,7 +215,7 @@ let TextDiffEditor = class TextDiffEditor extends AbstractTextEditor {
                  (errors.some(error => this.isFileBinaryError(error)))
             );
         }
-        return error.textFileOperationResult === TextFileOperationResult.FILE_IS_BINARY;
+        return error.textFileOperationResult === 0 ;
     }
     clearInput() {
         if (this._previousViewModel) {