@codingame/monaco-vscode-scm-service-override 19.1.4 → 20.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-scm-service-override",
-  "version": "19.1.4",
+  "version": "20.0.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - scm service-override",
   "keywords": [],
@@ -15,20 +15,18 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-262ed59d-4f76-57cd-9e9f-1877f26ae049-common": "19.1.4",
-    "@codingame/monaco-vscode-2726569c-a06b-5f25-b851-14311bef12fa-common": "19.1.4",
-    "@codingame/monaco-vscode-27663a0b-1249-58ba-9085-e52d706b50bc-common": "19.1.4",
-    "@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common": "19.1.4",
-    "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "19.1.4",
-    "@codingame/monaco-vscode-937ecbdf-94c7-5b16-aefa-ad78ae557a93-common": "19.1.4",
-    "@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common": "19.1.4",
-    "@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common": "19.1.4",
-    "@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common": "19.1.4",
-    "@codingame/monaco-vscode-api": "19.1.4",
-    "@codingame/monaco-vscode-dbfe5f85-b426-55ed-a79b-5f811b395762-common": "19.1.4",
-    "@codingame/monaco-vscode-f338ac19-278c-5fe1-bec8-b588de04a788-common": "19.1.4",
-    "@codingame/monaco-vscode-f99b74f5-fcb7-512f-8c6c-35f5a107577d-common": "19.1.4",
-    "@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common": "19.1.4"
+    "@codingame/monaco-vscode-262ed59d-4f76-57cd-9e9f-1877f26ae049-common": "20.0.1",
+    "@codingame/monaco-vscode-27663a0b-1249-58ba-9085-e52d706b50bc-common": "20.0.1",
+    "@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common": "20.0.1",
+    "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "20.0.1",
+    "@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common": "20.0.1",
+    "@codingame/monaco-vscode-api": "20.0.1",
+    "@codingame/monaco-vscode-bb83fe45-f4c7-5673-b9f1-5c409a63f19c-common": "20.0.1",
+    "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common": "20.0.1",
+    "@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common": "20.0.1",
+    "@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common": "20.0.1",
+    "@codingame/monaco-vscode-dbfe5f85-b426-55ed-a79b-5f811b395762-common": "20.0.1",
+    "@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common": "20.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-937ecbdf-94c7-5b16-aefa-ad78ae557a93-common/vscode/vs/workbench/services/activity/common/activity';
+import { NumberBadge } from '@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-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,9 +18,10 @@ 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-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/scm/browser/util';
+import { getRepositoryResourceCount } from '@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-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 { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 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';
@@ -104,7 +105,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
         if (count === 0) {
             return;
         }
