@codingame/monaco-vscode-multi-diff-editor-service-override 11.1.2 → 12.0.1

package/index.d.ts

@@ -1 +1,2 @@
-export { default } from 'vscode/service-override/multiDiffEditor';
+import { type IEditorOverrideServices } from "vscode/vscode/vs/editor/standalone/browser/standaloneServices";
+export default function getServiceOverride(): IEditorOverrideServices;

package/index.js

@@ -1 +1,14 @@
-export { default } from './multiDiffEditor.js';
+
+import 'vscode/vscode/vs/editor/standalone/browser/standaloneServices';
+import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
+import { MultiDiffSourceResolverService } from '@codingame/monaco-vscode-9d05a43d-c330-5ff1-937e-fde4a3852931-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService';
+import { IMultiDiffSourceResolverService } from 'vscode/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.service';
+import './vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.contribution.js';
+
+function getServiceOverride() {
+    return {
+        [IMultiDiffSourceResolverService.toString()]: new SyncDescriptor(MultiDiffSourceResolverService, [], true)
+    };
+}
+
+export { getServiceOverride as default };

package/package.json

@@ -1,6 +1,8 @@
 {
   "name": "@codingame/monaco-vscode-multi-diff-editor-service-override",
-  "version": "11.1.2",
+  "version": "12.0.1",
+  "private": false,
+  "description": "VSCode public API plugged on the monaco editor - multi-diff-editor service-override",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -12,8 +14,17 @@
     "url": "git+ssh://git@github.com/CodinGame/monaco-vscode-api.git"
   },
   "type": "module",
-  "private": false,
-  "description": "VSCode public API plugged on the monaco editor - multi-diff-editor service-override",
+  "dependencies": {
+    "@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common": "12.0.1",
+    "@codingame/monaco-vscode-219d9a5f-b446-507b-a188-1178a0867c75-common": "12.0.1",
+    "@codingame/monaco-vscode-5452e2b7-9081-5f95-839b-4ab3544ce28f-common": "12.0.1",
+    "@codingame/monaco-vscode-9d05a43d-c330-5ff1-937e-fde4a3852931-common": "12.0.1",
+    "@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common": "12.0.1",
+    "@codingame/monaco-vscode-f99b74f5-fcb7-512f-8c6c-35f5a107577d-common": "12.0.1",
+    "vscode": "npm:@codingame/monaco-vscode-api@12.0.1"
+  },
+  "peerDependencies": {},
+  "peerDependenciesMeta": {},
   "main": "index.js",
   "module": "index.js",
   "types": "index.d.ts",
@@ -22,10 +33,12 @@
       "default": "./index.js"
     },
     "./vscode/*": {
-      "default": "./vscode/src/*.js"
+      "default": "./vscode/src/*.js",
+      "types": "./vscode/src/*.d.ts"
+    },
+    "./*": {
+      "default": "./*.js",
+      "types": "./*.d.ts"
     }
-  },
-  "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@11.1.2"
   }
 }

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

@@ -0,0 +1,14 @@
+import { Action2 } from "vscode/vscode/vs/platform/actions/common/actions";
+import { ServicesAccessor } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+export declare class GoToFileAction extends Action2 {
+    constructor();
+    run(accessor: ServicesAccessor, ...args: any[]): Promise<void>;
+}
+export declare class CollapseAllAction extends Action2 {
+    constructor();
+    run(accessor: ServicesAccessor, ...args: unknown[]): Promise<void>;
+}
+export declare class ExpandAllAction extends Action2 {
+    constructor();
+    run(accessor: ServicesAccessor, ...args: unknown[]): Promise<void>;
+}

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

@@ -1,11 +1,13 @@
+
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 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 { resolveCommandsContext } from '@codingame/monaco-vscode-219d9a5f-b446-507b-a188-1178a0867c75-common/vscode/vs/workbench/browser/parts/editor/editorCommandsContext';
 import { MultiDiffEditor } from './multiDiffEditor.js';
