Context menu grouping is broken (microsoft#211625)

* Context menu grouping is broken
Fixes microsoft#211488

* Make grouping explicit

Author: alexr00

src/vs/workbench/browser/parts/views/treeView.ts

@@ -13,7 +13,7 @@ import { IIdentityProvider, IListVirtualDelegate } from 'vs/base/browser/ui/list
 import { ElementsDragAndDropData, ListViewTargetSector } from 'vs/base/browser/ui/list/listView';
 import { IAsyncDataSource, ITreeContextMenuEvent, ITreeDragAndDrop, ITreeDragOverReaction, ITreeNode, ITreeRenderer, TreeDragOverBubble } from 'vs/base/browser/ui/tree/tree';
 import { CollapseAllAction } from 'vs/base/browser/ui/tree/treeDefaults';
-import { ActionRunner, IAction } from 'vs/base/common/actions';
+import { ActionRunner, IAction, Separator } from 'vs/base/common/actions';
 import { timeout } from 'vs/base/common/async';
 import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
 import { Codicon } from 'vs/base/common/codicons';
@@ -1599,13 +1599,53 @@ class TreeMenus implements IDisposable {
 		this.contextKeyService = service;
 	}
 
+	private filterNonUniversalActions(groups: Map<string, IAction>[], newActions: IAction[]) {
+		const newActionsSet: Set<string> = new Set(newActions.map(a => a.id));
+		for (const group of groups) {
+			const actions = group.keys();
+			for (const action of actions) {
+				if (!newActionsSet.has(action)) {
+					group.delete(action);
+				}
+			}
+		}
+	}
+
+	private buildMenu(groups: Map<string, IAction>[]): IAction[] {
+		const result: IAction[] = [];
+		for (const group of groups) {
+			if (group.size > 0) {
+				if (result.length) {
+					result.push(new Separator());
+				}
+				result.push(...group.values());
+			}
+		}
+		return result;
+	}
+
+	private createGroups(actions: IAction[]): Map<string, IAction>[] {
+		const groups: Map<string, IAction>[] = [];
+		let group: Map<string, IAction> = new Map();
+		for (const action of actions) {
+			if (action instanceof Separator) {
+				groups.push(group);
+				group = new Map();
+			} else {
+				group.set(action.id, action);
+			}
+		}
+		groups.push(group);
+		return groups;
+	}
+
 	private getActions(menuId: MenuId, elements: ITreeItem[], listen?: DisposableStore): { primary: IAction[]; secondary: IAction[] } {
 		if (!this.contextKeyService) {
 			return { primary: [], secondary: [] };
 		}
 
-		const allowedPrimary = new Map<string, IAction>();
-		const allowedSecondary = new Map<string, IAction>();
+		let primaryGroups: Map<string, IAction>[] = [];
+		let secondaryGroups: Map<string, IAction>[] = [];
 		for (let i = 0; i < elements.length; i++) {
 			const element = elements[i];
 			const contextKeyService = this.contextKeyService.createOverlay([
@@ -1619,25 +1659,11 @@ class TreeMenus implements IDisposable {
 			const result = { primary, secondary, menu };
 			createAndFillInContextMenuActions(menu, { shouldForwardArgs: true }, result, 'inline');
 			if (i === 0) {
-				for (const action of result.primary) {
-					allowedPrimary.set(action.id, action);
-				}
-				for (const action of result.secondary) {
-					allowedSecondary.set(action.id, action);
-				}
+				primaryGroups = this.createGroups(result.primary);
+				secondaryGroups = this.createGroups(result.secondary);
 			} else {
-				const primaryKeys = allowedPrimary.keys();
-				for (const key of primaryKeys) {
-					if (!result.primary.some(action => action.id === key)) {
-						allowedPrimary.delete(key);
-					}
-				}
-				const secondaryKeys = allowedSecondary.keys();
-				for (const key of secondaryKeys) {
-					if (!result.secondary.some(action => action.id === key)) {
-						allowedSecondary.delete(key);
-					}
-				}
+				this.filterNonUniversalActions(primaryGroups, result.primary);
+				this.filterNonUniversalActions(secondaryGroups, result.secondary);
 			}
 			if (listen && elements.length === 1) {
 				listen.add(menu.onDidChange(() => this._onDidChange.fire(element)));
@@ -1647,7 +1673,7 @@ class TreeMenus implements IDisposable {
 			}
 		}
 
-		return { primary: Array.from(allowedPrimary.values()), secondary: Array.from(allowedSecondary.values()) };
+		return { primary: this.buildMenu(primaryGroups), secondary: this.buildMenu(secondaryGroups) };
 	}
 
 	dispose() {