Removes menu.command from registerAction2

Eric Amodio · Eric Amodio · commit a562dabe6093 · 2020-03-11T02:07:04.000-04:00
diff --git a/src/vs/platform/actions/common/actions.ts b/src/vs/platform/actions/common/actions.ts
@@ -373,7 +373,7 @@ export interface IAction2Options extends ICommandAction {
 	/**
 	 * One or many menu items.
 	 */
-	menu?: OneOrN<{ id: MenuId } & Omit<IMenuItem, 'command'> & { command?: Partial<Omit<ICommandAction, 'id'>> }>;
+	menu?: OneOrN<{ id: MenuId } & Omit<IMenuItem, 'command'>>;
 
 	/**
 	 * One keybinding.
@@ -396,7 +396,7 @@ export function registerAction2(ctor: { new(): Action2 }): IDisposable {
 	const disposables = new DisposableStore();
 	const action = new ctor();
 
-	const { f1, menu: menus, keybinding, description, ...command } = action.desc;
+	const { f1, menu, keybinding, description, ...command } = action.desc;
 
 	// command
 	disposables.add(CommandsRegistry.registerCommand({
@@ -406,14 +406,12 @@ export function registerAction2(ctor: { new(): Action2 }): IDisposable {
 	}));
 
 	// menu
-	if (Array.isArray(menus)) {
-		for (let item of menus) {
-			const { command: commandOverrides, ...menu } = item;
-			disposables.add(MenuRegistry.appendMenuItem(item.id, { command: { ...command, ...commandOverrides }, ...menu }));
+	if (Array.isArray(menu)) {
+		for (let item of menu) {
+			disposables.add(MenuRegistry.appendMenuItem(item.id, { command: { ...command }, ...item }));
 		}
-	} else if (menus) {
-		const { command: commandOverrides, ...menu } = menus;
-		disposables.add(MenuRegistry.appendMenuItem(menu.id, { command: { ...command, ...commandOverrides }, ...menu }));
+	} else if (menu) {
+		disposables.add(MenuRegistry.appendMenuItem(menu.id, { command: { ...command }, ...menu }));
 	}
 	if (f1) {
 		disposables.add(MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: command }));
diff --git a/src/vs/workbench/contrib/timeline/browser/timelinePane.ts b/src/vs/workbench/contrib/timeline/browser/timelinePane.ts
@@ -24,7 +24,7 @@ import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiati
 import { ITimelineService, TimelineChangeEvent, TimelineItem, TimelineOptions, TimelineProvidersChangeEvent, TimelineRequest, Timeline, TimelinePaneId } from 'vs/workbench/contrib/timeline/common/timeline';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { SideBySideEditor, toResource } from 'vs/workbench/common/editor';
-import { ICommandService } from 'vs/platform/commands/common/commands';
+import { ICommandService, CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { IThemeService, LIGHT, ThemeIcon } from 'vs/platform/theme/common/themeService';
 import { IViewDescriptorService } from 'vs/workbench/common/views';
 import { basename } from 'vs/base/common/path';
@@ -34,7 +34,7 @@ import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { IActionViewItemProvider, ActionBar, ActionViewItem } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IAction, ActionRunner } from 'vs/base/common/actions';
 import { ContextAwareMenuEntryActionViewItem, createAndFillInContextMenuActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
-import { MenuItemAction, IMenuService, MenuId, registerAction2, Action2 } from 'vs/platform/actions/common/actions';
+import { MenuItemAction, IMenuService, MenuId, registerAction2, Action2, MenuRegistry } from 'vs/platform/actions/common/actions';
 import { fromNow } from 'vs/base/common/date';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { escapeRegExpCharacters } from 'vs/base/common/strings';
@@ -932,38 +932,35 @@ class TimelinePaneCommands extends Disposable {
 			}
 		}));
 
-		this._register(registerAction2(class extends Action2 {
-			constructor() {
-				super({
-					id: 'timeline.toggleFollowActiveEditor',
-					title: { value: localize('timeline.toggleFollowActiveEditorCommand', "Toggle Active Editor Following"), original: 'Toggle Active Editor Following' },
-					category: { value: localize('timeline', "Timeline"), original: 'Timeline' },
-					menu: [{
-						id: MenuId.TimelineTitle,
-						command: {
-							// title: localize(`timeline.toggleFollowActiveEditorCommand.stop`, "Stop following the Active Editor"),
-							icon: { id: 'codicon/eye' }
-						},
-						group: 'navigation',
-						order: 98,
-						when: TimelineFollowActiveEditorContext
-					},
-					{
-						id: MenuId.TimelineTitle,
-						command: {
-							// title: localize(`ToggleFollowActiveEditorCommand.follow`, "Follow the Active Editor"),
-							icon: { id: 'codicon/eye-closed' }
-						},
-						group: 'navigation',
-						order: 98,
-						when: TimelineFollowActiveEditorContext.toNegated()
-					}]
-				});
-			}
-			run(accessor: ServicesAccessor, ...args: any[]) {
-				pane.followActiveEditor = !pane.followActiveEditor;
-			}
-		}));
+		this._register(CommandsRegistry.registerCommand('timeline.toggleFollowActiveEditor',
+			(accessor: ServicesAccessor, ...args: any[]) => pane.followActiveEditor = !pane.followActiveEditor
+		));
+
+		this._register(MenuRegistry.appendMenuItem(MenuId.TimelineTitle, ({
+			command: {
+				id: 'timeline.toggleFollowActiveEditor',
+				title: { value: localize('timeline.toggleFollowActiveEditorCommand', "Toggle Active Editor Following"), original: 'Toggle Active Editor Following' },
+				// title: localize(`timeline.toggleFollowActiveEditorCommand.stop`, "Stop following the Active Editor"),
+				icon: { id: 'codicon/eye' },
+				category: { value: localize('timeline', "Timeline"), original: 'Timeline' },
+			},
+			group: 'navigation',
+			order: 98,
+			when: TimelineFollowActiveEditorContext
+		})));
+
+		this._register(MenuRegistry.appendMenuItem(MenuId.TimelineTitle, ({
+			command: {
+				id: 'timeline.toggleFollowActiveEditor',
+				title: { value: localize('timeline.toggleFollowActiveEditorCommand', "Toggle Active Editor Following"), original: 'Toggle Active Editor Following' },
+				// title: localize(`timeline.toggleFollowActiveEditorCommand.stop`, "Stop following the Active Editor"),
+				icon: { id: 'codicon/eye-closed' },
+				category: { value: localize('timeline', "Timeline"), original: 'Timeline' },
+			},
+			group: 'navigation',
+			order: 98,
+			when: TimelineFollowActiveEditorContext.toNegated()
+		})));
 
 		this._register(timelineService.onDidChangeProviders(() => this.updateTimelineSourceFilters()));
 		this.updateTimelineSourceFilters();
