@codingame/monaco-vscode-api 9.0.2 → 10.0.0

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

@@ -1,7 +1,7 @@
 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, GroupModelChangeKind, SideBySideEditor, EditorResourceAccessor, EditorsOrder, EditorInputCapabilities, EditorCloseContext, CloseDirection, TEXT_DIFF_EDITOR_ID, SaveReason } from '../../../common/editor.js';
+import { DEFAULT_EDITOR_ASSOCIATION, SideBySideEditor, EditorResourceAccessor, EditorCloseContext, TEXT_DIFF_EDITOR_ID } from '../../../common/editor.js';
 import { ResourceContextKey, ActiveEditorDirtyContext, ActiveEditorPinnedContext, ActiveEditorFirstInGroupContext, ActiveEditorLastInGroupContext, ActiveEditorStickyContext, EditorGroupEditorsCountContext, ActiveEditorGroupLockedContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, SelectedEditorsInGroupFileOrUntitledResourceContextKey, 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';
@@ -24,12 +24,11 @@ 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';
 import { localize } from '../../../../nls.js';
-import { coalesce, firstOrDefault } from '../../../../base/common/arrays.js';
+import { coalesce } from '../../../../base/common/arrays.js';
 import { MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 import { RunOnceWorker, DeferredPromise, Promises } from '../../../../base/common/async.js';
@@ -48,9 +47,7 @@ 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';
@@ -64,7 +61,6 @@ 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;
 let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable {
@@ -199,7 +195,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
                 this.resourceContext.set(EditorResourceAccessor.getOriginalUri(activeEditor, { supportSideBySide: SideBySideEditor.PRIMARY }));
                 applyAvailableEditorIds(groupActiveEditorAvailableEditorIds, activeEditor, this.editorResolverService);
                 if (activeEditor) {
-                    groupActiveEditorCanSplitInGroupContext.set(activeEditor.hasCapability(EditorInputCapabilities.CanSplitInGroup));
+                    groupActiveEditorCanSplitInGroupContext.set(activeEditor.hasCapability(32 ));
                     groupActiveEditorIsSideBySideEditorContext.set(activeEditor.typeId === SideBySideEditorInput.ID);
                     groupActiveEditorDirtyContext.set(activeEditor.isDirty() && !activeEditor.isSaving());
                     activeEditorListener.value = activeEditor.onDidChangeDirty(() => {
@@ -213,12 +209,12 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
                 }
                 if (activeEditorPane) {
                     groupActiveEditorContext.set(activeEditorPane.getId());
-                    groupActiveEditorCanRevert.set(!activeEditorPane.input.hasCapability(EditorInputCapabilities.Untitled));
+                    groupActiveEditorCanRevert.set(!activeEditorPane.input.hasCapability(4 ));
                     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));
+                    groupActiveEditorCanToggleReadonly.set(!!primaryEditorResource && this.fileService.hasProvider(primaryEditorResource) && !this.fileService.hasCapability(primaryEditorResource, 2048 ));
                     const activePaneDiffEditor = activeEditorPane?.getId() === TEXT_DIFF_EDITOR_ID;
                     groupTextCompareEditorActiveContext.set(activePaneDiffEditor);
                     groupTextCompareEditorVisibleContext.set(activePaneDiffEditor);
@@ -234,34 +230,34 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         };
         const updateGroupContextKeys = (e) => {
             switch (e.kind) {
-                case GroupModelChangeKind.GROUP_LOCKED:
+                case 3 :
                     groupLockedContext.set(this.isLocked);
                     break;
-                case GroupModelChangeKind.EDITOR_ACTIVE:
+                case 8 :
                     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 GroupModelChangeKind.EDITOR_CLOSE:
+                case 6 :
                     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:
+                case 5 :
+                case 7 :
                     groupActiveEditorFirstContext.set(this.model.isFirst(this.model.activeEditor));
                     groupActiveEditorLastContext.set(this.model.isLast(this.model.activeEditor));
                     break;
-                case GroupModelChangeKind.EDITOR_PIN:
+                case 11 :
                     if (e.editor && e.editor === this.model.activeEditor) {
                         groupActiveEditorPinnedContext.set(this.model.isPinned(this.model.activeEditor));
                     }
                     break;
-                case GroupModelChangeKind.EDITOR_STICKY:
+                case 13 :
                     if (e.editor && e.editor === this.model.activeEditor) {
                         groupActiveEditorStickyContext.set(this.model.isSticky(this.model.activeEditor));
                     }
                     break;
-                case GroupModelChangeKind.EDITORS_SELECTION:
+                case 4 :
                     multipleEditorsSelectedContext.set(this.model.selectedEditors.length > 1);
                     twoEditorsSelectedContext.set(this.model.selectedEditors.length === 2);
                     selectedEditorsHaveFileOrUntitledResourceContext.set(this.model.selectedEditors.every(e => e.resource && (this.fileService.hasProvider(e.resource) || e.resource.scheme === Schemas.untitled)));
@@ -272,8 +268,8 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         this._register(this.onDidModelChange(e => updateGroupContextKeys(e)));
         this._register(this.onDidActiveEditorChange(() => observeActiveEditor()));
         observeActiveEditor();
-        updateGroupContextKeys({ kind: GroupModelChangeKind.EDITOR_ACTIVE });
-        updateGroupContextKeys({ kind: GroupModelChangeKind.GROUP_LOCKED });
+        updateGroupContextKeys({ kind: 8  });
+        updateGroupContextKeys({ kind: 3  });
     }
     registerContainerListeners() {
         this._register(addDisposableListener(this.element, EventType.DBLCLICK, e => {
@@ -300,7 +296,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         toolbarContainer.classList.add('editor-group-container-toolbar');
         this.element.appendChild(toolbarContainer);
         const containerToolbar = this._register(( (new ActionBar(toolbarContainer, {
-            ariaLabel: ( localize(10062, "Empty editor group actions")),
+            ariaLabel: ( localize(10179, "Empty editor group actions")),
             highlightToggledItems: true
         }))));
         const containerToolbarMenu = this._register(this.menuService.createMenu(MenuId.EmptyEditorGroup, this.scopedContextKeyService));
@@ -373,7 +369,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         if (this.isEmpty) {
             this.element.classList.add('empty');
             this.element.tabIndex = 0;
-            this.element.setAttribute('aria-label', ( localize(10063, "{0} (empty)", this.ariaLabel)));
+            this.element.setAttribute('aria-label', ( localize(10180, "{0} (empty)", this.ariaLabel)));
         }
         else {
             this.element.classList.remove('empty');
@@ -426,10 +422,10 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
     onDidGroupModelChange(e) {
         this._onDidModelChange.fire(e);
         switch (e.kind) {
-            case GroupModelChangeKind.GROUP_LOCKED:
+            case 3 :
                 this.element.classList.toggle('locked', this.isLocked);
                 break;
-            case GroupModelChangeKind.EDITORS_SELECTION:
+            case 4 :
                 this.onDidChangeEditorSelection();
                 break;
         }
@@ -437,26 +433,26 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
             return;
         }
         switch (e.kind) {
-            case GroupModelChangeKind.EDITOR_OPEN:
+            case 5 :
                 if (isGroupEditorOpenEvent(e)) {
                     this.onDidOpenEditor(e.editor, e.editorIndex);
                 }
                 break;
-            case GroupModelChangeKind.EDITOR_CLOSE:
+            case 6 :
                 if (isGroupEditorCloseEvent(e)) {
                     this.handleOnDidCloseEditor(e.editor, e.editorIndex, e.context, e.sticky);
                 }
                 break;
-            case GroupModelChangeKind.EDITOR_WILL_DISPOSE:
+            case 15 :
                 this.onWillDisposeEditor(e.editor);
                 break;
-            case GroupModelChangeKind.EDITOR_DIRTY:
+            case 14 :
                 this.onDidChangeEditorDirty(e.editor);
                 break;
-            case GroupModelChangeKind.EDITOR_TRANSIENT:
+            case 12 :
                 this.onDidChangeEditorTransient(e.editor);
                 break;
-            case GroupModelChangeKind.EDITOR_LABEL:
+            case 9 :
                 this.onDidChangeEditorLabel(e.editor);
                 break;
         }
@@ -564,7 +560,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
             (event.oldPartOptions.showTabs === 'multiple' && event.oldPartOptions.pinnedTabsOnSeparateRow !== event.newPartOptions.pinnedTabsOnSeparateRow)) {
             this.relayout();
             if (this.model.activeEditor) {
-                this.titleControl.openEditors(this.model.getEditors(EditorsOrder.SEQUENTIAL));
+                this.titleControl.openEditors(this.model.getEditors(1 ));
             }
         }
         this.updateStyles();
@@ -603,15 +599,15 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
     }
     get label() {
         if (this.groupsLabel) {
-            return ( localize(10064, "{0}: Group {1}", this.groupsLabel, this._index + 1));
+            return ( localize(10181, "{0}: Group {1}", this.groupsLabel, this._index + 1));
         }
-        return ( localize(10065, "Group {0}", this._index + 1));
+        return ( localize(10182, "Group {0}", this._index + 1));
     }
     get ariaLabel() {
         if (this.groupsLabel) {
-            return ( localize(10066, "{0}: Editor Group {1}", this.groupsLabel, this._index + 1));
+            return ( localize(10183, "{0}: Editor Group {1}", this.groupsLabel, this._index + 1));
         }
-        return ( localize(10067, "Editor Group {0}", this._index + 1));
+        return ( localize(10184, "Editor Group {0}", this._index + 1));
     }
     get disposed() {
         return this._disposed;
@@ -652,7 +648,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         return this.groupsView.windowId;
     }
     get editors() {
-        return this.model.getEditors(EditorsOrder.SEQUENTIAL);
+        return this.model.getEditors(1 );
     }
     get count() {
         return this.model.count;
@@ -703,7 +699,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
     }
     findEditors(resource, options) {
         const canonicalResource = this.uriIdentityService.asCanonicalUri(resource);
-        return this.getEditors(EditorsOrder.SEQUENTIAL).filter(editor => {
+        return this.getEditors(1 ).filter(editor => {
             if (editor.resource && isEqual(editor.resource, canonicalResource)) {
                 return true;
             }
@@ -792,7 +788,7 @@ 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(EditorInputCapabilities.Scratchpad);
+            || editor.hasCapability(512 );
         const openEditorOptions = {
             index: options ? options.index : undefined,
             pinned,
@@ -875,7 +871,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
     }
     async openEditors(editors) {
         const editorsToOpen = coalesce(editors).filter(({ editor }) => !editor.isDisposed());
-        const firstEditor = firstOrDefault(editorsToOpen);
+        const firstEditor = editorsToOpen.at(0);
         if (!firstEditor) {
             return;
         }
@@ -951,10 +947,10 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
     }
     doMoveOrCopyEditorAcrossGroups(editor, target, openOptions, internalOptions) {
         const keepCopy = internalOptions?.keepCopy;
-        if (!keepCopy || editor.hasCapability(EditorInputCapabilities.Singleton) ) {
+        if (!keepCopy || editor.hasCapability(8 ) ) {
             const canMoveVeto = editor.canMove(this.id, target.id);
             if (typeof canMoveVeto === 'string') {
-                this.dialogService.error(canMoveVeto, ( localize(10068, "Try saving or reverting the editor first and then try again.")));
+                this.dialogService.error(canMoveVeto, ( localize(10185, "Try saving or reverting the editor first and then try again.")));
                 return false;
             }
         }
@@ -1029,7 +1025,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(GroupsOrder.MOST_RECENTLY_ACTIVE);
+            const mostRecentlyActiveGroups = this.groupsView.getGroups(1 );
             const nextActiveGroup = mostRecentlyActiveGroups[1];
             if (nextActiveGroup) {
                 if (restoreFocus) {
@@ -1126,19 +1122,19 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         })))) {
             return false;
         }
-        let confirmation = ConfirmResult.CANCEL;
-        let saveReason = SaveReason.EXPLICIT;
+        let confirmation = 2 ;
+        let saveReason = 1 ;
         let autoSave = false;
-        if (!editor.hasCapability(EditorInputCapabilities.Untitled) && !options?.skipAutoSave && !editor.closeHandler) {
-            if (this.filesConfigurationService.getAutoSaveMode(editor).mode === AutoSaveMode.ON_FOCUS_CHANGE) {
+        if (!editor.hasCapability(4 ) && !options?.skipAutoSave && !editor.closeHandler) {
+            if (this.filesConfigurationService.getAutoSaveMode(editor).mode === 3 ) {
                 autoSave = true;
-                confirmation = ConfirmResult.SAVE;
-                saveReason = SaveReason.FOCUS_CHANGE;
+                confirmation = 0 ;
+                saveReason = 3 ;
             }
-            else if ((isNative && (isWindows || isLinux)) && this.filesConfigurationService.getAutoSaveMode(editor).mode === AutoSaveMode.ON_WINDOW_CHANGE) {
+            else if ((isNative && (isWindows || isLinux)) && this.filesConfigurationService.getAutoSaveMode(editor).mode === 4 ) {
                 autoSave = true;
-                confirmation = ConfirmResult.SAVE;
-                saveReason = SaveReason.WINDOW_CHANGE;
+                confirmation = 0 ;
+                saveReason = 4 ;
             }
         }
         if (!autoSave) {
@@ -1161,17 +1157,17 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
             }
         }
         if (!editor.closeHandler && !this.shouldConfirmClose(editor)) {
-            return confirmation === ConfirmResult.CANCEL ? true : false;
+            return confirmation === 2  ? true : false;
         }
         switch (confirmation) {
-            case ConfirmResult.SAVE: {
+            case 0 : {
                 const result = await editor.save(this.id, { reason: saveReason });
                 if (!result && autoSave) {
                     return this.doHandleCloseConfirmation(editor, { skipAutoSave: true });
                 }
                 return editor.isDirty();
             }
-            case ConfirmResult.DONT_SAVE:
+            case 1 :
                 try {
                     await editor.revert(this.id);
                     return editor.isDirty();
@@ -1181,7 +1177,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
                     await editor.revert(this.id, { soft: true });
                     return editor.isDirty();
                 }
-            case ConfirmResult.CANCEL:
+            case 2 :
                 return true;
         }
     }
@@ -1209,12 +1205,12 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         }
         const filter = args;
         const hasDirection = typeof filter.direction === 'number';
-        let editorsToClose = this.model.getEditors(hasDirection ? EditorsOrder.SEQUENTIAL : EditorsOrder.MOST_RECENTLY_ACTIVE, filter);
+        let editorsToClose = this.model.getEditors(hasDirection ? 1  : 0 , filter);
         if (filter.savedOnly) {
             editorsToClose = editorsToClose.filter(editor => !editor.isDirty() || editor.isSaving());
         }
         else if (hasDirection && filter.except) {
-            editorsToClose = (filter.direction === CloseDirection.LEFT) ?
+            editorsToClose = ((filter.direction === 0) ) ?
                 editorsToClose.slice(0, this.model.indexOf(filter.except, editorsToClose)) :
                 editorsToClose.slice(this.model.indexOf(filter.except, editorsToClose) + 1);
         }
@@ -1247,7 +1243,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
             }
             return true;
         }
-        let editors = this.model.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE, options);
+        let editors = this.model.getEditors(0 , options);
         if (options?.excludeConfirming) {
             editors = editors.filter(editor => !this.shouldConfirmClose(editor));
         }
@@ -1259,7 +1255,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         return true;
     }
     doCloseAllEditors(options) {
-        let editors = this.model.getEditors(EditorsOrder.SEQUENTIAL, options);
+        let editors = this.model.getEditors(1 , options);
         if (options?.excludeConfirming) {
             editors = editors.filter(editor => !this.shouldConfirmClose(editor));
         }

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

@@ -3,7 +3,6 @@ import { localize } 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';
@@ -23,19 +22,19 @@ import '../../../../platform/theme/common/colors/minimapColors.js';
 import '../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
-registerColor('editorWatermark.foreground', { dark: ( (transparent(editorForeground, 0.6))), light: ( (transparent(editorForeground, 0.68))), hcDark: editorForeground, hcLight: editorForeground }, ( localize(11304, 'Foreground color for the labels in the editor watermark.')));
-const showCommands = { text: ( localize(11305, "Show All Commands")), id: 'workbench.action.showCommands' };
-const quickAccess = { text: ( localize(11306, "Go to File")), id: 'workbench.action.quickOpen' };
-const openFileNonMacOnly = { text: ( localize(11307, "Open File")), id: 'workbench.action.files.openFile', mac: false };
-const openFolderNonMacOnly = { text: ( localize(11308, "Open Folder")), id: 'workbench.action.files.openFolder', mac: false };
-const openFileOrFolderMacOnly = { text: ( localize(11309, "Open File or Folder")), id: 'workbench.action.files.openFileFolder', mac: true };
-const openRecent = { text: ( localize(11310, "Open Recent")), id: 'workbench.action.openRecent' };
-const newUntitledFileMacOnly = { text: ( localize(11311, "New Untitled Text File")), id: 'workbench.action.files.newUntitledFile', mac: true };
-const findInFiles = { text: ( localize(11312, "Find in Files")), id: 'workbench.action.findInFiles' };
-const toggleTerminal = { text: ( localize(11313, "Toggle Terminal")), id: 'workbench.action.terminal.toggleTerminal', when: ( (ContextKeyExpr.equals('terminalProcessSupported', true))) };
-const startDebugging = { text: ( localize(11314, "Start Debugging")), id: 'workbench.action.debug.start', when: ( (ContextKeyExpr.equals('terminalProcessSupported', true))) };
-const toggleFullscreen = { text: ( localize(11315, "Toggle Full Screen")), id: 'workbench.action.toggleFullScreen' };
-const showSettings = { text: ( localize(11316, "Show Settings")), id: 'workbench.action.openSettings' };
+registerColor('editorWatermark.foreground', { dark: ( (transparent(editorForeground, 0.6))), light: ( (transparent(editorForeground, 0.68))), hcDark: editorForeground, hcLight: editorForeground }, ( localize(11422, 'Foreground color for the labels in the editor watermark.')));
+const showCommands = { text: ( localize(11423, "Show All Commands")), id: 'workbench.action.showCommands' };
+const quickAccess = { text: ( localize(11424, "Go to File")), id: 'workbench.action.quickOpen' };
+const openFileNonMacOnly = { text: ( localize(11425, "Open File")), id: 'workbench.action.files.openFile', mac: false };
+const openFolderNonMacOnly = { text: ( localize(11426, "Open Folder")), id: 'workbench.action.files.openFolder', mac: false };
+const openFileOrFolderMacOnly = { text: ( localize(11427, "Open File or Folder")), id: 'workbench.action.files.openFileFolder', mac: true };
+const openRecent = { text: ( localize(11428, "Open Recent")), id: 'workbench.action.openRecent' };
+const newUntitledFileMacOnly = { text: ( localize(11429, "New Untitled Text File")), id: 'workbench.action.files.newUntitledFile', mac: true };
+const findInFiles = { text: ( localize(11430, "Find in Files")), id: 'workbench.action.findInFiles' };
+const toggleTerminal = { text: ( localize(11431, "Toggle Terminal")), id: 'workbench.action.terminal.toggleTerminal', when: ( (ContextKeyExpr.equals('terminalProcessSupported', true))) };
+const startDebugging = { text: ( localize(11432, "Start Debugging")), id: 'workbench.action.debug.start', when: ( (ContextKeyExpr.equals('terminalProcessSupported', true))) };
+const toggleFullscreen = { text: ( localize(11433, "Toggle Full Screen")), id: 'workbench.action.toggleFullScreen' };
+const showSettings = { text: ( localize(11434, "Show Settings")), id: 'workbench.action.openSettings' };
 const noFolderEntries = [
     showCommands,
     openFileNonMacOnly,
@@ -106,7 +105,7 @@ let EditorGroupWatermark = class EditorGroupWatermark extends Disposable {
             return;
         }
         const box = append(this.shortcuts, $('.watermark-box'));
-        const folder = this.workbenchState !== WorkbenchState.EMPTY;
+        const folder = this.workbenchState !== 1 ;
         const selected = (folder ? folderEntries : noFolderEntries)
             .filter(entry => !('when' in entry) || this.contextKeyService.contextMatchesRules(entry.when))
             .filter(entry => !('mac' in entry) || entry.mac === (isMacintosh && !isWeb))

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

@@ -1,7 +1,6 @@
 import { Composite } from '../../composite.js';
 import { isEditorInput } from '../../../common/editor.js';
-import { StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
-import { Touch, LRUCache } from '../../../../base/common/map.js';
+import { 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';
@@ -57,7 +56,7 @@ class EditorPane extends Composite {
             editorMemento = this._register(( new EditorMemento(
                 this.getId(),
                 key,
-                this.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE),
+                this.getMemento(1 , 1 ),
                 limit,
                 editorGroupService,
                 configurationService
@@ -191,7 +190,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, Touch.None);
+            const value = cache.get(cacheKey, 0 );
             if (value) {
                 cache.delete(cacheKey);
                 cache.set(( targetResource.toString()), value);

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

@@ -3,8 +3,8 @@ import { localize } 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, EditorInputCapabilities, isEditorOpenError } from '../../../common/editor.js';
-import { getActiveElement, getWindowById, isAncestor, show, Dimension, hide } from '../../../../base/browser/dom.js';
+import { EditorExtensions, isEditorOpenError } from '../../../common/editor.js';
+import { getActiveElement, getWindowById, isEditableElement, 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';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -44,6 +44,7 @@ let EditorPanes = class EditorPanes extends Disposable {
         this.onDidChangeSizeConstraints = this._onDidChangeSizeConstraints.event;
         this._activeEditorPane = null;
         this.editorPanes = [];
+        this.mapEditorPaneToPendingSetInput = ( (new Map()));
         this.activeEditorPaneDisposables = this._register(( (new DisposableStore())));
         this.editorOperation = this._register(( (new LongRunningOperation(this.editorProgressService))));
         this.editorPanesRegistry = ( (Registry.as(EditorExtensions.EditorPane)));
@@ -55,7 +56,7 @@ let EditorPanes = class EditorPanes extends Disposable {
     onDidChangeWorkspaceTrust() {
         const editor = this._activeEditorPane?.input;
         const options = this._activeEditorPane?.options;
-        if (editor?.hasCapability(EditorInputCapabilities.RequiresTrust)) {
+        if (editor?.hasCapability(16 )) {
             this.groupView.openEditor(editor, options);
         }
     }
@@ -102,7 +103,7 @@ let EditorPanes = class EditorPanes extends Disposable {
             }
         }
         if (!message) {
-            message = ( localize(11302, "Unable to open '{0}'", editor.getName()));
+            message = ( localize(11420, "Unable to open '{0}'", editor.getName()));
         }
         const buttons = [];
         if (errorActions && errorActions.length > 0) {
@@ -115,7 +116,7 @@ let EditorPanes = class EditorPanes extends Disposable {
         }
         else {
             buttons.push({
-                label: ( localize(11303, "&&OK")),
+                label: ( localize(11421, "&&OK")),
                 run: () => undefined
             });
         }
@@ -175,7 +176,7 @@ let EditorPanes = class EditorPanes extends Disposable {
         if (same) {
             return true;
         }
-        if (activeElement.tagName !== 'INPUT' && activeElement.tagName !== 'TEXTAREA') {
+        if (!isEditableElement(activeElement)) {
             return true;
         }
         if (isAncestor(activeElement, this.editorGroupParent)) {
@@ -184,7 +185,7 @@ let EditorPanes = class EditorPanes extends Disposable {
         return false;
     }
     getEditorPaneDescriptor(editor) {
-        if (editor.hasCapability(EditorInputCapabilities.RequiresTrust) && !this.workspaceTrustService.isWorkspaceTrusted()) {
+        if (editor.hasCapability(16 ) && !this.workspaceTrustService.isWorkspaceTrusted()) {
             return WorkspaceTrustRequiredPlaceholderEditor.DESCRIPTOR;
         }
         return assertIsDefined(this.editorPanesRegistry.getEditorPane(editor));
@@ -237,16 +238,24 @@ let EditorPanes = class EditorPanes extends Disposable {
         this._onDidChangeSizeConstraints.fire(undefined);
     }
     async doSetInput(editorPane, editor, options, context) {
-        const inputMatches = editorPane.input?.matches(editor);
+        let inputMatches = editorPane.input?.matches(editor);
         if (inputMatches && !options?.forceReload) {
-            editorPane.setOptions(options);
-            return { changed: false, cancelled: false };
+            if (( (this.mapEditorPaneToPendingSetInput.has(editorPane)))) {
+                await this.mapEditorPaneToPendingSetInput.get(editorPane);
+            }
+            inputMatches = editorPane.input?.matches(editor);
+            if (inputMatches) {
+                editorPane.setOptions(options);
+            }
+            return { changed: false, cancelled: !inputMatches };
         }
         const operation = this.editorOperation.start(this.layoutService.isRestored() ? 800 : 3200);
         let cancelled = false;
         try {
             editorPane.clearInput();
-            await editorPane.setInput(editor, options, context, operation.token);
+            const pendingSetInput = editorPane.setInput(editor, options, context, operation.token);
+            this.mapEditorPaneToPendingSetInput.set(editorPane, pendingSetInput);
+            await pendingSetInput;
             if (!operation.isCurrent()) {
                 cancelled = true;
             }
@@ -260,6 +269,9 @@ let EditorPanes = class EditorPanes extends Disposable {
             }
         }
         finally {
+            if (operation.isCurrent()) {
+                this.mapEditorPaneToPendingSetInput.delete(editorPane);
+            }
             operation.stop();
         }
         return { changed: !inputMatches, cancelled };
@@ -271,6 +283,7 @@ let EditorPanes = class EditorPanes extends Disposable {
         this.editorOperation.stop();
         this.safeRun(() => this._activeEditorPane?.clearInput());
         this.safeRun(() => this._activeEditorPane?.setVisible(false));
+        this.mapEditorPaneToPendingSetInput.delete(this._activeEditorPane);
         const editorPaneContainer = this._activeEditorPane.getContainer();
         if (editorPaneContainer) {
             editorPaneContainer.remove();