@codingame/monaco-vscode-multi-diff-editor-service-override 4.5.0 → 4.5.2

package/index.d.ts

@@ -1 +1 @@
-export { default } from './multiDiffEditor.js';
+export { default } from 'vscode/service-override/multiDiffEditor';

package/package.json

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

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

@@ -8,15 +8,12 @@ import { MultiDiffEditor } from './multiDiffEditor.js';
 import { MultiDiffEditorInput } from 'vscode/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
 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(
-                'vs/workbench/contrib/multiDiffEditor/browser/actions',
-                'goToFile',
-                'Open File'
-            )),
+            title: ( localize2WithPath(_moduleId, 0, 'Open File')),
             icon: Codicon.goToFile,
             precondition: EditorContextKeys.inMultiDiffEditor,
             menu: {
@@ -52,15 +49,17 @@ class CollapseAllAction extends Action2 {
     constructor() {
         super({
             id: 'multiDiffEditor.collapseAll',
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/multiDiffEditor/browser/actions',
-                'collapseAllDiffs',
-                'Collapse All Diffs'
-            )),
+            title: ( localize2WithPath(_moduleId, 1, '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
@@ -81,15 +80,17 @@ class ExpandAllAction extends Action2 {
     constructor() {
         super({
             id: 'multiDiffEditor.expandAll',
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/multiDiffEditor/browser/actions',
-                'ExpandAllDiffs',
-                'Expand All Diffs'
-            )),
+            title: ( localize2WithPath(_moduleId, 2, '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.js

@@ -14,10 +14,11 @@ import 'vscode/vscode/vs/base/common/lifecycle';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { OpenScmGroupAction, ScmMultiDiffSourceResolverContribution } from './scmMultiDiffSourceResolver.js';
 
+const _moduleId = "vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.contribution";
 registerAction2(GoToFileAction);
 registerAction2(CollapseAllAction);
 registerAction2(ExpandAllAction);
-( Registry.as(Extensions.Configuration))
+( (Registry.as(Extensions.Configuration)))
     .registerConfiguration({
     properties: {
         'multiDiffEditor.experimental.enabled': {
@@ -28,13 +29,9 @@ registerAction2(ExpandAllAction);
     }
 });
 registerWorkbenchContribution2(MultiDiffEditorResolverContribution.ID, MultiDiffEditorResolverContribution, 1 );
-( Registry.as(EditorExtensions.EditorPane))
-    .registerEditorPane(EditorPaneDescriptor.create(MultiDiffEditor, MultiDiffEditor.ID, ( localizeWithPath(
-    'vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.contribution',
-    'name',
-    "Multi Diff Editor"
-))), [( new SyncDescriptor(MultiDiffEditorInput))]);
-( Registry.as(EditorExtensions.EditorFactory))
+( (Registry.as(EditorExtensions.EditorPane)))
+    .registerEditorPane(EditorPaneDescriptor.create(MultiDiffEditor, MultiDiffEditor.ID, ( localizeWithPath(_moduleId, 0, "Multi Diff Editor"))), [( (new SyncDescriptor(MultiDiffEditorInput)))]);
+( (Registry.as(EditorExtensions.EditorFactory)))
     .registerEditorSerializer(MultiDiffEditorInput.ID, MultiDiffEditorSerializer);
 registerAction2(OpenScmGroupAction);
 registerWorkbenchContribution2(ScmMultiDiffSourceResolverContribution.ID, ScmMultiDiffSourceResolverContribution, 1 );

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

@@ -16,14 +16,17 @@ import { ISCMService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm.s
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
 var ScmMultiDiffSourceResolver_1;
+const _moduleId = "vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver";
 let ScmMultiDiffSourceResolver = class ScmMultiDiffSourceResolver {
     static { ScmMultiDiffSourceResolver_1 = this; }
     static { this._scheme = 'scm-multi-diff-source'; }
     static getMultiDiffSourceUri(repositoryUri, groupId) {
-        return ( URI.from({
-            scheme: ScmMultiDiffSourceResolver_1._scheme,
-            query: JSON.stringify({ repositoryUri, groupId }),
-        }));
+        return (
+             (URI.from({
+                scheme: ScmMultiDiffSourceResolver_1._scheme,
+                query: JSON.stringify({ repositoryUri, groupId }),
+            }))
+        );
     }
     static parseUri(uri) {
         if (uri.scheme !== ScmMultiDiffSourceResolver_1._scheme) {
@@ -43,7 +46,7 @@ let ScmMultiDiffSourceResolver = class ScmMultiDiffSourceResolver {
         if (typeof repositoryUri !== 'string' || typeof groupId !== 'string') {
             return undefined;
         }
-        return { repositoryUri: ( URI.parse(repositoryUri)), groupId };
+        return { repositoryUri: ( (URI.parse(repositoryUri))), groupId };
     }
     constructor(_scmService) {
         this._scmService = _scmService;
@@ -54,28 +57,30 @@ let ScmMultiDiffSourceResolver = class ScmMultiDiffSourceResolver {
     async resolveDiffSource(uri) {
         const { repositoryUri, groupId } = ScmMultiDiffSourceResolver_1.parseUri(uri);
         const repository = await promiseFromEventState(this._scmService.onDidAddRepository, () => {
-            const repository = [...this._scmService.repositories].find(r => r.provider.rootUri?.toString() === ( repositoryUri.toString()));
+            const repository = [...this._scmService.repositories].find(r => r.provider.rootUri?.toString() === ( (repositoryUri.toString())));
             return repository ?? false;
         });
         const group = await promiseFromEventState(repository.provider.onDidChangeResourceGroups, () => {
             const group = repository.provider.groups.find(g => g.id === groupId);
             return group ?? false;
         });
-        const resources = observableFromEvent(group.onDidChangeResources, () => ( group.resources.map(e => {
+        const resources = observableFromEvent(group.onDidChangeResources, () => ( (group.resources.map(e => {
             return {
                 original: e.multiDiffEditorOriginalUri,
                 modified: e.multiDiffEditorModifiedUri
             };
-        })));
-        return ( new ScmResolvedMultiDiffSource(resources, {
-            scmResourceGroup: groupId,
-            scmProvider: repository.provider.contextValue,
-        }));
+        }))));
+        return (
+             (new ScmResolvedMultiDiffSource(resources, {
+                scmResourceGroup: groupId,
+                scmProvider: repository.provider.contextValue,
+            }))
+        );
     }
 };
-ScmMultiDiffSourceResolver = ScmMultiDiffSourceResolver_1 = ( __decorate([
-    ( __param(0, ISCMService))
-], ScmMultiDiffSourceResolver));
+ScmMultiDiffSourceResolver = ScmMultiDiffSourceResolver_1 = ( (__decorate([
+    ( (__param(0, ISCMService)))
+], ScmMultiDiffSourceResolver)));
 class ScmResolvedMultiDiffSource {
     get resources() { return this._resources.get(); }
     constructor(_resources, contextKeys) {
@@ -89,15 +94,17 @@ function promiseFromEventState(event, checkState) {
     if (state) {
         return Promise.resolve(state);
     }
-    return ( new Promise(resolve => {
-        const listener = event(() => {
-            const state = checkState();
-            if (state) {
-                listener.dispose();
-                resolve(state);
-            }
-        });
-    }));
+    return (
+         (new Promise(resolve => {
+            const listener = event(() => {
+                const state = checkState();
+                if (state) {
+                    listener.dispose();
+                    resolve(state);
+                }
+            });
+        }))
+    );
 }
 let ScmMultiDiffSourceResolverContribution = class ScmMultiDiffSourceResolverContribution extends Disposable {
     static { this.ID = 'workbench.contrib.scmMultiDiffSourceResolver'; }
@@ -106,22 +113,21 @@ let ScmMultiDiffSourceResolverContribution = class ScmMultiDiffSourceResolverCon
         this._register(multiDiffSourceResolverService.registerResolver(instantiationService.createInstance(ScmMultiDiffSourceResolver)));
     }
 };
-ScmMultiDiffSourceResolverContribution = ( __decorate([
-    ( __param(0, IInstantiationService)),
-    ( __param(1, IMultiDiffSourceResolverService))
-], ScmMultiDiffSourceResolverContribution));
+ScmMultiDiffSourceResolverContribution = ( (__decorate([
+    ( (__param(0, IInstantiationService))),
+    ( (__param(1, IMultiDiffSourceResolverService)))
+], ScmMultiDiffSourceResolverContribution)));
 class OpenScmGroupAction extends Action2 {
     constructor() {
         super({
             id: 'multiDiffEditor.openScmDiff',
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver',
-                'viewChanges',
-                'View Changes'
-            )),
+            title: ( localize2WithPath(_moduleId, 0, 'View Changes')),
             icon: Codicon.diffMultiple,
             menu: {
-                when: ( ContextKeyExpr.and(( ContextKeyExpr.has('config.multiDiffEditor.experimental.enabled')), ( ContextKeyExpr.has('multiDiffEditorEnableViewChanges')))),
+                when: ( (ContextKeyExpr.and(
+                     (ContextKeyExpr.has('config.multiDiffEditor.experimental.enabled')),
+                     (ContextKeyExpr.has('multiDiffEditorEnableViewChanges'))
+                ))),
                 id: MenuId.SCMResourceGroupContext,
                 group: 'inline',
             },
@@ -133,14 +139,8 @@ class OpenScmGroupAction extends Action2 {
         if (!group.provider.rootUri) {
             return;
         }
-        const multiDiffSource = ScmMultiDiffSourceResolver.getMultiDiffSourceUri(( group.provider.rootUri.toString()), group.id);
-        const label = ( localizeWithPath(
-            'vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver',
-            'scmDiffLabel',
-            '{0}: {1}',
-            group.provider.label,
-            group.label
-        ));
+        const multiDiffSource = ScmMultiDiffSourceResolver.getMultiDiffSourceUri(( (group.provider.rootUri.toString())), group.id);
+        const label = ( localizeWithPath(_moduleId, 1, '{0}: {1}', group.provider.label, group.label));
         await editorService.openEditor({ label, multiDiffSource });
     }
 }

package/multiDiffEditor.d.ts

@@ -1,5 +0,0 @@
-import { IEditorOverrideServices } from 'vscode/vscode/vs/editor/standalone/browser/standaloneServices';
-
-declare function getServiceOverride(): IEditorOverrideServices;
-
-export { getServiceOverride as default };