@codingame/monaco-vscode-multi-diff-editor-service-override 23.3.0 → 24.1.1

package/index.js

@@ -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-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService';
+import { MultiDiffSourceResolverService } from '@codingame/monaco-vscode-api/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

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-multi-diff-editor-service-override",
-  "version": "23.3.0",
+  "version": "24.1.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - multi-diff-editor service-override",
   "keywords": [],
@@ -15,13 +15,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-0b011daf-0f15-57de-bd5b-8953592c556c-common": "23.3.0",
-    "@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common": "23.3.0",
-    "@codingame/monaco-vscode-5452e2b7-9081-5f95-839b-4ab3544ce28f-common": "23.3.0",
-    "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "23.3.0",
-    "@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common": "23.3.0",
-    "@codingame/monaco-vscode-api": "23.3.0",
-    "@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common": "23.3.0"
+    "@codingame/monaco-vscode-api": "24.1.1"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -7,9 +7,9 @@ import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 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-0b011daf-0f15-57de-bd5b-8953592c556c-common/vscode/vs/workbench/browser/parts/editor/editorCommandsContext';
+import { resolveCommandsContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/editor/editorCommandsContext';
 import { MultiDiffEditor } from './multiDiffEditor.js';
-import { MultiDiffEditorInput } from '@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
+import { MultiDiffEditorInput } from '@codingame/monaco-vscode-api/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';
@@ -18,7 +18,7 @@ class GoToFileAction extends Action2 {
     constructor() {
         super({
             id: 'multiDiffEditor.goToFile',
-            title: ( localize2(9050, 'Open File')),
+            title: ( localize2(9182, 'Open File')),
             icon: Codicon.goToFile,
             precondition: ( ActiveEditorContext.isEqualTo(MultiDiffEditor.ID)),
             menu: {
@@ -60,7 +60,7 @@ class GoToNextChangeAction extends Action2 {
     constructor() {
         super({
             id: 'multiDiffEditor.goToNextChange',
-            title: ( localize2(9051, 'Go to Next Change')),
+            title: ( localize2(9183, 'Go to Next Change')),
             icon: Codicon.arrowDown,
             precondition: ( ContextKeyExpr.equals('activeEditor', MultiDiffEditor.ID)),
             menu: ( [MenuId.EditorTitle, MenuId.CompactWindowEditorTitle].map(id => ({
@@ -90,7 +90,7 @@ class GoToPreviousChangeAction extends Action2 {
     constructor() {
         super({
             id: 'multiDiffEditor.goToPreviousChange',
-            title: ( localize2(9052, 'Go to Previous Change')),
+            title: ( localize2(9184, 'Go to Previous Change')),
             icon: Codicon.arrowUp,
             precondition: ( ContextKeyExpr.equals('activeEditor', MultiDiffEditor.ID)),
             menu: ( [MenuId.EditorTitle, MenuId.CompactWindowEditorTitle].map(id => ({
@@ -120,7 +120,7 @@ class CollapseAllAction extends Action2 {
     constructor() {
         super({
             id: 'multiDiffEditor.collapseAll',
-            title: ( localize2(9053, 'Collapse All Diffs')),
+            title: ( localize2(9185, 'Collapse All Diffs')),
             icon: Codicon.collapseAll,
             precondition: ( ContextKeyExpr.and(( ContextKeyExpr.equals('activeEditor', MultiDiffEditor.ID)), ContextKeyExpr.not('multiDiffEditorAllCollapsed'))),
             menu: ( [MenuId.EditorTitle, MenuId.CompactWindowEditorTitle].map(id => ({
@@ -149,7 +149,7 @@ class ExpandAllAction extends Action2 {
     constructor() {
         super({
             id: 'multiDiffEditor.expandAll',
-            title: ( localize2(9054, 'Expand All Diffs')),
+            title: ( localize2(9186, 'Expand All Diffs')),
             icon: Codicon.expandAll,
             precondition: ( ContextKeyExpr.and(( ContextKeyExpr.equals('activeEditor', MultiDiffEditor.ID)), ( ContextKeyExpr.has('multiDiffEditorAllCollapsed')))),
             menu: ( [MenuId.EditorTitle, MenuId.CompactWindowEditorTitle].map(id => ({

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

@@ -4,17 +4,17 @@ import { registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform
 import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry';
 import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
-import { EditorPaneDescriptor } from '@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common/vscode/vs/workbench/browser/editor';
+import { EditorPaneDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/editor';
 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-bc6f260d-ec63-5c95-9446-1ca7d0872719-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
+import { MultiDiffEditorResolverContribution, MultiDiffEditorInput, MultiDiffEditorSerializer } from '@codingame/monaco-vscode-api/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-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver';
+import { OpenScmGroupAction, ScmMultiDiffSourceResolverContribution } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver';
 
 registerAction2(GoToFileAction);
 registerAction2(GoToNextChangeAction);
@@ -33,7 +33,7 @@ registerAction2(ExpandAllAction);
 });
 registerWorkbenchContribution2(MultiDiffEditorResolverContribution.ID, MultiDiffEditorResolverContribution, WorkbenchPhase.BlockStartup );
 ( Registry.as(EditorExtensions.EditorPane))
-    .registerEditorPane(EditorPaneDescriptor.create(MultiDiffEditor, MultiDiffEditor.ID, ( localize(9056, "Multi Diff Editor"))), [( new SyncDescriptor(MultiDiffEditorInput))]);
+    .registerEditorPane(EditorPaneDescriptor.create(MultiDiffEditor, MultiDiffEditor.ID, ( localize(9188, "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

@@ -1,32 +1,36 @@
 import * as DOM from "@codingame/monaco-vscode-api/vscode/vs/base/browser/dom";
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { ITextResourceConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/textResourceConfiguration.service";
+import { IMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.service";
 import { InstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiationService";
 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-0b011daf-0f15-57de-bd5b-8953592c556c-common/vscode/vs/workbench/browser/parts/editor/editorWithViewState";
+import { AbstractEditorWithViewState } from "@codingame/monaco-vscode-api/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-bc6f260d-ec63-5c95-9446-1ca7d0872719-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput";
+import { MultiDiffEditorInput } from "@codingame/monaco-vscode-api/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-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 { MultiDiffEditorViewModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorViewModel";
+import { IMultiDiffEditorOptions, IMultiDiffEditorViewState } from "@codingame/monaco-vscode-api/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-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService";
+import { MultiDiffEditorItem } from "@codingame/monaco-vscode-api/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;
+    private readonly menuService;
     static readonly ID = "multiDiffEditor";
     private _multiDiffEditorWidget;
     private _viewModel;
+    private _sessionResourceContextKey;
+    private _contentOverlay;
     get viewModel(): MultiDiffEditorViewModel | undefined;
-    constructor(group: IEditorGroup, instantiationService: InstantiationService, telemetryService: ITelemetryService, themeService: IThemeService, storageService: IStorageService, editorService: IEditorService, editorGroupService: IEditorGroupsService, textResourceConfigurationService: ITextResourceConfigurationService, editorProgressService: IEditorProgressService);
+    constructor(group: IEditorGroup, instantiationService: InstantiationService, telemetryService: ITelemetryService, themeService: IThemeService, storageService: IStorageService, editorService: IEditorService, editorGroupService: IEditorGroupsService, textResourceConfigurationService: ITextResourceConfigurationService, editorProgressService: IEditorProgressService, menuService: IMenuService);
     protected createEditor(parent: HTMLElement): void;
     setInput(input: MultiDiffEditorInput, options: IMultiDiffEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void>;
     setOptions(options: IMultiDiffEditorOptions | undefined): void;

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

@@ -1,18 +1,24 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { MultiDiffEditorWidget } from '@codingame/monaco-vscode-5452e2b7-9081-5f95-839b-4ab3544ce28f-common/vscode/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidget';
+import { h } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { Disposable, MutableDisposable, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { MultiDiffEditorWidget } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidget';
 import { ITextResourceConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/textResourceConfiguration.service';
+import { FloatingClickMenu } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/floatingMenu';
+import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { IMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 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-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/workbench/browser/labels';
-import { AbstractEditorWithViewState } from '@codingame/monaco-vscode-0b011daf-0f15-57de-bd5b-8953592c556c-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 { ResourceLabel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/labels';
+import { AbstractEditorWithViewState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/editor/editorWithViewState';
+import { MultiDiffEditorInput } from '@codingame/monaco-vscode-api/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';
 import { IEditorProgressService } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service';
+import { ResourceContextKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 
 var MultiDiffEditor_1;
 let MultiDiffEditor = class MultiDiffEditor extends AbstractEditorWithViewState {
@@ -21,9 +27,10 @@ let MultiDiffEditor = class MultiDiffEditor extends AbstractEditorWithViewState
     get viewModel() {
         return this._viewModel;
     }
-    constructor(group, instantiationService, telemetryService, themeService, storageService, editorService, editorGroupService, textResourceConfigurationService, editorProgressService) {
+    constructor(group, instantiationService, telemetryService, themeService, storageService, editorService, editorGroupService, textResourceConfigurationService, editorProgressService, menuService) {
         super(MultiDiffEditor_1.ID, group, 'multiDiffEditor', telemetryService, instantiationService, storageService, textResourceConfigurationService, themeService, editorService, editorGroupService);
         this.editorProgressService = editorProgressService;
+        this.menuService = menuService;
         this._multiDiffEditorWidget = undefined;
     }
     createEditor(parent) {
@@ -31,10 +38,22 @@ let MultiDiffEditor = class MultiDiffEditor extends AbstractEditorWithViewState
         this._register(this._multiDiffEditorWidget.onDidChangeActiveControl(() => {
             this._onDidChangeControl.fire();
         }));
+        const scopedContextKeyService = this._multiDiffEditorWidget.getContextKeyService();
+        const scopedInstantiationService = this._multiDiffEditorWidget.getScopedInstantiationService();
+        this._sessionResourceContextKey = this._register(scopedInstantiationService.createInstance(ResourceContextKey));
+        this._contentOverlay = this._register(( new MultiDiffEditorContentMenuOverlay(
+            this._multiDiffEditorWidget.getRootElement(),
+            this._sessionResourceContextKey,
+            scopedContextKeyService,
+            this.menuService,
+            scopedInstantiationService
+        )));
     }
     async setInput(input, options, context, token) {
         await super.setInput(input, options, context, token);
         this._viewModel = await input.getViewModel();
+        this._sessionResourceContextKey?.set(input.resource);
+        this._contentOverlay?.updateResource(input.resource);
         this._multiDiffEditorWidget.setViewModel(this._viewModel);
         const viewState = this.loadEditorViewState(input, context);
         if (viewState) {
@@ -57,6 +76,8 @@ let MultiDiffEditor = class MultiDiffEditor extends AbstractEditorWithViewState
     }
     async clearInput() {
         await super.clearInput();
+        this._sessionResourceContextKey?.set(null);
+        this._contentOverlay?.updateResource(undefined);
         this._multiDiffEditorWidget.setViewModel(undefined);
     }
     layout(dimension) {
@@ -110,8 +131,47 @@ MultiDiffEditor = MultiDiffEditor_1 = ( __decorate([
     ( __param(5, IEditorService)),
     ( __param(6, IEditorGroupsService)),
     ( __param(7, ITextResourceConfigurationService)),
-    ( __param(8, IEditorProgressService))
+    ( __param(8, IEditorProgressService)),
+    ( __param(9, IMenuService))
 ], MultiDiffEditor));
+class MultiDiffEditorContentMenuOverlay extends Disposable {
+    constructor(root, resourceContextKey, contextKeyService, menuService, instantiationService) {
+        super();
+        this.overlayStore = this._register(( new MutableDisposable()));
+        this.resourceContextKey = resourceContextKey;
+        const menu = this._register(menuService.createMenu(MenuId.MultiDiffEditorContent, contextKeyService));
+        this.rebuild = () => {
+            this.overlayStore.clear();
+            const hasActions = menu.getActions().length > 0;
+            if (!hasActions) {
+                return;
+            }
+            const container = h('div.floating-menu-overlay-widget.multi-diff-root-floating-menu');
+            root.appendChild(container.root);
+            const floatingMenu = instantiationService.createInstance(FloatingClickMenu, {
+                container: container.root,
+                menuId: MenuId.MultiDiffEditorContent,
+                getActionArg: () => this.currentResource,
+            });
+            const store = ( new DisposableStore());
+            store.add(floatingMenu);
+            store.add(toDisposable(() => container.root.remove()));
+            this.overlayStore.value = store;
+        };
+        this.rebuild();
+        this._register(menu.onDidChange(() => {
+            this.overlayStore.clear();
+            this.rebuild();
+        }));
+        this._register(resourceContextKey);
+    }
+    updateResource(resource) {
+        this.currentResource = resource;
+        this.resourceContextKey.set(resource ?? null);
+        this.overlayStore.clear();
+        this.rebuild();
+    }
+}
 let WorkbenchUIElementFactory = class WorkbenchUIElementFactory {
     constructor(_instantiationService) {
         this._instantiationService = _instantiationService;