-import { MultiDiffEditorInput } from 'vscode/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
+import { MultiDiffEditorInput } from '@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common/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';
@@ -14,11 +16,11 @@ class GoToFileAction extends Action2 {
     constructor() {
         super({
             id: 'multiDiffEditor.goToFile',
-            title: ( localize2(6154, 'Open File')),
+            title: ( localize2(7271, 'Open File')),
             icon: Codicon.goToFile,
-            precondition: ( (ActiveEditorContext.isEqualTo(MultiDiffEditor.ID))),
+            precondition: ( ActiveEditorContext.isEqualTo(MultiDiffEditor.ID)),
             menu: {
-                when: ( (ActiveEditorContext.isEqualTo(MultiDiffEditor.ID))),
+                when: ( ActiveEditorContext.isEqualTo(MultiDiffEditor.ID)),
                 id: MenuId.MultiDiffEditorFileToolbar,
                 order: 22,
                 group: 'navigation',
@@ -46,7 +48,7 @@ class GoToFileAction extends Action2 {
             resource: targetUri,
             options: {
                 selection: selections?.[0],
-                selectionRevealType: 1 ,
+                selectionRevealType: TextEditorSelectionRevealType.CenterIfOutsideViewport,
             },
         });
     }
@@ -55,17 +57,11 @@ class CollapseAllAction extends Action2 {
     constructor() {
         super({
             id: 'multiDiffEditor.collapseAll',
-            title: ( localize2(6155, 'Collapse All Diffs')),
+            title: ( localize2(7272, 'Collapse All Diffs')),
             icon: Codicon.collapseAll,
-            precondition: ( (ContextKeyExpr.and(
-                 (ContextKeyExpr.equals('activeEditor', MultiDiffEditor.ID)),
-                ContextKeyExpr.not('multiDiffEditorAllCollapsed')
-            ))),
+            precondition: ( ContextKeyExpr.and(( ContextKeyExpr.equals('activeEditor', MultiDiffEditor.ID)), ContextKeyExpr.not('multiDiffEditorAllCollapsed'))),
             menu: {
-                when: ( (ContextKeyExpr.and(
-                     (ContextKeyExpr.equals('activeEditor', MultiDiffEditor.ID)),
-                    ContextKeyExpr.not('multiDiffEditorAllCollapsed')
-                ))),
+                when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('activeEditor', MultiDiffEditor.ID)), ContextKeyExpr.not('multiDiffEditorAllCollapsed'))),
                 id: MenuId.EditorTitle,
                 group: 'navigation',
                 order: 100
@@ -90,17 +86,11 @@ class ExpandAllAction extends Action2 {
     constructor() {
         super({
             id: 'multiDiffEditor.expandAll',
-            title: ( localize2(6156, 'Expand All Diffs')),
+            title: ( localize2(7273, 'Expand All Diffs')),
             icon: Codicon.expandAll,
-            precondition: ( (ContextKeyExpr.and(
-                 (ContextKeyExpr.equals('activeEditor', MultiDiffEditor.ID)),
-                 (ContextKeyExpr.has('multiDiffEditorAllCollapsed'))
-            ))),
+            precondition: ( ContextKeyExpr.and(( ContextKeyExpr.equals('activeEditor', MultiDiffEditor.ID)), ( ContextKeyExpr.has('multiDiffEditorAllCollapsed')))),
             menu: {
-                when: ( (ContextKeyExpr.and(
-                     (ContextKeyExpr.equals('activeEditor', MultiDiffEditor.ID)),
-                     (ContextKeyExpr.has('multiDiffEditorAllCollapsed'))
-                ))),
+                when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('activeEditor', MultiDiffEditor.ID)), ( ContextKeyExpr.has('multiDiffEditorAllCollapsed')))),
                 id: MenuId.EditorTitle,
                 group: 'navigation',
                 order: 100

package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.contribution.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -1,22 +1,24 @@
+
 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';
 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 { EditorPaneDescriptor } from '@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common/vscode/vs/workbench/browser/editor';
+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 { MultiDiffEditorResolverContribution, MultiDiffEditorInput, MultiDiffEditorSerializer } from '@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common/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 { OpenScmGroupAction, ScmMultiDiffSourceResolverContribution } from 'vscode/vscode/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
+import { OpenScmGroupAction, ScmMultiDiffSourceResolverContribution } from '@codingame/monaco-vscode-f99b74f5-fcb7-512f-8c6c-35f5a107577d-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver';
 
 registerAction2(GoToFileAction);
 registerAction2(CollapseAllAction);
 registerAction2(ExpandAllAction);
-( (Registry.as(Extensions.Configuration)))
+( Registry.as(Extensions.Configuration))
     .registerConfiguration({
     properties: {
         'multiDiffEditor.experimental.enabled': {
@@ -26,10 +28,10 @@ registerAction2(ExpandAllAction);
         },
     }
 });
-registerWorkbenchContribution2(MultiDiffEditorResolverContribution.ID, MultiDiffEditorResolverContribution, 1 );
-( (Registry.as(EditorExtensions.EditorPane)))
-    .registerEditorPane(EditorPaneDescriptor.create(MultiDiffEditor, MultiDiffEditor.ID, ( localize(2708, "Multi Diff Editor"))), [( (new SyncDescriptor(MultiDiffEditorInput)))]);
-( (Registry.as(EditorExtensions.EditorFactory)))
+registerWorkbenchContribution2(MultiDiffEditorResolverContribution.ID, MultiDiffEditorResolverContribution, WorkbenchPhase.BlockStartup );
+( Registry.as(EditorExtensions.EditorPane))
+    .registerEditorPane(EditorPaneDescriptor.create(MultiDiffEditor, MultiDiffEditor.ID, ( localize(7275, "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 );

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

@@ -0,0 +1,48 @@
+import * as DOM from "vscode/vscode/vs/base/browser/dom";
+import { CancellationToken } from "vscode/vscode/vs/base/common/cancellation";
+import { ITextResourceConfigurationService } from "vscode/vscode/vs/editor/common/services/textResourceConfiguration";
+import { InstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiationService";
+import { IStorageService } from "vscode/vscode/vs/platform/storage/common/storage.service";
+import { ITelemetryService } from "vscode/vscode/vs/platform/telemetry/common/telemetry.service";
+import { IThemeService } from "vscode/vscode/vs/platform/theme/common/themeService.service";
+import { AbstractEditorWithViewState } from "@codingame/monaco-vscode-219d9a5f-b446-507b-a188-1178a0867c75-common/vscode/vs/workbench/browser/parts/editor/editorWithViewState";
+import { ICompositeControl } from "vscode/vscode/vs/workbench/common/composite";
+import { IEditorOpenContext } from "vscode/vscode/vs/workbench/common/editor";
+import { EditorInput } from "vscode/vscode/vs/workbench/common/editor/editorInput";
+import { MultiDiffEditorInput } from "@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput";
+import { IEditorGroup } from "vscode/vscode/vs/workbench/services/editor/common/editorGroupsService";
+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 { URI } from "vscode/vscode/vs/base/common/uri";
+import { MultiDiffEditorViewModel } from "@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-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 "vscode/vscode/vs/editor/browser/editorBrowser";
+import { IDiffEditor } from "vscode/vscode/vs/editor/common/editorCommon";
+import { MultiDiffEditorItem } from "@codingame/monaco-vscode-9d05a43d-c330-5ff1-937e-fde4a3852931-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService";
+import { IEditorProgressService } from "vscode/vscode/vs/platform/progress/common/progress.service";
+export declare class MultiDiffEditor extends AbstractEditorWithViewState<IMultiDiffEditorViewState> {
+    private editorProgressService;
+    static readonly ID = "multiDiffEditor";
+    private _multiDiffEditorWidget;
+    private _viewModel;
+    get viewModel(): MultiDiffEditorViewModel | undefined;
+    constructor(group: IEditorGroup, instantiationService: InstantiationService, telemetryService: ITelemetryService, themeService: IThemeService, storageService: IStorageService, editorService: IEditorService, editorGroupService: IEditorGroupsService, textResourceConfigurationService: ITextResourceConfigurationService, editorProgressService: IEditorProgressService);
+    protected createEditor(parent: HTMLElement): void;
+    setInput(input: MultiDiffEditorInput, options: IMultiDiffEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void>;
+    setOptions(options: IMultiDiffEditorOptions | undefined): void;
+    private _applyOptions;
+    clearInput(): Promise<void>;
+    layout(dimension: DOM.Dimension): void;
+    getControl(): ICompositeControl | undefined;
+    focus(): void;
+    hasFocus(): boolean;
+    protected computeEditorViewState(resource: URI): IMultiDiffEditorViewState | undefined;
+    protected tracksEditorViewState(input: EditorInput): boolean;
+    protected toEditorViewStateResource(input: EditorInput): URI | undefined;
+    tryGetCodeEditor(resource: URI): {
+        diffEditor: IDiffEditor;
+        editor: ICodeEditor;
+    } | undefined;
+    findDocumentDiffItem(resource: URI): MultiDiffEditorItem | undefined;
+    showWhile(promise: Promise<unknown>): Promise<void>;
+}

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

@@ -1,13 +1,14 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { MultiDiffEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidget';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
+import { MultiDiffEditorWidget } from '@codingame/monaco-vscode-5452e2b7-9081-5f95-839b-4ab3544ce28f-common/vscode/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidget';
 import { ITextResourceConfigurationService } from 'vscode/vscode/vs/editor/common/services/textResourceConfiguration';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
-import { ResourceLabel } from 'vscode/vscode/vs/workbench/browser/labels';
-import { AbstractEditorWithViewState } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorWithViewState';
-import { MultiDiffEditorInput } from 'vscode/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
+import { ResourceLabel } from '@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common/vscode/vs/workbench/browser/labels';
+import { AbstractEditorWithViewState } from '@codingame/monaco-vscode-219d9a5f-b446-507b-a188-1178a0867c75-common/vscode/vs/workbench/browser/parts/editor/editorWithViewState';
+import { MultiDiffEditorInput } from '@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common/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 { Range } from 'vscode/vscode/vs/editor/common/core/range';

package/multiDiffEditor.js

@@ -1,12 +0,0 @@
-import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
-import { MultiDiffSourceResolverService } from 'vscode/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService';
-import { IMultiDiffSourceResolverService } from 'vscode/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.service';
-import './vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.contribution.js';
-
-function getServiceOverride() {
-    return {
-        [( IMultiDiffSourceResolverService.toString())]: new SyncDescriptor(MultiDiffSourceResolverService, [], true)
-    };
-}
-
-export { getServiceOverride as default };