@codingame/monaco-vscode-multi-diff-editor-service-override 9.0.2 → 10.0.0

package/package.json

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

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

@@ -1,25 +1,24 @@
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
-import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
 import { localize2 } 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 { TextEditorSelectionRevealType } from 'vscode/vscode/vs/platform/editor/common/editor';
 import { IListService } from 'vscode/vscode/vs/platform/list/browser/listService.service';
 import { resolveCommandsContext } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorCommandsContext';
 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';
+import { ActiveEditorContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
 
 class GoToFileAction extends Action2 {
     constructor() {
         super({
             id: 'multiDiffEditor.goToFile',
-            title: ( localize2(6121, 'Open File')),
+            title: ( localize2(6172, 'Open File')),
             icon: Codicon.goToFile,
-            precondition: EditorContextKeys.inMultiDiffEditor,
+            precondition: ( (ActiveEditorContext.isEqualTo(MultiDiffEditor.ID))),
             menu: {
-                when: EditorContextKeys.inMultiDiffEditor,
+                when: ( (ActiveEditorContext.isEqualTo(MultiDiffEditor.ID))),
                 id: MenuId.MultiDiffEditorFileToolbar,
                 order: 22,
                 group: 'navigation',
@@ -47,7 +46,7 @@ class GoToFileAction extends Action2 {
             resource: targetUri,
             options: {
                 selection: selections?.[0],
-                selectionRevealType: TextEditorSelectionRevealType.CenterIfOutsideViewport,
+                selectionRevealType: 1 ,
             },
         });
     }
@@ -56,7 +55,7 @@ class CollapseAllAction extends Action2 {
     constructor() {
         super({
             id: 'multiDiffEditor.collapseAll',
-            title: ( localize2(6122, 'Collapse All Diffs')),
+            title: ( localize2(6173, 'Collapse All Diffs')),
             icon: Codicon.collapseAll,
             precondition: ( (ContextKeyExpr.and(
                  (ContextKeyExpr.equals('activeEditor', MultiDiffEditor.ID)),
@@ -91,7 +90,7 @@ class ExpandAllAction extends Action2 {
     constructor() {
         super({
             id: 'multiDiffEditor.expandAll',
-            title: ( localize2(6123, 'Expand All Diffs')),
+            title: ( localize2(6174, 'Expand All Diffs')),
             icon: Codicon.expandAll,
             precondition: ( (ContextKeyExpr.and(
                  (ContextKeyExpr.equals('activeEditor', MultiDiffEditor.ID)),

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

@@ -4,14 +4,13 @@ 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, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2 } 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';
 
 registerAction2(GoToFileAction);
@@ -27,10 +26,10 @@ registerAction2(ExpandAllAction);
         },
     }
 });
-registerWorkbenchContribution2(MultiDiffEditorResolverContribution.ID, MultiDiffEditorResolverContribution, WorkbenchPhase.BlockStartup );
+registerWorkbenchContribution2(MultiDiffEditorResolverContribution.ID, MultiDiffEditorResolverContribution, 1 );
 ( (Registry.as(EditorExtensions.EditorPane)))
-    .registerEditorPane(EditorPaneDescriptor.create(MultiDiffEditor, MultiDiffEditor.ID, ( localize(2696, "Multi Diff Editor"))), [( (new SyncDescriptor(MultiDiffEditorInput)))]);
+    .registerEditorPane(EditorPaneDescriptor.create(MultiDiffEditor, MultiDiffEditor.ID, ( localize(2710, "Multi Diff Editor"))), [( (new SyncDescriptor(MultiDiffEditorInput)))]);
 ( (Registry.as(EditorExtensions.EditorFactory)))
     .registerEditorSerializer(MultiDiffEditorInput.ID, MultiDiffEditorSerializer);
 registerAction2(OpenScmGroupAction);
-registerWorkbenchContribution2(ScmMultiDiffSourceResolverContribution.ID, ScmMultiDiffSourceResolverContribution, WorkbenchPhase.BlockStartup );
+registerWorkbenchContribution2(ScmMultiDiffSourceResolverContribution.ID, ScmMultiDiffSourceResolverContribution, 1 );

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

@@ -11,6 +11,7 @@ import { MultiDiffEditorInput } from 'vscode/vscode/vs/workbench/contrib/multiDi
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
+import { IEditorProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
 
 var MultiDiffEditor_1;
 let MultiDiffEditor = class MultiDiffEditor extends AbstractEditorWithViewState {
@@ -19,8 +20,9 @@ let MultiDiffEditor = class MultiDiffEditor extends AbstractEditorWithViewState
     get viewModel() {
         return this._viewModel;
     }
-    constructor(group, instantiationService, telemetryService, themeService, storageService, editorService, editorGroupService, textResourceConfigurationService) {
+    constructor(group, instantiationService, telemetryService, themeService, storageService, editorService, editorGroupService, textResourceConfigurationService, editorProgressService) {
         super(MultiDiffEditor_1.ID, group, 'multiDiffEditor', telemetryService, instantiationService, storageService, textResourceConfigurationService, themeService, editorService, editorGroupService);
+        this.editorProgressService = editorProgressService;
         this._multiDiffEditorWidget = undefined;
     }
     createEditor(parent) {
@@ -89,6 +91,9 @@ let MultiDiffEditor = class MultiDiffEditor extends AbstractEditorWithViewState
         const i2 = i;
         return i2.multiDiffEditorItem;
     }
+    async showWhile(promise) {
+        return this.editorProgressService.showWhile(promise);
+    }
 };
 MultiDiffEditor = MultiDiffEditor_1 = ( __decorate([
     ( __param(1, IInstantiationService)),
@@ -97,7 +102,8 @@ MultiDiffEditor = MultiDiffEditor_1 = ( __decorate([
     ( __param(4, IStorageService)),
     ( __param(5, IEditorService)),
     ( __param(6, IEditorGroupsService)),
-    ( __param(7, ITextResourceConfigurationService))
+    ( __param(7, ITextResourceConfigurationService)),
+    ( __param(8, IEditorProgressService))
 ], MultiDiffEditor));
 let WorkbenchUIElementFactory = class WorkbenchUIElementFactory {
     constructor(_instantiationService) {