@codingame/monaco-vscode-scm-service-override 25.1.2 → 26.0.0

package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffModel.js

@@ -28,7 +28,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/in
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 const decoratorQuickDiffModelOptions = {
-    algorithm: 'advanced',
+    algorithm: "advanced",
     maxComputationTimeMs: 1000
 };
 let QuickDiffModelReferenceCollection = class QuickDiffModelReferenceCollection extends ReferenceCollection {
@@ -43,9 +43,7 @@ let QuickDiffModelReferenceCollection = class QuickDiffModelReferenceCollection
         object.dispose();
     }
 };
-QuickDiffModelReferenceCollection = ( __decorate([
-    ( __param(0, IInstantiationService))
-], QuickDiffModelReferenceCollection));
+QuickDiffModelReferenceCollection = ( __decorate([( __param(0, IInstantiationService))], QuickDiffModelReferenceCollection));
 let QuickDiffModelService = class QuickDiffModelService {
     constructor(instantiationService, textFileService, uriIdentityService) {
         this.instantiationService = instantiationService;
@@ -58,23 +56,37 @@ let QuickDiffModelService = class QuickDiffModelService {
         if (!textFileModel?.isResolved()) {
             return undefined;
         }
-        resource = this.uriIdentityService.asCanonicalUri(resource).with({ query: JSON.stringify(options) });
+        resource = this.uriIdentityService.asCanonicalUri(resource).with({
+            query: JSON.stringify(options)
+        });
         return this._references.acquire(( resource.toString()), textFileModel, options);
     }
 };
-QuickDiffModelService = ( __decorate([
-    ( __param(0, IInstantiationService)),
-    ( __param(1, ITextFileService)),
-    ( __param(2, IUriIdentityService))
-], QuickDiffModelService));
+QuickDiffModelService = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, ITextFileService)), ( __param(2, IUriIdentityService))], QuickDiffModelService));
 let QuickDiffModel = class QuickDiffModel extends Disposable {
     get originalTextModels() {
         return ( Iterable.map(( this._originalEditorModels.values()), editorModel => editorModel.textEditorModel));
     }
-    get allChanges() { return this._allChanges; }
-    get changes() { return this._changes; }
-    get quickDiffChanges() { return this._quickDiffChanges; }
-    constructor(textFileModel, options, scmService, quickDiffService, editorWorkerService, configurationService, textModelResolverService, _chatEditingService, progressService) {
+    get allChanges() {
+        return this._allChanges;
+    }
+    get changes() {
+        return this._changes;
+    }
+    get quickDiffChanges() {
+        return this._quickDiffChanges;
+    }
+    constructor(
+        textFileModel,
+        options,
+        scmService,
+        quickDiffService,
+        editorWorkerService,
+        configurationService,
+        textModelResolverService,
+        _chatEditingService,
+        progressService
+    ) {
         super();
         this.options = options;
         this.scmService = scmService;
@@ -97,7 +109,10 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
         this._repositoryDisposables = ( new DisposableMap());
         this._model = textFileModel;
         this._register(textFileModel.textEditorModel.onDidChangeContent(() => this.triggerDiff()));
-        this._register(Event.filter(configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.diffDecorationsIgnoreTrimWhitespace') || e.affectsConfiguration('diffEditor.ignoreTrimWhitespace'))(this.triggerDiff, this));
+        this._register(Event.filter(
+            configurationService.onDidChangeConfiguration,
+            e => e.affectsConfiguration("scm.diffDecorationsIgnoreTrimWhitespace") || e.affectsConfiguration("diffEditor.ignoreTrimWhitespace")
+        )(this.triggerDiff, this));
         this._register(scmService.onDidAddRepository(this.onDidAddRepository, this));
         for (const r of scmService.repositories) {
             this.onDidAddRepository(r);
@@ -110,7 +125,9 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
             this.setChanges([], [], ( new Map()));
             this.triggerDiff();
         }));
-        this._register(this.quickDiffService.onDidChangeQuickDiffProviders(() => this.triggerDiff()));
+        this._register(
+            this.quickDiffService.onDidChangeQuickDiffProviders(() => this.triggerDiff())
+        );
         this._register(autorun(reader => {
             for (const session of this._chatEditingService.editingSessionsObs.read(reader)) {
                 reader.store.add(autorun(r => {
@@ -128,9 +145,10 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
     }
     getQuickDiffResults() {
         return ( this._quickDiffs.map(quickDiff => {
-            const changes = this.allChanges
-                .filter(change => change.providerId === quickDiff.id);
+            const changes = this.allChanges.filter(change => change.providerId === quickDiff.id);
             return {
+                providerId: quickDiff.id,
+                providerKind: quickDiff.kind,
                 original: quickDiff.originalResource,
                 modified: this._model.resource,
                 changes: ( changes.map(change => change.change)),
@@ -140,17 +158,18 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
     }
     getDiffEditorModel(originalUri) {
         const editorModel = this._originalEditorModels.get(originalUri);
-        return editorModel ?
-            {
-                modified: this._model.textEditorModel,
-                original: editorModel.textEditorModel
-            } : undefined;
+        return editorModel ? {
+            modified: this._model.textEditorModel,
+            original: editorModel.textEditorModel
+        } : undefined;
     }
     onDidAddRepository(repository) {
         const disposables = ( new DisposableStore());
         disposables.add(repository.provider.onDidChangeResources(this.triggerDiff, this));
         const onDidRemoveRepository = Event.filter(this.scmService.onDidRemoveRepository, r => r === repository);
-        disposables.add(onDidRemoveRepository(() => this._repositoryDisposables.deleteAndDispose(repository)));
+        disposables.add(
+            onDidRemoveRepository(() => this._repositoryDisposables.deleteAndDispose(repository))
+        );
         this._repositoryDisposables.set(repository, disposables);
         this.triggerDiff();
     }
@@ -158,40 +177,51 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
         if (!this._diffDelayer) {
             return;
         }
-        this._diffDelayer
-            .trigger(async () => {
+        this._diffDelayer.trigger(async () => {
             const result = await this.diff();
             const editorModels = Array.from(( this._originalEditorModels.values()));
             if (!result || this._disposed || this._model.isDisposed() || ( editorModels.some(editorModel => editorModel.isDisposed()))) {
                 return;
             }
             this.setChanges(result.allChanges, result.changes, result.mapChanges);
-        })
-            .catch(err => onUnexpectedError(err));
+        }).catch(err => onUnexpectedError(err));
     }
     setChanges(allChanges, changes, mapChanges) {
         const diff = sortedDiff(this.changes, changes, (a, b) => compareChanges(a.change, b.change));
         this._allChanges = allChanges;
         this._changes = changes;
         this._quickDiffChanges = mapChanges;
-        this._onDidChange.fire({ changes, diff });
+        this._onDidChange.fire({
+            changes,
+            diff
+        });
     }
     diff() {
-        return this.progressService.withProgress({ location: ProgressLocation.Scm, delay: 250 }, async () => {
+        return this.progressService.withProgress({
+            location: ProgressLocation.Scm,
+            delay: 250
+        }, async () => {
             const originalURIs = await this.getQuickDiffsPromise();
             if (this._disposed || this._model.isDisposed() || (originalURIs.length === 0)) {
-                return Promise.resolve({ allChanges: [], changes: [], mapChanges: ( new Map()) });
+                return Promise.resolve({
+                    allChanges: [],
+                    changes: [],
+                    mapChanges: ( new Map())
+                });
             }
-            const quickDiffs = originalURIs
-                .filter(quickDiff => this.editorWorkerService.canComputeDirtyDiff(quickDiff.originalResource, this._model.resource));
+            const quickDiffs = originalURIs.filter(
+                quickDiff => this.editorWorkerService.canComputeDirtyDiff(quickDiff.originalResource, this._model.resource)
+            );
             if (quickDiffs.length === 0) {
-                return Promise.resolve({ allChanges: [], changes: [], mapChanges: ( new Map()) });
+                return Promise.resolve({
+                    allChanges: [],
+                    changes: [],
+                    mapChanges: ( new Map())
+                });
             }
-            const quickDiffPrimary = quickDiffs.find(quickDiff => quickDiff.kind === 'primary');
-            const ignoreTrimWhitespaceSetting = this.configurationService.getValue('scm.diffDecorationsIgnoreTrimWhitespace');
-            const ignoreTrimWhitespace = ignoreTrimWhitespaceSetting === 'inherit'
-                ? this.configurationService.getValue('diffEditor.ignoreTrimWhitespace')
-                : ignoreTrimWhitespaceSetting !== 'false';
+            const quickDiffPrimary = quickDiffs.find(quickDiff => quickDiff.kind === "primary");
+            const ignoreTrimWhitespaceSetting = this.configurationService.getValue("scm.diffDecorationsIgnoreTrimWhitespace");
+            const ignoreTrimWhitespace = ignoreTrimWhitespaceSetting === "inherit" ? this.configurationService.getValue("diffEditor.ignoreTrimWhitespace") : ignoreTrimWhitespaceSetting !== "false";
             const diffs = [];
             const secondaryDiffs = [];
             for (const quickDiff of quickDiffs) {
@@ -199,10 +229,10 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
                 if (diff.changes && diff.changes2 && diff.changes.length === diff.changes2.length) {
                     for (let index = 0; index < diff.changes.length; index++) {
                         const change2 = diff.changes2[index];
-                        if (quickDiffPrimary && quickDiff.kind === 'secondary') {
-                            const primaryQuickDiffChange = diffs
-                                .find(d => d.change2.modified.equals(change2.modified) &&
-                                d.change2.original.length === change2.original.length);
+                        if (quickDiffPrimary && quickDiff.kind === "secondary") {
+                            const primaryQuickDiffChange = diffs.find(
+                                d => d.change2.modified.equals(change2.modified) && d.change2.original.length === change2.original.length
+                            );
                             if (primaryQuickDiffChange) {
                                 const primaryModel = this._originalEditorModels.get(quickDiffPrimary.originalResource)?.textEditorModel;
                                 const primaryContent = primaryModel?.getValueInRange(primaryQuickDiffChange.change2.toRangeMapping().originalRange);
@@ -240,21 +270,30 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
                 }
                 map.get(providerId).push(i);
             }
-            return { allChanges: allDiffsSorted, changes: diffsSorted, mapChanges: map };
+            return {
+                allChanges: allDiffsSorted,
+                changes: diffsSorted,
+                mapChanges: map
+            };
         });
     }
     async _diff(original, modified, ignoreTrimWhitespace) {
         const maxComputationTimeMs = this.options.maxComputationTimeMs ?? Number.MAX_SAFE_INTEGER;
         const result = await this.editorWorkerService.computeDiff(original, modified, {
-            computeMoves: false, ignoreTrimWhitespace, maxComputationTimeMs
+            computeMoves: false,
+            ignoreTrimWhitespace,
+            maxComputationTimeMs
         }, this.options.algorithm);
-        return { changes: result ? toLineChanges(DiffState.fromDiffResult(result)) : null, changes2: result?.changes ?? null };
+        return {
+            changes: result ? toLineChanges(DiffState.fromDiffResult(result)) : null,
+            changes2: result?.changes ?? null
+        };
     }
     getQuickDiffsPromise() {
         if (this._quickDiffsPromise) {
             return this._quickDiffsPromise;
         }
-        this._quickDiffsPromise = this.getOriginalResource().then(async (quickDiffs) => {
+        this._quickDiffsPromise = this.getOriginalResource().then(async quickDiffs => {
             if (this._disposed) {
                 return [];
             }
@@ -263,15 +302,13 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
                 this._originalEditorModels.clear();
                 return [];
             }
-            if (equals(this._quickDiffs, quickDiffs, (a, b) => a.id === b.id &&
-                ( a.originalResource.toString()) === ( b.originalResource.toString()) &&
-                this.quickDiffService.isQuickDiffProviderVisible(a.id) === this.quickDiffService.isQuickDiffProviderVisible(b.id))) {
+            if (equals(this._quickDiffs, quickDiffs, (a, b) => a.id === b.id && ( a.originalResource.toString()) === ( b.originalResource.toString()) && this.quickDiffService.isQuickDiffProviderVisible(a.id) === this.quickDiffService.isQuickDiffProviderVisible(b.id))) {
                 return quickDiffs;
             }
             this._quickDiffs = quickDiffs;
             this._originalEditorModels.clear();
             this._originalEditorModelsDisposables.clear();
-            return (await Promise.all(( quickDiffs.map(async (quickDiff) => {
+            return (await Promise.all(( quickDiffs.map(async quickDiff => {
                 try {
                     const ref = await this.textModelResolverService.createModelReference(quickDiff.originalResource);
                     if (this._disposed) {
@@ -288,8 +325,7 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
                     this._originalEditorModelsDisposables.add(ref);
                     this._originalEditorModelsDisposables.add(ref.object.textEditorModel.onDidChangeContent(() => this.triggerDiff()));
                     return quickDiff;
-                }
-                catch (error) {
+                } catch (error) {
                     return [];
                 }
             })))).flat();
@@ -303,8 +339,7 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
             return Promise.resolve([]);
         }
         const uri = this._model.resource;
-        const isBeingModifiedByChatEdits = ( this._chatEditingService.editingSessionsObs.get()
-            .some(
+        const isBeingModifiedByChatEdits = ( this._chatEditingService.editingSessionsObs.get().some(
             session => session.getEntry(uri)?.state.get() === ModifiedFileEntryState.Modified
         ));
         if (isBeingModifiedByChatEdits) {
@@ -314,9 +349,9 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
         return this.quickDiffService.getQuickDiffs(uri, this._model.getLanguageId(), isSynchronized);
     }
     findNextClosestChange(lineNumber, inclusive = true, providerId) {
-        const visibleQuickDiffIds = ( new Set(( this.quickDiffs
-            .filter(quickDiff => this.quickDiffService.isQuickDiffProviderVisible(quickDiff.id))
-            .map(quickDiff => quickDiff.id))));
+        const visibleQuickDiffIds = ( new Set(( this.quickDiffs.filter(
+            quickDiff => this.quickDiffService.isQuickDiffProviderVisible(quickDiff.id)
+        ).map(quickDiff => quickDiff.id))));
         for (let i = 0; i < this.changes.length; i++) {
             if (providerId && this.changes[i].providerId !== providerId) {
                 continue;
@@ -329,8 +364,7 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
                 if (getModifiedEndLineNumber(change) >= lineNumber) {
                     return i;
                 }
-            }
-            else {
+            } else {
                 if (change.modifiedStartLineNumber > lineNumber) {
                     return i;
                 }
@@ -339,9 +373,9 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
         return 0;
     }
     findPreviousClosestChange(lineNumber, inclusive = true, providerId) {
-        const visibleQuickDiffIds = ( new Set(( this.quickDiffs
-            .filter(quickDiff => this.quickDiffService.isQuickDiffProviderVisible(quickDiff.id))
-            .map(quickDiff => quickDiff.id))));
+        const visibleQuickDiffIds = ( new Set(( this.quickDiffs.filter(
+            quickDiff => this.quickDiffService.isQuickDiffProviderVisible(quickDiff.id)
+        ).map(quickDiff => quickDiff.id))));
         for (let i = this.changes.length - 1; i >= 0; i--) {
             if (providerId && this.changes[i].providerId !== providerId) {
                 continue;
@@ -354,8 +388,7 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
                 if (change.modifiedStartLineNumber <= lineNumber) {
                     return i;
                 }
-            }
-            else {
+            } else {
                 if (getModifiedEndLineNumber(change) < lineNumber) {
                     return i;
                 }
@@ -372,14 +405,6 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
         super.dispose();
     }
 };
-QuickDiffModel = ( __decorate([
-    ( __param(2, ISCMService)),
-    ( __param(3, IQuickDiffService)),
-    ( __param(4, IEditorWorkerService)),
-    ( __param(5, IConfigurationService)),
-    ( __param(6, ITextModelService)),
-    ( __param(7, IChatEditingService)),
-    ( __param(8, IProgressService))
-], QuickDiffModel));
+QuickDiffModel = ( __decorate([( __param(2, ISCMService)), ( __param(3, IQuickDiffService)), ( __param(4, IEditorWorkerService)), ( __param(5, IConfigurationService)), ( __param(6, ITextModelService)), ( __param(7, IChatEditingService)), ( __param(8, IProgressService))], QuickDiffModel));
 
 export { QuickDiffModel, QuickDiffModelService };