menu - move command palette special into registry

jrieken · jrieken · commit 542e4bf0bc86 · 2017-02-15T16:29:46.000+01:00
diff --git a/src/vs/platform/actions/common/actions.ts b/src/vs/platform/actions/common/actions.ts
@@ -111,7 +111,29 @@ export const MenuRegistry: IMenuRegistry = new class {
 	}
 
 	getMenuItems({ id }: MenuId): IMenuItem[] {
-		return this.menuItems[id] || [];
+		const result = this.menuItems[id] || [];
+
+		if (id === MenuId.CommandPalette.id) {
+			// CommandPalette is special because it shows
+			// all commands by default
+			this._appendImplicitItems(result);
+		}
+		return result;
+	}
+
+	private _appendImplicitItems(result: IMenuItem[]) {
+		const set = new Set<string>();
+		for (const { command, alt } of result) {
+			set.add(command.id);
+			if (alt) {
+				set.add(alt.id);
+			}
+		}
+		for (let id in this.commands) {
+			if (!set.has(id)) {
+				result.push({ command: this.commands[id] });
+			}
+		}
 	}
 };
 
diff --git a/src/vs/platform/actions/common/menu.ts b/src/vs/platform/actions/common/menu.ts
@@ -12,8 +12,6 @@ import { localize } from 'vs/nls';
 import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { MenuId, MenuRegistry, MenuItemAction, IMenu, IMenuItem } from 'vs/platform/actions/common/actions';
 import { ICommandService } from 'vs/platform/commands/common/commands';
-import { values } from 'vs/base/common/collections';
-import { index } from 'vs/base/common/arrays';
 
 type MenuItemGroup = [string, IMenuItem[]];
 
@@ -30,17 +28,7 @@ export class Menu implements IMenu {
 		@IContextKeyService private _contextKeyService: IContextKeyService
 	) {
 		startupSignal.then(_ => {
-			let menuItems = MenuRegistry.getMenuItems(id);
-
-			if (id === MenuId.CommandPalette) {
-				const ids = index(menuItems, i => i.command.id);
-				const commandMenuItems = values(MenuRegistry.commands)
-					.filter(c => !ids[c.id])
-					.map(command => ({ command }));
-
-				menuItems = [...menuItems, ...commandMenuItems];
-			}
-
+			const menuItems = MenuRegistry.getMenuItems(id);
 			const keysFilter = new Set<string>();
 
 			let group: MenuItemGroup;
diff --git a/src/vs/platform/actions/test/common/menuService.test.ts b/src/vs/platform/actions/test/common/menuService.test.ts
@@ -186,4 +186,20 @@ suite('MenuService', function () {
 		assert.equal(two.id, 'b');
 		assert.equal(three.id, 'a');
 	});
+
+	test('special MenuId palette', function () {
+
+		disposables.push(MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+			command: { id: 'a', title: 'Explicit' }
+		}));
+
+		MenuRegistry.addCommand({ id: 'b', title: 'Implicit' });
+
+		const [first, second] = MenuRegistry.getMenuItems(MenuId.CommandPalette);
+		assert.equal(first.command.id, 'a');
+		assert.equal(first.command.title, 'Explicit');
+
+		assert.equal(second.command.id, 'b');
+		assert.equal(second.command.title, 'Implicit');
+	});
 });
