@codingame/monaco-vscode-api 4.5.2 → 5.0.1

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

@@ -152,7 +152,7 @@ async function deleteFiles(explorerService, workingCopyFileService, dialogServic
     }
     let confirmation;
     const deleteDetail = ( (distinctElements.some(e => e.isDirectory))) ? ( localizeWithPath(_moduleId, 16, "This action is irreversible!")) :
-        distinctElements.length > 1 ? ( localizeWithPath(_moduleId, 17, "You can restore these files using the Undo command")) : ( localizeWithPath(_moduleId, 18, "You can restore this file using the Undo command"));
+        distinctElements.length > 1 ? ( localizeWithPath(_moduleId, 17, "You can restore these files using the Undo command.")) : ( localizeWithPath(_moduleId, 18, "You can restore this file using the Undo command."));
     if (skipConfirm || (useTrash && configurationService.getValue(CONFIRM_DELETE_SETTING_KEY) === false)) {
         confirmation = { confirmed: true };
     }
@@ -482,7 +482,14 @@ class GlobalCompareResourcesAction extends Action2 {
             title: GlobalCompareResourcesAction.LABEL,
             f1: true,
             category: Categories.File,
-            precondition: ActiveEditorContext
+            precondition: ActiveEditorContext,
+            metadata: {
+                description: ( localize2WithPath(
+                    _moduleId,
+                    45,
+                    "Opens a picker to select a file to diff with the active editor."
+                ))
+            }
         });
     }
     async run(accessor) {
@@ -511,12 +518,12 @@ class ToggleAutoSaveAction extends Action2 {
     constructor() {
         super({
             id: ToggleAutoSaveAction.ID,
-            title: ( localize2WithPath(_moduleId, 45, "Toggle Auto Save")),
+            title: ( localize2WithPath(_moduleId, 46, "Toggle Auto Save")),
             f1: true,
             category: Categories.File,
             metadata: { description: ( localize2WithPath(
                 _moduleId,
-                46,
+                47,
                 "Toggle the ability to save files automatically after typing"
             )) }
         });
@@ -562,7 +569,7 @@ BaseSaveAllAction = ( (__decorate([
 ], BaseSaveAllAction)));
 class SaveAllInGroupAction extends BaseSaveAllAction {
     static { this.ID = 'workbench.files.action.saveAllInGroup'; }
-    static { this.LABEL = ( localizeWithPath(_moduleId, 47, "Save All in Group")); }
+    static { this.LABEL = ( localizeWithPath(_moduleId, 48, "Save All in Group")); }
     get class() {
         return 'explorer-action ' + ThemeIcon.asClassName(Codicon.saveAll);
     }
@@ -572,7 +579,7 @@ class SaveAllInGroupAction extends BaseSaveAllAction {
 }
 let CloseGroupAction = class CloseGroupAction extends Action {
     static { this.ID = 'workbench.files.action.closeGroup'; }
-    static { this.LABEL = ( localizeWithPath(_moduleId, 48, "Close Group")); }
+    static { this.LABEL = ( localizeWithPath(_moduleId, 49, "Close Group")); }
     constructor(id, label, commandService) {
         super(id, label, ThemeIcon.asClassName(Codicon.closeAll));
         this.commandService = commandService;
@@ -586,13 +593,16 @@ CloseGroupAction = ( (__decorate([
 ], CloseGroupAction)));
 class FocusFilesExplorer extends Action2 {
     static { this.ID = 'workbench.files.action.focusFilesExplorer'; }
-    static { this.LABEL = ( localize2WithPath(_moduleId, 49, "Focus on Files Explorer")); }
+    static { this.LABEL = ( localize2WithPath(_moduleId, 50, "Focus on Files Explorer")); }
     constructor() {
         super({
             id: FocusFilesExplorer.ID,
             title: FocusFilesExplorer.LABEL,
             f1: true,
-            category: Categories.File
+            category: Categories.File,
+            metadata: {
+                description: ( localize2WithPath(_moduleId, 51, "Moves focus to the file explorer view container."))
+            }
         });
     }
     async run(accessor) {
@@ -602,13 +612,20 @@ class FocusFilesExplorer extends Action2 {
 }
 class ShowActiveFileInExplorer extends Action2 {
     static { this.ID = 'workbench.files.action.showActiveFileInExplorer'; }
-    static { this.LABEL = ( localize2WithPath(_moduleId, 50, "Reveal Active File in Explorer View")); }
+    static { this.LABEL = ( localize2WithPath(_moduleId, 52, "Reveal Active File in Explorer View")); }
     constructor() {
         super({
             id: ShowActiveFileInExplorer.ID,
             title: ShowActiveFileInExplorer.LABEL,
             f1: true,
-            category: Categories.File
+            category: Categories.File,
+            metadata: {
+                description: ( localize2WithPath(
+                    _moduleId,
+                    53,
+                    "Reveals and selects the active file within the explorer view."
+                ))
+            }
         });
     }
     async run(accessor) {
@@ -622,14 +639,21 @@ class ShowActiveFileInExplorer extends Action2 {
 }
 class OpenActiveFileInEmptyWorkspace extends Action2 {
     static { this.ID = 'workbench.action.files.showOpenedFileInNewWindow'; }
-    static { this.LABEL = ( localize2WithPath(_moduleId, 51, "Open Active File in New Empty Workspace")); }
+    static { this.LABEL = ( localize2WithPath(_moduleId, 54, "Open Active File in New Empty Workspace")); }
     constructor() {
         super({
             id: OpenActiveFileInEmptyWorkspace.ID,
             title: OpenActiveFileInEmptyWorkspace.LABEL,
             f1: true,
             category: Categories.File,
-            precondition: EmptyWorkspaceSupportContext
+            precondition: EmptyWorkspaceSupportContext,
+            metadata: {
+                description: ( localize2WithPath(
+                    _moduleId,
+                    55,
+                    "Opens the active file in a new window with no folders open."
+                ))
+            }
         });
     }
     async run(accessor) {
@@ -643,7 +667,7 @@ class OpenActiveFileInEmptyWorkspace extends Action2 {
                 hostService.openWindow([{ fileUri: fileResource }], { forceNewWindow: true });
             }
             else {
-                dialogService.error(( localizeWithPath(_moduleId, 52, "The active editor must contain an openable resource.")));
+                dialogService.error(( localizeWithPath(_moduleId, 56, "The active editor must contain an openable resource.")));
             }
         }
     }
@@ -652,13 +676,13 @@ function validateFileName(pathService, item, name, os) {
     name = getWellFormedFileName(name);
     if (!name || name.length === 0 || /^\s+$/.test(name)) {
         return {
-            content: ( localizeWithPath(_moduleId, 53, "A file or folder name must be provided.")),
+            content: ( localizeWithPath(_moduleId, 57, "A file or folder name must be provided.")),
             severity: Severity$1.Error
         };
     }
     if (name[0] === '/' || name[0] === '\\') {
         return {
-            content: ( localizeWithPath(_moduleId, 54, "A file or folder name cannot start with a slash.")),
+            content: ( localizeWithPath(_moduleId, 58, "A file or folder name cannot start with a slash.")),
             severity: Severity$1.Error
         };
     }
@@ -670,7 +694,7 @@ function validateFileName(pathService, item, name, os) {
             return {
                 content: ( localizeWithPath(
                     _moduleId,
-                    55,
+                    59,
                     "A file or folder **{0}** already exists at this location. Please choose a different name.",
                     name
                 )),
@@ -683,7 +707,7 @@ function validateFileName(pathService, item, name, os) {
         return {
             content: ( localizeWithPath(
                 _moduleId,
-                56,
+                60,
                 "The name **{0}** is not valid as a file or folder name. Please choose a different name.",
                 trimLongName(escapedName)
             )),
@@ -694,7 +718,7 @@ function validateFileName(pathService, item, name, os) {
         return {
             content: ( localizeWithPath(
                 _moduleId,
-                57,
+                61,
                 "Leading or trailing whitespace detected in file or folder name."
             )),
             severity: Severity$1.Warning
@@ -719,13 +743,16 @@ function getWellFormedFileName(filename) {
 }
 class CompareNewUntitledTextFilesAction extends Action2 {
     static { this.ID = 'workbench.files.action.compareNewUntitledTextFiles'; }
-    static { this.LABEL = ( localize2WithPath(_moduleId, 58, "Compare New Untitled Text Files")); }
+    static { this.LABEL = ( localize2WithPath(_moduleId, 62, "Compare New Untitled Text Files")); }
     constructor() {
         super({
             id: CompareNewUntitledTextFilesAction.ID,
             title: CompareNewUntitledTextFilesAction.LABEL,
             f1: true,
-            category: Categories.File
+            category: Categories.File,
+            metadata: {
+                description: ( localize2WithPath(_moduleId, 63, "Opens a new diff editor with two untitled files."))
+            }
         });
     }
     async run(accessor) {
@@ -739,7 +766,7 @@ class CompareNewUntitledTextFilesAction extends Action2 {
 }
 class CompareWithClipboardAction extends Action2 {
     static { this.ID = 'workbench.files.action.compareWithClipboard'; }
-    static { this.LABEL = ( localize2WithPath(_moduleId, 59, "Compare Active File with Clipboard")); }
+    static { this.LABEL = ( localize2WithPath(_moduleId, 64, "Compare Active File with Clipboard")); }
     static { this.SCHEME_COUNTER = 0; }
     constructor() {
         super({
@@ -747,7 +774,14 @@ class CompareWithClipboardAction extends Action2 {
             title: CompareWithClipboardAction.LABEL,
             f1: true,
             category: Categories.File,
-            keybinding: { primary: KeyChord(2048  | 41 , 33 ), weight: 200  }
+            keybinding: { primary: KeyChord(2048  | 41 , 33 ), weight: 200  },
+            metadata: {
+                description: ( localize2WithPath(
+                    _moduleId,
+                    65,
+                    "Opens a new diff editor to compare the active file with the contents of the clipboard."
+                ))
+            }
         });
     }
     async run(accessor) {
@@ -763,7 +797,7 @@ class CompareWithClipboardAction extends Action2 {
                 this.registrationDisposal = textModelService.registerTextModelContentProvider(scheme, provider);
             }
             const name = basename(resource);
-            const editorLabel = ( localizeWithPath(_moduleId, 60, "Clipboard ↔ {0}", name));
+            const editorLabel = ( localizeWithPath(_moduleId, 66, "Clipboard ↔ {0}", name));
             await editorService.openEditor({
                 original: { resource: resource.with({ scheme }) },
                 modified: { resource: resource },
@@ -799,7 +833,7 @@ ClipboardContentProvider = ( (__decorate([
 ], ClipboardContentProvider)));
 function onErrorWithRetry(notificationService, error, retry) {
     notificationService.prompt(Severity$1.Error, toErrorMessage(error, false), [{
-            label: ( localizeWithPath(_moduleId, 61, "Retry")),
+            label: ( localizeWithPath(_moduleId, 67, "Retry")),
             run: () => retry()
         }]);
 }
@@ -846,8 +880,8 @@ async function openExplorerAndCreate(accessor, isFolder) {
                 isFolder = true;
             }
             await explorerService.applyBulkEdit([( (new ResourceFileEdit(undefined, resourceToCreate, { folder: isFolder })))], {
-                undoLabel: ( localizeWithPath(_moduleId, 62, "Create {0}", value)),
-                progressLabel: ( localizeWithPath(_moduleId, 63, "Creating {0}", value)),
+                undoLabel: ( localizeWithPath(_moduleId, 68, "Create {0}", value)),
+                progressLabel: ( localizeWithPath(_moduleId, 69, "Creating {0}", value)),
                 confirmBeforeUndo: true
             });
             await refreshIfSeparator(value, explorerService);
@@ -908,8 +942,8 @@ const renameHandler = async (accessor) => {
                     try {
                         await explorerService.applyBulkEdit([( (new ResourceFileEdit(stat.resource, targetResource)))], {
                             confirmBeforeUndo: configurationService.getValue().explorer.confirmUndo === "verbose" ,
-                            undoLabel: ( localizeWithPath(_moduleId, 64, "Rename {0} to {1}", stat.name, value)),
-                            progressLabel: ( localizeWithPath(_moduleId, 65, "Renaming {0} to {1}", stat.name, value)),
+                            undoLabel: ( localizeWithPath(_moduleId, 70, "Rename {0} to {1}", stat.name, value)),
+                            progressLabel: ( localizeWithPath(_moduleId, 71, "Renaming {0} to {1}", stat.name, value)),
                         });
                         await refreshIfSeparator(value, explorerService);
                     }
@@ -1011,13 +1045,13 @@ const pasteFileHandler = async (accessor, fileList) => {
         const message = toPaste.files.length > 1 ?
             ( localizeWithPath(
                 _moduleId,
-                66,
+                72,
                 "Are you sure you want to paste the following {0} items?",
                 toPaste.files.length
             )) :
             ( localizeWithPath(
                 _moduleId,
-                67,
+                73,
                 "Are you sure you want to paste '{0}'?",
                 basename$1(toPaste.type === 'paths' ? toPaste.files[0].fsPath : toPaste.files[0].name)
             ));
@@ -1028,7 +1062,7 @@ const pasteFileHandler = async (accessor, fileList) => {
             checkbox: {
                 label: ( localizeWithPath(_moduleId, 23, "Do not ask me again"))
             },
-            primaryButton: ( localizeWithPath(_moduleId, 68, "&&Paste"))
+            primaryButton: ( localizeWithPath(_moduleId, 74, "&&Paste"))
         });
         if (!confirmation.confirmed) {
             return;
@@ -1049,7 +1083,7 @@ const pasteFileHandler = async (accessor, fileList) => {
             const sourceTargetPairs = coalesce(await Promise.all(( (toPaste.files.map(async (fileToPaste) => {
                 if (( (element.resource.toString())) !== ( (fileToPaste.toString())) && isEqualOrParent(element.resource, fileToPaste)) {
                     throw ( (new Error(
-                        localizeWithPath(_moduleId, 69, "File to paste is an ancestor of the destination folder")
+                        localizeWithPath(_moduleId, 75, "File to paste is an ancestor of the destination folder")
                     )));
                 }
                 const fileToPasteStat = await fileService.stat(fileToPaste);
@@ -1073,17 +1107,17 @@ const pasteFileHandler = async (accessor, fileList) => {
                     )));
                     const options = {
                         confirmBeforeUndo: configurationService.getValue().explorer.confirmUndo === "verbose" ,
-                        progressLabel: sourceTargetPairs.length > 1 ? ( localizeWithPath(_moduleId, 70, "Moving {0} files", sourceTargetPairs.length))
+                        progressLabel: sourceTargetPairs.length > 1 ? ( localizeWithPath(_moduleId, 76, "Moving {0} files", sourceTargetPairs.length))
                             : ( localizeWithPath(
                             _moduleId,
-                            71,
+                            77,
                             "Moving {0}",
                             basenameOrAuthority(sourceTargetPairs[0].target)
                         )),
-                        undoLabel: sourceTargetPairs.length > 1 ? ( localizeWithPath(_moduleId, 72, "Move {0} files", sourceTargetPairs.length))
+                        undoLabel: sourceTargetPairs.length > 1 ? ( localizeWithPath(_moduleId, 78, "Move {0} files", sourceTargetPairs.length))
                             : ( localizeWithPath(
                             _moduleId,
-                            73,
+                            79,
                             "Move {0}",
                             basenameOrAuthority(sourceTargetPairs[0].target)
                         ))
@@ -1133,7 +1167,7 @@ const pasteFileHandler = async (accessor, fileList) => {
     catch (e) {
         onError(notificationService, ( (new Error(( localizeWithPath(
             _moduleId,
-            74,
+            80,
             "The file(s) to paste have been deleted or moved since you copied them. {0}",
             getErrorMessage(e)
         ))))));
@@ -1148,10 +1182,10 @@ const pasteFileHandler = async (accessor, fileList) => {
         const undoLevel = configurationService.getValue().explorer.confirmUndo;
         const options = {
             confirmBeforeUndo: undoLevel === "default"  || undoLevel === "verbose" ,
-            progressLabel: targets.length > 1 ? ( localizeWithPath(_moduleId, 75, "Copying {0} files", targets.length))
-                : ( localizeWithPath(_moduleId, 76, "Copying {0}", basenameOrAuthority(targets[0]))),
-            undoLabel: targets.length > 1 ? ( localizeWithPath(_moduleId, 77, "Paste {0} files", targets.length))
-                : ( localizeWithPath(_moduleId, 78, "Paste {0}", basenameOrAuthority(targets[0])))
+            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))
+                : ( localizeWithPath(_moduleId, 84, "Paste {0}", basenameOrAuthority(targets[0])))
         };
         await explorerService.applyBulkEdit(resourceFileEdits, options);
     }
@@ -1200,28 +1234,28 @@ class BaseSetActiveEditorReadonlyInSession extends Action2 {
 }
 class SetActiveEditorReadonlyInSession extends BaseSetActiveEditorReadonlyInSession {
     static { this.ID = 'workbench.action.files.setActiveEditorReadonlyInSession'; }
-    static { this.LABEL = ( localize2WithPath(_moduleId, 79, "Set Active Editor Read-only in Session")); }
+    static { this.LABEL = ( localize2WithPath(_moduleId, 85, "Set Active Editor Read-only in Session")); }
     constructor() {
         super(SetActiveEditorReadonlyInSession.ID, SetActiveEditorReadonlyInSession.LABEL, true);
     }
 }
 class SetActiveEditorWriteableInSession extends BaseSetActiveEditorReadonlyInSession {
     static { this.ID = 'workbench.action.files.setActiveEditorWriteableInSession'; }
-    static { this.LABEL = ( localize2WithPath(_moduleId, 80, "Set Active Editor Writeable in Session")); }
+    static { this.LABEL = ( localize2WithPath(_moduleId, 86, "Set Active Editor Writeable in Session")); }
     constructor() {
         super(SetActiveEditorWriteableInSession.ID, SetActiveEditorWriteableInSession.LABEL, false);
     }
 }
 class ToggleActiveEditorReadonlyInSession extends BaseSetActiveEditorReadonlyInSession {
     static { this.ID = 'workbench.action.files.toggleActiveEditorReadonlyInSession'; }
-    static { this.LABEL = ( localize2WithPath(_moduleId, 81, "Toggle Active Editor Read-only in Session")); }
+    static { this.LABEL = ( localize2WithPath(_moduleId, 87, "Toggle Active Editor Read-only in Session")); }
     constructor() {
         super(ToggleActiveEditorReadonlyInSession.ID, ToggleActiveEditorReadonlyInSession.LABEL, 'toggle');
     }
 }
 class ResetActiveEditorReadonlyInSession extends BaseSetActiveEditorReadonlyInSession {
     static { this.ID = 'workbench.action.files.resetActiveEditorReadonlyInSession'; }
-    static { this.LABEL = ( localize2WithPath(_moduleId, 82, "Reset Active Editor Read-only in Session")); }
+    static { this.LABEL = ( localize2WithPath(_moduleId, 88, "Reset Active Editor Read-only in Session")); }
     constructor() {
         super(ResetActiveEditorReadonlyInSession.ID, ResetActiveEditorReadonlyInSession.LABEL, 'reset');
     }

package/vscode/src/vs/workbench/contrib/files/browser/{fileCommands.save.js → fileCommands._save.js}

@@ -23,7 +23,7 @@ import { IEditorService } from '../../../services/editor/common/editorService.se
 import { ITextFileService } from '../../../services/textfile/common/textfiles.service.js';
 import { SAVE_FILE_COMMAND_ID, SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID, SAVE_FILE_AS_COMMAND_ID, SAVE_ALL_COMMAND_ID, SAVE_ALL_IN_GROUP_COMMAND_ID, SAVE_FILES_COMMAND_ID } from './fileConstants.js';
 import Severity$1 from '../../../../base/common/severity.js';
-const _moduleId = "vs/workbench/contrib/files/browser/fileCommands.save";
+const _moduleId = "vs/workbench/contrib/files/browser/fileCommands";
 async function saveSelectedEditors(accessor, options) {
     const listService = accessor.get(IListService);
     const editorGroupService = accessor.get(IEditorGroupsService);
@@ -87,15 +87,15 @@ async function doSaveEditors(accessor, editors, options) {
                 severity: Severity$1.Error,
                 message: ( localizeWithPath(
                     _moduleId,
-                    0,
+                    3,
                     "Failed to save '{0}': {1}",
                     ( (editors.map(({ editor }) => editor.getName()))).join(', '),
                     toErrorMessage(error, false)
                 )),
                 actions: {
                     primary: [
-                        toAction({ id: 'workbench.action.files.saveEditors', label: ( localizeWithPath(_moduleId, 1, "Retry")), run: () => instantiationService.invokeFunction(accessor => doSaveEditors(accessor, editors, options)) }),
-                        toAction({ id: 'workbench.action.files.revertEditors', label: ( localizeWithPath(_moduleId, 2, "Discard")), run: () => editorService.revert(editors) })
+                        toAction({ id: 'workbench.action.files.saveEditors', label: ( localizeWithPath(_moduleId, 4, "Retry")), run: () => instantiationService.invokeFunction(accessor => doSaveEditors(accessor, editors, options)) }),
+                        toAction({ id: 'workbench.action.files.revertEditors', label: ( localizeWithPath(_moduleId, 5, "Discard")), run: () => editorService.revert(editors) })
                     ]
                 }
             });

package/vscode/src/vs/workbench/contrib/files/browser/{files.configuration.contribution.js → files.contribution._configuration.js}

@@ -5,7 +5,7 @@ import { Extensions } from '../../../../platform/configuration/common/configurat
 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';
-const _moduleId = "vs/workbench/contrib/files/browser/files.configuration.contribution";
+const _moduleId = "vs/workbench/contrib/files/browser/files.contribution";
 const configurationRegistry = ( (Registry.as(Extensions.Configuration)));
 const hotExitConfiguration = isNative ?
     {

package/vscode/src/vs/workbench/contrib/files/browser/{files.editorPane.contribution.js → files.contribution._editorPane.js}

@@ -1,26 +1,26 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { Schemas } from '../../../../base/common/network.js';
 import { sep } from '../../../../base/common/path.js';
+import { isWindows } from '../../../../base/common/platform.js';
+import { ModesRegistry } from '../../../../editor/common/languages/modesRegistry.js';
+import { localizeWithPath } from '../../../../nls.js';
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { ILabelService } from '../../../../platform/label/common/label.service.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
-import { registerWorkbenchContribution2, Extensions } from '../../../common/contributions.js';
+import { EditorPaneDescriptor } from '../../../browser/editor.js';
+import { registerWorkbenchContribution2 } from '../../../common/contributions.js';
 import { EditorExtensions } from '../../../common/editor.js';
-import { FILE_EDITOR_INPUT_ID, BINARY_TEXT_FILE_MODE } from '../common/files.js';
+import { BinaryFileEditor } from './editors/binaryFileEditor.js';
+import { FileEditorInputSerializer, FileEditorWorkingCopyEditorHandler } from './editors/fileEditorHandler.js';
+import { FileEditorInput } from './editors/fileEditorInput.js';
+import { TextFileEditor } from './editors/textFileEditor.js';
 import { TextFileEditorTracker } from './editors/textFileEditorTracker.js';
 import { TextFileSaveErrorHandler } from './editors/textFileSaveErrorHandler.js';
-import { FileEditorInput } from './editors/fileEditorInput.js';
-import { BinaryFileEditor } from './editors/binaryFileEditor.js';
-import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
-import { isWindows } from '../../../../base/common/platform.js';
-import { EditorPaneDescriptor } from '../../../browser/editor.js';
-import { ILabelService } from '../../../../platform/label/common/label.service.js';
-import { Schemas } from '../../../../base/common/network.js';
 import { WorkspaceWatcher } from './workspaceWatcher.js';
 import { DirtyFilesIndicator } from '../common/dirtyFilesIndicator.js';
-import { FileEditorInputSerializer, FileEditorWorkingCopyEditorHandler } from './editors/fileEditorHandler.js';
-import { ModesRegistry } from '../../../../editor/common/languages/modesRegistry.js';
-import { TextFileEditor } from './editors/textFileEditor.js';
-import './files.fileEditorFactory.contribution.js';
-const _moduleId = "vs/workbench/contrib/files/browser/files.editorPane.contribution";
+import { FILE_EDITOR_INPUT_ID, BINARY_TEXT_FILE_MODE } from '../common/files.js';
+import './files.contribution._fileEditorFactory.js';
+const _moduleId = "vs/workbench/contrib/files/browser/files.contribution";
 let FileUriLabelContribution = class FileUriLabelContribution {
     static { this.ID = 'workbench.contrib.fileUriLabel'; }
     constructor(labelService) {
@@ -40,10 +40,10 @@ let FileUriLabelContribution = class FileUriLabelContribution {
 FileUriLabelContribution = ( (__decorate([
     ( (__param(0, ILabelService)))
 ], FileUriLabelContribution)));
-( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(TextFileEditor, TextFileEditor.ID, ( localizeWithPath(_moduleId, 0, "Text File Editor"))), [
+( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(TextFileEditor, TextFileEditor.ID, ( localizeWithPath(_moduleId, 102, "Text File Editor"))), [
     ( (new SyncDescriptor(FileEditorInput)))
 ]);
-( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(BinaryFileEditor, BinaryFileEditor.ID, ( localizeWithPath(_moduleId, 1, "Binary File Editor"))), [
+( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(BinaryFileEditor, BinaryFileEditor.ID, ( localizeWithPath(_moduleId, 103, "Binary File Editor"))), [
     ( (new SyncDescriptor(FileEditorInput)))
 ]);
 ( (Registry.as(EditorExtensions.EditorFactory))).registerEditorSerializer(FILE_EDITOR_INPUT_ID, FileEditorInputSerializer);
@@ -51,7 +51,7 @@ registerWorkbenchContribution2(FileEditorWorkingCopyEditorHandler.ID, FileEditor
 registerWorkbenchContribution2(TextFileEditorTracker.ID, TextFileEditorTracker, 1 );
 registerWorkbenchContribution2(TextFileSaveErrorHandler.ID, TextFileSaveErrorHandler, 1 );
 registerWorkbenchContribution2(FileUriLabelContribution.ID, FileUriLabelContribution, 1 );
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(WorkspaceWatcher, 3 );
+registerWorkbenchContribution2(WorkspaceWatcher.ID, WorkspaceWatcher, 3 );
 registerWorkbenchContribution2(DirtyFilesIndicator.ID, DirtyFilesIndicator, 1 );
 ModesRegistry.registerLanguage({
     id: BINARY_TEXT_FILE_MODE,

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

@@ -27,14 +27,15 @@ import { IOpenerService } from '../../../../../platform/opener/common/opener.ser
 import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.service.js';
 import { isWeb } from '../../../../../base/common/platform.js';
 import { DragAndDropObserver, getWindow } from '../../../../../base/browser/dom.js';
+import { IHoverService } from '../../../../../platform/hover/browser/hover.service.js';
 var EmptyView_1;
 const _moduleId = "vs/workbench/contrib/files/browser/views/emptyView";
 let EmptyView = class EmptyView extends ViewPane {
     static { EmptyView_1 = this; }
     static { this.ID = 'workbench.explorer.emptyView'; }
     static { this.NAME = ( localize2WithPath(_moduleId, 0, "No Folder Opened")); }
-    constructor(options, themeService, viewDescriptorService, instantiationService, keybindingService, contextMenuService, contextService, configurationService, labelService, contextKeyService, openerService, telemetryService) {
-        super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
+    constructor(options, themeService, viewDescriptorService, instantiationService, keybindingService, contextMenuService, contextService, configurationService, labelService, contextKeyService, openerService, telemetryService, hoverService) {
+        super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
         this.contextService = contextService;
         this.labelService = labelService;
         this._disposed = false;
@@ -97,6 +98,7 @@ EmptyView = EmptyView_1 = ( (__decorate([
     ( (__param(8, ILabelService))),
     ( (__param(9, IContextKeyService))),
     ( (__param(10, IOpenerService))),
-    ( (__param(11, ITelemetryService)))
+    ( (__param(11, ITelemetryService))),
+    ( (__param(12, IHoverService)))
 ], EmptyView)));
 export { EmptyView };

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

@@ -33,7 +33,6 @@ import { IStorageService } from '../../../../../platform/storage/common/storage.
 import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.service.js';
 import { IFileService } from '../../../../../platform/files/common/files.service.js';
 import { Event } from '../../../../../base/common/event.js';
-import { SIDE_BAR_BACKGROUND } from '../../../../common/theme.js';
 import { IViewDescriptorService } from '../../../../common/views.service.js';
 import { IViewsService } from '../../../../services/views/common/viewsService.service.js';
 import { IOpenerService } from '../../../../../platform/opener/common/opener.service.js';
@@ -46,6 +45,7 @@ import { IEditorResolverService } from '../../../../services/editor/common/edito
 import { EditorOpenSource } from '../../../../../platform/editor/common/editor.js';
 import { ResourceMap } from '../../../../../base/common/map.js';
 import { isInputElement } from '../../../../../base/browser/ui/list/listWidget.js';
+import { IHoverService } from '../../../../../platform/hover/browser/hover.service.js';
 var ExplorerView_1;
 const _moduleId = "vs/workbench/contrib/files/browser/views/explorerView";
 function hasExpandedRootChild(tree, treeInput) {
@@ -118,8 +118,8 @@ function getContext(focus, selection, respectMultiSelection, compressedNavigatio
 let ExplorerView = class ExplorerView extends ViewPane {
     static { ExplorerView_1 = this; }
     static { this.TREE_VIEW_STATE_STORAGE_KEY = 'workbench.explorer.treeViewState'; }
-    constructor(options, contextMenuService, viewDescriptorService, instantiationService, contextService, progressService, editorService, editorResolverService, layoutService, keybindingService, contextKeyService, configurationService, decorationService, labelService, themeService, telemetryService, explorerService, storageService, clipboardService, fileService, uriIdentityService, commandService, openerService) {
-        super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
+    constructor(options, contextMenuService, viewDescriptorService, instantiationService, contextService, progressService, editorService, editorResolverService, layoutService, keybindingService, contextKeyService, configurationService, decorationService, labelService, themeService, telemetryService, hoverService, explorerService, storageService, clipboardService, fileService, uriIdentityService, commandService, openerService) {
+        super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
         this.contextService = contextService;
         this.progressService = progressService;
         this.editorService = editorService;
@@ -349,9 +349,7 @@ let ExplorerView = class ExplorerView extends ViewPane {
                 return false;
             },
             paddingBottom: ExplorerDelegate.ITEM_HEIGHT,
-            overrideStyles: {
-                listBackground: SIDE_BAR_BACKGROUND
-            }
+            overrideStyles: this.getLocationBasedColors().listOverrideStyles
         });
         this._register(this.tree);
         this._register(this.themeService.onDidColorThemeChange(() => this.tree.rerender()));
@@ -749,13 +747,14 @@ ExplorerView = ExplorerView_1 = ( (__decorate([
     ( (__param(13, ILabelService))),
     ( (__param(14, IThemeService))),
     ( (__param(15, ITelemetryService))),
-    ( (__param(16, IExplorerService))),
-    ( (__param(17, IStorageService))),
-    ( (__param(18, IClipboardService))),
-    ( (__param(19, IFileService))),
-    ( (__param(20, IUriIdentityService))),
-    ( (__param(21, ICommandService))),
-    ( (__param(22, IOpenerService)))
+    ( (__param(16, IHoverService))),
+    ( (__param(17, IExplorerService))),
+    ( (__param(18, IStorageService))),
+    ( (__param(19, IClipboardService))),
+    ( (__param(20, IFileService))),
+    ( (__param(21, IUriIdentityService))),
+    ( (__param(22, ICommandService))),
+    ( (__param(23, IOpenerService)))
 ], ExplorerView)));
 function createFileIconThemableTreeContainerScope(container, themeService) {
     container.classList.add('file-icon-themable-tree');
@@ -821,6 +820,9 @@ registerAction2(class extends Action2 {
                 group: 'navigation',
                 when: ( (ContextKeyExpr.equals('view', VIEW_ID))),
                 order: 30
+            },
+            metadata: {
+                description: ( localize2WithPath(_moduleId, 4, "Forces a refresh of the Explorer."))
             }
         });
     }
@@ -835,7 +837,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.files.action.collapseExplorerFolders',
-            title: ( localize2WithPath(_moduleId, 4, "Collapse Folders in Explorer")),
+            title: ( localize2WithPath(_moduleId, 5, "Collapse Folders in Explorer")),
             f1: true,
             icon: Codicon.collapseAll,
             menu: {
@@ -843,6 +845,9 @@ registerAction2(class extends Action2 {
                 group: 'navigation',
                 when: ( (ContextKeyExpr.equals('view', VIEW_ID))),
                 order: 40
+            },
+            metadata: {
+                description: ( localize2WithPath(_moduleId, 6, "Folds all folders in the Explorer."))
             }
         });
     }

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

@@ -1,4 +1,4 @@
 import n from '../../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".pane-header .open-editors-dirty-count-container{align-items:center;display:flex;min-width:fit-content}.pane-header .open-editors-dirty-count-container>.dirty-count.monaco-count-badge.hidden,.pane.horizontal:not(.expanded) .pane-header .open-editors-dirty-count-container>.dirty-count.monaco-count-badge{display:none}.pane-header .open-editors-dirty-count-container>.dirty-count.monaco-count-badge{margin-left:6px;min-height:auto;padding:2px 4px}.open-editors .monaco-list .monaco-list-row.dirty>.monaco-action-bar,.open-editors .monaco-list .monaco-list-row.focused>.monaco-action-bar,.open-editors .monaco-list .monaco-list-row.sticky>.monaco-action-bar,.open-editors .monaco-list .monaco-list-row:hover>.monaco-action-bar{visibility:visible}.open-editors .monaco-list .monaco-list-row>.monaco-action-bar .action-label{display:block;padding:2px}.open-editors .monaco-list .monaco-list-row>.monaco-action-bar .codicon{color:inherit}.open-editors .monaco-list .monaco-list-row.dirty:not(:hover)>.monaco-action-bar .codicon-pinned:before{content:\"\\ebb2\";font-family:codicon}.open-editors .monaco-list .monaco-list-row.dirty:not(:hover)>.monaco-action-bar .codicon-close:before{content:\"\\ea71\";font-family:codicon}.open-editors .monaco-list .monaco-list-row>.monaco-action-bar .action-close-all-files,.open-editors .monaco-list .monaco-list-row>.monaco-action-bar .save-all{height:22px;width:23px}.open-editors .monaco-list .monaco-list-row>.editor-group,.open-editors .monaco-list .monaco-list-row>.open-editor{flex:1}.open-editors .monaco-list .monaco-list-row{display:flex;padding-left:22px}.open-editors .monaco-list .monaco-list-row>.monaco-action-bar{align-items:center;display:flex;visibility:hidden}.open-editors .monaco-list .monaco-list-row .editor-group{cursor:default;font-size:11px;font-weight:700;text-transform:uppercase}.composite:lang(ja) .open-editors .monaco-list .monaco-list-row .editor-group,.composite:lang(ko) .open-editors .monaco-list .monaco-list-row .editor-group,.composite:lang(zh-Hans) .open-editors .monaco-list .monaco-list-row .editor-group,.composite:lang(zh-Hant) .open-editors .monaco-list .monaco-list-row .editor-group{font-weight:400}.open-editors .editor-group,.open-editors .open-editor{height:22px;line-height:22px}.open-editors .editor-group,.open-editors .open-editor>a{overflow:hidden;text-overflow:ellipsis}.monaco-workbench.hc-black .open-editors .editor-group,.monaco-workbench.hc-black .open-editors .open-editor,.monaco-workbench.hc-light .open-editors .editor-group,.monaco-workbench.hc-light .open-editors .open-editor{line-height:20px}";
+var css = ".pane-header .open-editors-dirty-count-container{align-items:center;display:flex;min-width:fit-content}.pane-header .open-editors-dirty-count-container>.dirty-count.monaco-count-badge.hidden,.pane.horizontal:not(.expanded) .pane-header .open-editors-dirty-count-container>.dirty-count.monaco-count-badge{display:none}.pane-header .open-editors-dirty-count-container>.dirty-count.monaco-count-badge{margin-left:6px;min-height:auto;padding:2px 4px}.open-editors .monaco-list .monaco-list-row.dirty>.monaco-action-bar,.open-editors .monaco-list .monaco-list-row.focused>.monaco-action-bar,.open-editors .monaco-list .monaco-list-row.sticky>.monaco-action-bar,.open-editors .monaco-list .monaco-list-row:hover>.monaco-action-bar{visibility:visible}.open-editors .monaco-list .monaco-list-row>.monaco-action-bar .action-label{display:block;padding:2px}.open-editors .monaco-list .monaco-list-row>.monaco-action-bar .codicon{color:inherit}.open-editors .monaco-list .monaco-list-row.dirty:not(:hover)>.monaco-action-bar .codicon-pinned:before{content:var(--vscode-icon-pinned-dirty-content);font-family:var(--vscode-icon-pinned-dirty-font-family)}.open-editors .monaco-list .monaco-list-row.dirty:not(:hover)>.monaco-action-bar .codicon-close:before{content:var(--vscode-icon-circle-filled-content);font-family:var(--vscode-icon-circle-filled-font-family)}.open-editors .monaco-list .monaco-list-row>.monaco-action-bar .action-close-all-files,.open-editors .monaco-list .monaco-list-row>.monaco-action-bar .save-all{height:22px;width:23px}.open-editors .monaco-list .monaco-list-row>.editor-group,.open-editors .monaco-list .monaco-list-row>.open-editor{flex:1}.open-editors .monaco-list .monaco-list-row{display:flex;padding-left:22px}.open-editors .monaco-list .monaco-list-row>.monaco-action-bar{align-items:center;display:flex;visibility:hidden}.open-editors .monaco-list .monaco-list-row .editor-group{cursor:default;font-size:11px;font-weight:700;text-transform:uppercase}.composite:lang(ja) .open-editors .monaco-list .monaco-list-row .editor-group,.composite:lang(ko) .open-editors .monaco-list .monaco-list-row .editor-group,.composite:lang(zh-Hans) .open-editors .monaco-list .monaco-list-row .editor-group,.composite:lang(zh-Hant) .open-editors .monaco-list .monaco-list-row .editor-group{font-weight:400}.open-editors .editor-group,.open-editors .open-editor{height:22px;line-height:22px}.open-editors .editor-group,.open-editors .open-editor>a{overflow:hidden;text-overflow:ellipsis}.monaco-workbench.hc-black .open-editors .editor-group,.monaco-workbench.hc-black .open-editors .open-editor,.monaco-workbench.hc-light .open-editors .editor-group,.monaco-workbench.hc-light .open-editors .open-editor{line-height:20px}";
 n(css,{});
 export { css, css as default };