@codingame/monaco-vscode-views-service-override 2.1.1 → 2.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-views-service-override",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,16 +18,16 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.1.1",
+    "vscode": "npm:@codingame/monaco-vscode-api@2.1.2",
     "vscode-marked": "npm:marked@=3.0.2",
-    "@codingame/monaco-vscode-bulk-edit-service-override": "2.1.1",
-    "@codingame/monaco-vscode-layout-service-override": "2.1.1",
-    "@codingame/monaco-vscode-quickaccess-service-override": "2.1.1",
-    "@codingame/monaco-vscode-keybindings-service-override": "2.1.1",
-    "@codingame/monaco-vscode-files-service-override": "2.1.1",
-    "@codingame/monaco-vscode-extensions-service-override": "2.1.1",
-    "@codingame/monaco-vscode-environment-service-override": "2.1.1",
-    "@codingame/monaco-vscode-host-service-override": "2.1.1",
-    "@codingame/monaco-vscode-base-service-override": "2.1.1"
+    "@codingame/monaco-vscode-bulk-edit-service-override": "2.1.2",
+    "@codingame/monaco-vscode-layout-service-override": "2.1.2",
+    "@codingame/monaco-vscode-quickaccess-service-override": "2.1.2",
+    "@codingame/monaco-vscode-keybindings-service-override": "2.1.2",
+    "@codingame/monaco-vscode-files-service-override": "2.1.2",
+    "@codingame/monaco-vscode-extensions-service-override": "2.1.2",
+    "@codingame/monaco-vscode-environment-service-override": "2.1.2",
+    "@codingame/monaco-vscode-host-service-override": "2.1.2",
+    "@codingame/monaco-vscode-base-service-override": "2.1.2"
   }
 }

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

@@ -1,46 +1,38 @@
+import { toErrorMessage } from 'vscode/vscode/vs/base/common/errorMessage';
+import { KeyChord } from 'vscode/vscode/vs/base/common/keyCodes';
+import { dispose } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
+import { isWeb, isWindows } from 'vscode/vscode/vs/base/common/platform';
+import { basename, joinPath } from 'vscode/vscode/vs/base/common/resources';
+import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
+import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { EditorResourceAccessor, SideBySideEditor } from 'vscode/vscode/vs/workbench/common/editor';
-import { SideBySideEditorInput } from 'vscode/vscode/vs/workbench/common/editor/sideBySideEditorInput';
-import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
-import { ExplorerFocusCondition, FilesExplorerFocusCondition, ExplorerFolderContext, TextFileContentProvider, VIEW_ID, ExplorerCompressedFocusContext, ExplorerCompressedFirstFocusContext, VIEWLET_ID, ExplorerCompressedLastFocusContext } from 'vscode/vscode/vs/workbench/contrib/files/common/files';
 import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService';
