@codingame/monaco-vscode-views-service-override 1.85.0-next.1 → 1.85.0-next.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-views-service-override",
-  "version": "1.85.0-next.1",
+  "version": "1.85.0-next.2",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,14 +18,14 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.85.0-next.1",
+    "vscode": "npm:@codingame/monaco-vscode-api@1.85.0-next.2",
     "monaco-editor": "0.45.0",
-    "@codingame/monaco-vscode-bulk-edit-service-override": "1.85.0-next.1",
-    "@codingame/monaco-vscode-layout-service-override": "1.85.0-next.1",
-    "@codingame/monaco-vscode-quickaccess-service-override": "1.85.0-next.1",
-    "@codingame/monaco-vscode-keybindings-service-override": "1.85.0-next.1",
-    "@codingame/monaco-vscode-environment-service-override": "1.85.0-next.1",
-    "@codingame/monaco-vscode-extensions-service-override": "1.85.0-next.1",
-    "@codingame/monaco-vscode-files-service-override": "1.85.0-next.1"
+    "@codingame/monaco-vscode-bulk-edit-service-override": "1.85.0-next.2",
+    "@codingame/monaco-vscode-layout-service-override": "1.85.0-next.2",
+    "@codingame/monaco-vscode-quickaccess-service-override": "1.85.0-next.2",
+    "@codingame/monaco-vscode-keybindings-service-override": "1.85.0-next.2",
+    "@codingame/monaco-vscode-environment-service-override": "1.85.0-next.2",
+    "@codingame/monaco-vscode-extensions-service-override": "1.85.0-next.2",
+    "@codingame/monaco-vscode-files-service-override": "1.85.0-next.2"
   }
 }

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

@@ -2,7 +2,7 @@ import * as nls from 'monaco-editor/esm/vs/nls.js';
 import { GlobalCompareResourcesAction, FocusFilesExplorer, ShowActiveFileInExplorer, CompareWithClipboardAction, CompareNewUntitledTextFilesAction, ToggleAutoSaveAction, ShowOpenedFileInNewWindow, SetActiveEditorReadonlyInSession, SetActiveEditorWriteableInSession, ToggleActiveEditorReadonlyInSession, ResetActiveEditorReadonlyInSession, renameHandler, moveFileToTrashHandler, deleteFileHandler, cutFileHandler, copyFileHandler, pasteFileHandler, openFilePreserveFocusHandler, NEW_FILE_COMMAND_ID, NEW_FILE_LABEL, NEW_FOLDER_COMMAND_ID, NEW_FOLDER_LABEL, COPY_FILE_LABEL, PASTE_FILE_LABEL, FileCopiedContext, DOWNLOAD_COMMAND_ID, DOWNLOAD_LABEL, UPLOAD_COMMAND_ID, UPLOAD_LABEL, TRIGGER_RENAME_LABEL, MOVE_FILE_TO_TRASH_LABEL } from 'vscode/vscode/vs/workbench/contrib/files/browser/fileActions';
 import { CONFLICT_RESOLUTION_CONTEXT, acceptLocalChangesCommand, revertLocalChangesCommand } from './editors/textFileSaveErrorHandler.js';
 import { registerAction2, MenuRegistry, MenuId } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
-import { openWindowCommand, newWindowCommand } from './fileCommands.js';
+import './fileCommands.js';
 import { COPY_PATH_COMMAND_ID, COPY_RELATIVE_PATH_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, SAVE_FILE_COMMAND_ID, SAVE_FILE_LABEL, SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID, SAVE_FILE_WITHOUT_FORMATTING_LABEL, SAVE_ALL_IN_GROUP_COMMAND_ID, SAVE_FILES_COMMAND_ID, REVERT_FILE_COMMAND_ID, COMPARE_WITH_SAVED_COMMAND_ID, SAVE_FILE_AS_COMMAND_ID, SAVE_FILE_AS_LABEL, NEW_UNTITLED_FILE_COMMAND_ID, NEW_UNTITLED_FILE_LABEL, OPEN_TO_SIDE_COMMAND_ID, OpenEditorsDirtyEditorContext, OpenEditorsGroupContext, OpenEditorsReadonlyEditorContext, COMPARE_RESOURCE_COMMAND_ID, ResourceSelectedForCompareContext, SELECT_FOR_COMPARE_COMMAND_ID, COMPARE_SELECTED_COMMAND_ID, OPEN_WITH_EXPLORER_COMMAND_ID, REMOVE_ROOT_FOLDER_COMMAND_ID, REMOVE_ROOT_FOLDER_LABEL, SAVE_ALL_COMMAND_ID } from 'vscode/vscode/vs/workbench/contrib/files/browser/fileConstants';
 import { CommandsRegistry } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
 import { ContextKeyExpr } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
@@ -30,8 +30,6 @@ registerAction2(SetActiveEditorReadonlyInSession);
 registerAction2(SetActiveEditorWriteableInSession);
 registerAction2(ToggleActiveEditorReadonlyInSession);
 registerAction2(ResetActiveEditorReadonlyInSession);
-CommandsRegistry.registerCommand('_files.windowOpen', openWindowCommand);
-CommandsRegistry.registerCommand('_files.newWindow', newWindowCommand);
 const explorerCommandsWeightBonus = 10;
 const RENAME_ID = 'renameFile';
 KeybindingsRegistry.registerCommandAndKeybindingRule({

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

@@ -1,10 +1,8 @@
 import * as nls from 'monaco-editor/esm/vs/nls.js';
 import { SideBySideEditor, EditorResourceAccessor } from 'vscode/vscode/vs/workbench/common/editor';
 import { SideBySideEditorInput } from 'vscode/vscode/vs/workbench/common/editor/sideBySideEditorInput';
-import { isWorkspaceToOpen } from 'vscode/vscode/vs/platform/window/common/window';
-import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host';
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { IWorkspaceContextService, UNTITLED_WORKSPACE_NAME } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
+import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
 import { ExplorerFocusCondition, FilesExplorerFocusCondition, ExplorerFolderContext, TextFileContentProvider, VIEW_ID, ExplorerCompressedFocusContext, ExplorerCompressedFirstFocusContext, VIEWLET_ID, ExplorerCompressedLastFocusContext } from 'vscode/vscode/vs/workbench/contrib/files/common/files';
 import { IClipboardService } from 'monaco-editor/esm/vs/platform/clipboard/common/clipboardService.js';
 import { toErrorMessage } from 'monaco-editor/esm/vs/base/common/errorMessage.js';
@@ -27,7 +25,6 @@ import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor
 import { ILabelService } from 'monaco-editor/esm/vs/platform/label/common/label.js';
 import { basename, joinPath, isEqual } from 'monaco-editor/esm/vs/base/common/resources.js';
 import { dispose } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { IEnvironmentService } from 'monaco-editor/esm/vs/platform/environment/common/environment.js';
 import { coalesce } from 'monaco-editor/esm/vs/base/common/arrays.js';
 import { ICodeEditorService } from 'monaco-editor/esm/vs/editor/browser/services/codeEditorService.js';
 import { EmbeddedCodeEditorWidget } from 'monaco-editor/esm/vs/editor/browser/widget/embeddedCodeEditorWidget.js';
@@ -46,25 +43,6 @@ import { RemoveRootFolderAction } from 'vscode/vscode/vs/workbench/browser/actio
 import { OpenEditorsView } from 'vscode/vscode/vs/workbench/contrib/files/browser/views/openEditorsView';
 import { IFileDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 
-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,
@@ -657,5 +635,3 @@ CommandsRegistry.registerCommand({
         });
     }
 });
-
-export { newWindowCommand, openWindowCommand };