Supply multiselects to scm/resourceGroup/context menu commands (fix #92337)

src/vs/workbench/contrib/scm/browser/scmViewPane.ts

@@ -464,6 +464,7 @@ class ResourceGroupRenderer implements ICompressibleTreeRenderer<ISCMResourceGro
 
 	constructor(
 		private actionViewItemProvider: IActionViewItemProvider,
+		private actionRunner: ActionRunner,
 		@ISCMViewService private scmViewService: ISCMViewService
 	) { }
 
@@ -474,7 +475,10 @@ class ResourceGroupRenderer implements ICompressibleTreeRenderer<ISCMResourceGro
 		const element = append(container, $('.resource-group'));
 		const name = append(element, $('.name'));
 		const actionsContainer = append(element, $('.actions'));
-		const actionBar = new ActionBar(actionsContainer, { actionViewItemProvider: this.actionViewItemProvider });
+		const actionBar = new ActionBar(actionsContainer, {
+			actionViewItemProvider: this.actionViewItemProvider,
+			actionRunner: this.actionRunner
+		});
 		const countContainer = append(element, $('.count'));
 		const count = new CountBadge(countContainer, {}, defaultCountBadgeStyles);
 		const disposables = combinedDisposable(actionBar);
@@ -528,7 +532,7 @@ interface RenderedResourceData {
 
 class RepositoryPaneActionRunner extends ActionRunner {
 
-	constructor(private getSelectedResources: () => (ISCMResource | IResourceNode<ISCMResource, ISCMResourceGroup>)[]) {
+	constructor(private getSelectedResources: (wantResourceGroups: boolean) => (ISCMResource | IResourceNode<ISCMResource, ISCMResourceGroup>)[]) {
 		super();
 	}
 
@@ -537,7 +541,7 @@ class RepositoryPaneActionRunner extends ActionRunner {
 			return super.runAction(action, context);
 		}
 
-		const selection = this.getSelectedResources();
+		const selection = this.getSelectedResources(!(context as ISCMResource).resourceGroup);
 		const contextIsSelected = selection.some(s => s === context);
 		const actualContext = contextIsSelected ? selection : [context];
 		const args = actualContext.map(e => ResourceTree.isResourceNode(e) ? ResourceTree.collect(e) : [e]).flat();
@@ -3251,7 +3255,7 @@ export class SCMViewPane extends ViewPane {
 		this.listLabels = this.instantiationService.createInstance(ResourceLabels, { onDidChangeVisibility: this.onDidChangeBodyVisibility });
 		this.disposables.add(this.listLabels);
 
-		const resourceActionRunner = new RepositoryPaneActionRunner(() => this.getSelectedResources());
+		const resourceActionRunner = new RepositoryPaneActionRunner((wantResourceGroups) => this.getSelectedResources(wantResourceGroups));
 		resourceActionRunner.onWillRun(() => this.tree.domFocus(), this, this.disposables);
 		this.disposables.add(resourceActionRunner);
 
@@ -3284,7 +3288,7 @@ export class SCMViewPane extends ViewPane {
 				this.inputRenderer,
 				this.actionButtonRenderer,
 				this.instantiationService.createInstance(RepositoryRenderer, MenuId.SCMTitle, getActionViewItemProvider(this.instantiationService)),
-				this.instantiationService.createInstance(ResourceGroupRenderer, getActionViewItemProvider(this.instantiationService)),
+				this.instantiationService.createInstance(ResourceGroupRenderer, getActionViewItemProvider(this.instantiationService), resourceActionRunner),
 				this.instantiationService.createInstance(ResourceRenderer, () => this.viewMode, this.listLabels, getActionViewItemProvider(this.instantiationService), resourceActionRunner),
 				this.instantiationService.createInstance(HistoryItemGroupRenderer, historyItemGroupActionRunner),
 				this.instantiationService.createInstance(HistoryItemRenderer, historyItemActionRunner, getActionViewItemProvider(this.instantiationService)),
@@ -3567,7 +3571,7 @@ export class SCMViewPane extends ViewPane {
 		const element = e.element;
 		let context: any = element;
 		let actions: IAction[] = [];
-		let actionRunner: IActionRunner = new RepositoryPaneActionRunner(() => this.getSelectedResources());
+		let actionRunner: IActionRunner = new RepositoryPaneActionRunner((wantResourceGroups) => this.getSelectedResources(wantResourceGroups));
 
 		if (isSCMRepository(element)) {
 			const menus = this.scmViewService.menus.getRepositoryMenus(element.provider);
@@ -3636,9 +3640,9 @@ export class SCMViewPane extends ViewPane {
 		return Array.from(new Set<ISCMRepository>([...focusedRepositories, ...selectedRepositories]));
 	}
 
-	private getSelectedResources(): (ISCMResource | IResourceNode<ISCMResource, ISCMResourceGroup>)[] {
+	private getSelectedResources(wantResourceGroups: boolean): (ISCMResource | IResourceNode<ISCMResource, ISCMResourceGroup>)[] {
 		return this.tree.getSelection()
-			.filter(r => !!r && !isSCMResourceGroup(r))! as any;
+			.filter(r => !!r && wantResourceGroups ? isSCMResourceGroup(r) : !isSCMResourceGroup(r))! as any;
 	}
 
 	private getSelectedHistoryItems(): SCMHistoryItemViewModelTreeElement[] {