npm - @codingame/monaco-vscode-multi-diff-editor-service-override - Versions diffs - 22.1.9 → 23.0.1 - Mend

@codingame/monaco-vscode-multi-diff-editor-service-override 22.1.9 → 23.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/index.js CHANGED Viewed

@@ -1,7 +1,7 @@
 import '@codingame/monaco-vscode-api/vscode/vs/editor/standalone/browser/standaloneServices';
 import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
-import { MultiDiffSourceResolverService } from '@codingame/monaco-vscode-7969284a-1a12-5148-9750-fcf9656a693f-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService';
+import { MultiDiffSourceResolverService } from '@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService';
 import { IMultiDiffSourceResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.service';
 import './vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.contribution.js';

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-multi-diff-editor-service-override",
-  "version": "22.1.9",
+  "version": "23.0.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - multi-diff-editor service-override",
   "keywords": [],
@@ -15,12 +15,13 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-5452e2b7-9081-5f95-839b-4ab3544ce28f-common": "22.1.9",
-    "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "22.1.9",
-    "@codingame/monaco-vscode-7969284a-1a12-5148-9750-fcf9656a693f-common": "22.1.9",
-    "@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common": "22.1.9",
-    "@codingame/monaco-vscode-api": "22.1.9",
-    "@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common": "22.1.9"
+    "@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common": "23.0.1",
+    "@codingame/monaco-vscode-5452e2b7-9081-5f95-839b-4ab3544ce28f-common": "23.0.1",
+    "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "23.0.1",
+    "@codingame/monaco-vscode-a6a3e03d-2b1a-5e17-b904-ed5d40c14550-common": "23.0.1",
+    "@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common": "23.0.1",
+    "@codingame/monaco-vscode-api": "23.0.1",
+    "@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common": "23.0.1"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/actions.d.ts CHANGED Viewed

@@ -2,7 +2,15 @@ import { Action2 } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions
 import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 export declare class GoToFileAction extends Action2 {
     constructor();
-    run(accessor: ServicesAccessor, ...args: any[]): Promise<void>;
+    run(accessor: ServicesAccessor, ...args: unknown[]): Promise<void>;
+}
+export declare class GoToNextChangeAction extends Action2 {
+    constructor();
+    run(accessor: ServicesAccessor): Promise<void>;
+}
+export declare class GoToPreviousChangeAction extends Action2 {
+    constructor();
+    run(accessor: ServicesAccessor): Promise<void>;
 }
 export declare class CollapseAllAction extends Action2 {
     constructor();

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

@@ -1,13 +1,15 @@
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { Action2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { TextEditorSelectionRevealType } from '@codingame/monaco-vscode-api/vscode/vs/platform/editor/common/editor';
+import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { IListService } from '@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService.service';
-import { resolveCommandsContext } from '@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/workbench/browser/parts/editor/editorCommandsContext';
+import { resolveCommandsContext } from '@codingame/monaco-vscode-a6a3e03d-2b1a-5e17-b904-ed5d40c14550-common/vscode/vs/workbench/browser/parts/editor/editorCommandsContext';
 import { MultiDiffEditor } from './multiDiffEditor.js';
-import { MultiDiffEditorInput } from '@codingame/monaco-vscode-7969284a-1a12-5148-9750-fcf9656a693f-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
+import { MultiDiffEditorInput } from '@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { ActiveEditorContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
@@ -16,7 +18,7 @@ class GoToFileAction extends Action2 {
     constructor() {
         super({
             id: 'multiDiffEditor.goToFile',
-            title: ( localize2(8770, 'Open File')),
+            title: ( localize2(9027, 'Open File')),
             icon: Codicon.goToFile,
             precondition: ( ActiveEditorContext.isEqualTo(MultiDiffEditor.ID)),
             menu: {
@@ -54,11 +56,71 @@ class GoToFileAction extends Action2 {
         });
     }
 }
+class GoToNextChangeAction extends Action2 {
+    constructor() {
+        super({
+            id: 'multiDiffEditor.goToNextChange',
+            title: ( localize2(9028, 'Go to Next Change')),
+            icon: Codicon.arrowDown,
+            precondition: ( ContextKeyExpr.equals('activeEditor', MultiDiffEditor.ID)),
+            menu: ( [MenuId.EditorTitle, MenuId.CompactWindowEditorTitle].map(id => ({
+                id,
+                when: ( ContextKeyExpr.equals('activeEditor', MultiDiffEditor.ID)),
+                group: 'navigation',
+                order: 2
+            }))),
+            keybinding: {
+                primary: KeyMod.Alt | KeyCode.F5,
+                weight: KeybindingWeight.EditorContrib,
+                when: ( ContextKeyExpr.equals('activeEditor', MultiDiffEditor.ID)),
+            },
+            f1: true,
+        });
+    }
+    async run(accessor) {
+        const editorService = accessor.get(IEditorService);
+        const activeEditorPane = editorService.activeEditorPane;
+        if (!(activeEditorPane instanceof MultiDiffEditor)) {
+            return;
+        }
+        activeEditorPane.goToNextChange();
+    }
+}
+class GoToPreviousChangeAction extends Action2 {
+    constructor() {
+        super({
+            id: 'multiDiffEditor.goToPreviousChange',
+            title: ( localize2(9029, 'Go to Previous Change')),
+            icon: Codicon.arrowUp,
+            precondition: ( ContextKeyExpr.equals('activeEditor', MultiDiffEditor.ID)),
+            menu: ( [MenuId.EditorTitle, MenuId.CompactWindowEditorTitle].map(id => ({
+                id,
+                when: ( ContextKeyExpr.equals('activeEditor', MultiDiffEditor.ID)),
+                group: 'navigation',
+                order: 1
+            }))),
+            keybinding: {
+                primary: KeyMod.Alt | KeyMod.Shift | KeyCode.F5,
+                weight: KeybindingWeight.EditorContrib,
+                when: ( ContextKeyExpr.equals('activeEditor', MultiDiffEditor.ID)),
+            },
+            f1: true,
+        });
+    }
+    async run(accessor) {
+        const editorService = accessor.get(IEditorService);
+        const activeEditorPane = editorService.activeEditorPane;
+        if (!(activeEditorPane instanceof MultiDiffEditor)) {
+            return;
+        }
+        activeEditorPane.goToPreviousChange();
+    }
+}
 class CollapseAllAction extends Action2 {
     constructor() {
         super({
             id: 'multiDiffEditor.collapseAll',
-            title: ( localize2(8771, 'Collapse All Diffs')),
+            title: ( localize2(9030, 'Collapse All Diffs')),
             icon: Codicon.collapseAll,
             precondition: ( ContextKeyExpr.and(( ContextKeyExpr.equals('activeEditor', MultiDiffEditor.ID)), ContextKeyExpr.not('multiDiffEditorAllCollapsed'))),
             menu: ( [MenuId.EditorTitle, MenuId.CompactWindowEditorTitle].map(id => ({
@@ -87,7 +149,7 @@ class ExpandAllAction extends Action2 {
     constructor() {
         super({
             id: 'multiDiffEditor.expandAll',
-            title: ( localize2(8772, 'Expand All Diffs')),
+            title: ( localize2(9031, 'Expand All Diffs')),
             icon: Codicon.expandAll,
             precondition: ( ContextKeyExpr.and(( ContextKeyExpr.equals('activeEditor', MultiDiffEditor.ID)), ( ContextKeyExpr.has('multiDiffEditorAllCollapsed')))),
             menu: ( [MenuId.EditorTitle, MenuId.CompactWindowEditorTitle].map(id => ({
@@ -113,4 +175,4 @@ class ExpandAllAction extends Action2 {
     }
 }
-export { CollapseAllAction, ExpandAllAction, GoToFileAction };
+export { CollapseAllAction, ExpandAllAction, GoToFileAction, GoToNextChangeAction, GoToPreviousChangeAction };

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

@@ -8,15 +8,17 @@ import { EditorPaneDescriptor } from '@codingame/monaco-vscode-60014c9d-b815-501
 import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import { EditorExtensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { MultiDiffEditor } from './multiDiffEditor.js';
-import { MultiDiffEditorResolverContribution, MultiDiffEditorInput, MultiDiffEditorSerializer } from '@codingame/monaco-vscode-7969284a-1a12-5148-9750-fcf9656a693f-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
-import { GoToFileAction, CollapseAllAction, ExpandAllAction } from './actions.js';
+import { MultiDiffEditorResolverContribution, MultiDiffEditorInput, MultiDiffEditorSerializer } from '@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
+import { GoToFileAction, GoToNextChangeAction, GoToPreviousChangeAction, CollapseAllAction, ExpandAllAction } from './actions.js';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
-import { OpenScmGroupAction, ScmMultiDiffSourceResolverContribution } from '@codingame/monaco-vscode-7969284a-1a12-5148-9750-fcf9656a693f-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver';
+import { OpenScmGroupAction, ScmMultiDiffSourceResolverContribution } from '@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver';
 registerAction2(GoToFileAction);
+registerAction2(GoToNextChangeAction);
+registerAction2(GoToPreviousChangeAction);
 registerAction2(CollapseAllAction);
 registerAction2(ExpandAllAction);
 ( Registry.as(Extensions.Configuration))
@@ -31,7 +33,7 @@ registerAction2(ExpandAllAction);
 });
 registerWorkbenchContribution2(MultiDiffEditorResolverContribution.ID, MultiDiffEditorResolverContribution, WorkbenchPhase.BlockStartup );
 ( Registry.as(EditorExtensions.EditorPane))
-    .registerEditorPane(EditorPaneDescriptor.create(MultiDiffEditor, MultiDiffEditor.ID, ( localize(8774, "Multi Diff Editor"))), [( new SyncDescriptor(MultiDiffEditorInput))]);
+    .registerEditorPane(EditorPaneDescriptor.create(MultiDiffEditor, MultiDiffEditor.ID, ( localize(9033, "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.d.ts CHANGED Viewed

@@ -5,20 +5,20 @@ import { InstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/pla
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
-import { AbstractEditorWithViewState } from "@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/workbench/browser/parts/editor/editorWithViewState";
+import { AbstractEditorWithViewState } from "@codingame/monaco-vscode-a6a3e03d-2b1a-5e17-b904-ed5d40c14550-common/vscode/vs/workbench/browser/parts/editor/editorWithViewState";
 import { ICompositeControl } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/composite";
 import { IEditorOpenContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
 import { EditorInput } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/editorInput";
-import { MultiDiffEditorInput } from "@codingame/monaco-vscode-7969284a-1a12-5148-9750-fcf9656a693f-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput";
+import { MultiDiffEditorInput } from "@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput";
 import { IEditorGroup } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService";
 import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { MultiDiffEditorViewModel } from "@codingame/monaco-vscode-7969284a-1a12-5148-9750-fcf9656a693f-common/vscode/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorViewModel";
+import { MultiDiffEditorViewModel } from "@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common/vscode/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorViewModel";
 import { IMultiDiffEditorOptions, IMultiDiffEditorViewState } from "@codingame/monaco-vscode-5452e2b7-9081-5f95-839b-4ab3544ce28f-common/vscode/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl";
 import { ICodeEditor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser";
 import { IDiffEditor } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/editorCommon";
-import { MultiDiffEditorItem } from "@codingame/monaco-vscode-7969284a-1a12-5148-9750-fcf9656a693f-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService";
+import { MultiDiffEditorItem } from "@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService";
 import { IEditorProgressService } from "@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service";
 export declare class MultiDiffEditor extends AbstractEditorWithViewState<IMultiDiffEditorViewState> {
     private editorProgressService;
@@ -44,5 +44,7 @@ export declare class MultiDiffEditor extends AbstractEditorWithViewState<IMultiD
         editor: ICodeEditor;
     } | undefined;
     findDocumentDiffItem(resource: URI): MultiDiffEditorItem | undefined;
+    goToNextChange(): void;
+    goToPreviousChange(): void;
     showWhile(promise: Promise<unknown>): Promise<void>;
 }

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

@@ -6,9 +6,9 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
-import { ResourceLabel } from '@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common/vscode/vs/workbench/browser/labels';
-import { AbstractEditorWithViewState } from '@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/workbench/browser/parts/editor/editorWithViewState';
-import { MultiDiffEditorInput } from '@codingame/monaco-vscode-7969284a-1a12-5148-9750-fcf9656a693f-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
+import { ResourceLabel } from '@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/workbench/browser/labels';
+import { AbstractEditorWithViewState } from '@codingame/monaco-vscode-a6a3e03d-2b1a-5e17-b904-ed5d40c14550-common/vscode/vs/workbench/browser/parts/editor/editorWithViewState';
+import { MultiDiffEditorInput } from '@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
@@ -92,6 +92,12 @@ let MultiDiffEditor = class MultiDiffEditor extends AbstractEditorWithViewState
         const i2 = i;
         return i2.multiDiffEditorItem;
     }
+    goToNextChange() {
+        this._multiDiffEditorWidget?.goToNextChange();
+    }
+    goToPreviousChange() {
+        this._multiDiffEditorWidget?.goToPreviousChange();
+    }
     async showWhile(promise) {
         return this.editorProgressService.showWhile(promise);
     }