@codingame/monaco-vscode-multi-diff-editor-service-override 7.1.0 → 7.1.1

package/package.json

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

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

@@ -1,21 +1,21 @@
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
-import { localize2WithPath } from 'vscode/vscode/vs/nls';
+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 { resolveCommandsContext, getCommandsContext } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorCommands';
-import { TextFileEditor } from 'vscode/vscode/vs/workbench/contrib/files/browser/editors/textFileEditor';
+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';
 
-const _moduleId = "vs/workbench/contrib/multiDiffEditor/browser/actions";
 class GoToFileAction extends Action2 {
     constructor() {
         super({
             id: 'multiDiffEditor.goToFile',
-            title: ( localize2WithPath(_moduleId, 0, 'Open File')),
+            title: ( localize2(5740, 'Open File')),
             icon: Codicon.goToFile,
             precondition: EditorContextKeys.inMultiDiffEditor,
             menu: {
@@ -31,27 +31,32 @@ class GoToFileAction extends Action2 {
         const editorService = accessor.get(IEditorService);
         const activeEditorPane = editorService.activeEditorPane;
         let selections = undefined;
-        if (activeEditorPane instanceof MultiDiffEditor) {
-            const editor = activeEditorPane.tryGetCodeEditor(uri);
-            if (editor) {
-                selections = editor.editor.getSelections() ?? undefined;
-            }
+        if (!(activeEditorPane instanceof MultiDiffEditor)) {
+            return;
         }
-        const editor = await editorService.openEditor({ resource: uri });
-        if (selections && (editor instanceof TextFileEditor)) {
-            const c = editor.getControl();
-            if (c) {
-                c.setSelections(selections);
-                c.revealLineInCenter(selections[0].selectionStartLineNumber);
-            }
+        const editor = activeEditorPane.tryGetCodeEditor(uri);
+        if (editor) {
+            selections = editor.editor.getSelections() ?? undefined;
         }
+        let targetUri = uri;
+        const item = activeEditorPane.findDocumentDiffItem(uri);
+        if (item && item.goToFileUri) {
+            targetUri = item.goToFileUri;
+        }
+        await editorService.openEditor({
+            resource: targetUri,
+            options: {
+                selection: selections?.[0],
+                selectionRevealType: TextEditorSelectionRevealType.CenterIfOutsideViewport,
+            },
+        });
     }
 }
 class CollapseAllAction extends Action2 {
     constructor() {
         super({
             id: 'multiDiffEditor.collapseAll',
-            title: ( localize2WithPath(_moduleId, 1, 'Collapse All Diffs')),
+            title: ( localize2(5741, 'Collapse All Diffs')),
             icon: Codicon.collapseAll,
             precondition: ( (ContextKeyExpr.and(
                  (ContextKeyExpr.equals('activeEditor', MultiDiffEditor.ID)),
@@ -69,8 +74,13 @@ class CollapseAllAction extends Action2 {
             f1: true,
         });
     }
-    async run(accessor, resourceOrContext, context) {
-        const { editor } = resolveCommandsContext(accessor.get(IEditorGroupsService), getCommandsContext(accessor, resourceOrContext, context));
+    async run(accessor, ...args) {
+        const resolvedContext = resolveCommandsContext(args, accessor.get(IEditorService), accessor.get(IEditorGroupsService), accessor.get(IListService));
+        const groupContext = resolvedContext.groupedEditors[0];
+        if (!groupContext) {
+            return;
+        }
+        const editor = groupContext.editors[0];
         if (editor instanceof MultiDiffEditorInput) {
             const viewModel = await editor.getViewModel();
             viewModel.collapseAll();
@@ -81,7 +91,7 @@ class ExpandAllAction extends Action2 {
     constructor() {
         super({
             id: 'multiDiffEditor.expandAll',
-            title: ( localize2WithPath(_moduleId, 2, 'Expand All Diffs')),
+            title: ( localize2(5742, 'Expand All Diffs')),
             icon: Codicon.expandAll,
             precondition: ( (ContextKeyExpr.and(
                  (ContextKeyExpr.equals('activeEditor', MultiDiffEditor.ID)),
@@ -99,8 +109,13 @@ class ExpandAllAction extends Action2 {
             f1: true,
         });
     }
-    async run(accessor, resourceOrContext, context) {
-        const { editor } = resolveCommandsContext(accessor.get(IEditorGroupsService), getCommandsContext(accessor, resourceOrContext, context));
+    async run(accessor, ...args) {
+        const resolvedContext = resolveCommandsContext(args, accessor.get(IEditorService), accessor.get(IEditorGroupsService), accessor.get(IListService));
+        const groupContext = resolvedContext.groupedEditors[0];
+        if (!groupContext) {
+            return;
+        }
+        const editor = groupContext.editors[0];
         if (editor instanceof MultiDiffEditorInput) {
             const viewModel = await editor.getViewModel();
             viewModel.expandAll();

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

@@ -1,4 +1,4 @@
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
@@ -14,7 +14,6 @@ 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";
 registerAction2(GoToFileAction);
 registerAction2(CollapseAllAction);
 registerAction2(ExpandAllAction);
@@ -30,7 +29,7 @@ registerAction2(ExpandAllAction);
 });
 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)))]);
+    .registerEditorPane(EditorPaneDescriptor.create(MultiDiffEditor, MultiDiffEditor.ID, ( localize(2554, "Multi Diff Editor"))), [( (new SyncDescriptor(MultiDiffEditorInput)))]);
 ( (Registry.as(EditorExtensions.EditorFactory)))
     .registerEditorSerializer(MultiDiffEditorInput.ID, MultiDiffEditorSerializer);
 registerAction2(OpenScmGroupAction);

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

@@ -81,6 +81,14 @@ let MultiDiffEditor = class MultiDiffEditor extends AbstractEditorWithViewState
     tryGetCodeEditor(resource) {
         return this._multiDiffEditorWidget.tryGetCodeEditor(resource);
     }
+    findDocumentDiffItem(resource) {
+        const i = this._multiDiffEditorWidget.findDocumentDiffItem(resource);
+        if (!i) {
+            return undefined;
+        }
+        const i2 = i;
+        return i2.multiDiffEditorItem;
+    }
 };
 MultiDiffEditor = MultiDiffEditor_1 = ( __decorate([
     ( __param(1, IInstantiationService)),