@codingame/monaco-vscode-multi-diff-editor-service-override 2.2.1 → 3.0.0

package/package.json

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

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

@@ -4,7 +4,7 @@ import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/confi
 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 { Extensions as Extensions$1 } from 'vscode/vscode/vs/workbench/common/contributions';
+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';
@@ -24,8 +24,7 @@ registerAction2(ExpandAllAction);
         },
     }
 });
-( Registry.as(Extensions$1.Workbench))
-    .registerWorkbenchContribution(MultiDiffEditorResolverContribution, 1 );
+registerWorkbenchContribution2(MultiDiffEditorResolverContribution.ID, MultiDiffEditorResolverContribution, 1 );
 ( Registry.as(EditorExtensions.EditorPane))
     .registerEditorPane(EditorPaneDescriptor.create(MultiDiffEditor, MultiDiffEditor.ID, ( localizeWithPath(
     'vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor.contribution',
@@ -35,5 +34,4 @@ registerAction2(ExpandAllAction);
 ( Registry.as(EditorExtensions.EditorFactory))
     .registerEditorSerializer(MultiDiffEditorInput.ID, MultiDiffEditorSerializer);
 registerAction2(OpenScmGroupAction);
-( Registry.as(Extensions$1.Workbench))
-    .registerWorkbenchContribution(ScmMultiDiffSourceResolverContribution, 1 );
+registerWorkbenchContribution2(ScmMultiDiffSourceResolverContribution.ID, ScmMultiDiffSourceResolverContribution, 1 );

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

@@ -10,6 +10,7 @@ import { AbstractEditorWithViewState } from 'vscode/vscode/vs/workbench/browser/
 import { MultiDiffEditorInput } from './multiDiffEditorInput.js';
 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';
 
 var MultiDiffEditor_1;
 let MultiDiffEditor = class MultiDiffEditor extends AbstractEditorWithViewState {
@@ -36,6 +37,20 @@ let MultiDiffEditor = class MultiDiffEditor extends AbstractEditorWithViewState
         if (viewState) {
             this._multiDiffEditorWidget.setViewState(viewState);
         }
+        this._applyOptions(options);
+    }
+    setOptions(options) {
+        this._applyOptions(options);
+    }
+    _applyOptions(options) {
+        const viewState = options?.viewState;
+        if (!viewState || !viewState.revealData) {
+            return;
+        }
+        this._multiDiffEditorWidget?.reveal(viewState.revealData.resource, {
+            range: viewState.revealData.range ? Range.lift(viewState.revealData.range) : undefined,
+            highlight: true
+        });
     }
     async clearInput() {
         await super.clearInput();
@@ -47,6 +62,13 @@ let MultiDiffEditor = class MultiDiffEditor extends AbstractEditorWithViewState
     getControl() {
         return this._multiDiffEditorWidget.getActiveControl();
     }
+    focus() {
+        super.focus();
+        this._multiDiffEditorWidget?.getActiveControl()?.focus();
+    }
+    hasFocus() {
+        return this._multiDiffEditorWidget?.getActiveControl()?.hasTextFocus() || super.hasFocus();
+    }
     computeEditorViewState(resource) {
         return this._multiDiffEditorWidget.getViewState();
     }

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

@@ -19,9 +19,9 @@ import { DEFAULT_EDITOR_ASSOCIATION } from 'vscode/vscode/vs/workbench/common/ed
 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 { ObservableLazyStatefulPromise } from './utils.js';
 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';
 
@@ -35,10 +35,10 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
         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))));
+        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; }
@@ -47,11 +47,12 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
     getName() { return this._name; }
     get editorId() { return DEFAULT_EDITOR_ASSOCIATION.id; }
     getIcon() { return MultiDiffEditorIcon; }
-    constructor(multiDiffSource, label, initialResources, _textModelService, _textResourceConfigurationService, _instantiationService, _multiDiffSourceResolverService, _textFileService) {
+    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;
@@ -66,7 +67,7 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
             await raceTimeout(vm.waitForDiffs(), 1000);
             return vm;
         }));
-        this._resolvedSource = ( new ObservableLazyStatefulPromise(async () => {
+        this._resolvedSource = ( new ObservableLazyPromise(async () => {
             const source = this.initialResources
                 ? ( new ConstResolvedMultiDiffSource(this.initialResources))
                 : await this._multiDiffSourceResolverService.resolve(this.multiDiffSource);
@@ -75,7 +76,7 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
                 resources: source ? observableFromEvent(source.onDidChange, () => source.resources) : constObservable([]),
             };
         }));
-        this._resources = derived(this, reader => this._resolvedSource.cachedValue.read(reader)?.value?.resources.read(reader));
+        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);
@@ -99,12 +100,10 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
                 'name',
                 "Multi Diff Editor"
             ));
