@codingame/monaco-vscode-api 2.2.2 → 3.0.0

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

@@ -49,11 +49,12 @@ import { Action2 } from '../../../../platform/actions/common/actions.js';
 import { EmptyWorkspaceSupportContext, ActiveEditorContext, ActiveEditorCanToggleReadonlyContext } from '../../../common/contextkeys.js';
 import { KeyChord } from '../../../../base/common/keyCodes.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
 import { IDialogService, getFileNamesMessage } from '../../../../platform/dialogs/common/dialogs.js';
 const NEW_FILE_COMMAND_ID = 'explorer.newFile';
-const NEW_FILE_LABEL = ( localizeWithPath('vs/workbench/contrib/files/browser/fileActions', 'newFile', "New File..."));
+const NEW_FILE_LABEL = ( localize2WithPath('vs/workbench/contrib/files/browser/fileActions', 'newFile', "New File..."));
 const NEW_FOLDER_COMMAND_ID = 'explorer.newFolder';
-const NEW_FOLDER_LABEL = ( localizeWithPath(
+const NEW_FOLDER_LABEL = ( localize2WithPath(
     'vs/workbench/contrib/files/browser/fileActions',
     'newFolder',
     "New Folder..."
@@ -422,7 +423,7 @@ function containsBothDirectoryAndFile(distinctElements) {
     return !!directory && !!file;
 }
 async function findValidPasteFileTarget(explorerService, fileService, dialogService, targetFolder, fileToPaste, incrementalNaming) {
-    let name = basenameOrAuthority(fileToPaste.resource);
+    let name = typeof fileToPaste.resource === 'string' ? fileToPaste.resource : basenameOrAuthority(fileToPaste.resource);
     let candidate = joinPath(targetFolder.resource, name);
     if (incrementalNaming === 'disabled') {
         const canOverwrite = await askForOverwrite(fileService, dialogService, candidate);
@@ -557,7 +558,7 @@ async function askForOverwrite(fileService, dialogService, targetResource) {
 }
 class GlobalCompareResourcesAction extends Action2 {
     static { this.ID = 'workbench.files.action.compareFileWith'; }
-    static { this.LABEL = ( localizeWithPath(
+    static { this.LABEL = ( localize2WithPath(
         'vs/workbench/contrib/files/browser/fileActions',
         'globalCompareFile',
         "Compare Active File With..."
@@ -565,7 +566,7 @@ class GlobalCompareResourcesAction extends Action2 {
     constructor() {
         super({
             id: GlobalCompareResourcesAction.ID,
-            title: { value: GlobalCompareResourcesAction.LABEL, original: 'Compare Active File With...' },
+            title: GlobalCompareResourcesAction.LABEL,
             f1: true,
             category: Categories.File,
             precondition: ActiveEditorContext
@@ -684,7 +685,7 @@ CloseGroupAction = ( __decorate([
 ], CloseGroupAction));
 class FocusFilesExplorer extends Action2 {
     static { this.ID = 'workbench.files.action.focusFilesExplorer'; }
-    static { this.LABEL = ( localizeWithPath(
+    static { this.LABEL = ( localize2WithPath(
         'vs/workbench/contrib/files/browser/fileActions',
         'focusFilesExplorer',
         "Focus on Files Explorer"
@@ -692,7 +693,7 @@ class FocusFilesExplorer extends Action2 {
     constructor() {
         super({
             id: FocusFilesExplorer.ID,
-            title: { value: FocusFilesExplorer.LABEL, original: 'Focus on Files Explorer' },
+            title: FocusFilesExplorer.LABEL,
             f1: true,
             category: Categories.File
         });
@@ -704,7 +705,7 @@ class FocusFilesExplorer extends Action2 {
 }
 class ShowActiveFileInExplorer extends Action2 {
     static { this.ID = 'workbench.files.action.showActiveFileInExplorer'; }
-    static { this.LABEL = ( localizeWithPath(
+    static { this.LABEL = ( localize2WithPath(
         'vs/workbench/contrib/files/browser/fileActions',
         'showInExplorer',
         "Reveal Active File in Explorer View"
@@ -712,7 +713,7 @@ class ShowActiveFileInExplorer extends Action2 {
     constructor() {
         super({
             id: ShowActiveFileInExplorer.ID,
-            title: { value: ShowActiveFileInExplorer.LABEL, original: 'Reveal Active File in Explorer View' },
+            title: ShowActiveFileInExplorer.LABEL,
             f1: true,
             category: Categories.File
         });
@@ -728,7 +729,7 @@ class ShowActiveFileInExplorer extends Action2 {
 }
 class OpenActiveFileInEmptyWorkspace extends Action2 {
     static { this.ID = 'workbench.action.files.showOpenedFileInNewWindow'; }
-    static { this.LABEL = ( localizeWithPath(
+    static { this.LABEL = ( localize2WithPath(
         'vs/workbench/contrib/files/browser/fileActions',
         'openFileInEmptyWorkspace',
         "Open Active File in New Empty Workspace"
@@ -736,7 +737,7 @@ class OpenActiveFileInEmptyWorkspace extends Action2 {
     constructor() {
         super({
             id: OpenActiveFileInEmptyWorkspace.ID,
-            title: { value: OpenActiveFileInEmptyWorkspace.LABEL, original: 'Open Active File in New Empty Workspace' },
+            title: OpenActiveFileInEmptyWorkspace.LABEL,
             f1: true,
             category: Categories.File,
             precondition: EmptyWorkspaceSupportContext
@@ -841,7 +842,7 @@ function getWellFormedFileName(filename) {
 }
 class CompareNewUntitledTextFilesAction extends Action2 {
     static { this.ID = 'workbench.files.action.compareNewUntitledTextFiles'; }
-    static { this.LABEL = ( localizeWithPath(
+    static { this.LABEL = ( localize2WithPath(
         'vs/workbench/contrib/files/browser/fileActions',
         'compareNewUntitledTextFiles',
         "Compare New Untitled Text Files"
@@ -849,7 +850,7 @@ class CompareNewUntitledTextFilesAction extends Action2 {
     constructor() {
         super({
             id: CompareNewUntitledTextFilesAction.ID,
-            title: { value: CompareNewUntitledTextFilesAction.LABEL, original: 'Compare New Untitled Text Files' },
+            title: CompareNewUntitledTextFilesAction.LABEL,
             f1: true,
             category: Categories.File
         });
@@ -865,7 +866,7 @@ class CompareNewUntitledTextFilesAction extends Action2 {
 }
 class CompareWithClipboardAction extends Action2 {
     static { this.ID = 'workbench.files.action.compareWithClipboard'; }
-    static { this.LABEL = ( localizeWithPath(
+    static { this.LABEL = ( localize2WithPath(
         'vs/workbench/contrib/files/browser/fileActions',
         'compareWithClipboard',
         "Compare Active File with Clipboard"
@@ -874,7 +875,7 @@ class CompareWithClipboardAction extends Action2 {
     constructor() {
         super({
             id: CompareWithClipboardAction.ID,
-            title: { value: CompareWithClipboardAction.LABEL, original: 'Compare Active File with Clipboard' },
+            title: CompareWithClipboardAction.LABEL,
             f1: true,
             category: Categories.File,
             keybinding: { primary: KeyChord(2048  | 41 , 33 ), weight: 200  }
@@ -1133,7 +1134,7 @@ const uploadFileHandler = async (accessor) => {
     const explorerService = accessor.get(IExplorerService);
     const notificationService = accessor.get(INotificationService);
     const instantiationService = accessor.get(IInstantiationService);
-    const context = explorerService.getContext(true);
+    const context = explorerService.getContext(false);
     const element = context.length ? context[0] : explorerService.roots[0];
     try {
         const files = await triggerUpload();
@@ -1160,25 +1161,25 @@ const pasteFileHandler = async (accessor, fileList) => {
     const configurationService = accessor.get(IConfigurationService);
     const uriIdentityService = accessor.get(IUriIdentityService);
     const dialogService = accessor.get(IDialogService);
-    const context = explorerService.getContext(true);
+    const context = explorerService.getContext(false);
     const hasNativeFilesToPaste = fileList && fileList.length > 0;
     const confirmPasteNative = hasNativeFilesToPaste && configurationService.getValue('explorer.confirmPasteNative');
     const toPaste = await getFilesToPaste(fileList, clipboardService);
-    if (confirmPasteNative && toPaste?.length >= 1) {
-        const message = toPaste.length > 1 ?
+    if (confirmPasteNative && toPaste.files.length >= 1) {
+        const message = toPaste.files.length > 1 ?
             ( localizeWithPath(
                 'vs/workbench/contrib/files/browser/fileActions',
                 'confirmMultiPasteNative',
                 "Are you sure you want to paste the following {0} items?",
-                toPaste.length
+                toPaste.files.length
             )) :
             ( localizeWithPath(
                 'vs/workbench/contrib/files/browser/fileActions',
                 'confirmPasteNative',
                 "Are you sure you want to paste '{0}'?",
-                basename(toPaste[0].fsPath)
+                basename(toPaste.type === 'paths' ? toPaste.files[0].fsPath : toPaste.files[0].name)
             ));
-        const detail = toPaste.length > 1 ? getFileNamesMessage(toPaste) : undefined;
+        const detail = toPaste.files.length > 1 ? getFileNamesMessage(( toPaste.files.map(item => toPaste.type === 'paths' ? item.path : item.name))) : undefined;
         const confirmation = await dialogService.confirm({
             message,
             detail,
@@ -1209,96 +1210,92 @@ const pasteFileHandler = async (accessor, fileList) => {
         return;
     }
     try {
-        const sourceTargetPairs = coalesce(await Promise.all(( toPaste.map(async (fileToPaste) => {
-            if (( element.resource.toString()) !== ( fileToPaste.toString()) && isEqualOrParent(element.resource, fileToPaste)) {
-                throw new Error(localizeWithPath('vs/workbench/contrib/files/browser/fileActions', 'fileIsAncestor', "File to paste is an ancestor of the destination folder"));
-            }
-            const fileToPasteStat = await fileService.stat(fileToPaste);
-            let target;
-            if (uriIdentityService.extUri.isEqual(element.resource, fileToPaste)) {
-                target = element.parent;
-            }
-            else {
-                target = element.isDirectory ? element : element.parent;
-            }
-            const targetFile = await findValidPasteFileTarget(explorerService, fileService, dialogService, target, { resource: fileToPaste, isDirectory: fileToPasteStat.isDirectory, allowOverwrite: pasteShouldMove || incrementalNaming === 'disabled' }, incrementalNaming);
-            if (!targetFile) {
-                return undefined;
-            }
-            return { source: fileToPaste, target: targetFile };
-        }))));
-        if (sourceTargetPairs.length >= 1) {
-            if (pasteShouldMove) {
-                const resourceFileEdits = ( sourceTargetPairs.map(pair => ( new ResourceFileEdit(pair.source, pair.target, { overwrite: incrementalNaming === 'disabled' }))));
-                const options = {
-                    confirmBeforeUndo: configurationService.getValue().explorer.confirmUndo === "verbose" ,
-                    progressLabel: sourceTargetPairs.length > 1 ? ( localizeWithPath(
-                        'vs/workbench/contrib/files/browser/fileActions',
-                        { key: 'movingBulkEdit', comment: ['Placeholder will be replaced by the number of files being moved'] },
-                        "Moving {0} files",
-                        sourceTargetPairs.length
-                    ))
-                        : ( localizeWithPath(
-                        'vs/workbench/contrib/files/browser/fileActions',
-                        { key: 'movingFileBulkEdit', comment: ['Placeholder will be replaced by the name of the file moved.'] },
-                        "Moving {0}",
-                        basenameOrAuthority(sourceTargetPairs[0].target)
-                    )),
-                    undoLabel: sourceTargetPairs.length > 1 ? ( localizeWithPath(
-                        'vs/workbench/contrib/files/browser/fileActions',
-                        { key: 'moveBulkEdit', comment: ['Placeholder will be replaced by the number of files being moved'] },
-                        "Move {0} files",
-                        sourceTargetPairs.length
-                    ))
-                        : ( localizeWithPath(
-                        'vs/workbench/contrib/files/browser/fileActions',
-                        { key: 'moveFileBulkEdit', comment: ['Placeholder will be replaced by the name of the file moved.'] },
-                        "Move {0}",
-                        basenameOrAuthority(sourceTargetPairs[0].target)
-                    ))
-                };
-                await explorerService.applyBulkEdit(resourceFileEdits, options);
+        let targets = [];
+        if (toPaste.type === 'paths') {
+            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('vs/workbench/contrib/files/browser/fileActions', 'fileIsAncestor', "File to paste is an ancestor of the destination folder"));
+                }
+                const fileToPasteStat = await fileService.stat(fileToPaste);
+                let target;
+                if (uriIdentityService.extUri.isEqual(element.resource, fileToPaste)) {
+                    target = element.parent;
+                }
+                else {
+                    target = element.isDirectory ? element : element.parent;
+                }
+                const targetFile = await findValidPasteFileTarget(explorerService, fileService, dialogService, target, { resource: fileToPaste, isDirectory: fileToPasteStat.isDirectory, allowOverwrite: pasteShouldMove || incrementalNaming === 'disabled' }, incrementalNaming);
+                if (!targetFile) {
+                    return undefined;
+                }
+                return { source: fileToPaste, target: targetFile };
+            }))));
+            if (sourceTargetPairs.length >= 1) {
+                if (pasteShouldMove) {
+                    const resourceFileEdits = ( sourceTargetPairs.map(pair => ( new ResourceFileEdit(pair.source, pair.target, { overwrite: incrementalNaming === 'disabled' }))));
+                    const options = {
+                        confirmBeforeUndo: configurationService.getValue().explorer.confirmUndo === "verbose" ,
+                        progressLabel: sourceTargetPairs.length > 1 ? ( localizeWithPath(
+                            'vs/workbench/contrib/files/browser/fileActions',
+                            { key: 'movingBulkEdit', comment: ['Placeholder will be replaced by the number of files being moved'] },
+                            "Moving {0} files",
+                            sourceTargetPairs.length
+                        ))
+                            : ( localizeWithPath(
+                            'vs/workbench/contrib/files/browser/fileActions',
+                            { key: 'movingFileBulkEdit', comment: ['Placeholder will be replaced by the name of the file moved.'] },
+                            "Moving {0}",
+                            basenameOrAuthority(sourceTargetPairs[0].target)
+                        )),
+                        undoLabel: sourceTargetPairs.length > 1 ? ( localizeWithPath(
+                            'vs/workbench/contrib/files/browser/fileActions',
+                            { key: 'moveBulkEdit', comment: ['Placeholder will be replaced by the number of files being moved'] },
+                            "Move {0} files",
+                            sourceTargetPairs.length
+                        ))
+                            : ( localizeWithPath(
+                            'vs/workbench/contrib/files/browser/fileActions',
+                            { key: 'moveFileBulkEdit', comment: ['Placeholder will be replaced by the name of the file moved.'] },
+                            "Move {0}",
+                            basenameOrAuthority(sourceTargetPairs[0].target)
+                        ))
+                    };
+                    await explorerService.applyBulkEdit(resourceFileEdits, options);
+                }
+                else {
+                    const resourceFileEdits = ( sourceTargetPairs.map(pair => ( new ResourceFileEdit(
+                        pair.source,
+                        pair.target,
+                        { copy: true, overwrite: incrementalNaming === 'disabled' }
+                    ))));
+                    await applyCopyResourceEdit(( sourceTargetPairs.map(pair => pair.target)), resourceFileEdits);
+                }
             }
-            else {
-                const resourceFileEdits = ( sourceTargetPairs.map(pair => ( new ResourceFileEdit(
-                    pair.source,
-                    pair.target,
-                    { copy: true, overwrite: incrementalNaming === 'disabled' }
-                ))));
-                const undoLevel = configurationService.getValue().explorer.confirmUndo;
-                const options = {
-                    confirmBeforeUndo: undoLevel === "default"  || undoLevel === "verbose" ,
-                    progressLabel: sourceTargetPairs.length > 1 ? ( localizeWithPath(
-                        'vs/workbench/contrib/files/browser/fileActions',
-                        { key: 'copyingBulkEdit', comment: ['Placeholder will be replaced by the number of files being copied'] },
-                        "Copying {0} files",
-                        sourceTargetPairs.length
-                    ))
-                        : ( localizeWithPath(
-                        'vs/workbench/contrib/files/browser/fileActions',
-                        { key: 'copyingFileBulkEdit', comment: ['Placeholder will be replaced by the name of the file copied.'] },
-                        "Copying {0}",
-                        basenameOrAuthority(sourceTargetPairs[0].target)
-                    )),
-                    undoLabel: sourceTargetPairs.length > 1 ? ( localizeWithPath(
-                        'vs/workbench/contrib/files/browser/fileActions',
-                        { key: 'copyBulkEdit', comment: ['Placeholder will be replaced by the number of files being copied'] },
-                        "Paste {0} files",
-                        sourceTargetPairs.length
-                    ))
-                        : ( localizeWithPath(
-                        'vs/workbench/contrib/files/browser/fileActions',
-                        { key: 'copyFileBulkEdit', comment: ['Placeholder will be replaced by the name of the file copied.'] },
-                        "Paste {0}",
-                        basenameOrAuthority(sourceTargetPairs[0].target)
-                    ))
+            targets = ( sourceTargetPairs.map(pair => pair.target));
+        }
+        else {
+            const targetAndEdits = coalesce(await Promise.all(( toPaste.files.map(async (file) => {
+                const target = element.isDirectory ? element : element.parent;
+                const targetFile = await findValidPasteFileTarget(explorerService, fileService, dialogService, target, { resource: file.name, isDirectory: false, allowOverwrite: pasteShouldMove || incrementalNaming === 'disabled' }, incrementalNaming);
+                if (!targetFile) {
+                    return;
+                }
+                return {
+                    target: targetFile,
+                    edit: ( new ResourceFileEdit(undefined, targetFile, {
+                        overwrite: incrementalNaming === 'disabled',
+                        contents: (async () => VSBuffer.wrap(( new Uint8Array(await file.arrayBuffer()))))(),
+                    }))
                 };
-                await explorerService.applyBulkEdit(resourceFileEdits, options);
-            }
-            const pair = sourceTargetPairs[0];
-            await explorerService.select(pair.target);
-            if (sourceTargetPairs.length === 1) {
-                const item = explorerService.findClosest(pair.target);
+            }))));
+            await applyCopyResourceEdit(( targetAndEdits.map(pair => pair.target)), ( targetAndEdits.map(pair => pair.edit)));
+            targets = ( targetAndEdits.map(pair => pair.target));
+        }
+        if (targets.length) {
+            const firstTarget = targets[0];
+            await explorerService.select(firstTarget);
+            if (targets.length === 1) {
+                const item = explorerService.findClosest(firstTarget);
                 if (item && !item.isDirectory) {
                     await editorService.openEditor({ resource: item.resource, options: { pinned: true, preserveFocus: true } });
                 }
@@ -1319,13 +1316,48 @@ const pasteFileHandler = async (accessor, fileList) => {
             pasteShouldMove = false;
         }
     }
+    async function applyCopyResourceEdit(targets, resourceFileEdits) {
+        const undoLevel = configurationService.getValue().explorer.confirmUndo;
+        const options = {
+            confirmBeforeUndo: undoLevel === "default"  || undoLevel === "verbose" ,
+            progressLabel: targets.length > 1 ? ( localizeWithPath(
+                'vs/workbench/contrib/files/browser/fileActions',
+                { key: 'copyingBulkEdit', comment: ['Placeholder will be replaced by the number of files being copied'] },
+                "Copying {0} files",
+                targets.length
+            ))
+                : ( localizeWithPath(
+                'vs/workbench/contrib/files/browser/fileActions',
+                { key: 'copyingFileBulkEdit', comment: ['Placeholder will be replaced by the name of the file copied.'] },
+                "Copying {0}",
+                basenameOrAuthority(targets[0])
+            )),
+            undoLabel: targets.length > 1 ? ( localizeWithPath(
+                'vs/workbench/contrib/files/browser/fileActions',
+                { key: 'copyBulkEdit', comment: ['Placeholder will be replaced by the number of files being copied'] },
+                "Paste {0} files",
+                targets.length
+            ))
+                : ( localizeWithPath(
+                'vs/workbench/contrib/files/browser/fileActions',
+                { key: 'copyFileBulkEdit', comment: ['Placeholder will be replaced by the name of the file copied.'] },
+                "Paste {0}",
+                basenameOrAuthority(targets[0])
+            ))
+        };
+        await explorerService.applyBulkEdit(resourceFileEdits, options);
+    }
 };
 async function getFilesToPaste(fileList, clipboardService) {
     if (fileList && fileList.length > 0) {
-        return ( [...fileList].filter(file => !!file.path && isAbsolute(file.path)).map(file => URI.file(file.path)));
+        const resources = ( [...fileList].filter(file => !!file.path && isAbsolute(file.path)).map(file => URI.file(file.path)));
+        if (resources.length) {
+            return { type: 'paths', files: resources, };
+        }
+        return { type: 'data', files: [...fileList].filter(file => !file.path) };
     }
     else {
-        return distinctParents(await clipboardService.readResources(), resource => resource);
+        return { type: 'paths', files: distinctParents(await clipboardService.readResources(), resource => resource) };
     }
 }
 const openFilePreserveFocusHandler = async (accessor) => {
@@ -1360,46 +1392,46 @@ class BaseSetActiveEditorReadonlyInSession extends Action2 {
 }
 class SetActiveEditorReadonlyInSession extends BaseSetActiveEditorReadonlyInSession {
     static { this.ID = 'workbench.action.files.setActiveEditorReadonlyInSession'; }
-    static { this.LABEL = ( localizeWithPath(
+    static { this.LABEL = ( localize2WithPath(
         'vs/workbench/contrib/files/browser/fileActions',
         'setActiveEditorReadonlyInSession',
         "Set Active Editor Read-only in Session"
     )); }
     constructor() {
-        super(SetActiveEditorReadonlyInSession.ID, { value: SetActiveEditorReadonlyInSession.LABEL, original: 'Set Active Editor Readonly in Session' }, true);
+        super(SetActiveEditorReadonlyInSession.ID, SetActiveEditorReadonlyInSession.LABEL, true);
     }
 }
 class SetActiveEditorWriteableInSession extends BaseSetActiveEditorReadonlyInSession {
     static { this.ID = 'workbench.action.files.setActiveEditorWriteableInSession'; }
-    static { this.LABEL = ( localizeWithPath(
+    static { this.LABEL = ( localize2WithPath(
         'vs/workbench/contrib/files/browser/fileActions',
         'setActiveEditorWriteableInSession',
         "Set Active Editor Writeable in Session"
     )); }
     constructor() {
-        super(SetActiveEditorWriteableInSession.ID, { value: SetActiveEditorWriteableInSession.LABEL, original: 'Set Active Editor Writeable in Session' }, false);
+        super(SetActiveEditorWriteableInSession.ID, SetActiveEditorWriteableInSession.LABEL, false);
     }
 }
 class ToggleActiveEditorReadonlyInSession extends BaseSetActiveEditorReadonlyInSession {
     static { this.ID = 'workbench.action.files.toggleActiveEditorReadonlyInSession'; }
-    static { this.LABEL = ( localizeWithPath(
+    static { this.LABEL = ( localize2WithPath(
         'vs/workbench/contrib/files/browser/fileActions',
         'toggleActiveEditorReadonlyInSession',
         "Toggle Active Editor Read-only in Session"
     )); }
     constructor() {
-        super(ToggleActiveEditorReadonlyInSession.ID, { value: ToggleActiveEditorReadonlyInSession.LABEL, original: 'Toggle Active Editor Readonly in Session' }, 'toggle');
+        super(ToggleActiveEditorReadonlyInSession.ID, ToggleActiveEditorReadonlyInSession.LABEL, 'toggle');
     }
 }
 class ResetActiveEditorReadonlyInSession extends BaseSetActiveEditorReadonlyInSession {
     static { this.ID = 'workbench.action.files.resetActiveEditorReadonlyInSession'; }
-    static { this.LABEL = ( localizeWithPath(
+    static { this.LABEL = ( localize2WithPath(
         'vs/workbench/contrib/files/browser/fileActions',
         'resetActiveEditorReadonlyInSession',
         "Reset Active Editor Read-only in Session"
     )); }
     constructor() {
-        super(ResetActiveEditorReadonlyInSession.ID, { value: ResetActiveEditorReadonlyInSession.LABEL, original: 'Reset Active Editor Readonly in Session' }, 'reset');
+        super(ResetActiveEditorReadonlyInSession.ID, ResetActiveEditorReadonlyInSession.LABEL, 'reset');
     }
 }
 export { COPY_FILE_LABEL, CloseGroupAction, CompareNewUntitledTextFilesAction, CompareWithClipboardAction, DOWNLOAD_COMMAND_ID, DOWNLOAD_LABEL, FileCopiedContext, FocusFilesExplorer, GlobalCompareResourcesAction, MOVE_FILE_TO_TRASH_LABEL, NEW_FILE_COMMAND_ID, NEW_FILE_LABEL, NEW_FOLDER_COMMAND_ID, NEW_FOLDER_LABEL, OpenActiveFileInEmptyWorkspace, PASTE_FILE_LABEL, ResetActiveEditorReadonlyInSession, SaveAllInGroupAction, SetActiveEditorReadonlyInSession, SetActiveEditorWriteableInSession, ShowActiveFileInExplorer, TRIGGER_RENAME_LABEL, ToggleActiveEditorReadonlyInSession, ToggleAutoSaveAction, UPLOAD_COMMAND_ID, UPLOAD_LABEL, copyFileHandler, cutFileHandler, deleteFileHandler, findValidPasteFileTarget, incrementFileName, moveFileToTrashHandler, openFilePreserveFocusHandler, pasteFileHandler, renameHandler, validateFileName };

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

@@ -13,6 +13,7 @@ import { IConfigurationService } from '../../../../platform/configuration/common
 import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
 import { EditorResolution, EditorOpenSource } from '../../../../platform/editor/common/editor.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
 import { IFileService } from '../../../../platform/files/common/files.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { KeybindingsRegistry } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
@@ -20,7 +21,8 @@ import { ILabelService } from '../../../../platform/label/common/label.js';
 import { IListService } from '../../../../platform/list/browser/listService.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
-import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { isWorkspaceToOpen } from '../../../../platform/window/common/window.js';
+import { IWorkspaceContextService, UNTITLED_WORKSPACE_NAME } from '../../../../platform/workspace/common/workspace.js';
 import { RemoveRootFolderAction } from '../../../browser/actions/workspaceActions.js';
 import { EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
 import { IExplorerService, getMultiSelectedResources, getResourceForCommand, getOpenEditorsViewMultiSelection } from './files.js';
@@ -28,12 +30,32 @@ import { OpenEditorsView } from './views/openEditorsView.js';
 import { ExplorerFocusCondition, FilesExplorerFocusCondition, ExplorerFolderContext, TextFileContentProvider, VIEW_ID, ExplorerCompressedFocusContext, ExplorerCompressedFirstFocusContext, VIEWLET_ID, ExplorerCompressedLastFocusContext } from '../common/files.js';
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
 import { IEditorService, SIDE_GROUP } from '../../../services/editor/common/editorService.js';
+import { IHostService } from '../../../services/host/browser/host.js';
 import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.js';
 import { IViewsService } from '../../../services/views/common/viewsService.js';
 import { IWorkspaceEditingService } from '../../../services/workspaces/common/workspaceEditing.js';
 import { OPEN_TO_SIDE_COMMAND_ID, COMPARE_WITH_SAVED_COMMAND_ID, SELECT_FOR_COMPARE_COMMAND_ID, ResourceSelectedForCompareContext, COMPARE_SELECTED_COMMAND_ID, COMPARE_RESOURCE_COMMAND_ID, COPY_PATH_COMMAND_ID, COPY_RELATIVE_PATH_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, OPEN_WITH_EXPLORER_COMMAND_ID, REVERT_FILE_COMMAND_ID, REMOVE_ROOT_FOLDER_COMMAND_ID, PREVIOUS_COMPRESSED_FOLDER, NEXT_COMPRESSED_FOLDER, FIRST_COMPRESSED_FOLDER, LAST_COMPRESSED_FOLDER, NEW_UNTITLED_FILE_COMMAND_ID, NEW_UNTITLED_FILE_LABEL, NEW_FILE_COMMAND_ID } from './fileConstants.js';
 import './fileCommands.save.js';
 import { IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+const openWindowCommand = (accessor, toOpen, options) => {
+    if (Array.isArray(toOpen)) {
+        const hostService = accessor.get(IHostService);
+        const environmentService = accessor.get(IEnvironmentService);
+        toOpen = ( toOpen.map(openable => {
+            if (isWorkspaceToOpen(openable) && openable.workspaceUri.scheme === Schemas.untitled) {
+                return {
+                    workspaceUri: joinPath(environmentService.untitledWorkspacesHome, openable.workspaceUri.path, UNTITLED_WORKSPACE_NAME)
+                };
+            }
+            return openable;
+        }));
+        hostService.openWindow(toOpen, options);
+    }
+};
+const newWindowCommand = (accessor, options) => {
+    const hostService = accessor.get(IHostService);
+    hostService.openWindow(options);
+};
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     weight: 200 ,
     when: ExplorerFocusCondition,
@@ -485,3 +507,4 @@ CommandsRegistry.registerCommand({
         });
     }
 });
+export { newWindowCommand, openWindowCommand };

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

@@ -1,4 +1,4 @@
-import { localizeWithPath } from '../../../../nls.js';
+import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 const REVEAL_IN_EXPLORER_COMMAND_ID = 'revealInExplorer';
 const REVERT_FILE_COMMAND_ID = 'workbench.action.files.revert';
@@ -11,17 +11,17 @@ const COMPARE_WITH_SAVED_COMMAND_ID = 'workbench.files.action.compareWithSaved';
 const COPY_PATH_COMMAND_ID = 'copyFilePath';
 const COPY_RELATIVE_PATH_COMMAND_ID = 'copyRelativeFilePath';
 const SAVE_FILE_AS_COMMAND_ID = 'workbench.action.files.saveAs';
-const SAVE_FILE_AS_LABEL = ( localizeWithPath('vs/workbench/contrib/files/browser/fileConstants', 'saveAs', "Save As..."));
+const SAVE_FILE_AS_LABEL = ( localize2WithPath('vs/workbench/contrib/files/browser/fileConstants', 'saveAs', "Save As..."));
 const SAVE_FILE_COMMAND_ID = 'workbench.action.files.save';
-const SAVE_FILE_LABEL = ( localizeWithPath('vs/workbench/contrib/files/browser/fileConstants', 'save', "Save"));
+const SAVE_FILE_LABEL = ( localize2WithPath('vs/workbench/contrib/files/browser/fileConstants', 'save', "Save"));
 const SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID = 'workbench.action.files.saveWithoutFormatting';
-const SAVE_FILE_WITHOUT_FORMATTING_LABEL = ( localizeWithPath(
+const SAVE_FILE_WITHOUT_FORMATTING_LABEL = ( localize2WithPath(
  'vs/workbench/contrib/files/browser/fileConstants',
  'saveWithoutFormatting',
  "Save without Formatting"
 ));
 const SAVE_ALL_COMMAND_ID = 'saveAll';
-const SAVE_ALL_LABEL = ( localizeWithPath('vs/workbench/contrib/files/browser/fileConstants', 'saveAll', "Save All"));
+const SAVE_ALL_LABEL = ( localize2WithPath('vs/workbench/contrib/files/browser/fileConstants', 'saveAll', "Save All"));
 const SAVE_ALL_IN_GROUP_COMMAND_ID = 'workbench.files.action.saveAllInGroup';
 const SAVE_FILES_COMMAND_ID = 'workbench.action.files.saveFiles';
 const OpenEditorsGroupContext = ( new RawContextKey('groupFocusedInOpenEditors', false));
@@ -39,7 +39,7 @@ const NEXT_COMPRESSED_FOLDER = 'nextCompressedFolder';
 const FIRST_COMPRESSED_FOLDER = 'firstCompressedFolder';
 const LAST_COMPRESSED_FOLDER = 'lastCompressedFolder';
 const NEW_UNTITLED_FILE_COMMAND_ID = 'workbench.action.files.newUntitledFile';
-const NEW_UNTITLED_FILE_LABEL = ( localizeWithPath(
+const NEW_UNTITLED_FILE_LABEL = ( localize2WithPath(
  'vs/workbench/contrib/files/browser/fileConstants',
  'newUntitledFile',
  "New Untitled Text File"