@codingame/monaco-vscode-scm-service-override 17.2.1 → 18.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-scm-service-override",
-  "version": "17.2.1",
+  "version": "18.0.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - scm service-override",
   "keywords": [],
@@ -15,18 +15,20 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-25a9b730-95ad-54d3-8807-71421ad9b891-common": "17.2.1",
-    "@codingame/monaco-vscode-27663a0b-1249-58ba-9085-e52d706b50bc-common": "17.2.1",
-    "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common": "17.2.1",
-    "@codingame/monaco-vscode-a7c9ae3c-16d2-5d17-86b2-981be7094566-common": "17.2.1",
-    "@codingame/monaco-vscode-api": "17.2.1",
-    "@codingame/monaco-vscode-b4efa70b-52b9-5670-ab5c-f10b10b6834e-common": "17.2.1",
-    "@codingame/monaco-vscode-bb83fe45-f4c7-5673-b9f1-5c409a63f19c-common": "17.2.1",
-    "@codingame/monaco-vscode-be8ddbb5-094a-5657-b1cc-fe106c94c632-common": "17.2.1",
-    "@codingame/monaco-vscode-e67a0dae-5b2c-54e6-8d61-90102c78362d-common": "17.2.1",
-    "@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common": "17.2.1",
-    "@codingame/monaco-vscode-f99b74f5-fcb7-512f-8c6c-35f5a107577d-common": "17.2.1",
-    "@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common": "17.2.1"
+    "@codingame/monaco-vscode-27663a0b-1249-58ba-9085-e52d706b50bc-common": "18.0.1",
+    "@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common": "18.0.1",
+    "@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common": "18.0.1",
+    "@codingame/monaco-vscode-7adbeffb-8051-54a9-8c9b-b62ce9e5836f-common": "18.0.1",
+    "@codingame/monaco-vscode-8d39d04c-3201-5bd6-be79-eed8d17a5ad0-common": "18.0.1",
+    "@codingame/monaco-vscode-924e8f00-6faf-5059-b518-e43427d29ab3-common": "18.0.1",
+    "@codingame/monaco-vscode-937ecbdf-94c7-5b16-aefa-ad78ae557a93-common": "18.0.1",
+    "@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common": "18.0.1",
+    "@codingame/monaco-vscode-api": "18.0.1",
+    "@codingame/monaco-vscode-f24b7f0a-ceeb-5877-9148-81eb98a4f5d7-common": "18.0.1",
+    "@codingame/monaco-vscode-f338ac19-278c-5fe1-bec8-b588de04a788-common": "18.0.1",
+    "@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common": "18.0.1",
+    "@codingame/monaco-vscode-f99b74f5-fcb7-512f-8c6c-35f5a107577d-common": "18.0.1",
+    "@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common": "18.0.1"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -6,7 +6,7 @@ import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { Event, Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { VIEW_PANE_ID } from '@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common/vscode/vs/workbench/contrib/scm/common/scm';
 import { ISCMService, ISCMViewService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service';
-import { NumberBadge } from '@codingame/monaco-vscode-a7c9ae3c-16d2-5d17-86b2-981be7094566-common/vscode/vs/workbench/services/activity/common/activity';
+import { NumberBadge } from '@codingame/monaco-vscode-937ecbdf-94c7-5b16-aefa-ad78ae557a93-common/vscode/vs/workbench/services/activity/common/activity';
 import { IActivityService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/activity/common/activity.service';
 import { RawContextKey } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
@@ -18,12 +18,12 @@ import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/plat
 import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
 import { ITitleService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/title/browser/titleService.service';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
-import { getRepositoryResourceCount } from '@codingame/monaco-vscode-be8ddbb5-094a-5657-b1cc-fe106c94c632-common/vscode/vs/workbench/contrib/scm/browser/util';
+import { getRepositoryResourceCount } from '@codingame/monaco-vscode-7adbeffb-8051-54a9-8c9b-b62ce9e5836f-common/vscode/vs/workbench/contrib/scm/browser/util';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
-import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
-import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
-import { autorunWithStore, autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
+import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
+import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
+import { autorunWithStore, autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 const ActiveRepositoryContextKeys = {
     ActiveRepositoryName: ( new RawContextKey('scmActiveRepositoryName', '')),
@@ -104,7 +104,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
         if (count === 0) {
             return;
         }
-        const badge = ( new NumberBadge(count, num => ( localize(9071, '{0} pending changes', num))));
+        const badge = ( new NumberBadge(count, num => ( localize(9308, '{0} pending changes', num))));
         store.add(this.activityService.showViewActivity(VIEW_PANE_ID, { badge }));
     }
     _updateStatusBar(repository, commands, store) {
@@ -130,7 +130,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
                 repoAgnosticActionName = '';
             }
             const statusbarEntry = {
-                name: ( localize(9072, "Source Control")) + (repoAgnosticActionName ? ` ${repoAgnosticActionName}` : ''),
+                name: ( localize(9309, "Source Control")) + (repoAgnosticActionName ? ` ${repoAgnosticActionName}` : ''),
                 text: command.title,
                 ariaLabel: tooltip,
                 tooltip,
@@ -142,7 +142,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
         }
         if (this.scmService.repositoryCount > 1) {
             const repositoryStatusbarEntry = {
-                name: ( localize(9073, "Source Control Provider")),
+                name: ( localize(9310, "Source Control Provider")),
                 text: `$(repo) ${repository.provider.name}`,
                 ariaLabel: label,
                 tooltip: label,
@@ -171,8 +171,8 @@ let SCMActiveResourceContextKeyController = class SCMActiveResourceContextKeyCon
         this.scmService = scmService;
         this.uriIdentityService = uriIdentityService;
         this._onDidRepositoryChange = ( new Emitter());
-        const activeResourceHasChangesContextKey = ( new RawContextKey('scmActiveResourceHasChanges', false, ( localize(9074, "Whether the active resource has changes"))));
-        const activeResourceRepositoryContextKey = ( new RawContextKey('scmActiveResourceRepository', undefined, ( localize(9075, "The active resource's repository"))));
+        const activeResourceHasChangesContextKey = ( new RawContextKey('scmActiveResourceHasChanges', false, ( localize(9311, "Whether the active resource has changes"))));
+        const activeResourceRepositoryContextKey = ( new RawContextKey('scmActiveResourceRepository', undefined, ( localize(9312, "The active resource's repository"))));
         this._repositories = observableFromEvent(this, Event.any(this.scmService.onDidAddRepository, this.scmService.onDidRemoveRepository), () => this.scmService.repositories);
         this._store.add(autorunWithStore((reader, store) => {
             for (const repository of this._repositories.read(reader)) {

package/vscode/src/vs/workbench/contrib/scm/browser/media/scm.css

@@ -101,6 +101,9 @@
 	display: flex;
 	align-items: center;
 }
+.scm-view .monaco-list-row .monaco-tl-twistie:not(.collapsed) + .monaco-tl-contents > .history-item > .graph-container > svg > path:last-of-type {
+	stroke-width: 3px;
+}
 .scm-view .monaco-list-row .history-item > .graph-container {
 	display: flex;
 	flex-shrink: 0;
@@ -121,6 +124,7 @@
 .scm-view .monaco-list-row .history-item > .label-container {
 	display: flex;
 	flex-shrink: 0;
+	margin-left: 4px;
 	gap: 4px;
 }
 .scm-view .monaco-list-row .history-item > .label-container > .label {
@@ -165,6 +169,9 @@
 .scm-view .monaco-list-row .history-item .monaco-icon-label.history-item-current .label-description {
 	font-weight: 500;
 }
+.scm-view .monaco-list-row .history-item > .actions {
+	margin-left: 4px;
+}
 .scm-view .monaco-list-row .history > .name,
 .scm-view .monaco-list-row .resource-group > .name {
 	flex: 1;
@@ -182,7 +189,8 @@
 	flex: 1;
 	overflow: hidden;
 }
-.scm-view .monaco-list-row .resource > .name > .monaco-icon-label::after {
+.scm-view .monaco-list-row .resource > .name > .monaco-icon-label::after,
+.scm-view .monaco-list-row .history-item-change > .label-container > .monaco-icon-label::after {
 	margin-right: 3px;
 }
 .scm-view .monaco-list-row .resource > .decoration-icon {
@@ -201,7 +209,8 @@
 }
 .scm-view .monaco-list .monaco-list-row .resource-group > .actions,
 .scm-view .monaco-list .monaco-list-row .resource > .name > .monaco-icon-label > .actions,
-.scm-view .monaco-list .monaco-list-row .history-item > .actions {
+.scm-view .monaco-list .monaco-list-row .history-item > .actions,
+.scm-view .monaco-list .monaco-list-row .history-item-change > .label-container > .monaco-icon-label > .actions {
 	display: none;
 	max-width: fit-content;
 }
@@ -211,7 +220,9 @@
 .scm-view .monaco-list .monaco-list-row.focused .resource > .name > .monaco-icon-label > .actions,
 .scm-view .monaco-list:not(.selection-multiple) .monaco-list-row .resource:hover > .actions,
 .scm-view .monaco-list .monaco-list-row:hover .history-item > .actions,
-.scm-view .monaco-list .monaco-list-row.focused .history-item > .actions {
+.scm-view .monaco-list .monaco-list-row.focused .history-item > .actions,
+.scm-view .monaco-list .monaco-list-row:hover .history-item-change > .label-container > .monaco-icon-label > .actions,
+.scm-view .monaco-list .monaco-list-row.focused .history-item-change > .label-container > .monaco-icon-label > .actions {
 	display: block;
 }
 .scm-view .monaco-list .monaco-list-row.force-no-hover,
@@ -473,6 +484,9 @@
 	overflow: hidden;
 	text-overflow: ellipsis;
 }
+.scm-history-view .monaco-list-row > .monaco-tl-row > .monaco-tl-twistie.force-no-twistie {
+	display: none !important;
+}
 .scm-history-view .scm-provider .label-name {
 	font-weight: bold;
 }
@@ -491,6 +505,22 @@
 	display: flex;
 	flex-grow: 1;
 }
+.scm-view .monaco-list-row .history-item-change {
+	display: flex;
+	align-items: center;
+}
+.scm-view .monaco-list-row .history-item-change > .graph-placeholder {
+	position: absolute;
+	height: 22px;
+}
+.scm-view .monaco-list-row .history-item-change > .label-container {
+	display: flex;
+	flex: 1;
+	overflow: hidden;
+}
+.scm-view .monaco-list-row .history-item-change > .label-container > .monaco-icon-label {
+	flex-grow: 1;
+}
 .scm-history-view .history-item-load-more {
 	display: flex;
 	height: 22px;

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

@@ -233,7 +233,7 @@ SCMMenus = ( __decorate([
     ( __param(1, IInstantiationService))
 ], SCMMenus));
 MenuRegistry.appendMenuItem(MenuId.SCMResourceContext, {
-    title: ( localize(9076, "Share")),
+    title: ( localize(9313, "Share")),
     submenu: MenuId.SCMResourceContextShare,
     group: '45_share',
     order: 3,

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

@@ -12,7 +12,7 @@ import { isCodeEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/brow
 import { OverviewRulerLane, MinimapPosition } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
 import { createStyleSheet } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/domStylesheets';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
-import { minimapGutterAddedBackground, overviewRulerAddedForeground, minimapGutterModifiedBackground, overviewRulerModifiedForeground, minimapGutterDeletedBackground, overviewRulerDeletedForeground, getChangeType, ChangeType } from '@codingame/monaco-vscode-bb83fe45-f4c7-5673-b9f1-5c409a63f19c-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
+import { minimapGutterAddedBackground, overviewRulerAddedForeground, minimapGutterModifiedBackground, overviewRulerModifiedForeground, minimapGutterDeletedBackground, overviewRulerDeletedForeground, getChangeType, ChangeType } from '@codingame/monaco-vscode-f338ac19-278c-5fe1-bec8-b588de04a788-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
 import { IQuickDiffService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiff.service';
 import { IQuickDiffModelService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/browser/quickDiffModel.service';
 import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
@@ -21,8 +21,8 @@ import { RawContextKey, ContextKeyTrueExpr, ContextKeyFalseExpr } from '@codinga
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { registerAction2, Action2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
-import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
-import { autorunWithStore, autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
+import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
+import { autorunWithStore, autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 var QuickDiffDecorator_1;
 registerCss(dirtydiffDecorator);
@@ -61,7 +61,7 @@ let QuickDiffDecorator = QuickDiffDecorator_1 = class QuickDiffDecorator extends
         const gutter = decorations === 'all' || decorations === 'gutter';
         const overview = decorations === 'all' || decorations === 'overview';
         const minimap = decorations === 'all' || decorations === 'minimap';
-        const diffAdded = ( localize(9077, 'Added lines'));
+        const diffAdded = ( localize(9314, 'Added lines'));
         const diffAddedOptions = {
             gutter,
             overview: { active: overview, color: overviewRulerAddedForeground },
@@ -72,7 +72,7 @@ let QuickDiffDecorator = QuickDiffDecorator_1 = class QuickDiffDecorator extends
         this.addedPatternOptions = QuickDiffDecorator_1.createDecoration('dirty-diff-added primary pattern', diffAdded, diffAddedOptions);
         this.addedSecondaryOptions = QuickDiffDecorator_1.createDecoration('dirty-diff-added secondary', diffAdded, diffAddedOptions);
         this.addedSecondaryPatternOptions = QuickDiffDecorator_1.createDecoration('dirty-diff-added secondary pattern', diffAdded, diffAddedOptions);
-        const diffModified = ( localize(9078, 'Changed lines'));
+        const diffModified = ( localize(9315, 'Changed lines'));
         const diffModifiedOptions = {
             gutter,
             overview: { active: overview, color: overviewRulerModifiedForeground },
@@ -83,7 +83,7 @@ let QuickDiffDecorator = QuickDiffDecorator_1 = class QuickDiffDecorator extends
         this.modifiedPatternOptions = QuickDiffDecorator_1.createDecoration('dirty-diff-modified primary pattern', diffModified, diffModifiedOptions);
         this.modifiedSecondaryOptions = QuickDiffDecorator_1.createDecoration('dirty-diff-modified secondary', diffModified, diffModifiedOptions);
         this.modifiedSecondaryPatternOptions = QuickDiffDecorator_1.createDecoration('dirty-diff-modified secondary pattern', diffModified, diffModifiedOptions);
-        const diffDeleted = ( localize(9079, 'Removed lines'));
+        const diffDeleted = ( localize(9316, 'Removed lines'));
         const diffDeletedOptions = {
             gutter,
             overview: { active: overview, color: overviewRulerDeletedForeground },
@@ -113,7 +113,7 @@ let QuickDiffDecorator = QuickDiffDecorator_1 = class QuickDiffDecorator extends
             if (!quickDiff || !this.quickDiffService.isQuickDiffProviderVisible(quickDiff.id)) {
                 continue;
             }
-            if (quickDiff.kind !== 'primary' && ( primaryQuickDiffChanges.some(c => c.change2.modified.overlapOrTouch(change.change2.modified)))) {
+            if (quickDiff.kind !== 'primary' && ( primaryQuickDiffChanges.some(c => c.change2.modified.intersectsOrTouches(change.change2.modified)))) {
                 continue;
             }
             const changeType = getChangeType(change.change);

package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffModel.d.ts

@@ -8,7 +8,7 @@ import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/plat
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
 import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
-import { QuickDiff, QuickDiffChange, QuickDiffResult } from "@codingame/monaco-vscode-bb83fe45-f4c7-5673-b9f1-5c409a63f19c-common/vscode/vs/workbench/contrib/scm/common/quickDiff";
+import { QuickDiff, QuickDiffChange, QuickDiffResult } from "@codingame/monaco-vscode-f338ac19-278c-5fe1-bec8-b588de04a788-common/vscode/vs/workbench/contrib/scm/common/quickDiff";
 import { IQuickDiffService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiff.service";
 import { ISCMService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service";
 import { ISplice } from "@codingame/monaco-vscode-api/vscode/vs/base/common/sequence";
@@ -40,7 +40,7 @@ export declare class QuickDiffModel extends Disposable {
     private readonly textModelResolverService;
     private readonly _chatEditingService;
     private readonly progressService;
-    private _model;
+    private readonly _model;
     private readonly _originalEditorModels;
     private readonly _originalEditorModelsDisposables;
     get originalTextModels(): Iterable<ITextModel>;
@@ -53,6 +53,8 @@ export declare class QuickDiffModel extends Disposable {
         changes: QuickDiffChange[];
         diff: ISplice<QuickDiffChange>[];
     }>;
+    private _allChanges;
+    get allChanges(): QuickDiffChange[];
     private _changes;
     get changes(): QuickDiffChange[];
     private _quickDiffChanges;
@@ -69,7 +71,7 @@ export declare class QuickDiffModel extends Disposable {
     private _diff;
     private getQuickDiffsPromise;
     private getOriginalResource;
-    findNextClosestChange(lineNumber: number, inclusive?: boolean, provider?: string): number;
-    findPreviousClosestChange(lineNumber: number, inclusive?: boolean, provider?: string): number;
+    findNextClosestChange(lineNumber: number, inclusive?: boolean, providerId?: string): number;
+    findPreviousClosestChange(lineNumber: number, inclusive?: boolean, providerId?: string): number;
     dispose(): void;
 }

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

@@ -9,7 +9,7 @@ import { IEditorWorkerService } from '@codingame/monaco-vscode-api/vscode/vs/edi
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
 import { shouldSynchronizeModel } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
-import { compareChanges, getModifiedEndLineNumber } from '@codingame/monaco-vscode-bb83fe45-f4c7-5673-b9f1-5c409a63f19c-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
+import { compareChanges, getModifiedEndLineNumber } from '@codingame/monaco-vscode-f338ac19-278c-5fe1-bec8-b588de04a788-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
 import { IQuickDiffService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiff.service';
 import { ThrottledDelayer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { ISCMService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service';
@@ -25,10 +25,10 @@ import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/w
 import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
 import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
-import { autorunWithStore, autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
+import { autorunWithStore, autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 const decoratorQuickDiffModelOptions = {
-    algorithm: 'legacy',
+    algorithm: 'advanced',
     maxComputationTimeMs: 1000
 };
 let QuickDiffModelReferenceCollection = class QuickDiffModelReferenceCollection extends ReferenceCollection {
@@ -71,6 +71,7 @@ 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) {
@@ -90,6 +91,7 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
         this._diffDelayer = ( new ThrottledDelayer(200));
         this._onDidChange = ( new Emitter());
         this.onDidChange = this._onDidChange.event;
+        this._allChanges = [];
         this._changes = [];
         this._quickDiffChanges = ( new Map());
         this._repositoryDisposables = ( new DisposableMap());
@@ -105,7 +107,7 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
             this._quickDiffs = [];
             this._originalEditorModels.clear();
             this._quickDiffsPromise = undefined;
-            this.setChanges([], ( new Map()));
+            this.setChanges([], [], ( new Map()));
             this.triggerDiff();
         }));
         this._register(this.quickDiffService.onDidChangeQuickDiffProviders(() => this.triggerDiff()));
@@ -126,7 +128,7 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
     }
     getQuickDiffResults() {
         return ( this._quickDiffs.map(quickDiff => {
-            const changes = this.changes
+            const changes = this.allChanges
                 .filter(change => change.providerId === quickDiff.id);
             return {
                 original: quickDiff.originalResource,
@@ -163,12 +165,13 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
             if (!result || this._disposed || this._model.isDisposed() || ( editorModels.some(editorModel => editorModel.isDisposed()))) {
                 return;
             }
-            this.setChanges(result.changes, result.mapChanges);
+            this.setChanges(result.allChanges, result.changes, result.mapChanges);
         })
             .catch(err => onUnexpectedError(err));
     }
-    setChanges(changes, mapChanges) {
+    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 });
@@ -177,26 +180,27 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
         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({ 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));
             if (quickDiffs.length === 0) {
-                return Promise.resolve({ 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 allDiffs = [];
+            const diffs = [];
+            const secondaryDiffs = [];
             for (const quickDiff of quickDiffs) {
                 const diff = await this._diff(quickDiff.originalResource, this._model.resource, ignoreTrimWhitespace);
                 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 = allDiffs
+                            const primaryQuickDiffChange = diffs
                                 .find(d => d.change2.modified.equals(change2.modified) &&
                                 d.change2.original.length === change2.original.length);
                             if (primaryQuickDiffChange) {
@@ -205,13 +209,19 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
                                 const secondaryModel = this._originalEditorModels.get(quickDiff.originalResource)?.textEditorModel;
                                 const secondaryContent = secondaryModel?.getValueInRange(change2.toRangeMapping().originalRange);
                                 if (primaryContent === secondaryContent) {
+                                    secondaryDiffs.push({
+                                        providerId: quickDiff.id,
+                                        original: quickDiff.originalResource,
+                                        modified: this._model.resource,
+                                        change: diff.changes[index],
+                                        change2: diff.changes2[index]
+                                    });
                                     continue;
                                 }
                             }
                         }
-                        allDiffs.push({
+                        diffs.push({
                             providerId: quickDiff.id,
-                            label: quickDiff.label,
                             original: quickDiff.originalResource,
                             modified: this._model.resource,
                             change: diff.changes[index],
@@ -220,16 +230,17 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
                     }
                 }
             }
-            const sorted = allDiffs.sort((a, b) => compareChanges(a.change, b.change));
+            const diffsSorted = diffs.sort((a, b) => compareChanges(a.change, b.change));
+            const allDiffsSorted = [...diffs, ...secondaryDiffs].sort((a, b) => compareChanges(a.change, b.change));
             const map = ( new Map());
-            for (let i = 0; i < sorted.length; i++) {
-                const label = sorted[i].label;
-                if (!( map.has(label))) {
-                    map.set(label, []);
+            for (let i = 0; i < diffsSorted.length; i++) {
+                const providerId = diffsSorted[i].providerId;
+                if (!( map.has(providerId))) {
+                    map.set(providerId, []);
                 }
-                map.get(label).push(i);
+                map.get(providerId).push(i);
             }
-            return { changes: sorted, mapChanges: map };
+            return { allChanges: allDiffsSorted, changes: diffsSorted, mapChanges: map };
         });
     }
     async _diff(original, modified, ignoreTrimWhitespace) {
@@ -302,16 +313,21 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
         const isSynchronized = this._model.textEditorModel ? shouldSynchronizeModel(this._model.textEditorModel) : undefined;
         return this.quickDiffService.getQuickDiffs(uri, this._model.getLanguageId(), isSynchronized);
     }
-    findNextClosestChange(lineNumber, inclusive = true, provider) {
-        const visibleQuickDiffLabels = ( this.quickDiffs
-            .filter(quickDiff => (!provider || quickDiff.label === provider) &&
+    findNextClosestChange(lineNumber, inclusive = true, providerId) {
+        const visibleQuickDiffIds = ( this.quickDiffs
+            .filter(quickDiff => (!providerId || quickDiff.id === providerId) &&
             this.quickDiffService.isQuickDiffProviderVisible(quickDiff.id))
-            .map(quickDiff => quickDiff.label));
+            .map(quickDiff => quickDiff.id));
         if (!inclusive) {
-            const nextChange = this.changes
-                .findIndex(change => visibleQuickDiffLabels.includes(change.label) &&
+            let nextChangeIndex = this.changes
+                .findIndex(change => visibleQuickDiffIds.includes(change.providerId) &&
                 change.change.modifiedStartLineNumber > lineNumber);
-            return nextChange !== -1 ? nextChange : 0;
+            if (nextChangeIndex !== -1) {
+                return nextChangeIndex;
+            }
+            nextChangeIndex = this.changes
+                .findIndex(change => visibleQuickDiffIds.includes(change.providerId));
+            return nextChangeIndex !== -1 ? nextChangeIndex : 0;
         }
         const primaryQuickDiffId = this.quickDiffs
             .find(quickDiff => quickDiff.kind === 'primary')?.id;
@@ -322,15 +338,20 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
         if (primaryInclusiveChangeIndex !== -1) {
             return primaryInclusiveChangeIndex;
         }
-        const inclusiveChangeIndex = this.changes
-            .findIndex(change => visibleQuickDiffLabels.includes(change.label) &&
+        let nextChangeIndex = this.changes
+            .findIndex(change => visibleQuickDiffIds.includes(change.providerId) &&
             change.change.modifiedStartLineNumber <= lineNumber &&
             getModifiedEndLineNumber(change.change) >= lineNumber);
-        return inclusiveChangeIndex !== -1 ? inclusiveChangeIndex : 0;
+        if (nextChangeIndex !== -1) {
+            return nextChangeIndex;
+        }
+        nextChangeIndex = this.changes
+            .findIndex(change => visibleQuickDiffIds.includes(change.providerId));
+        return nextChangeIndex !== -1 ? nextChangeIndex : 0;
     }
-    findPreviousClosestChange(lineNumber, inclusive = true, provider) {
+    findPreviousClosestChange(lineNumber, inclusive = true, providerId) {
         for (let i = this.changes.length - 1; i >= 0; i--) {
-            if (provider && this.changes[i].label !== provider) {
+            if (providerId && this.changes[i].providerId !== providerId) {
                 continue;
             }
             const quickDiff = this.quickDiffs.find(quickDiff => quickDiff.id === this.changes[i].providerId);

package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffWidget.d.ts

@@ -12,14 +12,15 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { RawContextKey } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { QuickDiff } from "@codingame/monaco-vscode-f338ac19-278c-5fe1-bec8-b588de04a788-common/vscode/vs/workbench/contrib/scm/common/quickDiff";
 export declare const isQuickDiffVisible: RawContextKey<boolean>;
 export interface IQuickDiffSelectItem extends ISelectOptionItem {
-    provider: string;
+    providerId: string;
 }
 export declare class QuickDiffPickerViewItem extends SelectActionViewItem<IQuickDiffSelectItem> {
     private optionsItems;
-    constructor(action: IAction, contextViewService: IContextViewService, themeService: IThemeService);
-    setSelection(providers: string[], provider: string): void;
+    constructor(action: IAction, contextViewService: IContextViewService, themeService: IThemeService, configurationService: IConfigurationService);
+    setSelection(quickDiffs: QuickDiff[], providerId: string): void;
     protected getActionContext(_: string, index: number): IQuickDiffSelectItem;
     render(container: HTMLElement): void;
 }