-import { toErrorMessage } from 'vscode/vscode/vs/base/common/errorMessage';
-import { IListService } from 'vscode/vscode/vs/platform/list/browser/listService';
 import { CommandsRegistry, ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { ContextKeyExpr, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
+import { EditorResolution, EditorOpenSource } from 'vscode/vscode/vs/platform/editor/common/editor';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { KeybindingsRegistry } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
-import { KeyChord } from 'vscode/vscode/vs/base/common/keyCodes';
-import { isWeb, isWindows } from 'vscode/vscode/vs/base/common/platform';
-import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
-import { IExplorerService, getMultiSelectedResources, getResourceForCommand, getOpenEditorsViewMultiSelection } from 'vscode/vscode/vs/workbench/contrib/files/browser/files';
-import { IWorkspaceEditingService } from 'vscode/vscode/vs/workbench/services/workspaces/common/workspaceEditing';
-import { getMultiSelectedEditorContexts } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorCommands';
-import { Schemas } from 'vscode/vscode/vs/base/common/network';
-import { INotificationService, Severity } from 'vscode/vscode/vs/platform/notification/common/notification';
-import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
-import { IEditorService, SIDE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
-import { basename, joinPath, isEqual } from 'vscode/vscode/vs/base/common/resources';
-import { dispose } from 'vscode/vscode/vs/base/common/lifecycle';
-import { coalesce } from 'vscode/vscode/vs/base/common/arrays';
-import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
-import { EmbeddedCodeEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/embeddedCodeEditorWidget';
-import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles';
+import { IListService } from 'vscode/vscode/vs/platform/list/browser/listService';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
-import { isCancellationError } from 'vscode/vscode/vs/base/common/errors';
-import { toAction } from 'vscode/vscode/vs/base/common/actions';
-import { EditorResolution, EditorOpenSource } from 'vscode/vscode/vs/platform/editor/common/editor';
-import { hash } from 'vscode/vscode/vs/base/common/hash';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
-import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite';
-import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
-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, 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, 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 'vscode/vscode/vs/workbench/contrib/files/browser/fileConstants';
-import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { RemoveRootFolderAction } from 'vscode/vscode/vs/workbench/browser/actions/workspaceActions';
+import { EditorResourceAccessor, SideBySideEditor } from 'vscode/vscode/vs/workbench/common/editor';
+import { IExplorerService, getMultiSelectedResources, getResourceForCommand, getOpenEditorsViewMultiSelection } from 'vscode/vscode/vs/workbench/contrib/files/browser/files';
 import { OpenEditorsView } from 'vscode/vscode/vs/workbench/contrib/files/browser/views/openEditorsView';
+import { ExplorerFocusCondition, FilesExplorerFocusCondition, ExplorerFolderContext, TextFileContentProvider, VIEW_ID, ExplorerCompressedFocusContext, ExplorerCompressedFirstFocusContext, VIEWLET_ID, ExplorerCompressedLastFocusContext } from 'vscode/vscode/vs/workbench/contrib/files/common/files';
+import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
+import { IEditorService, SIDE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
+import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
+import { IWorkspaceEditingService } from 'vscode/vscode/vs/workbench/services/workspaces/common/workspaceEditing';
+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 'vscode/vscode/vs/workbench/contrib/files/browser/fileConstants';
+import 'vscode/vscode/vs/workbench/contrib/files/browser/fileCommands.save';
 import { IFileDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
@@ -301,146 +293,6 @@ CommandsRegistry.registerCommand({
         return undefined;
     }
 });
-async function saveSelectedEditors(accessor, options) {
-    const listService = accessor.get(IListService);
-    const editorGroupService = accessor.get(IEditorGroupsService);
-    const codeEditorService = accessor.get(ICodeEditorService);
-    const textFileService = accessor.get(ITextFileService);
-    let editors = getOpenEditorsViewMultiSelection(listService);
-    if (!editors) {
-        const activeGroup = editorGroupService.activeGroup;
-        if (activeGroup.activeEditor) {
-            editors = [];
-            if (activeGroup.activeEditor instanceof SideBySideEditorInput &&
-                !options?.saveAs && !(activeGroup.activeEditor.primary.hasCapability(4 ) || activeGroup.activeEditor.secondary.hasCapability(4 )) &&
-                activeGroup.activeEditor.secondary.isModified()) {
-                editors.push({ groupId: activeGroup.id, editor: activeGroup.activeEditor.primary });
-                editors.push({ groupId: activeGroup.id, editor: activeGroup.activeEditor.secondary });
-            }
-            else {
-                editors.push({ groupId: activeGroup.id, editor: activeGroup.activeEditor });
-            }
-        }
-    }
-    if (!editors || editors.length === 0) {
-        return;
-    }
-    await doSaveEditors(accessor, editors, options);
-    const focusedCodeEditor = codeEditorService.getFocusedCodeEditor();
-    if (focusedCodeEditor instanceof EmbeddedCodeEditorWidget && !focusedCodeEditor.isSimpleWidget) {
-        const resource = focusedCodeEditor.getModel()?.uri;
-        if (resource && !( editors.some(
-            ({ editor }) => isEqual(EditorResourceAccessor.getCanonicalUri(editor, { supportSideBySide: SideBySideEditor.PRIMARY }), resource)
-        ))) {
-            const model = textFileService.files.get(resource);
-            if (!model?.isReadonly()) {
-                await textFileService.save(resource, options);
-            }
-        }
-    }
-}
-function saveDirtyEditorsOfGroups(accessor, groups, options) {
-    const dirtyEditors = [];
-    for (const group of groups) {
-        for (const editor of group.getEditors(0 )) {
-            if (editor.isDirty()) {
-                dirtyEditors.push({ groupId: group.id, editor });
-            }
-        }
-    }
-    return doSaveEditors(accessor, dirtyEditors, options);
-}
-async function doSaveEditors(accessor, editors, options) {
-    const editorService = accessor.get(IEditorService);
-    const notificationService = accessor.get(INotificationService);
-    const instantiationService = accessor.get(IInstantiationService);
-    try {
-        await editorService.save(editors, options);
-    }
-    catch (error) {
-        if (!isCancellationError(error)) {
-            notificationService.notify({
-                id: ( editors.map(({ editor }) => hash(editor.resource?.toString()))).join(),
-                severity: Severity.Error,
-                message: ( localizeWithPath(
-                    'vs/workbench/contrib/files/browser/fileCommands',
-                    { key: 'genericSaveError', comment: ['{0} is the resource that failed to save and {1} the error message'] },
-                    "Failed to save '{0}': {1}",
-                    ( editors.map(({ editor }) => editor.getName())).join(', '),
-                    toErrorMessage(error, false)
-                )),
-                actions: {
-                    primary: [
-                        toAction({ id: 'workbench.action.files.saveEditors', label: ( localizeWithPath('vs/workbench/contrib/files/browser/fileCommands', 'retry', "Retry")), run: () => instantiationService.invokeFunction(accessor => doSaveEditors(accessor, editors, options)) }),
-                        toAction({ id: 'workbench.action.files.revertEditors', label: ( localizeWithPath('vs/workbench/contrib/files/browser/fileCommands', 'discard', "Discard")), run: () => editorService.revert(editors) })
-                    ]
-                }
-            });
-        }
-    }
-}
-KeybindingsRegistry.registerCommandAndKeybindingRule({
-    when: undefined,
-    weight: 200 ,
-    primary: 2048  | 49 ,
-    id: SAVE_FILE_COMMAND_ID,
-    handler: accessor => {
-        return saveSelectedEditors(accessor, { reason: 1 , force: true  });
-    }
-});
-KeybindingsRegistry.registerCommandAndKeybindingRule({
-    when: undefined,
-    weight: 200 ,
-    primary: KeyChord(2048  | 41 , 49 ),
-    win: { primary: KeyChord(2048  | 41 , 2048  | 1024  | 49 ) },
-    id: SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID,
-    handler: accessor => {
-        return saveSelectedEditors(accessor, { reason: 1 , force: true , skipSaveParticipants: true });
-    }
-});
-KeybindingsRegistry.registerCommandAndKeybindingRule({
-    id: SAVE_FILE_AS_COMMAND_ID,
-    weight: 200 ,
-    when: undefined,
-    primary: 2048  | 1024  | 49 ,
-    handler: accessor => {
-        return saveSelectedEditors(accessor, { reason: 1 , saveAs: true });
-    }
-});
-KeybindingsRegistry.registerCommandAndKeybindingRule({
-    when: undefined,
-    weight: 200 ,
-    primary: undefined,
-    mac: { primary: 2048  | 512  | 49  },
-    win: { primary: KeyChord(2048  | 41 , 49 ) },
-    id: SAVE_ALL_COMMAND_ID,
-    handler: accessor => {
-        return saveDirtyEditorsOfGroups(accessor, accessor.get(IEditorGroupsService).getGroups(1 ), { reason: 1  });
-    }
-});
-CommandsRegistry.registerCommand({
-    id: SAVE_ALL_IN_GROUP_COMMAND_ID,
-    handler: (accessor, _, editorContext) => {
-        const editorGroupService = accessor.get(IEditorGroupsService);
-        const contexts = getMultiSelectedEditorContexts(editorContext, accessor.get(IListService), accessor.get(IEditorGroupsService));
-        let groups = undefined;
-        if (!contexts.length) {
-            groups = editorGroupService.getGroups(1 );
-        }
-        else {
-            groups = coalesce(( contexts.map(context => editorGroupService.getGroup(context.groupId))));
-        }
-        return saveDirtyEditorsOfGroups(accessor, groups, { reason: 1  });
-    }
-});
-CommandsRegistry.registerCommand({
-    id: SAVE_FILES_COMMAND_ID,
-    handler: async (accessor) => {
-        const editorService = accessor.get(IEditorService);
-        const res = await editorService.saveAll({ includeUntitled: false, reason: 1  });
-        return res.success;
-    }
-});
 CommandsRegistry.registerCommand({
     id: REVERT_FILE_COMMAND_ID,
     handler: async (accessor) => {