@codingame/monaco-vscode-multi-diff-editor-service-override 5.3.0 → 6.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-multi-diff-editor-service-override",
-  "version": "5.3.0",
+  "version": "6.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@5.3.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@6.0.0"
   }
 }

package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/actions.js

@@ -3,9 +3,11 @@ import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextK
 import { localize2WithPath } from 'vscode/vscode/vs/nls';
 import { Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { resolveCommandsContext, getCommandsContext } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorCommands';
 import { TextFileEditor } from 'vscode/vscode/vs/workbench/contrib/files/browser/editors/textFileEditor';
 import { MultiDiffEditor } from './multiDiffEditor.js';
 import { MultiDiffEditorInput } from 'vscode/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
+import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
 const _moduleId = "vs/workbench/contrib/multiDiffEditor/browser/actions";
@@ -67,11 +69,10 @@ class CollapseAllAction extends Action2 {
             f1: true,
         });
     }
-    async run(accessor, ...args) {
-        const editorService = accessor.get(IEditorService);
-        const activeEditor = editorService.activeEditor;
-        if (activeEditor instanceof MultiDiffEditorInput) {
-            const viewModel = await activeEditor.getViewModel();
+    async run(accessor, resourceOrContext, context) {
+        const { editor } = resolveCommandsContext(accessor.get(IEditorGroupsService), getCommandsContext(accessor, resourceOrContext, context));
+        if (editor instanceof MultiDiffEditorInput) {
+            const viewModel = await editor.getViewModel();
             viewModel.collapseAll();
         }
     }
@@ -98,11 +99,10 @@ class ExpandAllAction extends Action2 {
             f1: true,
         });
     }
-    async run(accessor, ...args) {
-        const editorService = accessor.get(IEditorService);
-        const activeEditor = editorService.activeEditor;
-        if (activeEditor instanceof MultiDiffEditorInput) {
-            const viewModel = await activeEditor.getViewModel();
+    async run(accessor, resourceOrContext, context) {
+        const { editor } = resolveCommandsContext(accessor.get(IEditorGroupsService), getCommandsContext(accessor, resourceOrContext, context));
+        if (editor instanceof MultiDiffEditorInput) {
+            const viewModel = await editor.getViewModel();
             viewModel.expandAll();
         }
     }

package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.contribution.js

@@ -4,13 +4,14 @@ import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/confi
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { EditorPaneDescriptor } from 'vscode/vscode/vs/workbench/browser/editor';
-import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
 import { EditorExtensions } from 'vscode/vscode/vs/workbench/common/editor';
 import { MultiDiffEditor } from './multiDiffEditor.js';
 import { MultiDiffEditorResolverContribution, MultiDiffEditorInput, MultiDiffEditorSerializer } from 'vscode/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
 import { GoToFileAction, CollapseAllAction, ExpandAllAction } from './actions.js';
 import 'vscode/vscode/vs/base/common/lifecycle';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { OpenScmGroupAction, ScmMultiDiffSourceResolverContribution } from 'vscode/vscode/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver';
 
 const _moduleId = "vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.contribution";
@@ -27,10 +28,10 @@ registerAction2(ExpandAllAction);
         },
     }
 });
-registerWorkbenchContribution2(MultiDiffEditorResolverContribution.ID, MultiDiffEditorResolverContribution, 1 );
+registerWorkbenchContribution2(MultiDiffEditorResolverContribution.ID, MultiDiffEditorResolverContribution, WorkbenchPhase.BlockStartup );
 ( (Registry.as(EditorExtensions.EditorPane)))
     .registerEditorPane(EditorPaneDescriptor.create(MultiDiffEditor, MultiDiffEditor.ID, ( localizeWithPath(_moduleId, 0, "Multi Diff Editor"))), [( (new SyncDescriptor(MultiDiffEditorInput)))]);
 ( (Registry.as(EditorExtensions.EditorFactory)))
     .registerEditorSerializer(MultiDiffEditorInput.ID, MultiDiffEditorSerializer);
 registerAction2(OpenScmGroupAction);
-registerWorkbenchContribution2(ScmMultiDiffSourceResolverContribution.ID, ScmMultiDiffSourceResolverContribution, 1 );
+registerWorkbenchContribution2(ScmMultiDiffSourceResolverContribution.ID, ScmMultiDiffSourceResolverContribution, WorkbenchPhase.BlockStartup );