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

package/package.json

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

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

@@ -9,10 +9,9 @@ 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 { GoToFileAction, CollapseAllAction, ExpandAllAction } from './actions.js';
-import 'vscode/vscode/vs/base/common/event';
 import 'vscode/vscode/vs/base/common/lifecycle';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { OpenScmGroupAction, ScmMultiDiffSourceResolverContribution } from './scmMultiDiffSourceResolver.js';
+import { OpenScmGroupAction, ScmMultiDiffSourceResolverContribution } from 'vscode/vscode/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver';
 
 const _moduleId = "vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.contribution";
 registerAction2(GoToFileAction);

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

@@ -1,148 +0,0 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
-import { Event } from 'vscode/vscode/vs/base/common/event';
-import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import 'vscode/vscode/vs/base/common/observableInternal/derived';
-import 'vscode/vscode/vs/base/common/observableInternal/autorun';
-import { observableFromEvent } from 'vscode/vscode/vs/base/common/observableInternal/utils';
-import 'vscode/vscode/vs/base/common/cancellation';
-import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { localize2WithPath, localizeWithPath } 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 { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { IMultiDiffSourceResolverService } from 'vscode/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.service';
-import { ISCMService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm.service';
-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 }),
-            }))
-        );
-    }
-    static parseUri(uri) {
-        if (uri.scheme !== ScmMultiDiffSourceResolver_1._scheme) {
-            return undefined;
-        }
-        let query;
-        try {
-            query = JSON.parse(uri.query);
-        }
-        catch (e) {
-            return undefined;
-        }
-        if (typeof query !== 'object' || query === null) {
-            return undefined;
-        }
-        const { repositoryUri, groupId } = query;
-        if (typeof repositoryUri !== 'string' || typeof groupId !== 'string') {
-            return undefined;
-        }
-        return { repositoryUri: ( (URI.parse(repositoryUri))), groupId };
-    }
-    constructor(_scmService) {
-        this._scmService = _scmService;
-    }
-    canHandleUri(uri) {
-        return ScmMultiDiffSourceResolver_1.parseUri(uri) !== undefined;
-    }
-    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())));
-            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 => {
-            return {
-                original: e.multiDiffEditorOriginalUri,
-                modified: e.multiDiffEditorModifiedUri
-            };
-        }))));
-        return (
-             (new ScmResolvedMultiDiffSource(resources, {
-                scmResourceGroup: groupId,
-                scmProvider: repository.provider.contextValue,
-            }))
-        );
-    }
-};
-ScmMultiDiffSourceResolver = ScmMultiDiffSourceResolver_1 = ( (__decorate([
-    ( (__param(0, ISCMService)))
-], ScmMultiDiffSourceResolver)));
-class ScmResolvedMultiDiffSource {
-    get resources() { return this._resources.get(); }
-    constructor(_resources, contextKeys) {
-        this._resources = _resources;
-        this.contextKeys = contextKeys;
-        this.onDidChange = Event.fromObservableLight(this._resources);
-    }
-}
-function promiseFromEventState(event, checkState) {
-    const state = checkState();
-    if (state) {
-        return Promise.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'; }
-    constructor(instantiationService, multiDiffSourceResolverService) {
-        super();
-        this._register(multiDiffSourceResolverService.registerResolver(instantiationService.createInstance(ScmMultiDiffSourceResolver)));
-    }
-};
-ScmMultiDiffSourceResolverContribution = ( (__decorate([
-    ( (__param(0, IInstantiationService))),
-    ( (__param(1, IMultiDiffSourceResolverService)))
-], ScmMultiDiffSourceResolverContribution)));
-class OpenScmGroupAction extends Action2 {
-    constructor() {
-        super({
-            id: 'multiDiffEditor.openScmDiff',
-            title: ( localize2WithPath(_moduleId, 0, 'View Changes')),
-            icon: Codicon.diffMultiple,
-            menu: {
-                when: ( (ContextKeyExpr.and(
-                     (ContextKeyExpr.has('config.multiDiffEditor.experimental.enabled')),
-                     (ContextKeyExpr.has('multiDiffEditorEnableViewChanges'))
-                ))),
-                id: MenuId.SCMResourceGroupContext,
-                group: 'inline',
-            },
-            f1: false,
-        });
-    }
-    async run(accessor, group) {
-        const editorService = accessor.get(IEditorService);
-        if (!group.provider.rootUri) {
-            return;
-        }
-        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 });
-    }
-}
-
-export { OpenScmGroupAction, ScmMultiDiffSourceResolver, ScmMultiDiffSourceResolverContribution };