@codingame/monaco-vscode-scm-service-override 19.1.3 → 20.0.0

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

@@ -16,18 +16,14 @@ import { IMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/ac
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
-import { IManagedHover } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hover";
-import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
+import { IconLabel } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/iconLabel/iconLabel";
 export declare class RepositoryActionRunner extends ActionRunner {
     private readonly getSelectedRepositories;
     constructor(getSelectedRepositories: () => ISCMRepository[]);
     protected runAction(action: IAction, context: ISCMProvider): Promise<void>;
 }
 interface RepositoryTemplate {
-    readonly label: HTMLElement;
-    readonly labelCustomHover: IManagedHover;
-    readonly name: HTMLElement;
-    readonly description: HTMLElement;
+    readonly label: IconLabel;
     readonly countContainer: HTMLElement;
     readonly count: CountBadge;
     readonly toolBar: WorkbenchToolBar;
@@ -40,14 +36,13 @@ export declare class RepositoryRenderer implements ICompressibleTreeRenderer<ISC
     private commandService;
     private contextKeyService;
     private contextMenuService;
-    private hoverService;
     private keybindingService;
     private menuService;
     private scmViewService;
     private telemetryService;
     static readonly TEMPLATE_ID = "repository";
     get templateId(): string;
-    constructor(toolbarMenuId: MenuId, actionViewItemProvider: IActionViewItemProvider, commandService: ICommandService, contextKeyService: IContextKeyService, contextMenuService: IContextMenuService, hoverService: IHoverService, keybindingService: IKeybindingService, menuService: IMenuService, scmViewService: ISCMViewService, telemetryService: ITelemetryService);
+    constructor(toolbarMenuId: MenuId, actionViewItemProvider: IActionViewItemProvider, commandService: ICommandService, contextKeyService: IContextKeyService, contextMenuService: IContextMenuService, keybindingService: IKeybindingService, menuService: IMenuService, scmViewService: ISCMViewService, telemetryService: ITelemetryService);
     renderTemplate(container: HTMLElement): RepositoryTemplate;
     renderElement(arg: ISCMRepository | ITreeNode<ISCMRepository, FuzzyScore>, index: number, templateData: RepositoryTemplate): void;
     renderCompressedElements(): void;

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

@@ -10,7 +10,7 @@ import { CountBadge } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/
 import { IContextMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { ActionRunner } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
-import { isSCMRepository, StatusBarAction, getRepositoryResourceCount, connectPrimaryMenu } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/scm/browser/util';
+import { isSCMRepository, StatusBarAction, getRepositoryResourceCount, connectPrimaryMenu } from '@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common/vscode/vs/workbench/contrib/scm/browser/util';
 import { defaultCountBadgeStyles } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/browser/defaultStyles';
 import { WorkbenchToolBar } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/toolbar';
 import { MenuItemAction, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
@@ -18,8 +18,8 @@ import { IMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/ac
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
-import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
-import { getDefaultHoverDelegate } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
+import { IconLabel } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/iconLabel/iconLabel';
+import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { autorunWithStore, autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 var RepositoryRenderer_1;
@@ -33,8 +33,11 @@ class RepositoryActionRunner extends ActionRunner {
         if (!(action instanceof MenuItemAction)) {
             return super.runAction(action, context);
         }
+        const actionContext = [context];
         const selection = ( this.getSelectedRepositories().map(r => r.provider));
-        const actionContext = ( selection.some(s => s === context)) ? selection : [context];
+        if (( selection.some(s => s === context))) {
+            actionContext.push(...selection.filter(s => s !== context));
+        }
         await action.run(...actionContext);
     }
 }
@@ -42,13 +45,12 @@ let RepositoryRenderer = class RepositoryRenderer {
     static { RepositoryRenderer_1 = this; }
     static { this.TEMPLATE_ID = 'repository'; }
     get templateId() { return RepositoryRenderer_1.TEMPLATE_ID; }
-    constructor(toolbarMenuId, actionViewItemProvider, commandService, contextKeyService, contextMenuService, hoverService, keybindingService, menuService, scmViewService, telemetryService) {
+    constructor(toolbarMenuId, actionViewItemProvider, commandService, contextKeyService, contextMenuService, keybindingService, menuService, scmViewService, telemetryService) {
         this.toolbarMenuId = toolbarMenuId;
         this.actionViewItemProvider = actionViewItemProvider;
         this.commandService = commandService;
         this.contextKeyService = contextKeyService;
         this.contextMenuService = contextMenuService;
-        this.hoverService = hoverService;
         this.keybindingService = keybindingService;
         this.menuService = menuService;
         this.scmViewService = scmViewService;
@@ -59,10 +61,7 @@ let RepositoryRenderer = class RepositoryRenderer {
             container.parentElement.parentElement.querySelector('.monaco-tl-twistie').classList.add('force-twistie');
         }
         const provider = append(container, $('.scm-provider'));
-        const label = append(provider, $('.label'));
-        const labelCustomHover = this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), label, '', {});
-        const name = append(label, $('span.name'));
-        const description = append(label, $('span.description'));
+        const label = ( new IconLabel(provider, { supportIcons: true }));
         const actions = append(provider, $('.actions'));
         const toolBar = ( new WorkbenchToolBar(
             actions,
@@ -77,19 +76,22 @@ let RepositoryRenderer = class RepositoryRenderer {
         const countContainer = append(provider, $('.count'));
         const count = ( new CountBadge(countContainer, {}, defaultCountBadgeStyles));
         const visibilityDisposable = toolBar.onDidChangeDropdownVisibility(e => provider.classList.toggle('active', e));
-        const templateDisposable = combinedDisposable(labelCustomHover, visibilityDisposable, toolBar);
-        return { label, labelCustomHover, name, description, countContainer, count, toolBar, elementDisposables: ( new DisposableStore()), templateDisposable };
+        const templateDisposable = combinedDisposable(label, visibilityDisposable, toolBar);
+        return { label, countContainer, count, toolBar, elementDisposables: ( new DisposableStore()), templateDisposable };
     }
     renderElement(arg, index, templateData) {
         const repository = isSCMRepository(arg) ? arg : arg.element;
-        templateData.name.textContent = repository.provider.name;
+        const icon = ThemeIcon.isThemeIcon(repository.provider.iconPath)
+            ? repository.provider.iconPath.id
+            : undefined;
+        const label = icon
+            ? `$(${icon}) ${repository.provider.name}`
+            : repository.provider.name;
         if (repository.provider.rootUri) {
-            templateData.labelCustomHover.update(`${repository.provider.label}: ${repository.provider.rootUri.fsPath}`);
-            templateData.description.textContent = repository.provider.label;
+            templateData.label.setLabel(label, repository.provider.label, { title: `${repository.provider.label}: ${repository.provider.rootUri.fsPath}` });
         }
         else {
-            templateData.labelCustomHover.update(repository.provider.label);
-            templateData.description.textContent = '';
+            templateData.label.setLabel(label, undefined, { title: repository.provider.label });
         }
         let statusPrimaryActions = [];
         let menuPrimaryActions = [];
@@ -107,12 +109,17 @@ let RepositoryRenderer = class RepositoryRenderer {
             templateData.countContainer.setAttribute('data-count', String(count));
             templateData.count.setCount(count);
         }));
-        const repositoryMenus = this.scmViewService.menus.getRepositoryMenus(repository.provider);
-        const menu = this.toolbarMenuId === MenuId.SCMTitle ? repositoryMenus.titleMenu.menu : repositoryMenus.repositoryMenu;
-        templateData.elementDisposables.add(connectPrimaryMenu(menu, (primary, secondary) => {
-            menuPrimaryActions = primary;
-            menuSecondaryActions = secondary;
-            updateToolbar();
+        templateData.elementDisposables.add(autorun(reader => {
+            repository.provider.contextValue.read(reader);
+            const repositoryMenus = this.scmViewService.menus.getRepositoryMenus(repository.provider);
+            const menu = this.toolbarMenuId === MenuId.SCMTitle
+                ? repositoryMenus.titleMenu.menu
+                : repositoryMenus.getRepositoryMenu(repository);
+            reader.store.add(connectPrimaryMenu(menu, (primary, secondary) => {
+                menuPrimaryActions = primary;
+                menuSecondaryActions = secondary;
+                updateToolbar();
+            }));
         }));
         templateData.toolBar.context = repository.provider;
     }
@@ -132,11 +139,10 @@ RepositoryRenderer = RepositoryRenderer_1 = ( __decorate([
     ( __param(2, ICommandService)),
     ( __param(3, IContextKeyService)),
     ( __param(4, IContextMenuService)),
-    ( __param(5, IHoverService)),
-    ( __param(6, IKeybindingService)),
-    ( __param(7, IMenuService)),
-    ( __param(8, ISCMViewService)),
-    ( __param(9, ITelemetryService))
+    ( __param(5, IKeybindingService)),
+    ( __param(6, IMenuService)),
+    ( __param(7, ISCMViewService)),
+    ( __param(8, ITelemetryService))
 ], RepositoryRenderer));
 
 export { RepositoryActionRunner, RepositoryRenderer };

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

@@ -15,7 +15,7 @@ import { IMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/ac
 import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { ITreeNode, ITreeSorter } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/tree/tree";
-import { IResourceNode } from "@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/base/common/resourceTree";
+import { IResourceNode } from "@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common/vscode/vs/base/common/resourceTree";
 import { ICompressibleTreeRenderer, ICompressibleKeyboardNavigationLabelProvider } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/tree/objectTree";
 import { FuzzyScore } from "@codingame/monaco-vscode-api/vscode/vs/base/common/filters";
 import { IViewDescriptorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service";

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

@@ -10,7 +10,7 @@ import { append, $, Dimension, trackFocus, isPointerEvent, isActiveElement, clea
 import { asCSSUrl } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/cssValue';
 import { ViewMode, VIEW_PANE_ID, ISCMRepositorySortKey, InputValidationType, SCMInputChangeReason } from '@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common/vscode/vs/workbench/contrib/scm/common/scm';
 import { ISCMViewService, ISCMService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service';
-import { ResourceLabels } from '@codingame/monaco-vscode-2726569c-a06b-5f25-b851-14311bef12fa-common/vscode/vs/workbench/browser/labels';
+import { ResourceLabels } from '@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common/vscode/vs/workbench/browser/labels';
 import { CountBadge } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/countBadge/countBadge';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
@@ -24,12 +24,12 @@ import { IMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/ac
 import { ActionRunner, Action, toAction, Separator } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
 import { ActionBar } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
-import { isSCMResource, connectPrimaryMenu, isSCMResourceGroup, isSCMInput, isSCMActionButton, isSCMRepository, isSCMResourceNode, getActionViewItemProvider, collectContextMenuActions, isSCMViewService } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/scm/browser/util';
+import { isSCMResource, connectPrimaryMenu, isSCMResourceGroup, isSCMInput, isSCMActionButton, isSCMRepository, isSCMResourceNode, getActionViewItemProvider, collectContextMenuActions, isSCMViewService } from '@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common/vscode/vs/workbench/contrib/scm/browser/util';
 import { WorkbenchCompressibleAsyncDataTree } from '@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService';
 import { ConfigurationTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { disposableTimeout, ThrottledDelayer, Sequencer, Throttler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
-import { ResourceTree } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/base/common/resourceTree';
+import { ResourceTree } from '@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common/vscode/vs/base/common/resourceTree';
 import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
 import { FileKind } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
 import { compareFileNames, comparePaths } from '@codingame/monaco-vscode-api/vscode/vs/base/common/comparers';
@@ -89,7 +89,7 @@ import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/
 import { DropdownWithPrimaryActionViewItem } from '@codingame/monaco-vscode-262ed59d-4f76-57cd-9e9f-1877f26ae049-common/vscode/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem';
 import { clamp, rot } from '@codingame/monaco-vscode-api/vscode/vs/base/common/numbers';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
-import { OpenScmGroupAction } from '@codingame/monaco-vscode-f99b74f5-fcb7-512f-8c6c-35f5a107577d-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver';
+import { OpenScmGroupAction } from '@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver';
 import { ContentHoverController } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/hover/browser/contentHoverController';
 import { GlyphHoverController } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/hover/browser/glyphHoverController';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
@@ -100,7 +100,7 @@ import { IAccessibilityService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { AccessibilityCommandId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/common/accessibilityCommands';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import product from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/product';
-import { CHAT_SETUP_ACTION_ID } from '@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_SETUP_ACTION_ID } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { runOnChange } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/runOnChange';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
@@ -307,6 +307,7 @@ let InputRenderer = class InputRenderer {
         template.elementDisposables.clear();
     }
     disposeTemplate(templateData) {
+        templateData.elementDisposables.dispose();
         templateData.templateDisposable.dispose();
     }
     getHeight(input) {
@@ -759,7 +760,7 @@ let SCMAccessibilityProvider = class SCMAccessibilityProvider {
         this.labelService = labelService;
     }
     getWidgetAriaLabel() {
-        return localize(9730, "Source Control Management");
+        return localize(9886, "Source Control Management");
     }
     getAriaLabel(element) {
         if (ResourceTree.isResourceNode(element)) {
@@ -771,17 +772,17 @@ let SCMAccessibilityProvider = class SCMAccessibilityProvider {
         else if (isSCMInput(element)) {
             const verbosity = this.configurationService.getValue(AccessibilityVerbositySettingId.SourceControl) === true;
             if (!verbosity || !this.accessibilityService.isScreenReaderOptimized()) {
-                return localize(9731, "Source Control Input");
+                return localize(9887, "Source Control Input");
             }
             const kbLabel = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getLabel();
             return kbLabel
                 ? ( localize(
-                9732,
+                9888,
                 "Source Control Input, Use {0} to open Source Control Accessibility Help.",
                 kbLabel
             ))
                 : ( localize(
-                9733,
+                9889,
                 "Source Control Input, Run the Open Accessibility Help command for more information."
             ));
         }
@@ -839,14 +840,14 @@ const ContextKeys = {
     }
 };
 MenuRegistry.appendMenuItem(MenuId.SCMTitle, {
-    title: ( localize(9734, "View & Sort")),
+    title: ( localize(9890, "View & Sort")),
     submenu: Menus.ViewSort,
     when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', VIEW_PANE_ID)), ( ContextKeys.RepositoryCount.notEqualsTo(0)))),
     group: '0_view&sort',
     order: 1
 });
 MenuRegistry.appendMenuItem(Menus.ViewSort, {
-    title: ( localize(9735, "Repositories")),
+    title: ( localize(9891, "Repositories")),
     submenu: Menus.Repositories,
     when: ContextKeyExpr.greater(ContextKeys.RepositoryCount.key, 1),
     group: '0_repositories'
@@ -936,7 +937,7 @@ class SetListViewModeAction extends ViewAction {
     constructor(id = 'workbench.scm.action.setListViewMode', menu = {}) {
         super({
             id,
-            title: ( localize(9736, "View as List")),
+            title: ( localize(9892, "View as List")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.listTree,
@@ -962,7 +963,7 @@ class SetTreeViewModeAction extends ViewAction {
     constructor(id = 'workbench.scm.action.setTreeViewMode', menu = {}) {
         super({
             id,
-            title: ( localize(9737, "View as Tree")),
+            title: ( localize(9893, "View as Tree")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.listFlat,
@@ -1015,17 +1016,17 @@ class RepositorySortAction extends ViewAction {
 }
 class RepositorySortByDiscoveryTimeAction extends RepositorySortAction {
     constructor() {
-        super(ISCMRepositorySortKey.DiscoveryTime, ( localize(9738, "Sort by Discovery Time")));
+        super(ISCMRepositorySortKey.DiscoveryTime, ( localize(9894, "Sort by Discovery Time")));
     }
 }
 class RepositorySortByNameAction extends RepositorySortAction {
     constructor() {
-        super(ISCMRepositorySortKey.Name, ( localize(9739, "Sort by Name")));
+        super(ISCMRepositorySortKey.Name, ( localize(9895, "Sort by Name")));
     }
 }
 class RepositorySortByPathAction extends RepositorySortAction {
     constructor() {
-        super(ISCMRepositorySortKey.Path, ( localize(9740, "Sort by Path")));
+        super(ISCMRepositorySortKey.Path, ( localize(9896, "Sort by Path")));
     }
 }
 registerAction2(RepositorySortByDiscoveryTimeAction);
@@ -1050,17 +1051,17 @@ class SetSortKeyAction extends ViewAction {
 }
 class SetSortByNameAction extends SetSortKeyAction {
     constructor() {
-        super(ViewSortKey.Name, ( localize(9741, "Sort Changes by Name")));
+        super(ViewSortKey.Name, ( localize(9897, "Sort Changes by Name")));
     }
 }
 class SetSortByPathAction extends SetSortKeyAction {
     constructor() {
-        super(ViewSortKey.Path, ( localize(9742, "Sort Changes by Path")));
+        super(ViewSortKey.Path, ( localize(9898, "Sort Changes by Path")));
     }
 }
 class SetSortByStatusAction extends SetSortKeyAction {
     constructor() {
-        super(ViewSortKey.Status, ( localize(9743, "Sort Changes by Status")));
+        super(ViewSortKey.Status, ( localize(9899, "Sort Changes by Status")));
     }
 }
 registerAction2(SetSortByNameAction);
@@ -1070,7 +1071,7 @@ class CollapseAllRepositoriesAction extends ViewAction {
     constructor() {
         super({
             id: `workbench.scm.action.collapseAllRepositories`,
-            title: ( localize(9744, "Collapse All Repositories")),
+            title: ( localize(9900, "Collapse All Repositories")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.collapseAll,
@@ -1089,7 +1090,7 @@ class ExpandAllRepositoriesAction extends ViewAction {
     constructor() {
         super({
             id: `workbench.scm.action.expandAllRepositories`,
-            title: ( localize(9745, "Expand All Repositories")),
+            title: ( localize(9901, "Expand All Repositories")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.expandAll,
@@ -1119,7 +1120,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: SCMInputWidgetCommandId.SetupAction,
-            title: ( localize(9746, "Generate Commit Message with Copilot")),
+            title: ( localize(9902, "Generate commit message")),
             icon: Codicon.sparkle,
             f1: false,
             menu: {
@@ -1196,17 +1197,17 @@ let SCMInputWidgetToolbar = class SCMInputWidgetToolbar extends WorkbenchToolBar
         this._onDidChange = ( new Emitter());
         this.onDidChange = this._onDidChange.event;
         this._disposables = this._register(( new MutableDisposable()));
-        this._dropdownAction = ( new Action('scmInputMoreActions', ( localize(9747, "More Actions...")), 'codicon-chevron-down'));
+        this._dropdownAction = ( new Action('scmInputMoreActions', ( localize(9903, "More Actions...")), 'codicon-chevron-down'));
         this._cancelAction = ( new MenuItemAction({
             id: SCMInputWidgetCommandId.CancelAction,
-            title: ( localize(9748, "Cancel")),
+            title: ( localize(9904, "Cancel")),
             icon: Codicon.stopCircle,
         }, undefined, undefined, undefined, undefined, contextKeyService, commandService));
     }
     setInput(input) {
         this._disposables.value = ( new DisposableStore());
         const contextKeyService = this.contextKeyService.createOverlay([
-            ['scmProvider', input.repository.provider.contextValue],
+            ['scmProvider', input.repository.provider.providerId],
             ['scmProviderRootUri', input.repository.provider.rootUri?.toString()],
             ['scmProviderHasRootUri', !!input.repository.provider.rootUri]
         ]);
@@ -1279,6 +1280,7 @@ class SCMInputWidgetEditorOptions {
                 e.affectsConfiguration('editor.fontFamily') ||
                 e.affectsConfiguration('editor.rulers') ||
                 e.affectsConfiguration('editor.wordWrap') ||
+                e.affectsConfiguration('editor.wordSegmenterLocales') ||
                 e.affectsConfiguration('scm.inputFontFamily') ||
                 e.affectsConfiguration('scm.inputFontSize');
         }, this._disposables);
@@ -1308,12 +1310,13 @@ class SCMInputWidgetEditorOptions {
         const fontFamily = this._getEditorFontFamily();
         const fontSize = this._getEditorFontSize();
         const lineHeight = this._getEditorLineHeight(fontSize);
+        const wordSegmenterLocales = this.configurationService.getValue('editor.wordSegmenterLocales');
         const accessibilitySupport = this.configurationService.getValue('editor.accessibilitySupport');
         const cursorBlinking = this.configurationService.getValue('editor.cursorBlinking');
         const cursorStyle = this.configurationService.getValue('editor.cursorStyle');
         const cursorWidth = this.configurationService.getValue('editor.cursorWidth') ?? 1;
         const emptySelectionClipboard = this.configurationService.getValue('editor.emptySelectionClipboard') === true;
-        return { ...this._getEditorLanguageConfiguration(), accessibilitySupport, cursorBlinking, cursorStyle, cursorWidth, fontFamily, fontSize, lineHeight, emptySelectionClipboard };
+        return { ...this._getEditorLanguageConfiguration(), accessibilitySupport, cursorBlinking, cursorStyle, cursorWidth, fontFamily, fontSize, lineHeight, emptySelectionClipboard, wordSegmenterLocales };
     }
     _getEditorFontFamily() {
         const inputFontFamily = this.configurationService.getValue('scm.inputFontFamily').trim();
@@ -1413,13 +1416,13 @@ let SCMInputWidget = class SCMInputWidget {
             const kbLabel = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getLabel();
             return kbLabel
                 ? ( localize(
-                9749,
+                9905,
                 "{0}, Use {1} to open Source Control Accessibility Help.",
                 placeholder,
                 kbLabel
             ))
                 : ( localize(
-                9750,
+                9906,
                 "{0}, Run the Open Accessibility Help command for more information.",
                 placeholder
             ));
@@ -1679,7 +1682,7 @@ let SCMInputWidget = class SCMInputWidget {
                 }
                 const actionsContainer = append(validationContainer, $('.scm-editor-validation-actions'));
                 const actionbar = ( new ActionBar(actionsContainer));
-                const action = ( new Action('scmInputWidget.validationMessage.close', ( localize(9751, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => {
+                const action = ( new Action('scmInputWidget.validationMessage.close', ( localize(9907, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => {
                     this.contextViewService.hideContextView();
                     this.element.style.borderBottomLeftRadius = '2px';
                     this.element.style.borderBottomRightRadius = '2px';
@@ -2094,7 +2097,7 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
         disposables.add(actionRunner);
         if (isSCMRepository(element)) {
             const menus = this.scmViewService.menus.getRepositoryMenus(element.provider);
-            const menu = menus.repositoryContextMenu;
+            const menu = menus.getRepositoryContextMenu(element);
             context = element.provider;
             actionRunner = ( new RepositoryActionRunner(() => this.getSelectedRepositories()));
             disposables.add(actionRunner);
@@ -2215,7 +2218,7 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
         const alwaysShowRepositories = this.configurationService.getValue('scm.alwaysShowRepositories');
         if (!alwaysShowRepositories && this.items.size === 1) {
             const provider = Iterable.first(( this.items.keys())).provider;
-            this.scmProviderContextKey.set(provider.contextValue);
+            this.scmProviderContextKey.set(provider.providerId);
             this.scmProviderRootUriContextKey.set(provider.rootUri?.toString());
             this.scmProviderHasRootUriContextKey.set(!!provider.rootUri);
         }

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

@@ -32,7 +32,7 @@ import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/com
 import { derivedOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
 
 function getProviderStorageKey(provider) {
-    return `${provider.contextValue}:${provider.label}${provider.rootUri ? `:${( provider.rootUri.toString())}` : ''}`;
+    return `${provider.providerId}:${provider.label}${provider.rootUri ? `:${( provider.rootUri.toString())}` : ''}`;
 }
 function getRepositoryName(workspaceContextService, repository) {
     if (!repository.provider.rootUri) {
@@ -51,7 +51,7 @@ let RepositoryPicker = class RepositoryPicker {
         this._quickInputService = _quickInputService;
         this._scmViewService = _scmViewService;
         this._autoQuickPickItem = {
-            label: ( localize(9752, "Auto")),
+            label: ( localize(9908, "Auto")),
             description: this._autoQuickItemDescription,
             repository: 'auto'
         };
@@ -64,7 +64,9 @@ let RepositoryPicker = class RepositoryPicker {
         picks.push(...( this._scmViewService.repositories.map(r => ({
             label: r.provider.name,
             description: r.provider.rootUri?.fsPath,
-            iconClass: ThemeIcon.asClassName(Codicon.repo),
+            iconClass: ThemeIcon.isThemeIcon(r.provider.iconPath)
+                ? ThemeIcon.asClassName(r.provider.iconPath)
+                : ThemeIcon.asClassName(Codicon.repo),
             repository: r
         }))));
         return this._quickInputService.pick(picks, { placeHolder: this._placeHolder });

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

@@ -6,7 +6,7 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
-import { getProviderKey } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/scm/browser/util';
+import { getProviderKey } from '@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common/vscode/vs/workbench/contrib/scm/browser/util';
 import { ISCMService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { Parts } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService';

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

@@ -1,9 +0,0 @@
-import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
-import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
-import { IChatContextPickService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContextPickService.service";
-export declare class SCMHistoryItemContextContribution extends Disposable implements IWorkbenchContribution {
-    static readonly ID = "workbench.contrib.chat.scmHistoryItemContextContribution";
-    constructor(contextPickService: IChatContextPickService, instantiationService: IInstantiationService, textModelResolverService: ITextModelService);
-}