Remove split button from comments additional actions (microsoft#166568)

and add a max number of 4 actions
Part of microsoft#163281

Author: alexr00

src/vs/workbench/contrib/comments/browser/commentFormActions.ts

@@ -3,12 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Button, ButtonWithDropdown, IButton } from 'vs/base/browser/ui/button/button';
+import { Button } from 'vs/base/browser/ui/button/button';
 import { IAction } from 'vs/base/common/actions';
 import { DisposableStore, IDisposable } from 'vs/base/common/lifecycle';
-import { IMenu, SubmenuItemAction } from 'vs/platform/actions/common/actions';
+import { IMenu } from 'vs/platform/actions/common/actions';
 import { defaultButtonStyles } from 'vs/platform/theme/browser/defaultStyles';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 
 export class CommentFormActions implements IDisposable {
 	private _buttonElements: HTMLElement[] = [];
@@ -18,7 +17,7 @@ export class CommentFormActions implements IDisposable {
 	constructor(
 		private container: HTMLElement,
 		private actionHandler: (action: IAction) => void,
-		private contextMenuService?: IContextMenuService
+		private readonly maxActions?: number
 	) { }
 
 	setActions(menu: IMenu, hasOnlySecondaryActions: boolean = false) {
@@ -33,34 +32,20 @@ export class CommentFormActions implements IDisposable {
 
 			this._actions = actions;
 			for (const action of actions) {
-				const submenuAction = action as SubmenuItemAction;
-
-				// Use the first action from the submenu as the primary button.
-				const appliedAction: IAction = submenuAction.actions?.length > 0 ? submenuAction.actions[0] : action;
-				let button: IButton | undefined;
-
-				// Use dropdown only if submenu contains more than 1 action.
-				if (submenuAction.actions?.length > 1 && this.contextMenuService) {
-					button = new ButtonWithDropdown(this.container,
-						{
-							contextMenuProvider: this.contextMenuService,
-							actions: submenuAction.actions.slice(1),
-							addPrimaryActionToDropdown: false,
-							secondary: !isPrimary,
-							...defaultButtonStyles
-						});
-				} else {
-					button = new Button(this.container, { secondary: !isPrimary, ...defaultButtonStyles });
-				}
+				const button = new Button(this.container, { secondary: !isPrimary, ...defaultButtonStyles });
 
 				isPrimary = false;
 				this._buttonElements.push(button.element);
 
 				this._toDispose.add(button);
-				this._toDispose.add(button.onDidClick(() => this.actionHandler(appliedAction)));
+				this._toDispose.add(button.onDidClick(() => this.actionHandler(action)));
 
-				button.enabled = appliedAction.enabled;
-				button.label = appliedAction.label;
+				button.enabled = action.enabled;
+				button.label = action.label;
+				if ((this.maxActions !== undefined) && (this._buttonElements.length >= this.maxActions)) {
+					console.warn(`An extension has contributed more than the allowable number of actions to a comments menu.`);
+					return;
+				}
 			}
 		}
 	}

src/vs/workbench/contrib/comments/browser/commentThreadAdditionalActions.ts

@@ -15,7 +15,6 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { CommentFormActions } from 'vs/workbench/contrib/comments/browser/commentFormActions';
 import { CommentMenus } from 'vs/workbench/contrib/comments/browser/commentMenus';
 import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 
 export class CommentThreadAdditionalActions<T extends IRange | ICellRange> extends Disposable {
 	private _container: HTMLElement | null;
@@ -28,7 +27,6 @@ export class CommentThreadAdditionalActions<T extends IRange | ICellRange> exten
 		private _contextKeyService: IContextKeyService,
 		private _commentMenus: CommentMenus,
 		private _actionRunDelegate: (() => void) | null,
-		@IContextMenuService private contextMenuService: IContextMenuService,
 	) {
 		super();
 
@@ -76,7 +74,7 @@ export class CommentThreadAdditionalActions<T extends IRange | ICellRange> exten
 		const menu = this._commentMenus.getCommentThreadAdditionalActions(this._contextKeyService);
 		this._register(menu);
 		this._register(menu.onDidChange(() => {
-			this._commentFormActions.setActions(menu);
+			this._commentFormActions.setActions(menu, /*hasOnlySecondaryActions*/ true);
 			this._enableDisableMenu(menu);
 		}));
 
@@ -87,8 +85,7 @@ export class CommentThreadAdditionalActions<T extends IRange | ICellRange> exten
 				thread: this._commentThread,
 				$mid: MarshalledId.CommentThreadInstance
 			});
-
-		}, this.contextMenuService);
+		}, 4);
 
 		this._register(this._commentFormActions);
 		this._commentFormActions.setActions(menu, /*hasOnlySecondaryActions*/ true);

src/vs/workbench/services/actions/common/menusExtensionPoint.ts

@@ -163,7 +163,7 @@ const apiMenus: IAPIMenu[] = [
 		key: 'comments/commentThread/additionalActions',
 		id: MenuId.CommentThreadAdditionalActions,
 		description: localize('commentThread.actions', "The contributed comment thread context menu, rendered as buttons below the comment editor"),
-		supportsSubmenus: true,
+		supportsSubmenus: false,
 		proposed: 'contribCommentThreadAdditionalMenu'
 	},
 	{