@codingame/monaco-vscode-explorer-service-override 5.3.0 → 6.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-explorer-service-override",
-  "version": "5.3.0",
+  "version": "6.0.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@5.3.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@6.0.1"
   }
 }

package/vscode/src/vs/workbench/contrib/files/browser/explorerService.js

@@ -2,7 +2,9 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import { SortOrder, LexicographicOptions } from 'vscode/vscode/vs/workbench/contrib/files/common/files';
 import { ExplorerModel, ExplorerItem } from 'vscode/vscode/vs/workbench/contrib/files/common/explorerModel';
+import { FileChangeType, FileOperation } from 'vscode/vscode/vs/platform/files/common/files';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { dirname, basename } from 'vscode/vscode/vs/base/common/resources';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
@@ -11,6 +13,7 @@ import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/commo
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { IBulkEditService } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
 import { UndoRedoSource } from 'vscode/vscode/vs/platform/undoRedo/common/undoRedo';
+import { ProgressLocation } from 'vscode/vscode/vs/platform/progress/common/progress';
 import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
@@ -50,9 +53,9 @@ let ExplorerService = class ExplorerService {
         this.onFileChangesScheduler = ( new RunOnceScheduler(async () => {
             const events = this.fileChangeEvents;
             this.fileChangeEvents = [];
-            const types = [2 ];
-            if (this.config.sortOrder === "modified" ) {
-                types.push(0 );
+            const types = [FileChangeType.DELETED];
+            if (this.config.sortOrder === SortOrder.Modified) {
+                types.push(FileChangeType.UPDATED);
             }
             let shouldRefresh = false;
             this.roots.forEach(r => {
@@ -148,12 +151,24 @@ let ExplorerService = class ExplorerService {
     }
     async applyBulkEdit(edit, options) {
         const cancellationTokenSource = ( new CancellationTokenSource());
-        const promise = this.progressService.withProgress({
-            location: options.progressLocation || 10 ,
-            title: options.progressLabel,
-            cancellable: edit.length > 1,
-            delay: 500,
-        }, async (progress) => {
+        const location = options.progressLocation ?? ProgressLocation.Window;
+        let progressOptions;
+        if (location === ProgressLocation.Window) {
+            progressOptions = {
+                location: location,
+                title: options.progressLabel,
+                cancellable: edit.length > 1,
+            };
+        }
+        else {
+            progressOptions = {
+                location: location,
+                title: options.progressLabel,
+                cancellable: edit.length > 1,
+                delay: 500,
+            };
+        }
+        const promise = this.progressService.withProgress(progressOptions, async (progress) => {
             await this.bulkEditService.apply(edit, {
                 undoRedoSource: UNDO_REDO_SOURCE,
                 label: options.undoLabel,
@@ -163,7 +178,7 @@ let ExplorerService = class ExplorerService {
                 confirmBeforeUndo: options.confirmBeforeUndo
             });
         }, () => cancellationTokenSource.cancel());
-        await this.progressService.withProgress({ location: 1 , delay: 500 }, () => promise);
+        await this.progressService.withProgress({ location: ProgressLocation.Explorer, delay: 500 }, () => promise);
         cancellationTokenSource.dispose();
     }
     hasViewFocus() {
@@ -243,7 +258,7 @@ let ExplorerService = class ExplorerService {
             await this.view.selectResource(fileStat.resource, reveal);
             return Promise.resolve(undefined);
         }
-        const options = { resolveTo: [resource], resolveMetadata: this.config.sortOrder === "modified"  };
+        const options = { resolveTo: [resource], resolveMetadata: this.config.sortOrder === SortOrder.Modified };
         const root = this.findClosestRoot(resource);
         if (!root) {
             return undefined;
@@ -277,7 +292,7 @@ let ExplorerService = class ExplorerService {
     }
     async onDidRunOperation(e) {
         const shouldDeepRefresh = this.config.fileNesting.enabled;
-        if (e.isOperation(0 ) || e.isOperation(3 )) {
+        if (e.isOperation(FileOperation.CREATE) || e.isOperation(FileOperation.COPY)) {
             const addedElement = e.target;
             const parentResource = dirname(addedElement.resource);
             const parents = this.model.findAll(parentResource);
@@ -298,7 +313,7 @@ let ExplorerService = class ExplorerService {
                 })));
             }
         }
-        else if (e.isOperation(2 )) {
+        else if (e.isOperation(FileOperation.MOVE)) {
             const oldResource = e.resource;
             const newElement = e.target;
             const oldParentResource = dirname(oldResource);
@@ -327,7 +342,7 @@ let ExplorerService = class ExplorerService {
                 }
             }
         }
-        else if (e.isOperation(1 )) {
+        else if (e.isOperation(FileOperation.DELETE)) {
             const modelElements = this.model.findAll(e.resource);
             await Promise.all(( modelElements.map(async (modelElement) => {
                 if (modelElement.parent) {
@@ -376,11 +391,11 @@ let ExplorerService = class ExplorerService {
             shouldRefresh = true;
         }
         const configuration = this.configurationService.getValue();
-        const configSortOrder = configuration?.explorer?.sortOrder || "default" ;
+        const configSortOrder = configuration?.explorer?.sortOrder || SortOrder.Default;
         if (this.config.sortOrder !== configSortOrder) {
             shouldRefresh = this.config.sortOrder !== undefined;
         }
-        const configLexicographicOptions = configuration?.explorer?.sortOrderLexicographicOptions || "default" ;
+        const configLexicographicOptions = configuration?.explorer?.sortOrderLexicographicOptions || LexicographicOptions.Default;
         if (this.config.sortOrderLexicographicOptions !== configLexicographicOptions) {
             shouldRefresh = shouldRefresh || this.config.sortOrderLexicographicOptions !== undefined;
         }

package/vscode/src/vs/workbench/contrib/files/browser/fileActions.contribution.js

@@ -2,18 +2,19 @@ import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { GlobalCompareResourcesAction, FocusFilesExplorer, ShowActiveFileInExplorer, CompareWithClipboardAction, CompareNewUntitledTextFilesAction, ToggleAutoSaveAction, OpenActiveFileInEmptyWorkspace, SetActiveEditorReadonlyInSession, SetActiveEditorWriteableInSession, ToggleActiveEditorReadonlyInSession, ResetActiveEditorReadonlyInSession, renameHandler, moveFileToTrashHandler, deleteFileHandler, cutFileHandler, copyFileHandler, pasteFileHandler, openFilePreserveFocusHandler, NEW_FILE_COMMAND_ID, NEW_FILE_LABEL, NEW_FOLDER_COMMAND_ID, NEW_FOLDER_LABEL, COPY_FILE_LABEL, PASTE_FILE_LABEL, FileCopiedContext, DOWNLOAD_COMMAND_ID, DOWNLOAD_LABEL, UPLOAD_COMMAND_ID, UPLOAD_LABEL, TRIGGER_RENAME_LABEL, MOVE_FILE_TO_TRASH_LABEL } from 'vscode/vscode/vs/workbench/contrib/files/browser/fileActions';
 import { acceptLocalChangesCommand, revertLocalChangesCommand, CONFLICT_RESOLUTION_CONTEXT } from 'vscode/vscode/vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler';
 import { registerAction2, MenuRegistry, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { KeyCode, KeyMod } from 'vscode/vscode/vs/base/common/keyCodes';
 import { openWindowCommand, newWindowCommand } from './fileCommands.js';
 import { COPY_PATH_COMMAND_ID, COPY_RELATIVE_PATH_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, SAVE_FILE_COMMAND_ID, SAVE_FILE_LABEL, SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID, SAVE_FILE_WITHOUT_FORMATTING_LABEL, SAVE_ALL_IN_GROUP_COMMAND_ID, SAVE_FILES_COMMAND_ID, REVERT_FILE_COMMAND_ID, COMPARE_WITH_SAVED_COMMAND_ID, SAVE_FILE_AS_COMMAND_ID, SAVE_FILE_AS_LABEL, NEW_UNTITLED_FILE_COMMAND_ID, NEW_UNTITLED_FILE_LABEL, OPEN_TO_SIDE_COMMAND_ID, OpenEditorsDirtyEditorContext, OpenEditorsGroupContext, OpenEditorsReadonlyEditorContext, COMPARE_RESOURCE_COMMAND_ID, ResourceSelectedForCompareContext, SELECT_FOR_COMPARE_COMMAND_ID, COMPARE_SELECTED_COMMAND_ID, OPEN_WITH_EXPLORER_COMMAND_ID, REMOVE_ROOT_FOLDER_COMMAND_ID, REMOVE_ROOT_FOLDER_LABEL, SAVE_ALL_COMMAND_ID } from 'vscode/vscode/vs/workbench/contrib/files/browser/fileConstants';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { KeybindingsRegistry } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingsRegistry, KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { FilesExplorerFocusCondition, ExplorerRootContext, ExplorerResourceNotReadonlyContext, ExplorerResourceMoveableToTrash, ExplorerResourceCut, ExplorerFolderContext, ExplorerResourceAvailableEditorIdsContext, FoldersViewVisibleContext } from 'vscode/vscode/vs/workbench/contrib/files/common/files';
 import { ADD_ROOT_FOLDER_COMMAND_ID, ADD_ROOT_FOLDER_LABEL } from 'vscode/vscode/vs/workbench/browser/actions/workspaceCommands';
 import { REOPEN_WITH_COMMAND_ID, CLOSE_EDITOR_COMMAND_ID, CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID, CLOSE_SAVED_EDITORS_COMMAND_ID, CLOSE_EDITORS_IN_GROUP_COMMAND_ID } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorCommands';
 import { AutoSaveAfterShortDelayContext } from 'vscode/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService';
 import { WorkbenchListDoubleSelection } from 'vscode/vscode/vs/platform/list/browser/listService';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
-import { ResourceContextKey, WorkspaceFolderCountContext, ActiveEditorAvailableEditorIdsContext, DirtyWorkingCopiesContext, HasWebFileSystemAccess, EnterMultiRootWorkspaceSupportContext, WorkbenchStateContext, ActiveEditorContext, SidebarFocusContext, ActiveEditorCanRevertContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
+import { ResourceContextKey, MultipleEditorsSelectedInGroupContext, WorkspaceFolderCountContext, ActiveEditorAvailableEditorIdsContext, DirtyWorkingCopiesContext, TwoEditorsSelectedInGroupContext, HasWebFileSystemAccess, EnterMultiRootWorkspaceSupportContext, WorkbenchStateContext, ActiveEditorContext, SidebarFocusContext, ActiveEditorCanRevertContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
 import { IsWebContext } from 'vscode/vscode/vs/platform/contextkey/common/contextkeys';
 import { IExplorerService } from 'vscode/vscode/vs/workbench/contrib/files/browser/files.service';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
@@ -37,95 +38,95 @@ const explorerCommandsWeightBonus = 10;
 const RENAME_ID = 'renameFile';
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: RENAME_ID,
-    weight: 200  + explorerCommandsWeightBonus,
+    weight: KeybindingWeight.WorkbenchContrib + explorerCommandsWeightBonus,
     when: ( (ContextKeyExpr.and(
         FilesExplorerFocusCondition,
          (ExplorerRootContext.toNegated()),
         ExplorerResourceNotReadonlyContext
     ))),
-    primary: 60 ,
+    primary: KeyCode.F2,
     mac: {
-        primary: 3
+        primary: KeyCode.Enter
     },
     handler: renameHandler
 });
 const MOVE_FILE_TO_TRASH_ID = 'moveFileToTrash';
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: MOVE_FILE_TO_TRASH_ID,
-    weight: 200  + explorerCommandsWeightBonus,
+    weight: KeybindingWeight.WorkbenchContrib + explorerCommandsWeightBonus,
     when: ( (ContextKeyExpr.and(
         FilesExplorerFocusCondition,
         ExplorerResourceNotReadonlyContext,
         ExplorerResourceMoveableToTrash
     ))),
-    primary: 20 ,
+    primary: KeyCode.Delete,
     mac: {
-        primary: 2048  | 1 ,
-        secondary: [20 ]
+        primary: KeyMod.CtrlCmd | KeyCode.Backspace,
+        secondary: [KeyCode.Delete]
     },
     handler: moveFileToTrashHandler
 });
 const DELETE_FILE_ID = 'deleteFile';
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: DELETE_FILE_ID,
-    weight: 200  + explorerCommandsWeightBonus,
+    weight: KeybindingWeight.WorkbenchContrib + explorerCommandsWeightBonus,
     when: ( (ContextKeyExpr.and(FilesExplorerFocusCondition, ExplorerResourceNotReadonlyContext))),
-    primary: 1024  | 20 ,
+    primary: KeyMod.Shift | KeyCode.Delete,
     mac: {
-        primary: 2048  | 512  | 1
+        primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.Backspace
     },
     handler: deleteFileHandler
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: DELETE_FILE_ID,
-    weight: 200  + explorerCommandsWeightBonus,
+    weight: KeybindingWeight.WorkbenchContrib + explorerCommandsWeightBonus,
     when: ( (ContextKeyExpr.and(
         FilesExplorerFocusCondition,
         ExplorerResourceNotReadonlyContext,
          (ExplorerResourceMoveableToTrash.toNegated())
     ))),
-    primary: 20 ,
+    primary: KeyCode.Delete,
     mac: {
-        primary: 2048  | 1
+        primary: KeyMod.CtrlCmd | KeyCode.Backspace
     },
     handler: deleteFileHandler
 });
 const CUT_FILE_ID = 'filesExplorer.cut';
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: CUT_FILE_ID,
-    weight: 200  + explorerCommandsWeightBonus,
+    weight: KeybindingWeight.WorkbenchContrib + explorerCommandsWeightBonus,
     when: ( (ContextKeyExpr.and(
         FilesExplorerFocusCondition,
          (ExplorerRootContext.toNegated()),
         ExplorerResourceNotReadonlyContext
     ))),
-    primary: 2048  | 54 ,
+    primary: KeyMod.CtrlCmd | KeyCode.KeyX,
     handler: cutFileHandler,
 });
 const COPY_FILE_ID = 'filesExplorer.copy';
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: COPY_FILE_ID,
-    weight: 200  + explorerCommandsWeightBonus,
+    weight: KeybindingWeight.WorkbenchContrib + explorerCommandsWeightBonus,
     when: ( (ContextKeyExpr.and(
         FilesExplorerFocusCondition,
          (ExplorerRootContext.toNegated())
     ))),
-    primary: 2048  | 33 ,
+    primary: KeyMod.CtrlCmd | KeyCode.KeyC,
     handler: copyFileHandler,
 });
 const PASTE_FILE_ID = 'filesExplorer.paste';
 CommandsRegistry.registerCommand(PASTE_FILE_ID, pasteFileHandler);
 KeybindingsRegistry.registerKeybindingRule({
     id: `^${PASTE_FILE_ID}`,
-    weight: 200  + explorerCommandsWeightBonus,
+    weight: KeybindingWeight.WorkbenchContrib + explorerCommandsWeightBonus,
     when: ( (ContextKeyExpr.and(FilesExplorerFocusCondition, ExplorerResourceNotReadonlyContext))),
-    primary: 2048  | 52 ,
+    primary: KeyMod.CtrlCmd | KeyCode.KeyV,
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'filesExplorer.cancelCut',
-    weight: 200  + explorerCommandsWeightBonus,
+    weight: KeybindingWeight.WorkbenchContrib + explorerCommandsWeightBonus,
     when: ( (ContextKeyExpr.and(FilesExplorerFocusCondition, ExplorerResourceCut))),
-    primary: 9 ,
+    primary: KeyCode.Escape,
     handler: async (accessor) => {
         const explorerService = accessor.get(IExplorerService);
         await explorerService.setToCopy([], true);
@@ -133,12 +134,12 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'filesExplorer.openFilePreserveFocus',
-    weight: 200  + explorerCommandsWeightBonus,
+    weight: KeybindingWeight.WorkbenchContrib + explorerCommandsWeightBonus,
     when: ( (ContextKeyExpr.and(
         FilesExplorerFocusCondition,
          (ExplorerFolderContext.toNegated())
     ))),
-    primary: 10 ,
+    primary: KeyCode.Space,
     handler: openFilePreserveFocusHandler
 });
 const copyPathCommand = {
@@ -149,15 +150,16 @@ const copyRelativePathCommand = {
     id: COPY_RELATIVE_PATH_COMMAND_ID,
     title: ( localizeWithPath(_moduleId, 1, "Copy Relative Path"))
 };
-appendEditorTitleContextMenuItem(COPY_PATH_COMMAND_ID, copyPathCommand.title, ResourceContextKey.IsFileSystemResource, '1_cutcopypaste');
-appendEditorTitleContextMenuItem(COPY_RELATIVE_PATH_COMMAND_ID, copyRelativePathCommand.title, ResourceContextKey.IsFileSystemResource, '1_cutcopypaste');
-appendEditorTitleContextMenuItem(REVEAL_IN_EXPLORER_COMMAND_ID, ( localizeWithPath(_moduleId, 2, "Reveal in Explorer View")), ResourceContextKey.IsFileSystemResource, '2_files', 1);
-function appendEditorTitleContextMenuItem(id, title, when, group, order) {
+appendEditorTitleContextMenuItem(COPY_PATH_COMMAND_ID, copyPathCommand.title, ResourceContextKey.IsFileSystemResource, '1_cutcopypaste', true);
+appendEditorTitleContextMenuItem(COPY_RELATIVE_PATH_COMMAND_ID, copyRelativePathCommand.title, ResourceContextKey.IsFileSystemResource, '1_cutcopypaste', true);
+appendEditorTitleContextMenuItem(REVEAL_IN_EXPLORER_COMMAND_ID, ( localizeWithPath(_moduleId, 2, "Reveal in Explorer View")), ResourceContextKey.IsFileSystemResource, '2_files', false, 1);
+function appendEditorTitleContextMenuItem(id, title, when, group, supportsMultiSelect, order) {
+    const precondition = supportsMultiSelect !== true ? ( (MultipleEditorsSelectedInGroupContext.negate())) : undefined;
     MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, {
-        command: { id, title },
+        command: { id, title, precondition },
         when,
         group,
-        order
+        order,
     });
 }
 appendSaveConflictEditorTitleAction('workbench.files.action.acceptLocalChanges', ( localizeWithPath(_moduleId, 3, "Use your changes and overwrite file contents")), Codicon.check, -10, acceptLocalChangesCommand);
@@ -381,6 +383,16 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
         isFileOrUntitledResourceContextKey
     )))
 });
+MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, {
+    group: '3_compare',
+    order: 30,
+    command: compareSelectedCommand,
+    when: ( (ContextKeyExpr.and(
+        ResourceContextKey.HasResource,
+        TwoEditorsSelectedInGroupContext,
+        isFileOrUntitledResourceContextKey
+    )))
+});
 MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
     group: '4_close',
     order: 10,

package/vscode/src/vs/workbench/contrib/files/browser/fileCommands.js

@@ -1,5 +1,5 @@
 import { toErrorMessage } from 'vscode/vscode/vs/base/common/errorMessage';
-import { KeyChord } from 'vscode/vscode/vs/base/common/keyCodes';
+import { KeyMod, KeyCode, KeyChord } from 'vscode/vscode/vs/base/common/keyCodes';
 import { dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { isWindows, isWeb } from 'vscode/vscode/vs/base/common/platform';
@@ -18,7 +18,7 @@ import { EditorResolution, EditorOpenSource } from 'vscode/vscode/vs/platform/ed
 import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment.service';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { KeybindingsRegistry } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingsRegistry, KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { IListService } from 'vscode/vscode/vs/platform/list/browser/listService.service';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
@@ -27,7 +27,8 @@ import { isWorkspaceToOpen } from 'vscode/vscode/vs/platform/window/common/windo
 import { UNTITLED_WORKSPACE_NAME } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { RemoveRootFolderAction } from 'vscode/vscode/vs/workbench/browser/actions/workspaceActions';
-import { EditorResourceAccessor, SideBySideEditor } from 'vscode/vscode/vs/workbench/common/editor';
+import { EditorResourceAccessor, SideBySideEditor, EditorInputCapabilities } from 'vscode/vscode/vs/workbench/common/editor';
+import { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 import { getMultiSelectedResources, getResourceForCommand, getOpenEditorsViewMultiSelection } from 'vscode/vscode/vs/workbench/contrib/files/browser/files';
 import { IExplorerService } from 'vscode/vscode/vs/workbench/contrib/files/browser/files.service';
 import { OpenEditorsView } from 'vscode/vscode/vs/workbench/contrib/files/browser/views/openEditorsView';
@@ -63,18 +64,19 @@ const newWindowCommand = (accessor, options) => {
     hostService.openWindow(options);
 };
 KeybindingsRegistry.registerCommandAndKeybindingRule({
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: ExplorerFocusCondition,
-    primary: 2048  | 3 ,
+    primary: KeyMod.CtrlCmd | KeyCode.Enter,
     mac: {
-        primary: 256  | 3
+        primary: KeyMod.WinCtrl | KeyCode.Enter
     },
     id: OPEN_TO_SIDE_COMMAND_ID, handler: async (accessor, resource) => {
         const editorService = accessor.get(IEditorService);
+        const editorGroupService = accessor.get(IEditorGroupsService);
         const listService = accessor.get(IListService);
         const fileService = accessor.get(IFileService);
         const explorerService = accessor.get(IExplorerService);
-        const resources = getMultiSelectedResources(resource, listService, editorService, explorerService);
+        const resources = getMultiSelectedResources(resource, listService, editorService, editorGroupService, explorerService);
         if (resources.length) {
             const untitledResources = resources.filter(resource => resource.scheme === Schemas.untitled);
             const fileResources = resources.filter(resource => resource.scheme !== Schemas.untitled);
@@ -97,14 +99,14 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     }
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
-    weight: 200  + 10,
+    weight: KeybindingWeight.WorkbenchContrib + 10,
     when: ( (ContextKeyExpr.and(
         FilesExplorerFocusCondition,
          (ExplorerFolderContext.toNegated())
     ))),
-    primary: 3 ,
+    primary: KeyCode.Enter,
     mac: {
-        primary: 2048  | 18
+        primary: KeyMod.CtrlCmd | KeyCode.DownArrow
     },
     id: 'explorer.openAndPassFocus', handler: async (accessor, _resource) => {
         const editorService = accessor.get(IEditorService);
@@ -122,8 +124,8 @@ let providerDisposables = [];
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: COMPARE_WITH_SAVED_COMMAND_ID,
     when: undefined,
-    weight: 200 ,
-    primary: KeyChord(2048  | 41 , 34 ),
+    weight: KeybindingWeight.WorkbenchContrib,
+    primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.KeyD),
     handler: async (accessor, resource) => {
         const instantiationService = accessor.get(IInstantiationService);
         const textModelService = accessor.get(ITextModelService);
@@ -175,8 +177,9 @@ CommandsRegistry.registerCommand({
     id: COMPARE_SELECTED_COMMAND_ID,
     handler: async (accessor, resource) => {
         const editorService = accessor.get(IEditorService);
+        const editorGroupService = accessor.get(IEditorGroupsService);
         const explorerService = accessor.get(IExplorerService);
-        const resources = getMultiSelectedResources(resource, accessor.get(IListService), editorService, explorerService);
+        const resources = getMultiSelectedResources(resource, accessor.get(IListService), editorService, editorGroupService, explorerService);
         if (resources.length === 2) {
             return editorService.openEditor({
                 original: { resource: resources[0] },
@@ -219,57 +222,57 @@ async function resourcesToClipboard(resources, relative, clipboardService, label
     }
 }
 const copyPathCommandHandler = async (accessor, resource) => {
-    const resources = getMultiSelectedResources(resource, accessor.get(IListService), accessor.get(IEditorService), accessor.get(IExplorerService));
+    const resources = getMultiSelectedResources(resource, accessor.get(IListService), accessor.get(IEditorService), accessor.get(IEditorGroupsService), accessor.get(IExplorerService));
     await resourcesToClipboard(resources, false, accessor.get(IClipboardService), accessor.get(ILabelService), accessor.get(IConfigurationService));
 };
 KeybindingsRegistry.registerCommandAndKeybindingRule({
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: ( (EditorContextKeys.focus.toNegated())),
-    primary: 2048  | 512  | 33 ,
+    primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyC,
     win: {
-        primary: 1024  | 512  | 33
+        primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KeyC
     },
     id: COPY_PATH_COMMAND_ID,
     handler: copyPathCommandHandler
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: EditorContextKeys.focus,
-    primary: KeyChord(2048  | 41 , 2048  | 512  | 33 ),
+    primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyC),
     win: {
-        primary: 1024  | 512  | 33
+        primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KeyC
     },
     id: COPY_PATH_COMMAND_ID,
     handler: copyPathCommandHandler
 });
 const copyRelativePathCommandHandler = async (accessor, resource) => {
-    const resources = getMultiSelectedResources(resource, accessor.get(IListService), accessor.get(IEditorService), accessor.get(IExplorerService));
+    const resources = getMultiSelectedResources(resource, accessor.get(IListService), accessor.get(IEditorService), accessor.get(IEditorGroupsService), accessor.get(IExplorerService));
     await resourcesToClipboard(resources, true, accessor.get(IClipboardService), accessor.get(ILabelService), accessor.get(IConfigurationService));
 };
 KeybindingsRegistry.registerCommandAndKeybindingRule({
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: ( (EditorContextKeys.focus.toNegated())),
-    primary: 2048  | 1024  | 512  | 33 ,
+    primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyMod.Alt | KeyCode.KeyC,
     win: {
-        primary: KeyChord(2048  | 41 , 2048  | 1024  | 33 )
+        primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyC)
     },
     id: COPY_RELATIVE_PATH_COMMAND_ID,
     handler: copyRelativePathCommandHandler
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: EditorContextKeys.focus,
-    primary: KeyChord(2048  | 41 , 2048  | 1024  | 512  | 33 ),
+    primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyMod.Shift | KeyMod.Alt | KeyCode.KeyC),
     win: {
-        primary: KeyChord(2048  | 41 , 2048  | 1024  | 33 )
+        primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyC)
     },
     id: COPY_RELATIVE_PATH_COMMAND_ID,
     handler: copyRelativePathCommandHandler
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: undefined,
-    primary: KeyChord(2048  | 41 , 46 ),
+    primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.KeyP),
     id: 'workbench.action.files.copyPathOfActiveFile',
     handler: async (accessor) => {
         const editorService = accessor.get(IEditorService);
@@ -335,7 +338,7 @@ CommandsRegistry.registerCommand({
             return;
         }
         try {
-            await editorService.revert(editors.filter(({ editor }) => !editor.hasCapability(4 ) ), { force: true });
+            await editorService.revert(editors.filter(({ editor }) => !editor.hasCapability(EditorInputCapabilities.Untitled) ), { force: true });
         }
         catch (error) {
             notificationService.error(( localizeWithPath(
@@ -355,7 +358,7 @@ CommandsRegistry.registerCommand({
         const contextService = accessor.get(IWorkspaceContextService);
         const uriIdentityService = accessor.get(IUriIdentityService);
         const workspace = contextService.getWorkspace();
-        const resources = getMultiSelectedResources(resource, accessor.get(IListService), accessor.get(IEditorService), accessor.get(IExplorerService)).filter(resource => ( (workspace.folders.some(folder => uriIdentityService.extUri.isEqual(folder.uri, resource))))
+        const resources = getMultiSelectedResources(resource, accessor.get(IListService), accessor.get(IEditorService), accessor.get(IEditorGroupsService), accessor.get(IExplorerService)).filter(resource => ( (workspace.folders.some(folder => uriIdentityService.extUri.isEqual(folder.uri, resource))))
         );
         if (resources.length === 0) {
             const commandService = accessor.get(ICommandService);
@@ -365,17 +368,17 @@ CommandsRegistry.registerCommand({
     }
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
-    weight: 200  + 10,
+    weight: KeybindingWeight.WorkbenchContrib + 10,
     when: ( (ContextKeyExpr.and(
         FilesExplorerFocusCondition,
         ExplorerCompressedFocusContext,
          (ExplorerCompressedFirstFocusContext.negate())
     ))),
-    primary: 15 ,
+    primary: KeyCode.LeftArrow,
     id: PREVIOUS_COMPRESSED_FOLDER,
     handler: accessor => {
         const paneCompositeService = accessor.get(IPaneCompositePartService);
-        const viewlet = paneCompositeService.getActivePaneComposite(0 );
+        const viewlet = paneCompositeService.getActivePaneComposite(ViewContainerLocation.Sidebar);
         if (viewlet?.getId() !== VIEWLET_ID) {
             return;
         }
@@ -385,17 +388,17 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     }
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
-    weight: 200  + 10,
+    weight: KeybindingWeight.WorkbenchContrib + 10,
     when: ( (ContextKeyExpr.and(
         FilesExplorerFocusCondition,
         ExplorerCompressedFocusContext,
          (ExplorerCompressedLastFocusContext.negate())
     ))),
-    primary: 17 ,
+    primary: KeyCode.RightArrow,
     id: NEXT_COMPRESSED_FOLDER,
     handler: accessor => {
         const paneCompositeService = accessor.get(IPaneCompositePartService);
-        const viewlet = paneCompositeService.getActivePaneComposite(0 );
+        const viewlet = paneCompositeService.getActivePaneComposite(ViewContainerLocation.Sidebar);
         if (viewlet?.getId() !== VIEWLET_ID) {
             return;
         }
@@ -405,17 +408,17 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     }
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
-    weight: 200  + 10,
+    weight: KeybindingWeight.WorkbenchContrib + 10,
     when: ( (ContextKeyExpr.and(
         FilesExplorerFocusCondition,
         ExplorerCompressedFocusContext,
          (ExplorerCompressedFirstFocusContext.negate())
     ))),
-    primary: 14 ,
+    primary: KeyCode.Home,
     id: FIRST_COMPRESSED_FOLDER,
     handler: accessor => {
         const paneCompositeService = accessor.get(IPaneCompositePartService);
-        const viewlet = paneCompositeService.getActivePaneComposite(0 );
+        const viewlet = paneCompositeService.getActivePaneComposite(ViewContainerLocation.Sidebar);
         if (viewlet?.getId() !== VIEWLET_ID) {
             return;
         }
@@ -425,17 +428,17 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     }
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
-    weight: 200  + 10,
+    weight: KeybindingWeight.WorkbenchContrib + 10,
     when: ( (ContextKeyExpr.and(
         FilesExplorerFocusCondition,
         ExplorerCompressedFocusContext,
          (ExplorerCompressedLastFocusContext.negate())
     ))),
-    primary: 13 ,
+    primary: KeyCode.End,
     id: LAST_COMPRESSED_FOLDER,
     handler: accessor => {
         const paneCompositeService = accessor.get(IPaneCompositePartService);
-        const viewlet = paneCompositeService.getActivePaneComposite(0 );
+        const viewlet = paneCompositeService.getActivePaneComposite(ViewContainerLocation.Sidebar);
         if (viewlet?.getId() !== VIEWLET_ID) {
             return;
         }
@@ -445,10 +448,10 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     }
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: null,
-    primary: isWeb ? ((isWindows ? KeyChord(2048  | 41 , 44 ) : 2048  | 512  | 44) ) : 2048  | 44 ,
-    secondary: isWeb ? [2048  | 44 ] : undefined,
+    primary: isWeb ? (isWindows ? KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.KeyN) : KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyN) : KeyMod.CtrlCmd | KeyCode.KeyN,
+    secondary: isWeb ? [KeyMod.CtrlCmd | KeyCode.KeyN] : undefined,
     id: NEW_UNTITLED_FILE_COMMAND_ID,
     metadata: {
         description: NEW_UNTITLED_FILE_LABEL,

package/vscode/src/vs/workbench/contrib/files/browser/files.contribution._explorer.js

@@ -1,19 +1,21 @@
 import { UndoCommand, RedoCommand } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
-import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { Extensions, ConfigurationScope } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { IUndoRedoService } from 'vscode/vscode/vs/platform/undoRedo/common/undoRedo.service';
-import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
 import { UNDO_REDO_SOURCE } from './explorerService.js';
 import { ExplorerViewletViewsContribution } from 'vscode/vscode/vs/workbench/contrib/files/browser/explorerViewlet';
 import { IExplorerService } from 'vscode/vscode/vs/workbench/contrib/files/browser/files.service';
+import { UndoConfirmLevel, SortOrder, LexicographicOptions } from 'vscode/vscode/vs/workbench/contrib/files/common/files';
 import 'vscode/vscode/vs/workbench/contrib/files/browser/files.contribution._configuration';
 import 'vscode/vscode/vs/workbench/contrib/files/browser/files.contribution._editorPane';
 import 'vscode/vscode/vs/workbench/contrib/files/browser/files.contribution._fileEditorFactory';
 
 const _moduleId = "vs/workbench/contrib/files/browser/files.contribution";
-registerWorkbenchContribution2(ExplorerViewletViewsContribution.ID, ExplorerViewletViewsContribution, 1 );
+registerWorkbenchContribution2(ExplorerViewletViewsContribution.ID, ExplorerViewletViewsContribution, WorkbenchPhase.BlockStartup);
 const configurationRegistry = ( (Registry.as(Extensions.Configuration)));
 configurationRegistry.registerConfiguration({
     'id': 'explorer',
@@ -170,13 +172,13 @@ configurationRegistry.registerConfiguration({
         },
         'explorer.confirmUndo': {
             'type': 'string',
-            'enum': ["verbose" , "default" , "light" ],
+            'enum': [UndoConfirmLevel.Verbose, UndoConfirmLevel.Default, UndoConfirmLevel.Light],
             'description': ( localizeWithPath(
                 _moduleId,
                 69,
                 "Controls whether the Explorer should ask for confirmation when undoing."
             )),
-            'default': "default" ,
+            'default': UndoConfirmLevel.Default,
             'enumDescriptions': [
                 ( localizeWithPath(_moduleId, 70, 'Explorer will prompt before all undo operations.')),
                 ( localizeWithPath(_moduleId, 71, 'Explorer will prompt before destructive undo operations.')),
@@ -198,8 +200,8 @@ configurationRegistry.registerConfiguration({
         },
         'explorer.sortOrder': {
             'type': 'string',
-            'enum': ["default" , "mixed" , "filesFirst" , "type" , "modified" , "foldersNestsFiles" ],
-            'default': "default" ,
+            'enum': [SortOrder.Default, SortOrder.Mixed, SortOrder.FilesFirst, SortOrder.Type, SortOrder.Modified, SortOrder.FoldersNestsFiles],
+            'default': SortOrder.Default,
             'enumDescriptions': [
                 ( localizeWithPath(
                     _moduleId,
@@ -240,8 +242,8 @@ configurationRegistry.registerConfiguration({
         },
         'explorer.sortOrderLexicographicOptions': {
             'type': 'string',
-            'enum': ["default" , "upper" , "lower" , "unicode" ],
-            'default': "default" ,
+            'enum': [LexicographicOptions.Default, LexicographicOptions.Upper, LexicographicOptions.Lower, LexicographicOptions.Unicode],
+            'default': LexicographicOptions.Default,
             'enumDescriptions': [
                 ( localizeWithPath(_moduleId, 81, 'Uppercase and lowercase names are mixed together.')),
                 ( localizeWithPath(
@@ -336,11 +338,11 @@ configurationRegistry.registerConfiguration({
                 '`#files.exclude#`'
             )),
             default: false,
-            scope: 4
+            scope: ConfigurationScope.RESOURCE
         },
         'explorer.fileNesting.enabled': {
             'type': 'boolean',
-            scope: 4 ,
+            scope: ConfigurationScope.RESOURCE,
             'markdownDescription': ( localizeWithPath(
                 _moduleId,
                 98,
@@ -360,7 +362,7 @@ configurationRegistry.registerConfiguration({
         },
         'explorer.fileNesting.patterns': {
             'type': 'object',
-            scope: 4 ,
+            scope: ConfigurationScope.RESOURCE,
             'markdownDescription': ( localizeWithPath(
                 _moduleId,
                 100,