@codingame/monaco-vscode-multi-diff-editor-service-override 3.2.2 → 4.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-multi-diff-editor-service-override",
-  "version": "3.2.2",
+  "version": "4.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,6 +18,6 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@3.2.2"
+    "vscode": "npm:@codingame/monaco-vscode-api@4.0.0"
   }
 }

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

@@ -5,7 +5,7 @@ import { Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/action
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { TextFileEditor } from 'vscode/vscode/vs/workbench/contrib/files/browser/editors/textFileEditor';
 import { MultiDiffEditor } from './multiDiffEditor.js';
-import { MultiDiffEditorInput } from './multiDiffEditorInput.js';
+import { MultiDiffEditorInput } from 'vscode/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 
 class GoToFileAction extends Action2 {

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

@@ -7,8 +7,11 @@ import { EditorPaneDescriptor } from 'vscode/vscode/vs/workbench/browser/editor'
 import { registerWorkbenchContribution2 } 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 './multiDiffEditorInput.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/platform/instantiation/common/instantiation';
+import 'vscode/vscode/vs/base/common/event';
+import 'vscode/vscode/vs/base/common/lifecycle';
 import { OpenScmGroupAction, ScmMultiDiffSourceResolverContribution } from './scmMultiDiffSourceResolver.js';
 
 registerAction2(GoToFileAction);

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { MultiDiffEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/multiDiffEditorWidget/multiDiffEditorWidget';
+import { MultiDiffEditorWidget } from 'vscode/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';
@@ -7,7 +7,7 @@ import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/te
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { ResourceLabel } from 'vscode/vscode/vs/workbench/browser/labels';
 import { AbstractEditorWithViewState } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorWithViewState';
-import { MultiDiffEditorInput } from './multiDiffEditorInput.js';
+import { MultiDiffEditorInput } from 'vscode/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
@@ -19,8 +19,8 @@ let MultiDiffEditor = class MultiDiffEditor extends AbstractEditorWithViewState
     get viewModel() {
         return this._viewModel;
     }
-    constructor(instantiationService, telemetryService, themeService, storageService, editorService, editorGroupService, textResourceConfigurationService) {
-        super(MultiDiffEditor_1.ID, 'multiDiffEditor', telemetryService, instantiationService, storageService, textResourceConfigurationService, themeService, editorService, editorGroupService);
+    constructor(group, instantiationService, telemetryService, themeService, storageService, editorService, editorGroupService, textResourceConfigurationService) {
+        super(MultiDiffEditor_1.ID, group, 'multiDiffEditor', telemetryService, instantiationService, storageService, textResourceConfigurationService, themeService, editorService, editorGroupService);
         this._multiDiffEditorWidget = undefined;
     }
     createEditor(parent) {
@@ -83,13 +83,13 @@ let MultiDiffEditor = class MultiDiffEditor extends AbstractEditorWithViewState
     }
 };
 MultiDiffEditor = MultiDiffEditor_1 = ( __decorate([
-    ( __param(0, IInstantiationService)),
-    ( __param(1, ITelemetryService)),
-    ( __param(2, IThemeService)),
-    ( __param(3, IStorageService)),
-    ( __param(4, IEditorService)),
-    ( __param(5, IEditorGroupsService)),
-    ( __param(6, ITextResourceConfigurationService))
+    ( __param(1, IInstantiationService)),
+    ( __param(2, ITelemetryService)),
+    ( __param(3, IThemeService)),
+    ( __param(4, IStorageService)),
+    ( __param(5, IEditorService)),
+    ( __param(6, IEditorGroupsService)),
+    ( __param(7, ITextResourceConfigurationService))
 ], MultiDiffEditor));
 let WorkbenchUIElementFactory = class WorkbenchUIElementFactory {
     constructor(_instantiationService) {

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

@@ -2,6 +2,10 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 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';
@@ -10,7 +14,6 @@ import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/c
 import { IMultiDiffSourceResolverService } from 'vscode/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService';
 import { ISCMService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { observableFromEvent } from 'vscode/vscode/vs/base/common/observableInternal/utils';
 
 var ScmMultiDiffSourceResolver_1;
 let ScmMultiDiffSourceResolver = class ScmMultiDiffSourceResolver {

package/vscode/src/vs/editor/browser/widget/multiDiffEditorWidget/model.js

@@ -1,16 +0,0 @@
-import { Event } from 'vscode/vscode/vs/base/common/event';
-
-class ConstLazyPromise {
-    constructor(_value) {
-        this._value = _value;
-        this.onHasValueDidChange = Event.None;
-    }
-    request() {
-        return Promise.resolve(this._value);
-    }
-    get value() {
-        return this._value;
-    }
-}
-
-export { ConstLazyPromise };

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

@@ -1,11 +0,0 @@
-import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
-
-const MultiDiffEditorIcon = registerIcon('multi-diff-editor-label-icon', Codicon.diffMultiple, ( localizeWithPath(
- 'vs/workbench/contrib/multiDiffEditor/browser/icons.contribution',
- 'multiDiffEditorLabelIcon',
- 'Icon of the multi diff editor label.'
-)));
-
-export { MultiDiffEditorIcon };

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

@@ -1,305 +0,0 @@
-import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { LazyStatefulPromise, raceTimeout } from 'vscode/vscode/vs/base/common/async';
-import { BugIndicatingError, onUnexpectedError } from 'vscode/vscode/vs/base/common/errors';
-import { Event, Emitter } from 'vscode/vscode/vs/base/common/event';
-import { DisposableStore, toDisposable, Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { parse } from 'vscode/vscode/vs/base/common/marshalling';
-import { Schemas } from 'vscode/vscode/vs/base/common/network';
-import { deepClone } from 'vscode/vscode/vs/base/common/objects';
-import { observableFromEvent, constObservable, mapObservableArrayCached } from 'vscode/vscode/vs/base/common/observableInternal/utils';
-import { isDefined, isObject } from 'vscode/vscode/vs/base/common/types';
-import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { ConstLazyPromise } from '../../../../editor/browser/widget/multiDiffEditorWidget/model.js';
-import { MultiDiffEditorViewModel } from 'vscode/vscode/vs/editor/browser/widget/multiDiffEditorWidget/multiDiffEditorViewModel';
-import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
-import { ITextResourceConfigurationService } from 'vscode/vscode/vs/editor/common/services/textResourceConfiguration';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { DEFAULT_EDITOR_ASSOCIATION } from 'vscode/vscode/vs/workbench/common/editor';
-import { EditorInput } from 'vscode/vscode/vs/workbench/common/editor/editorInput';
-import { MultiDiffEditorIcon } from './icons.contribution.js';
-import { MultiDiffEditorItem, ConstResolvedMultiDiffSource, IMultiDiffSourceResolverService } from 'vscode/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService';
-import { RegisteredEditorPriority, IEditorResolverService } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
-import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles';
-import { ObservableLazyPromise } from 'vscode/vscode/vs/base/common/observableInternal/promise';
-import { derived } from 'vscode/vscode/vs/base/common/observableInternal/derived';
-import { autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
-
-var MultiDiffEditorInput_1;
-let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
-    static { MultiDiffEditorInput_1 = this; }
-    static fromResourceMultiDiffEditorInput(input, instantiationService) {
-        if (!input.multiDiffSource && !input.resources) {
-            throw new BugIndicatingError('MultiDiffEditorInput requires either multiDiffSource or resources');
-        }
-        const multiDiffSource = input.multiDiffSource ?? ( URI.parse(`multi-diff-editor:${( ( new Date()).getMilliseconds().toString()) + ( Math.random().toString())}`));
-        return instantiationService.createInstance(MultiDiffEditorInput_1, multiDiffSource, input.label, input.resources?.map(resource => {
-            return ( new MultiDiffEditorItem(resource.original.resource, resource.modified.resource));
-        }), input.isTransient ?? false);
-    }
-    static fromSerialized(data, instantiationService) {
-        return instantiationService.createInstance(MultiDiffEditorInput_1, ( URI.parse(data.multiDiffSourceUri)), data.label, data.resources?.map(resource => ( new MultiDiffEditorItem(resource.originalUri ? ( URI.parse(resource.originalUri)) : undefined, resource.modifiedUri ? ( URI.parse(resource.modifiedUri)) : undefined))), false);
-    }
-    static { this.ID = 'workbench.input.multiDiffEditor'; }
-    get resource() { return this.multiDiffSource; }
-    get capabilities() { return 2 ; }
-    get typeId() { return MultiDiffEditorInput_1.ID; }
-    getName() { return this._name; }
-    get editorId() { return DEFAULT_EDITOR_ASSOCIATION.id; }
-    getIcon() { return MultiDiffEditorIcon; }
-    constructor(multiDiffSource, label, initialResources, isTransient = false, _textModelService, _textResourceConfigurationService, _instantiationService, _multiDiffSourceResolverService, _textFileService) {
-        super();
-        this.multiDiffSource = multiDiffSource;
-        this.label = label;
-        this.initialResources = initialResources;
-        this.isTransient = isTransient;
-        this._textModelService = _textModelService;
-        this._textResourceConfigurationService = _textResourceConfigurationService;
-        this._instantiationService = _instantiationService;
-        this._multiDiffSourceResolverService = _multiDiffSourceResolverService;
-        this._textFileService = _textFileService;
-        this._name = '';
-        this._viewModel = ( new LazyStatefulPromise(async () => {
-            const model = await this._createModel();
-            this._register(model);
-            const vm = ( new MultiDiffEditorViewModel(model, this._instantiationService));
-            this._register(vm);
-            await raceTimeout(vm.waitForDiffs(), 1000);
-            return vm;
-        }));
-        this._resolvedSource = ( new ObservableLazyPromise(async () => {
-            const source = this.initialResources
-                ? ( new ConstResolvedMultiDiffSource(this.initialResources))
-                : await this._multiDiffSourceResolverService.resolve(this.multiDiffSource);
-            return {
-                source,
-                resources: source ? observableFromEvent(source.onDidChange, () => source.resources) : constObservable([]),
-            };
-        }));
-        this._resources = derived(this, reader => this._resolvedSource.cachedPromiseResult.read(reader)?.data?.resources.read(reader));
-        this._isDirtyObservables = mapObservableArrayCached(this, ( this._resources.map(r => r || [])), res => {
-            const isModifiedDirty = res.modified ? isUriDirty(this._textFileService, res.modified) : constObservable(false);
-            const isOriginalDirty = res.original ? isUriDirty(this._textFileService, res.original) : constObservable(false);
-            return derived(reader =>  isModifiedDirty.read(reader) || isOriginalDirty.read(reader));
-        }, i => JSON.stringify([i.modified?.toString(), i.original?.toString()]));
-        this._isDirtyObservable = derived(this, reader => ( this._isDirtyObservables.read(reader).some(isDirty => isDirty.read(reader))))
-            .keepObserved(this._store);
-        this.onDidChangeDirty = Event.fromObservableLight(this._isDirtyObservable);
-        this.closeHandler = {
-            async confirm() {
-                return 1 ;
-            },
-            showConfirm() {
-                return false;
-            }
-        };
-        this._register(autorun((reader) => {
-            const resources = this._resources.read(reader) ?? [];
-            const label = this.label ?? ( localizeWithPath(
-                'vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput',
-                'name',
-                "Multi Diff Editor"
-            ));
-            this._name = label + ( localizeWithPath('vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput', {
-                key: 'files',
-                comment: ['the number of files being shown']
-            }, " ({0} files)", resources?.length ?? 0));
-            this._onDidChangeLabel.fire();
-        }));
-    }
-    serialize() {
-        return {
-            label: this.label,
-            multiDiffSourceUri: ( this.multiDiffSource.toString()),
-            resources: this.initialResources?.map(resource => ({
-                originalUri: resource.original?.toString(),
-                modifiedUri: resource.modified?.toString(),
-            })),
-        };
-    }
-    setLanguageId(languageId, source) {
-        const activeDiffItem = this._viewModel.requireValue().activeDiffItem.get();
-        const value = activeDiffItem?.entry?.value;
-        if (!value) {
-            return;
-        }
-        const target = value.modified ?? value.original;
-        if (!target) {
-            return;
-        }
-        target.setLanguage(languageId, source);
-    }
-    async getViewModel() {
-        return this._viewModel.getPromise();
-    }
-    async _createModel() {
-        const source = await this._resolvedSource.getPromise();
-        const textResourceConfigurationService = this._textResourceConfigurationService;
-        const garbage = ( new DisposableStore());
-        const documentsWithPromises = mapObservableArrayCached(undefined, source.resources, async (r, store) => {
-            let original;
-            let modified;
-            const store2 = ( new DisposableStore());
-            store.add(toDisposable(() => {
-                garbage.add(store2);
-            }));
-            try {
-                [original, modified] = await Promise.all([
-                    r.original ? this._textModelService.createModelReference(r.original) : undefined,
-                    r.modified ? this._textModelService.createModelReference(r.modified) : undefined,
-                ]);
-                if (original) {
-                    store.add(original);
-                }
-                if (modified) {
-                    store.add(modified);
-                }
-            }
-            catch (e) {
-                console.error(e);
-                onUnexpectedError(e);
-                return undefined;
-            }
-            const uri = (r.modified ?? r.original);
-            return ( new ConstLazyPromise({
-                original: original?.object.textEditorModel,
-                modified: modified?.object.textEditorModel,
-                get options() {
-                    return {
-                        ...getReadonlyConfiguration(modified?.object.isReadonly() ?? true),
-                        ...computeOptions(textResourceConfigurationService.getValue(uri)),
-                    };
-                },
-                onOptionsDidChange: h => this._textResourceConfigurationService.onDidChangeConfiguration(e => {
-                    if (e.affectsConfiguration(uri, 'editor') || e.affectsConfiguration(uri, 'diffEditor')) {
-                        h();
-                    }
-                }),
-            }));
-        }, i => JSON.stringify([i.modified?.toString(), i.original?.toString()]));
-        let documents = [];
-        const documentChangeEmitter = ( new Emitter());
-        const p = Event.toPromise(documentChangeEmitter.event);
-        const a = autorun(async (reader) => {
-            const docsPromises = documentsWithPromises.read(reader);
-            const docs = await Promise.all(docsPromises);
-            documents = docs.filter(isDefined);
-            documentChangeEmitter.fire();
-            garbage.clear();
-        });
-        await p;
-        return {
-            dispose: () => {
-                a.dispose();
-                garbage.dispose();
-            },
-            onDidChange: documentChangeEmitter.event,
-            get documents() { return documents; },
-            contextKeys: source.source?.contextKeys,
-        };
-    }
-    matches(otherInput) {
-        if (super.matches(otherInput)) {
-            return true;
-        }
-        if (otherInput instanceof MultiDiffEditorInput_1) {
-            return ( this.multiDiffSource.toString()) === ( otherInput.multiDiffSource.toString());
-        }
-        return false;
-    }
-    isDirty() { return this._isDirtyObservable.get(); }
-    async save(group, options) {
-        await this.doSaveOrRevert('save', group, options);
-        return this;
-    }
-    revert(group, options) {
-        return this.doSaveOrRevert('revert', group, options);
-    }
-    async doSaveOrRevert(mode, group, options) {
-        const items = this._viewModel.currentValue?.items.get();
-        if (items) {
-            await Promise.all(( items.map(async (item) => {
-                const model = item.diffEditorViewModel.model;
-                const handleOriginal = model.original.uri.scheme !== Schemas.untitled && this._textFileService.isDirty(model.original.uri);
-                await Promise.all([
-                    handleOriginal ? mode === 'save' ? this._textFileService.save(model.original.uri, options) : this._textFileService.revert(model.original.uri, options) : Promise.resolve(),
-                    mode === 'save' ? this._textFileService.save(model.modified.uri, options) : this._textFileService.revert(model.modified.uri, options),
-                ]);
-            })));
-        }
-        return undefined;
-    }
-};
-MultiDiffEditorInput = MultiDiffEditorInput_1 = ( __decorate([
-    ( __param(4, ITextModelService)),
-    ( __param(5, ITextResourceConfigurationService)),
-    ( __param(6, IInstantiationService)),
-    ( __param(7, IMultiDiffSourceResolverService)),
-    ( __param(8, ITextFileService))
-], MultiDiffEditorInput));
-function isUriDirty(textFileService, uri) {
-    return observableFromEvent(Event.filter(textFileService.files.onDidChangeDirty, e => ( e.resource.toString()) === ( uri.toString())), () => textFileService.isDirty(uri));
-}
-function getReadonlyConfiguration(isReadonly) {
-    return {
-        readOnly: !!isReadonly,
-        readOnlyMessage: typeof isReadonly !== 'boolean' ? isReadonly : undefined
-    };
-}
-function computeOptions(configuration) {
-    const editorConfiguration = deepClone(configuration.editor);
-    if (isObject(configuration.diffEditor)) {
-        const diffEditorConfiguration = deepClone(configuration.diffEditor);
-        diffEditorConfiguration.diffCodeLens = diffEditorConfiguration.codeLens;
-        delete diffEditorConfiguration.codeLens;
-        diffEditorConfiguration.diffWordWrap = diffEditorConfiguration.wordWrap;
-        delete diffEditorConfiguration.wordWrap;
-        Object.assign(editorConfiguration, diffEditorConfiguration);
-    }
-    return editorConfiguration;
-}
-let MultiDiffEditorResolverContribution = class MultiDiffEditorResolverContribution extends Disposable {
-    static { this.ID = 'workbench.contrib.multiDiffEditorResolver'; }
-    constructor(editorResolverService, instantiationService) {
-        super();
-        this._register(editorResolverService.registerEditor(`*`, {
-            id: DEFAULT_EDITOR_ASSOCIATION.id,
-            label: DEFAULT_EDITOR_ASSOCIATION.displayName,
-            detail: DEFAULT_EDITOR_ASSOCIATION.providerDisplayName,
-            priority: RegisteredEditorPriority.builtin
-        }, {}, {
-            createMultiDiffEditorInput: (diffListEditor) => {
-                return {
-                    editor: MultiDiffEditorInput.fromResourceMultiDiffEditorInput(diffListEditor, instantiationService),
-                };
-            },
-        }));
-    }
-};
-MultiDiffEditorResolverContribution = ( __decorate([
-    ( __param(0, IEditorResolverService)),
-    ( __param(1, IInstantiationService))
-], MultiDiffEditorResolverContribution));
-class MultiDiffEditorSerializer {
-    canSerialize(editor) {
-        return editor instanceof MultiDiffEditorInput && !editor.isTransient;
-    }
-    serialize(editor) {
-        if (!this.canSerialize(editor)) {
-            return undefined;
-        }
-        return JSON.stringify(editor.serialize());
-    }
-    deserialize(instantiationService, serializedEditor) {
-        try {
-            const data = parse(serializedEditor);
-            return MultiDiffEditorInput.fromSerialized(data, instantiationService);
-        }
-        catch (err) {
-            onUnexpectedError(err);
-            return undefined;
-        }
-    }
-}
-
-export { MultiDiffEditorInput, MultiDiffEditorResolverContribution, MultiDiffEditorSerializer };