-        const badge = ( new NumberBadge(count, num => ( localize(9563, '{0} pending changes', num))));
+        const badge = ( new NumberBadge(count, num => ( localize(9720, '{0} pending changes', num))));
         store.add(this.activityService.showViewActivity(VIEW_PANE_ID, { badge }));
     }
     _updateStatusBar(repository, commands, store) {
@@ -130,7 +131,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
                 repoAgnosticActionName = '';
             }
             const statusbarEntry = {
-                name: ( localize(9564, "Source Control")) + (repoAgnosticActionName ? ` ${repoAgnosticActionName}` : ''),
+                name: ( localize(9721, "Source Control")) + (repoAgnosticActionName ? ` ${repoAgnosticActionName}` : ''),
                 text: command.title,
                 ariaLabel: tooltip,
                 tooltip,
@@ -141,9 +142,12 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
                 this.statusbarService.addEntry(statusbarEntry, `status.scm.${index}`, StatusbarAlignment.LEFT, { location: { id: `status.scm.${index - 1}`, priority: 10000 }, alignment: StatusbarAlignment.RIGHT, compact: true }));
         }
         if (this.scmService.repositoryCount > 1) {
+            const icon = ThemeIcon.isThemeIcon(repository.provider.iconPath)
+                ? `$(${repository.provider.iconPath.id})`
+                : '$(repo)';
             const repositoryStatusbarEntry = {
-                name: ( localize(9565, "Source Control Provider")),
-                text: `$(repo) ${repository.provider.name}`,
+                name: ( localize(9722, "Source Control Provider")),
+                text: `${icon} ${repository.provider.name}`,
                 ariaLabel: label,
                 tooltip: label,
                 command: 'scm.setActiveProvider'
@@ -171,8 +175,8 @@ let SCMActiveResourceContextKeyController = class SCMActiveResourceContextKeyCon
         this.scmService = scmService;
         this.uriIdentityService = uriIdentityService;
         this._onDidRepositoryChange = ( new Emitter());
-        const activeResourceHasChangesContextKey = ( new RawContextKey('scmActiveResourceHasChanges', false, ( localize(9566, "Whether the active resource has changes"))));
-        const activeResourceRepositoryContextKey = ( new RawContextKey('scmActiveResourceRepository', undefined, ( localize(9567, "The active resource's repository"))));
+        const activeResourceHasChangesContextKey = ( new RawContextKey('scmActiveResourceHasChanges', false, ( localize(9723, "Whether the active resource has changes"))));
+        const activeResourceRepositoryContextKey = ( new RawContextKey('scmActiveResourceRepository', undefined, ( localize(9724, "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

@@ -33,19 +33,16 @@
 .scm-view.auto-provider-counts .scm-provider > .count[data-count="0"] {
 	display: none;
 }
-.scm-view .scm-provider > .label {
+.scm-view .scm-provider > .monaco-icon-label {
 	flex: 1;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	min-width: 50px;
 }
-.scm-view .scm-provider > .label > .name {
+.scm-view .scm-provider .monaco-highlighted-label {
+	display: flex;
+	align-items: center;
 	font-weight: bold;
 }
-.scm-view .scm-provider > .label > .description {
-	opacity: 0.7;
-	margin-left: 0.5em;
-	font-size: 0.9em;
+.scm-view .scm-provider .monaco-highlighted-label .codicon {
+	font-size: 14px;
 }
 .scm-view .scm-provider > .actions {
 	overflow: hidden;
@@ -395,7 +392,7 @@
 .scm-view .scm-editor-container .placeholder-text.mtk1 {
 	color: var(--vscode-input-placeholderForeground);
 }
-.scm-repositories-view .scm-provider > .label > .name {
+.scm-view.scm-repositories-view .monaco-highlighted-label {
 	font-weight: normal;
 }
 .monaco-hover.history-item-hover p:first-child {

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

@@ -5,7 +5,7 @@ import { IMenu } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/c
 import { IMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.service";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { ISCMMenus, ISCMProvider, ISCMRepositoryMenus, ISCMResource, ISCMResourceGroup } from "@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common/vscode/vs/workbench/contrib/scm/common/scm";
+import { ISCMMenus, ISCMProvider, ISCMRepository, ISCMRepositoryMenus, ISCMResource, ISCMResourceGroup } from "@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common/vscode/vs/workbench/contrib/scm/common/scm";
 import { ISCMService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service";
 export declare class SCMTitleMenu implements IDisposable {
     private _actions;
@@ -25,12 +25,15 @@ export declare class SCMRepositoryMenus implements ISCMRepositoryMenus, IDisposa
     private readonly menuService;
     private contextKeyService;
     readonly titleMenu: SCMTitleMenu;
-    readonly repositoryMenu: IMenu;
+    private genericRepositoryMenu;
+    private contextualRepositoryMenus;
+    private genericRepositoryContextMenu;
+    private contextualRepositoryContextMenus;
     private readonly resourceGroupMenusItems;
-    private _repositoryContextMenu;
-    get repositoryContextMenu(): IMenu;
     private readonly disposables;
     constructor(provider: ISCMProvider, contextKeyService: IContextKeyService, instantiationService: IInstantiationService, menuService: IMenuService);
+    getRepositoryMenu(repository: ISCMRepository): IMenu;
+    getRepositoryContextMenu(repository: ISCMRepository): IMenu;
     getResourceGroupMenu(group: ISCMResourceGroup): IMenu;
     getResourceMenu(resource: ISCMResource): IMenu;
     getResourceFolderMenu(group: ISCMResourceGroup): IMenu;

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

@@ -123,20 +123,13 @@ class SCMMenusItem {
     }
 }
 let SCMRepositoryMenus = class SCMRepositoryMenus {
-    get repositoryContextMenu() {
-        if (!this._repositoryContextMenu) {
-            this._repositoryContextMenu = this.menuService.createMenu(MenuId.SCMSourceControl, this.contextKeyService);
-            this.disposables.add(this._repositoryContextMenu);
-        }
-        return this._repositoryContextMenu;
-    }
     constructor(provider, contextKeyService, instantiationService, menuService) {
         this.provider = provider;
         this.menuService = menuService;
         this.resourceGroupMenusItems = ( new Map());
         this.disposables = ( new DisposableStore());
         this.contextKeyService = contextKeyService.createOverlay([
-            ['scmProvider', provider.contextValue],
+            ['scmProvider', provider.providerId],
             ['scmProviderRootUri', provider.rootUri?.toString()],
             ['scmProviderHasRootUri', !!provider.rootUri],
         ]);
@@ -144,11 +137,57 @@ let SCMRepositoryMenus = class SCMRepositoryMenus {
         instantiationService = instantiationService.createChild(serviceCollection, this.disposables);
         this.titleMenu = instantiationService.createInstance(SCMTitleMenu);
         this.disposables.add(this.titleMenu);
-        this.repositoryMenu = menuService.createMenu(MenuId.SCMSourceControlInline, this.contextKeyService);
-        this.disposables.add(this.repositoryMenu);
         provider.onDidChangeResourceGroups(this.onDidChangeResourceGroups, this, this.disposables);
         this.onDidChangeResourceGroups();
     }
+    getRepositoryMenu(repository) {
+        const contextValue = repository.provider.contextValue.get();
+        if (typeof contextValue === 'undefined') {
+            if (!this.genericRepositoryMenu) {
+                this.genericRepositoryMenu = this.menuService.createMenu(MenuId.SCMSourceControlInline, this.contextKeyService);
+            }
+            return this.genericRepositoryMenu;
+        }
+        if (!this.contextualRepositoryMenus) {
+            this.contextualRepositoryMenus = ( new Map());
+        }
+        let item = this.contextualRepositoryMenus.get(contextValue);
+        if (!item) {
+            const contextKeyService = this.contextKeyService.createOverlay([['scmProviderContext', contextValue]]);
+            const menu = this.menuService.createMenu(MenuId.SCMSourceControlInline, contextKeyService);
+            item = {
+                menu, dispose() {
+                    menu.dispose();
+                }
+            };
+            this.contextualRepositoryMenus.set(contextValue, item);
+        }
+        return item.menu;
+    }
+    getRepositoryContextMenu(repository) {
+        const contextValue = repository.provider.contextValue.get();
+        if (typeof contextValue === 'undefined') {
+            if (!this.genericRepositoryContextMenu) {
+                this.genericRepositoryContextMenu = this.menuService.createMenu(MenuId.SCMSourceControl, this.contextKeyService);
+            }
+            return this.genericRepositoryContextMenu;
+        }
+        if (!this.contextualRepositoryContextMenus) {
+            this.contextualRepositoryContextMenus = ( new Map());
+        }
+        let item = this.contextualRepositoryContextMenus.get(contextValue);
+        if (!item) {
+            const contextKeyService = this.contextKeyService.createOverlay([['scmProviderContext', contextValue]]);
+            const menu = this.menuService.createMenu(MenuId.SCMSourceControl, contextKeyService);
+            item = {
+                menu, dispose() {
+                    menu.dispose();
+                }
+            };
+            this.contextualRepositoryContextMenus.set(contextValue, item);
+        }
+        return item.menu;
+    }
     getResourceGroupMenu(group) {
         return this.getOrCreateResourceGroupMenusItem(group).getResourceGroupMenu(group);
     }
@@ -179,8 +218,14 @@ let SCMRepositoryMenus = class SCMRepositoryMenus {
         }
     }
     dispose() {
-        this.disposables.dispose();
+        this.genericRepositoryMenu?.dispose();
+        if (this.contextualRepositoryMenus) {
+            dispose(( this.contextualRepositoryMenus.values()));
+            this.contextualRepositoryMenus.clear();
+            this.contextualRepositoryMenus = undefined;
+        }
         this.resourceGroupMenusItems.forEach(item => item.dispose());
+        this.disposables.dispose();
     }
 };
 SCMRepositoryMenus = ( __decorate([
@@ -233,7 +278,7 @@ SCMMenus = ( __decorate([
     ( __param(1, IInstantiationService))
 ], SCMMenus));
 MenuRegistry.appendMenuItem(MenuId.SCMResourceContext, {
-    title: ( localize(9568, "Share")),
+    title: ( localize(9725, "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-f338ac19-278c-5fe1-bec8-b588de04a788-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
+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 { 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';
@@ -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(9569, 'Added lines'));
+        const diffAdded = ( localize(9726, '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(9570, 'Changed lines'));
+        const diffModified = ( localize(9727, '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(9571, 'Removed lines'));
+        const diffDeleted = ( localize(9728, 'Removed lines'));
         const diffDeletedOptions = {
             gutter,
             overview: { active: overview, color: overviewRulerDeletedForeground },

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-f338ac19-278c-5fe1-bec8-b588de04a788-common/vscode/vs/workbench/contrib/scm/common/quickDiff";
+import { QuickDiff, QuickDiffChange, QuickDiffResult } from "@codingame/monaco-vscode-bb83fe45-f4c7-5673-b9f1-5c409a63f19c-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";

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-f338ac19-278c-5fe1-bec8-b588de04a788-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
+import { compareChanges, getModifiedEndLineNumber } from '@codingame/monaco-vscode-bb83fe45-f4c7-5673-b9f1-5c409a63f19c-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';

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

@@ -12,7 +12,7 @@ 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";
+import { QuickDiff } from "@codingame/monaco-vscode-bb83fe45-f4c7-5673-b9f1-5c409a63f19c-common/vscode/vs/workbench/contrib/scm/common/quickDiff";
 export declare const isQuickDiffVisible: RawContextKey<boolean>;
 export interface IQuickDiffSelectItem extends ISelectOptionItem {
     providerId: string;

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

@@ -35,7 +35,7 @@ import { RawContextKey, ContextKeyExpr } from '@codingame/monaco-vscode-api/vsco
 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 { rot } from '@codingame/monaco-vscode-api/vscode/vs/base/common/numbers';
-import { getModifiedEndLineNumber, getChangeHeight, getChangeType, getChangeTypeColor, lineIntersectsChange, ChangeType } from '@codingame/monaco-vscode-f338ac19-278c-5fe1-bec8-b588de04a788-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
+import { getModifiedEndLineNumber, getChangeHeight, getChangeType, getChangeTypeColor, lineIntersectsChange, ChangeType } from '@codingame/monaco-vscode-bb83fe45-f4c7-5673-b9f1-5c409a63f19c-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
 import { IQuickDiffService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiff.service';
 import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service';
 import { TextCompareEditorActiveContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
@@ -68,7 +68,7 @@ let QuickDiffPickerViewItem = class QuickDiffPickerViewItem extends SelectAction
         const peekTitleColor = theme.getColor(peekViewTitleBackground);
         const opaqueTitleColor = peekTitleColor?.makeOpaque(editorBackgroundColor) ?? editorBackgroundColor;
         styles.selectBackground = ( ( opaqueTitleColor.lighten(.6)).toString());
-        super(null, action, [], 0, contextViewService, styles, { ariaLabel: ( localize(9572, 'Switch quick diff base')), useCustomDrawn: !hasNativeContextMenu(configurationService) });
+        super(null, action, [], 0, contextViewService, styles, { ariaLabel: ( localize(9729, 'Switch quick diff base')), useCustomDrawn: !hasNativeContextMenu(configurationService) });
         this.optionsItems = [];
     }
     setSelection(quickDiffs, providerId) {
@@ -91,7 +91,7 @@ QuickDiffPickerViewItem = ( __decorate([
 ], QuickDiffPickerViewItem));
 class QuickDiffPickerBaseAction extends Action {
     static { this.ID = 'quickDiff.base.switch'; }
-    static { this.LABEL = ( localize(9573, "Switch Quick Diff Base")); }
+    static { this.LABEL = ( localize(9730, "Switch Quick Diff Base")); }
     constructor(callback) {
         super(QuickDiffPickerBaseAction.ID, QuickDiffPickerBaseAction.LABEL, undefined, undefined);
         this.callback = callback;
@@ -218,14 +218,14 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
                 .find(quickDiff => quickDiff.id === this._providerId)?.label ?? '';
             detail = this.model.changes.length > 1
                 ? ( localize(
-                9574,
+                9731,
                 "{0} - {1} of {2} changes",
                 label,
                 providerIndex + 1,
                 providerChanges.length
             ))
                 : ( localize(
-                9575,
+                9732,
                 "{0} - {1} of {2} change",
                 label,
                 providerIndex + 1,
@@ -235,8 +235,8 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
         }
         else {
             detail = this.model.changes.length > 1
-                ? ( localize(9576, "{0} of {1} changes", providerIndex + 1, providerChanges.length))
-                : ( localize(9577, "{0} of {1} change", providerIndex + 1, providerChanges.length));
+                ? ( localize(9733, "{0} of {1} changes", providerIndex + 1, providerChanges.length))
+                : ( localize(9734, "{0} of {1} change", providerIndex + 1, providerChanges.length));
             this.dropdownContainer.style.display = 'inherit';
         }
         this.setTitle(this.title, detail);
@@ -285,7 +285,7 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
         this._actionbarWidget.clear();
         this._actionbarWidget.push(actions.reverse(), { label: false, icon: true });
         this._actionbarWidget.push([next, previous], { label: false, icon: true });
-        this._actionbarWidget.push(this._disposables.add(( new Action('peekview.close', ( localize(9578, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => this.dispose()))), { label: false, icon: true });
+        this._actionbarWidget.push(this._disposables.add(( new Action('peekview.close', ( localize(9735, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => this.dispose()))), { label: false, icon: true });
     }
     updateDropdown() {
         const quickDiffs = this.getQuickDiffsContainingChange();
@@ -636,7 +636,7 @@ class ShowPreviousChangeAction extends EditorAction {
     constructor(outerEditor) {
         super({
             id: 'editor.action.dirtydiff.previous',
-            label: ( localize2(9579, "Show Previous Change")),
+            label: ( localize2(9736, "Show Previous Change")),
             precondition: ( TextCompareEditorActiveContext.toNegated()),
             kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Shift | KeyMod.Alt | KeyCode.F3, weight: KeybindingWeight.EditorContrib }
         });
@@ -662,7 +662,7 @@ class ShowNextChangeAction extends EditorAction {
     constructor(outerEditor) {
         super({
             id: 'editor.action.dirtydiff.next',
-            label: ( localize2(9580, "Show Next Change")),
+            label: ( localize2(9737, "Show Next Change")),
             precondition: ( TextCompareEditorActiveContext.toNegated()),
             kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Alt | KeyCode.F3, weight: KeybindingWeight.EditorContrib }
         });
@@ -688,7 +688,7 @@ class GotoPreviousChangeAction extends EditorAction {
     constructor() {
         super({
             id: 'workbench.action.editor.previousChange',
-            label: ( localize2(9581, "Go to Previous Change")),
+            label: ( localize2(9738, "Go to Previous Change")),
             precondition: ( ContextKeyExpr.and(( TextCompareEditorActiveContext.toNegated()), ( quickDiffDecorationCount.notEqualsTo(0)))),
             kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Shift | KeyMod.Alt | KeyCode.F5, weight: KeybindingWeight.EditorContrib }
         });
@@ -723,7 +723,7 @@ class GotoNextChangeAction extends EditorAction {
     constructor() {
         super({
             id: 'workbench.action.editor.nextChange',
-            label: ( localize2(9582, "Go to Next Change")),
+            label: ( localize2(9739, "Go to Next Change")),
             precondition: ( ContextKeyExpr.and(( TextCompareEditorActiveContext.toNegated()), ( quickDiffDecorationCount.notEqualsTo(0)))),
             kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Alt | KeyCode.F5, weight: KeybindingWeight.EditorContrib }
         });
@@ -758,7 +758,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: '7_change_nav',
     command: {
         id: 'editor.action.dirtydiff.next',
-        title: ( localize(9583, "Next &&Change"))
+        title: ( localize(9740, "Next &&Change"))
     },
     order: 1
 });
@@ -766,7 +766,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: '7_change_nav',
     command: {
         id: 'editor.action.dirtydiff.previous',
-        title: ( localize(9584, "Previous &&Change"))
+        title: ( localize(9741, "Previous &&Change"))
     },
     order: 2
 });