-            this._name = label + ( localizeWithPath(
-                'vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput',
-                'files',
-                " ({0} files)",
-                resources?.length ?? 0
-            ));
+            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();
         }));
     }
@@ -134,7 +133,7 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
         return this._viewModel.getPromise();
     }
     async _createModel() {
-        const source = await this._resolvedSource.getValue();
+        const source = await this._resolvedSource.getPromise();
         const textResourceConfigurationService = this._textResourceConfigurationService;
         const garbage = ( new DisposableStore());
         const documentsWithPromises = mapObservableArrayCached(undefined, source.resources, async (r, store) => {
@@ -232,11 +231,11 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
     }
 };
 MultiDiffEditorInput = MultiDiffEditorInput_1 = ( __decorate([
-    ( __param(3, ITextModelService)),
-    ( __param(4, ITextResourceConfigurationService)),
-    ( __param(5, IInstantiationService)),
-    ( __param(6, IMultiDiffSourceResolverService)),
-    ( __param(7, ITextFileService))
+    ( __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));
@@ -260,6 +259,7 @@ function computeOptions(configuration) {
     return editorConfiguration;
 }
 let MultiDiffEditorResolverContribution = class MultiDiffEditorResolverContribution extends Disposable {
+    static { this.ID = 'workbench.contrib.multiDiffEditorResolver'; }
     constructor(editorResolverService, instantiationService) {
         super();
         this._register(editorResolverService.registerEditor(`*`, {
@@ -282,9 +282,12 @@ MultiDiffEditorResolverContribution = ( __decorate([
 ], MultiDiffEditorResolverContribution));
 class MultiDiffEditorSerializer {
     canSerialize(editor) {
-        return editor instanceof MultiDiffEditorInput;
+        return editor instanceof MultiDiffEditorInput && !editor.isTransient;
     }
     serialize(editor) {
+        if (!this.canSerialize(editor)) {
+            return undefined;
+        }
         return JSON.stringify(editor.serialize());
     }
     deserialize(instantiationService, serializedEditor) {

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

@@ -97,6 +97,7 @@ function promiseFromEventState(event, checkState) {
     }));
 }
 let ScmMultiDiffSourceResolverContribution = class ScmMultiDiffSourceResolverContribution extends Disposable {
+    static { this.ID = 'workbench.contrib.scmMultiDiffSourceResolver'; }
     constructor(instantiationService, multiDiffSourceResolverService) {
         super();
         this._register(multiDiffSourceResolverService.registerResolver(instantiationService.createInstance(ScmMultiDiffSourceResolver)));

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

@@ -1,57 +0,0 @@
-import { derived } from 'vscode/vscode/vs/base/common/observableInternal/derived';
-import { observableValue } from 'vscode/vscode/vs/base/common/observableInternal/base';
-
-class ObservableLazy {
-    get cachedValue() { return this._value; }
-    constructor(_computeValue) {
-        this._computeValue = _computeValue;
-        this._value = observableValue(this, undefined);
-    }
-    getValue() {
-        let v = this._value.get();
-        if (!v) {
-            v = this._computeValue();
-            this._value.set(v, undefined);
-        }
-        return v;
-    }
-}
-class ObservablePromise {
-    constructor(promise) {
-        this._value = observableValue(this, undefined);
-        this.value = this._value;
-        this.promise = promise.then(value => {
-            this._value.set(( new PromiseResult(value, undefined)), undefined);
-            return value;
-        }, error => {
-            this._value.set(( new PromiseResult(undefined, error)), undefined);
-            throw error;
-        });
-    }
-}
-class PromiseResult {
-    constructor(
-    value,
-    error) {
-        this.value = value;
-        this.error = error;
-    }
-    getValue() {
-        if (this.error) {
-            throw this.error;
-        }
-        return this.value;
-    }
-}
-class ObservableLazyStatefulPromise {
-    constructor(_computeValue) {
-        this._computeValue = _computeValue;
-        this._lazyValue = ( new ObservableLazy(() => ( new ObservablePromise(this._computeValue()))));
-        this.cachedValue = derived(this, reader => this._lazyValue.cachedValue.read(reader)?.value.read(reader));
-    }
-    getValue() {
-        return this._lazyValue.getValue().promise;
-    }
-}
-
-export { ObservableLazy, ObservableLazyStatefulPromise, ObservablePromise, PromiseResult };