@codingame/monaco-vscode-api 5.3.0 → 6.0.1

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

@@ -7,7 +7,7 @@ import { URI } from '../../../../base/common/uri.js';
 import { toErrorMessage } from '../../../../base/common/errorMessage.js';
 import { Action } from '../../../../base/common/actions.js';
 import { dispose } from '../../../../base/common/lifecycle.js';
-import { VIEWLET_ID, VIEW_ID } from '../common/files.js';
+import { VIEWLET_ID, VIEW_ID, UndoConfirmLevel } from '../common/files.js';
 import { IFileService } from '../../../../platform/files/common/files.service.js';
 import { EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
 import { ItemActivation } from '../../../../platform/quickinput/common/quickInput.js';
@@ -29,6 +29,7 @@ import { IDialogService } from '../../../../platform/dialogs/common/dialogs.serv
 import '../../../../platform/notification/common/notification.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
+import { Constants } from '../../../../base/common/uint.js';
 import { CLOSE_EDITORS_AND_GROUP_COMMAND_ID } from '../../../browser/parts/editor/editorCommands.js';
 import { coalesce } from '../../../../base/common/arrays.js';
 import { NewExplorerItem } from '../common/explorerModel.js';
@@ -40,6 +41,7 @@ import { timeout } from '../../../../base/common/async.js';
 import { IWorkingCopyFileService } from '../../../services/workingCopy/common/workingCopyFileService.service.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
+import { ViewContainerLocation } from '../../../common/views.js';
 import { IViewsService } from '../../../services/views/common/viewsService.service.js';
 import { trim, rtrim } from '../../../../base/common/strings.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.service.js';
@@ -51,7 +53,8 @@ import { IRemoteAgentService } from '../../../services/remote/common/remoteAgent
 import { IPathService } from '../../../services/path/common/pathService.service.js';
 import { Action2 } from '../../../../platform/actions/common/actions.js';
 import { ActiveEditorContext, EmptyWorkspaceSupportContext, ActiveEditorCanToggleReadonlyContext } from '../../../common/contextkeys.js';
-import { KeyChord } from '../../../../base/common/keyCodes.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeyChord, KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
 import { VSBuffer } from '../../../../base/common/buffer.js';
 import Severity$1 from '../../../../base/common/severity.js';
@@ -377,7 +380,7 @@ function incrementFileName(name, isFolder, incrementalNaming) {
                 const number = (g2 ? parseInt(g2) : 1);
                 return number === 0
                     ? `${g1}`
-                    : (number < 1073741824
+                    : (number < Constants.MAX_SAFE_SMALL_INTEGER
                         ? `${g1} ${number + 1}`
                         : `${g1}${g2} copy`);
             }) + extSuffix;
@@ -385,7 +388,7 @@ function incrementFileName(name, isFolder, incrementalNaming) {
         return `${namePrefix} copy${extSuffix}`;
     }
     const separators = '[\\.\\-_]';
-    const maxNumber = 1073741824 ;
+    const maxNumber = Constants.MAX_SAFE_SMALL_INTEGER;
     const suffixFileRegex = RegExp('(.*' + separators + ')(\\d+)(\\..*)$');
     if (!isFolder && name.match(suffixFileRegex)) {
         return name.replace(suffixFileRegex, (match, g1, g2, g3) => {
@@ -607,7 +610,7 @@ class FocusFilesExplorer extends Action2 {
     }
     async run(accessor) {
         const paneCompositeService = accessor.get(IPaneCompositePartService);
-        await paneCompositeService.openPaneComposite(VIEWLET_ID, 0 , true);
+        await paneCompositeService.openPaneComposite(VIEWLET_ID, ViewContainerLocation.Sidebar, true);
     }
 }
 class ShowActiveFileInExplorer extends Action2 {
@@ -774,7 +777,7 @@ class CompareWithClipboardAction extends Action2 {
             title: CompareWithClipboardAction.LABEL,
             f1: true,
             category: Categories.File,
-            keybinding: { primary: KeyChord(2048  | 41 , 33 ), weight: 200  },
+            keybinding: { primary: KeyChord(KeyMod$1.CtrlCmd | KeyCode.KeyK, KeyCode.KeyC), weight: KeybindingWeight.WorkbenchContrib },
             metadata: {
                 description: ( localize2WithPath(
                     _moduleId,
@@ -941,7 +944,7 @@ const renameHandler = async (accessor) => {
                 if (( (stat.resource.toString())) !== ( (targetResource.toString()))) {
                     try {
                         await explorerService.applyBulkEdit([( (new ResourceFileEdit(stat.resource, targetResource)))], {
-                            confirmBeforeUndo: configurationService.getValue().explorer.confirmUndo === "verbose" ,
+                            confirmBeforeUndo: configurationService.getValue().explorer.confirmUndo === UndoConfirmLevel.Verbose,
                             undoLabel: ( localizeWithPath(_moduleId, 70, "Rename {0} to {1}", stat.name, value)),
                             progressLabel: ( localizeWithPath(_moduleId, 71, "Renaming {0} to {1}", stat.name, value)),
                         });
@@ -1106,7 +1109,7 @@ const pasteFileHandler = async (accessor, fileList) => {
                         pair => ( (new ResourceFileEdit(pair.source, pair.target, { overwrite: incrementalNaming === 'disabled' })))
                     )));
                     const options = {
-                        confirmBeforeUndo: configurationService.getValue().explorer.confirmUndo === "verbose" ,
+                        confirmBeforeUndo: configurationService.getValue().explorer.confirmUndo === UndoConfirmLevel.Verbose,
                         progressLabel: sourceTargetPairs.length > 1 ? ( localizeWithPath(_moduleId, 76, "Moving {0} files", sourceTargetPairs.length))
                             : ( localizeWithPath(
                             _moduleId,
@@ -1181,7 +1184,7 @@ const pasteFileHandler = async (accessor, fileList) => {
     async function applyCopyResourceEdit(targets, resourceFileEdits) {
         const undoLevel = configurationService.getValue().explorer.confirmUndo;
         const options = {
-            confirmBeforeUndo: undoLevel === "default"  || undoLevel === "verbose" ,
+            confirmBeforeUndo: undoLevel === UndoConfirmLevel.Default || undoLevel === UndoConfirmLevel.Verbose,
             progressLabel: targets.length > 1 ? ( localizeWithPath(_moduleId, 81, "Copying {0} files", targets.length))
                 : ( localizeWithPath(_moduleId, 82, "Copying {0}", basenameOrAuthority(targets[0]))),
             undoLabel: targets.length > 1 ? ( localizeWithPath(_moduleId, 83, "Paste {0} files", targets.length))

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

@@ -3,21 +3,22 @@ import { coalesce } from '../../../../base/common/arrays.js';
 import { toErrorMessage } from '../../../../base/common/errorMessage.js';
 import { isCancellationError } from '../../../../base/common/errors.js';
 import { hash } from '../../../../base/common/hash.js';
-import { KeyChord } from '../../../../base/common/keyCodes.js';
+import { KeyMod as KeyMod$1, KeyCode, KeyChord } from '../../../../base/common/keyCodes.js';
 import { isEqual } from '../../../../base/common/resources.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
 import { EmbeddedCodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/embeddedCodeEditorWidget.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { KeybindingsRegistry } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { IListService } from '../../../../platform/list/browser/listService.service.js';
 import '../../../../platform/notification/common/notification.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
 import { getMultiSelectedEditorContexts } from '../../../browser/parts/editor/editorCommands.js';
-import { EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
+import { SaveReason, EditorInputCapabilities, EditorResourceAccessor, SideBySideEditor, EditorsOrder } from '../../../common/editor.js';
 import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
 import { getOpenEditorsViewMultiSelection } from './files.js';
+import { GroupsOrder } from '../../../services/editor/common/editorGroupsService.js';
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.service.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { ITextFileService } from '../../../services/textfile/common/textfiles.service.js';
@@ -35,7 +36,7 @@ async function saveSelectedEditors(accessor, options) {
         if (activeGroup.activeEditor) {
             editors = [];
             if (activeGroup.activeEditor instanceof SideBySideEditorInput &&
-                !options?.saveAs && !(activeGroup.activeEditor.primary.hasCapability(4 ) || activeGroup.activeEditor.secondary.hasCapability(4 )) &&
+                !options?.saveAs && !(activeGroup.activeEditor.primary.hasCapability(EditorInputCapabilities.Untitled) || activeGroup.activeEditor.secondary.hasCapability(EditorInputCapabilities.Untitled)) &&
                 activeGroup.activeEditor.secondary.isModified()) {
                 editors.push({ groupId: activeGroup.id, editor: activeGroup.activeEditor.primary });
                 editors.push({ groupId: activeGroup.id, editor: activeGroup.activeEditor.secondary });
@@ -65,7 +66,7 @@ async function saveSelectedEditors(accessor, options) {
 function saveDirtyEditorsOfGroups(accessor, groups, options) {
     const dirtyEditors = [];
     for (const group of groups) {
-        for (const editor of group.getEditors(0 )) {
+        for (const editor of group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)) {
             if (editor.isDirty()) {
                 dirtyEditors.push({ groupId: group.id, editor });
             }
@@ -104,41 +105,41 @@ async function doSaveEditors(accessor, editors, options) {
 }
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     when: undefined,
-    weight: 200 ,
-    primary: 2048  | 49 ,
+    weight: KeybindingWeight.WorkbenchContrib,
+    primary: KeyMod$1.CtrlCmd | KeyCode.KeyS,
     id: SAVE_FILE_COMMAND_ID,
     handler: accessor => {
-        return saveSelectedEditors(accessor, { reason: 1 , force: true  });
+        return saveSelectedEditors(accessor, { reason: SaveReason.EXPLICIT, force: true  });
     }
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     when: undefined,
-    weight: 200 ,
-    primary: KeyChord(2048  | 41 , 49 ),
-    win: { primary: KeyChord(2048  | 41 , 2048  | 1024  | 49 ) },
+    weight: KeybindingWeight.WorkbenchContrib,
+    primary: KeyChord(KeyMod$1.CtrlCmd | KeyCode.KeyK, KeyCode.KeyS),
+    win: { primary: KeyChord(KeyMod$1.CtrlCmd | KeyCode.KeyK, KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.KeyS) },
     id: SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID,
     handler: accessor => {
-        return saveSelectedEditors(accessor, { reason: 1 , force: true , skipSaveParticipants: true });
+        return saveSelectedEditors(accessor, { reason: SaveReason.EXPLICIT, force: true , skipSaveParticipants: true });
     }
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: SAVE_FILE_AS_COMMAND_ID,
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: undefined,
-    primary: 2048  | 1024  | 49 ,
+    primary: KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.KeyS,
     handler: accessor => {
-        return saveSelectedEditors(accessor, { reason: 1 , saveAs: true });
+        return saveSelectedEditors(accessor, { reason: SaveReason.EXPLICIT, saveAs: true });
     }
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     when: undefined,
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     primary: undefined,
-    mac: { primary: 2048  | 512  | 49  },
-    win: { primary: KeyChord(2048  | 41 , 49 ) },
+    mac: { primary: KeyMod$1.CtrlCmd | KeyMod$1.Alt | KeyCode.KeyS },
+    win: { primary: KeyChord(KeyMod$1.CtrlCmd | KeyCode.KeyK, KeyCode.KeyS) },
     id: SAVE_ALL_COMMAND_ID,
     handler: accessor => {
-        return saveDirtyEditorsOfGroups(accessor, accessor.get(IEditorGroupsService).getGroups(1 ), { reason: 1  });
+        return saveDirtyEditorsOfGroups(accessor, accessor.get(IEditorGroupsService).getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE), { reason: SaveReason.EXPLICIT });
     }
 });
 CommandsRegistry.registerCommand({
@@ -148,19 +149,19 @@ CommandsRegistry.registerCommand({
         const contexts = getMultiSelectedEditorContexts(editorContext, accessor.get(IListService), accessor.get(IEditorGroupsService));
         let groups = undefined;
         if (!contexts.length) {
-            groups = editorGroupService.getGroups(1 );
+            groups = editorGroupService.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE);
         }
         else {
             groups = coalesce(( (contexts.map(context => editorGroupService.getGroup(context.groupId)))));
         }
-        return saveDirtyEditorsOfGroups(accessor, groups, { reason: 1  });
+        return saveDirtyEditorsOfGroups(accessor, groups, { reason: SaveReason.EXPLICIT });
     }
 });
 CommandsRegistry.registerCommand({
     id: SAVE_FILES_COMMAND_ID,
     handler: async (accessor) => {
         const editorService = accessor.get(IEditorService);
-        const res = await editorService.saveAll({ includeUntitled: false, reason: 1  });
+        const res = await editorService.saveAll({ includeUntitled: false, reason: SaveReason.EXPLICIT });
         return res.success;
     }
 });

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

@@ -3,13 +3,14 @@ import { localizeWithPath } from '../../../../nls.js';
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { getFileNamesMessage } from '../../../../platform/dialogs/common/dialogs.js';
 import { IDialogService, IFileDialogService } from '../../../../platform/dialogs/common/dialogs.service.js';
-import { ByteSize } from '../../../../platform/files/common/files.js';
+import { ByteSize, FileSystemProviderCapabilities } from '../../../../platform/files/common/files.js';
 import { IFileService } from '../../../../platform/files/common/files.service.js';
 import '../../../../platform/notification/common/notification.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
+import { ProgressLocation } from '../../../../platform/progress/common/progress.js';
 import { IProgressService } from '../../../../platform/progress/common/progress.service.js';
 import { IExplorerService } from './files.service.js';
-import { VIEW_ID } from '../common/files.js';
+import { VIEW_ID, UndoConfirmLevel } from '../common/files.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { Promises, RunOnceWorker, Limiter } from '../../../../base/common/async.js';
 import { VSBuffer, newWriteableBufferStream } from '../../../../base/common/buffer.js';
@@ -34,6 +35,7 @@ import { canceled } from '../../../../base/common/errors.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { WebFileSystemAccess } from '../../../../platform/files/browser/webFileSystemAccess.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 import Severity$1 from '../../../../base/common/severity.js';
 var BrowserFileUpload_1, FileDownload_1;
@@ -51,7 +53,7 @@ let BrowserFileUpload = class BrowserFileUpload {
     upload(target, source) {
         const cts = ( (new CancellationTokenSource()));
         const uploadPromise = this.progressService.withProgress({
-            location: 10 ,
+            location: ProgressLocation.Window,
             delay: 800,
             cancellable: true,
             title: ( localizeWithPath(_moduleId, 0, "Uploading"))
@@ -301,7 +303,7 @@ let ExternalFileImport = class ExternalFileImport {
     async import(target, source, targetWindow) {
         const cts = ( (new CancellationTokenSource()));
         const importPromise = this.progressService.withProgress({
-            location: 10 ,
+            location: ProgressLocation.Window,
             delay: 800,
             cancellable: true,
             title: ( localizeWithPath(_moduleId, 5, "Copying..."))
@@ -389,7 +391,7 @@ let ExternalFileImport = class ExternalFileImport {
                 return;
             }
             const targetNames = ( (new Set()));
-            const caseSensitive = this.fileService.hasCapability(target.resource, 1024 );
+            const caseSensitive = this.fileService.hasCapability(target.resource, FileSystemProviderCapabilities.PathCaseSensitive);
             if (targetStat.children) {
                 targetStat.children.forEach(child => {
                     targetNames.add(caseSensitive ? child.name : child.name.toLowerCase());
@@ -432,8 +434,8 @@ let ExternalFileImport = class ExternalFileImport {
                 progressLabel: resourcesFiltered.length === 1 ?
                     ( localizeWithPath(_moduleId, 18, "Copying {0}", basename(resourcesFiltered[0]))) :
                     ( localizeWithPath(_moduleId, 19, "Copying {0} resources", resourcesFiltered.length)),
-                progressLocation: 10 ,
-                confirmBeforeUndo: undoLevel === "verbose"  || undoLevel === "default" ,
+                progressLocation: ProgressLocation.Window,
+                confirmBeforeUndo: undoLevel === UndoConfirmLevel.Verbose || undoLevel === UndoConfirmLevel.Default,
             });
             if (resourceFileEdits.length === 1) {
                 const item = this.explorerService.findClosest(resourceFileEdits[0].newResource);
@@ -471,7 +473,7 @@ let FileDownload = class FileDownload {
     download(source) {
         const cts = ( (new CancellationTokenSource()));
         const downloadPromise = this.progressService.withProgress({
-            location: 10 ,
+            location: ProgressLocation.Window,
             delay: 800,
             cancellable: isWeb,
             title: ( localizeWithPath(_moduleId, 20, "Downloading"))
@@ -643,7 +645,7 @@ let FileDownload = class FileDownload {
     async doDownloadNative(explorerItem, progress, cts) {
         progress.report({ message: explorerItem.name });
         let defaultUri;
-        const lastUsedDownloadPath = this.storageService.get(FileDownload_1.LAST_USED_DOWNLOAD_PATH_STORAGE_KEY, -1 );
+        const lastUsedDownloadPath = this.storageService.get(FileDownload_1.LAST_USED_DOWNLOAD_PATH_STORAGE_KEY, StorageScope.APPLICATION);
         if (lastUsedDownloadPath) {
             defaultUri = joinPath(URI.file(lastUsedDownloadPath), explorerItem.name);
         }
@@ -659,11 +661,11 @@ let FileDownload = class FileDownload {
             defaultUri
         });
         if (destination) {
-            this.storageService.store(FileDownload_1.LAST_USED_DOWNLOAD_PATH_STORAGE_KEY, dirname(destination).fsPath, -1 , 1 );
+            this.storageService.store(FileDownload_1.LAST_USED_DOWNLOAD_PATH_STORAGE_KEY, dirname(destination).fsPath, StorageScope.APPLICATION, StorageTarget.MACHINE);
             await this.explorerService.applyBulkEdit([( (new ResourceFileEdit(explorerItem.resource, destination, { overwrite: true, copy: true })))], {
                 undoLabel: ( localizeWithPath(_moduleId, 25, "Download {0}", explorerItem.name)),
                 progressLabel: ( localizeWithPath(_moduleId, 26, "Downloading {0}", explorerItem.name)),
-                progressLocation: 10
+                progressLocation: ProgressLocation.Window
             });
         }
         else {

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

@@ -1,7 +1,7 @@
 import { isWeb, isNative } from '../../../../base/common/platform.js';
 import { editorConfigurationBaseNode } from '../../../../editor/common/config/editorConfigurationSchema.js';
 import { localizeWithPath } from '../../../../nls.js';
-import { Extensions } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { ConfigurationScope, Extensions } from '../../../../platform/configuration/common/configurationRegistry.js';
 import { FILES_EXCLUDE_CONFIG, FILES_ASSOCIATIONS_CONFIG, AutoSaveConfiguration, FILES_READONLY_INCLUDE_CONFIG, FILES_READONLY_EXCLUDE_CONFIG, FILES_READONLY_FROM_PERMISSIONS_CONFIG, HotExitConfiguration } from '../../../../platform/files/common/files.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { SUPPORTED_ENCODINGS } from '../../../services/textfile/common/encoding.js';
@@ -10,7 +10,7 @@ const configurationRegistry = ( (Registry.as(Extensions.Configuration)));
 const hotExitConfiguration = isNative ?
     {
         'type': 'string',
-        'scope': 1 ,
+        'scope': ConfigurationScope.APPLICATION,
         'enum': [HotExitConfiguration.OFF, HotExitConfiguration.ON_EXIT, HotExitConfiguration.ON_EXIT_AND_WINDOW_CLOSE],
         'default': HotExitConfiguration.ON_EXIT,
         'markdownEnumDescriptions': [
@@ -39,7 +39,7 @@ const hotExitConfiguration = isNative ?
         ))
     } : {
     'type': 'string',
-    'scope': 1 ,
+    'scope': ConfigurationScope.APPLICATION,
     'enum': [HotExitConfiguration.OFF, HotExitConfiguration.ON_EXIT_AND_WINDOW_CLOSE],
     'default': HotExitConfiguration.ON_EXIT_AND_WINDOW_CLOSE,
     'markdownEnumDescriptions': [
@@ -79,7 +79,7 @@ configurationRegistry.registerConfiguration({
                 ...{ '**/.git': true, '**/.svn': true, '**/.hg': true, '**/CVS': true, '**/.DS_Store': true, '**/Thumbs.db': true },
                 ...(isWeb ? { '**/*.crswap': true  } : undefined)
             },
-            'scope': 4 ,
+            'scope': ConfigurationScope.RESOURCE,
             'additionalProperties': {
                 'anyOf': [
                     {
@@ -130,7 +130,7 @@ configurationRegistry.registerConfiguration({
                 12,
                 "The default character set encoding to use when reading and writing files. This setting can also be configured per language."
             )),
-            'scope': 5 ,
+            'scope': ConfigurationScope.LANGUAGE_OVERRIDABLE,
             'enumDescriptions': ( (( (Object.keys(SUPPORTED_ENCODINGS))).map(key => SUPPORTED_ENCODINGS[key].labelLong))),
             'enumItemLabels': ( (( (Object.keys(SUPPORTED_ENCODINGS))).map(key => SUPPORTED_ENCODINGS[key].labelLong)))
         },
@@ -143,7 +143,7 @@ configurationRegistry.registerConfiguration({
                 "When enabled, the editor will attempt to guess the character set encoding when opening files. This setting can also be configured per language. Note, this setting is not respected by text search. Only {0} is respected.",
                 '`#files.encoding#`'
             )),
-            'scope': 5
+            'scope': ConfigurationScope.LANGUAGE_OVERRIDABLE
         },
         'files.eol': {
             'type': 'string',
@@ -159,7 +159,7 @@ configurationRegistry.registerConfiguration({
             ],
             'default': 'auto',
             'description': ( localizeWithPath(_moduleId, 17, "The default end of line character.")),
-            'scope': 5
+            'scope': ConfigurationScope.LANGUAGE_OVERRIDABLE
         },
         'files.enableTrash': {
             'type': 'boolean',
@@ -178,7 +178,7 @@ configurationRegistry.registerConfiguration({
                 19,
                 "When enabled, will trim trailing whitespace when saving a file."
             )),
-            'scope': 5
+            'scope': ConfigurationScope.LANGUAGE_OVERRIDABLE
         },
         'files.trimTrailingWhitespaceInRegexAndStrings': {
             'type': 'boolean',
@@ -188,7 +188,7 @@ configurationRegistry.registerConfiguration({
                 20,
                 "When enabled, trailing whitespace will be removed from multiline strings and regexes will be removed on save or when executing 'editor.action.trimTrailingWhitespace'. This can cause whitespace to not be trimmed from lines when there isn't up-to-date token information."
             )),
-            'scope': 5
+            'scope': ConfigurationScope.LANGUAGE_OVERRIDABLE
         },
         'files.insertFinalNewline': {
             'type': 'boolean',
@@ -198,7 +198,7 @@ configurationRegistry.registerConfiguration({
                 21,
                 "When enabled, insert a final new line at the end of the file when saving it."
             )),
-            'scope': 5
+            'scope': ConfigurationScope.LANGUAGE_OVERRIDABLE
         },
         'files.trimFinalNewlines': {
             'type': 'boolean',
@@ -208,7 +208,7 @@ configurationRegistry.registerConfiguration({
                 22,
                 "When enabled, will trim all new lines after the final new line at the end of the file when saving it."
             )),
-            scope: 5 ,
+            scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
         },
         'files.autoSave': {
             'type': 'string',
@@ -242,7 +242,7 @@ configurationRegistry.registerConfiguration({
                 AutoSaveConfiguration.ON_WINDOW_CHANGE,
                 AutoSaveConfiguration.AFTER_DELAY
             )),
-            scope: 5
+            scope: ConfigurationScope.LANGUAGE_OVERRIDABLE
         },
         'files.autoSaveDelay': {
             'type': 'number',
@@ -254,7 +254,7 @@ configurationRegistry.registerConfiguration({
                 "Controls the delay in milliseconds after which an editor with unsaved changes is saved automatically. Only applies when `#files.autoSave#` is set to `{0}`.",
                 AutoSaveConfiguration.AFTER_DELAY
             )),
-            scope: 5
+            scope: ConfigurationScope.LANGUAGE_OVERRIDABLE
         },
         'files.autoSaveWorkspaceFilesOnly': {
             'type': 'boolean',
@@ -264,7 +264,7 @@ configurationRegistry.registerConfiguration({
                 29,
                 "When enabled, will limit [auto save](https://code.visualstudio.com/docs/editor/codebasics#_save-auto-save) of editors to files that are inside the opened workspace. Only applies when `#files.autoSave#` is enabled."
             )),
-            scope: 5
+            scope: ConfigurationScope.LANGUAGE_OVERRIDABLE
         },
         'files.autoSaveWhenNoErrors': {
             'type': 'boolean',
@@ -274,7 +274,7 @@ configurationRegistry.registerConfiguration({
                 30,
                 "When enabled, will limit [auto save](https://code.visualstudio.com/docs/editor/codebasics#_save-auto-save) of editors to files that have no errors reported in them at the time the auto save is triggered. Only applies when `#files.autoSave#` is enabled."
             )),
-            scope: 5
+            scope: ConfigurationScope.LANGUAGE_OVERRIDABLE
         },
         'files.watcherExclude': {
             'type': 'object',
@@ -287,7 +287,7 @@ configurationRegistry.registerConfiguration({
                 31,
                 "Configure paths or [glob patterns](https://aka.ms/vscode-glob-patterns) to exclude from file watching. Paths can either be relative to the watched folder or absolute. Glob patterns are matched relative from the watched folder. When you experience the file watcher process consuming a lot of CPU, make sure to exclude large folders that are of less interest (such as build output folders)."
             )),
-            'scope': 4
+            'scope': ConfigurationScope.RESOURCE
         },
         'files.watcherInclude': {
             'type': 'array',
@@ -300,7 +300,7 @@ configurationRegistry.registerConfiguration({
                 32,
                 "Configure extra paths to watch for changes inside the workspace. By default, all workspace folders will be watched recursively, except for folders that are symbolic links. You can explicitly add absolute or relative paths to support watching folders that are symbolic links. Relative paths will be resolved to an absolute path using the currently opened workspace."
             )),
-            'scope': 4
+            'scope': ConfigurationScope.RESOURCE
         },
         'files.hotExit': hotExitConfiguration,
         'files.defaultLanguage': {
@@ -322,7 +322,7 @@ configurationRegistry.registerConfiguration({
                 34,
                 "Configure paths or [glob patterns](https://aka.ms/vscode-glob-patterns) to mark as read-only. Glob patterns are always evaluated relative to the path of the workspace folder unless they are absolute paths. You can exclude matching paths via the `#files.readonlyExclude#` setting. Files from readonly file system providers will always be read-only independent of this setting."
             )),
-            'scope': 4
+            'scope': ConfigurationScope.RESOURCE
         },
         [FILES_READONLY_EXCLUDE_CONFIG]: {
             'type': 'object',
@@ -335,7 +335,7 @@ configurationRegistry.registerConfiguration({
                 35,
                 "Configure paths or [glob patterns](https://aka.ms/vscode-glob-patterns) to exclude from being marked as read-only if they match as a result of the `#files.readonlyInclude#` setting. Glob patterns are always evaluated relative to the path of the workspace folder unless they are absolute paths. Files from readonly file system providers will always be read-only independent of this setting."
             )),
-            'scope': 4
+            'scope': ConfigurationScope.RESOURCE
         },
         [FILES_READONLY_FROM_PERMISSIONS_CONFIG]: {
             'type': 'boolean',
@@ -375,7 +375,7 @@ configurationRegistry.registerConfiguration({
                 "A save conflict can occur when a file is saved to disk that was changed by another program in the meantime. To prevent data loss, the user is asked to compare the changes in the editor with the version on disk. This setting should only be changed if you frequently encounter save conflict errors and may result in data loss if used without caution."
             )),
             'default': 'askUser',
-            'scope': 5
+            'scope': ConfigurationScope.LANGUAGE_OVERRIDABLE
         },
         'files.dialog.defaultPath': {
             'type': 'string',
@@ -390,7 +390,7 @@ configurationRegistry.registerConfiguration({
                 42,
                 "Default path for file dialogs, overriding user's home path. Only used in the absence of a context-specific path, such as most recently opened file or folder."
             )),
-            'scope': 2
+            'scope': ConfigurationScope.MACHINE
         },
         'files.simpleDialog.enable': {
             'type': 'boolean',
@@ -422,7 +422,7 @@ configurationRegistry.registerConfiguration({
                 45,
                 "Format a file on save. A formatter must be available, the file must not be saved after delay, and the editor must not be shutting down."
             )),
-            'scope': 5 ,
+            'scope': ConfigurationScope.LANGUAGE_OVERRIDABLE,
         },
         'editor.formatOnSaveMode': {
             'type': 'string',
@@ -446,7 +446,7 @@ configurationRegistry.registerConfiguration({
                 49,
                 "Controls if format on save formats the whole file or only modifications. Only applies when `#editor.formatOnSave#` is enabled."
             )),
-            'scope': 5 ,
+            'scope': ConfigurationScope.LANGUAGE_OVERRIDABLE,
         },
     }
 });
@@ -460,7 +460,7 @@ configurationRegistry.registerConfiguration({
                 45,
                 "Format a file on save. A formatter must be available, the file must not be saved after delay, and the editor must not be shutting down."
             )),
-            'scope': 5 ,
+            'scope': ConfigurationScope.LANGUAGE_OVERRIDABLE,
         },
         'editor.formatOnSaveMode': {
             'type': 'string',
@@ -484,7 +484,7 @@ configurationRegistry.registerConfiguration({
                 49,
                 "Controls if format on save formats the whole file or only modifications. Only applies when `#editor.formatOnSave#` is enabled."
             )),
-            'scope': 5 ,
+            'scope': ConfigurationScope.LANGUAGE_OVERRIDABLE,
         },
     }
 });

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

@@ -8,7 +8,7 @@ import { SyncDescriptor } from '../../../../platform/instantiation/common/descri
 import { ILabelService } from '../../../../platform/label/common/label.service.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { EditorPaneDescriptor } from '../../../browser/editor.js';
-import { registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
 import { EditorExtensions } from '../../../common/editor.js';
 import { BinaryFileEditor } from './editors/binaryFileEditor.js';
 import { FileEditorInputSerializer, FileEditorWorkingCopyEditorHandler } from './editors/fileEditorHandler.js';
@@ -47,12 +47,12 @@ FileUriLabelContribution = ( (__decorate([
     ( (new SyncDescriptor(FileEditorInput)))
 ]);
 ( (Registry.as(EditorExtensions.EditorFactory))).registerEditorSerializer(FILE_EDITOR_INPUT_ID, FileEditorInputSerializer);
-registerWorkbenchContribution2(FileEditorWorkingCopyEditorHandler.ID, FileEditorWorkingCopyEditorHandler, 2 );
-registerWorkbenchContribution2(TextFileEditorTracker.ID, TextFileEditorTracker, 1 );
-registerWorkbenchContribution2(TextFileSaveErrorHandler.ID, TextFileSaveErrorHandler, 1 );
-registerWorkbenchContribution2(FileUriLabelContribution.ID, FileUriLabelContribution, 1 );
-registerWorkbenchContribution2(WorkspaceWatcher.ID, WorkspaceWatcher, 3 );
-registerWorkbenchContribution2(DirtyFilesIndicator.ID, DirtyFilesIndicator, 1 );
+registerWorkbenchContribution2(FileEditorWorkingCopyEditorHandler.ID, FileEditorWorkingCopyEditorHandler, WorkbenchPhase.BlockRestore);
+registerWorkbenchContribution2(TextFileEditorTracker.ID, TextFileEditorTracker, WorkbenchPhase.BlockStartup);
+registerWorkbenchContribution2(TextFileSaveErrorHandler.ID, TextFileSaveErrorHandler, WorkbenchPhase.BlockStartup);
+registerWorkbenchContribution2(FileUriLabelContribution.ID, FileUriLabelContribution, WorkbenchPhase.BlockStartup);
+registerWorkbenchContribution2(WorkspaceWatcher.ID, WorkspaceWatcher, WorkbenchPhase.AfterRestored);
+registerWorkbenchContribution2(DirtyFilesIndicator.ID, DirtyFilesIndicator, WorkbenchPhase.BlockStartup);
 ModesRegistry.registerLanguage({
     id: BINARY_TEXT_FILE_MODE,
     aliases: ['Binary'],

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

@@ -40,7 +40,7 @@ function getResourceForCommand(resource, listService, editorService) {
     }
     return EditorResourceAccessor.getOriginalUri(editorService.activeEditor, { supportSideBySide: SideBySideEditor.PRIMARY });
 }
-function getMultiSelectedResources(resource, listService, editorService, explorerService) {
+function getMultiSelectedResources(resource, listService, editorService, editorGroupService, explorerService) {
     const list = listService.lastFocusedList;
     const element = list?.getHTMLElement();
     if (element && isActiveElement(element)) {
@@ -67,6 +67,13 @@ function getMultiSelectedResources(resource, listService, editorService, explore
             }
         }
     }
+    const activeGroup = editorGroupService.activeGroup;
+    const selection = activeGroup.selectedEditors;
+    if (selection.length > 1 && URI.isUri(resource)) {
+        if (( selection.some(e => e.matches({ resource })))) {
+            return ( selection.map(editor => EditorResourceAccessor.getOriginalUri(editor))).filter(uri => !!uri);
+        }
+    }
     const result = getResourceForCommand(resource, listService, editorService);
     return !!result ? [result] : [];
 }

package/vscode/src/vs/workbench/contrib/files/browser/media/explorerviewlet.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".explorer-folders-view{height:100%}.explorer-item-hover{cursor:pointer!important;font-size:13px!important;height:22px;padding-left:6px;user-select:none!important}.explorer-folders-view .monaco-list-row{padding-left:4px}.explorer-folders-view .explorer-folders-view.highlight .monaco-list .explorer-item:not(.explorer-item-edited),.explorer-folders-view .explorer-folders-view.highlight .monaco-list .monaco-tl-twistie{opacity:.3}.explorer-folders-view .editor-group,.explorer-folders-view .explorer-item{height:22px;line-height:22px}.explorer-folders-view .explorer-item{display:flex;flex-wrap:nowrap}.explorer-folders-view .editor-group,.explorer-folders-view .explorer-item>a{overflow:hidden;text-overflow:ellipsis}.explorer-folders-view .explorer-item,.explorer-folders-view .explorer-item .monaco-inputbox{flex:1}.explorer-folders-view .explorer-item.cut{opacity:.5}.explorer-folders-view .explorer-item.explorer-item-edited .label-name{flex:0}.explorer-folders-view .explorer-item.nonexistent-root{opacity:.5}.explorer-folders-view .explorer-item .monaco-inputbox{line-height:normal;width:100%}.explorer-folders-view .explorer-item .monaco-icon-name-container.multiple>.label-name>.monaco-highlighted-label{border-radius:3px}.explorer-folders-view .explorer-item .monaco-icon-name-container.multiple>.label-name:hover>.monaco-highlighted-label,.explorer-folders-view .monaco-list .monaco-list-row.focused .explorer-item .monaco-icon-name-container.multiple>.label-name.active>.monaco-highlighted-label{text-decoration:underline}.explorer-folders-view .explorer-item .monaco-icon-name-container.multiple>.label-name.drop-target>.monaco-highlighted-label{background-color:var(--vscode-list-dropBackground)}.explorer-folders-view .explorer-item.align-nest-icon-with-parent-icon{margin-left:var(--vscode-explorer-align-offset-margin-left)}.monaco-workbench.linux .explorer-folders-view .explorer-item .monaco-inputbox,.monaco-workbench.mac .explorer-folders-view .explorer-item .monaco-inputbox{height:22px}.monaco-workbench .explorer-folders-view .explorer-item .monaco-inputbox>.ibwrapper>.input{height:20px;padding:0}.monaco-workbench.hc-black .explorer-folders-view .explorer-item,.monaco-workbench.hc-light .explorer-folders-view .explorer-item{line-height:20px}.monaco-workbench .explorer-folders-view .explorer-item .monaco-inputbox input[type=text]{opacity:1;outline-color:var(--vscode-focusBorder);outline-offset:-1px;outline-style:solid;outline-width:1px}.monaco-workbench.context-menu-visible .explorer-folders-view.highlight .monaco-list-row{outline:none!important}";
+var css = ".explorer-folders-view{height:100%}.explorer-folders-view .monaco-list-row{padding-left:4px}.explorer-folders-view .explorer-folders-view.highlight .monaco-list .explorer-item:not(.explorer-item-edited),.explorer-folders-view .explorer-folders-view.highlight .monaco-list .monaco-tl-twistie{opacity:.3}.explorer-folders-view .editor-group,.explorer-folders-view .explorer-item{height:22px;line-height:22px}.explorer-folders-view .explorer-item{display:flex;flex-wrap:nowrap}.explorer-folders-view .editor-group,.explorer-folders-view .explorer-item>a{overflow:hidden;text-overflow:ellipsis}.explorer-folders-view .explorer-item,.explorer-folders-view .explorer-item .monaco-inputbox{flex:1}.explorer-folders-view .explorer-item.cut{opacity:.5}.explorer-folders-view .explorer-item.explorer-item-edited .label-name{flex:0}.explorer-folders-view .explorer-item.nonexistent-root{opacity:.5}.explorer-folders-view .explorer-item .monaco-inputbox{line-height:normal;width:100%}.explorer-folders-view .explorer-item .monaco-icon-name-container.multiple>.label-name>.monaco-highlighted-label{border-radius:3px}.explorer-folders-view .explorer-item .monaco-icon-name-container.multiple>.label-name:hover>.monaco-highlighted-label,.explorer-folders-view .monaco-list .monaco-list-row.focused .explorer-item .monaco-icon-name-container.multiple>.label-name.active>.monaco-highlighted-label{text-decoration:underline}.explorer-folders-view .explorer-item .monaco-icon-name-container.multiple>.label-name.drop-target>.monaco-highlighted-label{background-color:var(--vscode-list-dropBackground)}.explorer-folders-view .explorer-item.align-nest-icon-with-parent-icon{margin-left:var(--vscode-explorer-align-offset-margin-left)}.monaco-workbench.linux .explorer-folders-view .explorer-item .monaco-inputbox,.monaco-workbench.mac .explorer-folders-view .explorer-item .monaco-inputbox{height:22px}.monaco-workbench .explorer-folders-view .explorer-item .monaco-inputbox>.ibwrapper>.input{height:20px;padding:0}.monaco-workbench.hc-black .explorer-folders-view .explorer-item,.monaco-workbench.hc-light .explorer-folders-view .explorer-item{line-height:20px}.monaco-workbench .explorer-folders-view .explorer-item .monaco-inputbox input[type=text]{opacity:1;outline-color:var(--vscode-focusBorder);outline-offset:-1px;outline-style:solid;outline-width:1px}.monaco-workbench.context-menu-visible .explorer-folders-view.highlight .monaco-list-row{outline:none!important}";
 n(css,{});
 export { css, css as default };

package/vscode/src/vs/workbench/contrib/files/browser/views/emptyView.js

@@ -4,7 +4,7 @@ import { IInstantiationService } from '../../../../../platform/instantiation/com
 import { IThemeService } from '../../../../../platform/theme/common/themeService.service.js';
 import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.service.js';
 import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.service.js';
-import { isTemporaryWorkspace } from '../../../../../platform/workspace/common/workspace.js';
+import { isTemporaryWorkspace, 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 { ViewPane } from '../../../../browser/parts/views/viewPane.js';
@@ -75,7 +75,7 @@ let EmptyView = class EmptyView extends ViewPane {
         if (this._disposed) {
             return;
         }
-        if (this.contextService.getWorkbenchState() === 3 ) {
+        if (this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE) {
             this.updateTitle(EmptyView_1.NAME.value);
         }
         else {