menus: move View menu contributions to appropriate owners

#54510

src/vs/workbench/browser/parts/menubar/menubar.contribution.ts

@@ -9,7 +9,6 @@ import { isMacintosh } from 'vs/base/common/platform';
 
 editMenuRegistration();
 selectionMenuRegistration();
-viewMenuRegistration();
 appearanceMenuRegistration();
 layoutMenuRegistration();
 goMenuRegistration();
@@ -272,163 +271,21 @@ function selectionMenuRegistration() {
 	});
 }
 
-function viewMenuRegistration() {
-
-	// Command Palette
-	MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
-		group: '1_open',
-		command: {
-			id: 'workbench.action.showCommands',
-			title: nls.localize({ key: 'miCommandPalette', comment: ['&& denotes a mnemonic'] }, "&&Command Palette...")
-		},
-		order: 1
-	});
-
-	MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
-		group: '1_open',
-		command: {
-			id: 'workbench.action.openView',
-			title: nls.localize({ key: 'miOpenView', comment: ['&& denotes a mnemonic'] }, "&&Open View...")
-		},
-		order: 2
-	});
-
-	// TODO: Appearance Submenu
-	MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
-		group: '2_appearance',
-		title: nls.localize({ key: 'miAppearance', comment: ['&& denotes a mnemonic'] }, "&&Appearance"),
-		submenu: MenuId.MenubarAppearanceMenu,
-		order: 1
-	});
-
-	// TODO: Editor Layout Submenu
-	MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
-		group: '2_appearance',
-		title: nls.localize({ key: 'miEditorLayout', comment: ['&& denotes a mnemonic'] }, "Editor &&Layout"),
-		submenu: MenuId.MenubarLayoutMenu,
-		order: 2
-	});
-
-	// Viewlets
-	MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
-		group: '3_views',
-		command: {
-			id: 'workbench.view.explorer',
-			title: nls.localize({ key: 'miViewExplorer', comment: ['&& denotes a mnemonic'] }, "&&Explorer")
-		},
-		order: 1
-	});
-
-	MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
-		group: '3_views',
-		command: {
-			id: 'workbench.view.search',
-			title: nls.localize({ key: 'miViewSearch', comment: ['&& denotes a mnemonic'] }, "&&Search")
-		},
-		order: 2
-	});
-
-	MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
-		group: '3_views',
-		command: {
-			id: 'workbench.view.scm',
-			title: nls.localize({ key: 'miViewSCM', comment: ['&& denotes a mnemonic'] }, "S&&CM")
-		},
-		order: 3
-	});
-
-	MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
-		group: '3_views',
-		command: {
-			id: 'workbench.view.debug',
-			title: nls.localize({ key: 'miViewDebug', comment: ['&& denotes a mnemonic'] }, "&&Debug")
-		},
-		order: 4
-	});
-
-	MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
-		group: '3_views',
-		command: {
-			id: 'workbench.view.extensions',
-			title: nls.localize({ key: 'miViewExtensions', comment: ['&& denotes a mnemonic'] }, "E&&xtensions")
-		},
-		order: 5
-	});
-
-	// Panels
-	MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
-		group: '4_panels',
-		command: {
-			id: 'workbench.action.output.toggleOutput',
-			title: nls.localize({ key: 'miToggleOutput', comment: ['&& denotes a mnemonic'] }, "&&Output")
-		},
-		order: 1
-	});
-
-	MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
-		group: '4_panels',
-		command: {
-			id: 'workbench.debug.action.toggleRepl',
-			title: nls.localize({ key: 'miToggleDebugConsole', comment: ['&& denotes a mnemonic'] }, "De&&bug Console")
-		},
-		order: 2
-	});
-
-	MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
-		group: '4_panels',
-		command: {
-			id: 'workbench.action.terminal.toggleTerminal',
-			title: nls.localize({ key: 'miToggleIntegratedTerminal', comment: ['&& denotes a mnemonic'] }, "&&Integrated Terminal")
-		},
-		order: 3
-	});
-
-	MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
-		group: '4_panels',
-		command: {
-			id: 'workbench.actions.view.problems',
-			title: nls.localize({ key: 'miMarker', comment: ['&& denotes a mnemonic'] }, "&&Problems")
-		},
-		order: 4
-	});
-
-	// Toggle Editor Settings
-	MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
-		group: '5_editor',
-		command: {
-			id: 'workbench.action.toggleWordWrap',
-			title: nls.localize({ key: 'miToggleWordWrap', comment: ['&& denotes a mnemonic'] }, "Toggle &&Word Wrap")
-		},
-		order: 1
-	});
-
-	MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
-		group: '5_editor',
-		command: {
-			id: 'workbench.action.toggleMinimap',
-			title: nls.localize({ key: 'miToggleMinimap', comment: ['&& denotes a mnemonic'] }, "Toggle &&Minimap")
-		},
-		order: 2
-	});
-
-	MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
-		group: '5_editor',
-		command: {
-			id: 'workbench.action.toggleRenderWhitespace',
-			title: nls.localize({ key: 'miToggleRenderWhitespace', comment: ['&& denotes a mnemonic'] }, "Toggle &&Render Whitespace")
-		},
-		order: 3
-	});
-
-	MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
-		group: '5_editor',
-		command: {
-			id: 'workbench.action.toggleRenderControlCharacters',
-			title: nls.localize({ key: 'miToggleRenderControlCharacters', comment: ['&& denotes a mnemonic'] }, "Toggle &&Control Characters")
-		},
-		order: 4
-	});
-}
+// TODO: Appearance Submenu
+MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+	group: '2_appearance',
+	title: nls.localize({ key: 'miAppearance', comment: ['&& denotes a mnemonic'] }, "&&Appearance"),
+	submenu: MenuId.MenubarAppearanceMenu,
+	order: 1
+});
+
+// TODO: Editor Layout Submenu
+MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+	group: '2_appearance',
+	title: nls.localize({ key: 'miEditorLayout', comment: ['&& denotes a mnemonic'] }, "Editor &&Layout"),
+	submenu: MenuId.MenubarLayoutMenu,
+	order: 2
+});
 
 function appearanceMenuRegistration() {
 	MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {

src/vs/workbench/parts/codeEditor/electron-browser/toggleMinimap.ts

@@ -10,7 +10,7 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
 import { Action } from 'vs/base/common/actions';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 
 export class ToggleMinimapAction extends Action {
 	public static readonly ID = 'editor.action.toggleMinimap';
@@ -32,3 +32,12 @@ export class ToggleMinimapAction extends Action {
 
 const registry = Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions);
 registry.registerWorkbenchAction(new SyncActionDescriptor(ToggleMinimapAction, ToggleMinimapAction.ID, ToggleMinimapAction.LABEL), 'View: Toggle Minimap');
+
+MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+	group: '5_editor',
+	command: {
+		id: ToggleMinimapAction.ID,
+		title: nls.localize({ key: 'miToggleMinimap', comment: ['&& denotes a mnemonic'] }, "Toggle &&Minimap")
+	},
+	order: 2
+});

src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderControlCharacter.ts

@@ -10,7 +10,7 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
 import { Action } from 'vs/base/common/actions';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 
 export class ToggleRenderControlCharacterAction extends Action {
 
@@ -33,3 +33,12 @@ export class ToggleRenderControlCharacterAction extends Action {
 
 const registry = Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions);
 registry.registerWorkbenchAction(new SyncActionDescriptor(ToggleRenderControlCharacterAction, ToggleRenderControlCharacterAction.ID, ToggleRenderControlCharacterAction.LABEL), 'View: Toggle Control Characters');
+
+MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+	group: '5_editor',
+	command: {
+		id: ToggleRenderControlCharacterAction.ID,
+		title: nls.localize({ key: 'miToggleRenderControlCharacters', comment: ['&& denotes a mnemonic'] }, "Toggle &&Control Characters")
+	},
+	order: 4
+});

src/vs/workbench/parts/codeEditor/electron-browser/toggleRenderWhitespace.ts

@@ -10,7 +10,7 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
 import { Action } from 'vs/base/common/actions';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 
 export class ToggleRenderWhitespaceAction extends Action {
 
@@ -41,3 +41,12 @@ export class ToggleRenderWhitespaceAction extends Action {
 
 const registry = Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions);
 registry.registerWorkbenchAction(new SyncActionDescriptor(ToggleRenderWhitespaceAction, ToggleRenderWhitespaceAction.ID, ToggleRenderWhitespaceAction.LABEL), 'View: Toggle Render Whitespace');
+
+MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+	group: '5_editor',
+	command: {
+		id: ToggleRenderWhitespaceAction.ID,
+		title: nls.localize({ key: 'miToggleRenderWhitespace', comment: ['&& denotes a mnemonic'] }, "Toggle &&Render Whitespace")
+	},
+	order: 3
+});

src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.ts

@@ -130,11 +130,12 @@ function applyWordWrapState(editor: ICodeEditor, state: IWordWrapState): void {
 	});
 }
 
+const TOGGLE_WORD_WRAP_ID = 'editor.action.toggleWordWrap';
 class ToggleWordWrapAction extends EditorAction {
 
 	constructor() {
 		super({
-			id: 'editor.action.toggleWordWrap',
+			id: TOGGLE_WORD_WRAP_ID,
 			label: nls.localize('toggle.wordwrap', "View: Toggle Word Wrap"),
 			alias: 'View: Toggle Word Wrap',
 			precondition: null,
@@ -255,7 +256,7 @@ registerEditorAction(ToggleWordWrapAction);
 
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
 	command: {
-		id: 'editor.action.toggleWordWrap',
+		id: TOGGLE_WORD_WRAP_ID,
 		title: nls.localize('unwrapMinified', "Disable wrapping for this file"),
 		iconLocation: { dark: URI.parse(require.toUrl('vs/workbench/parts/codeEditor/electron-browser/media/WordWrap_16x.svg')) }
 	},
@@ -269,7 +270,7 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
 });
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
 	command: {
-		id: 'editor.action.toggleWordWrap',
+		id: TOGGLE_WORD_WRAP_ID,
 		title: nls.localize('wrapMinified', "Enable wrapping for this file"),
 		iconLocation: { dark: URI.parse(require.toUrl('vs/workbench/parts/codeEditor/electron-browser/media/WordWrap_16x.svg')) }
 	},
@@ -281,3 +282,14 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
 		ContextKeyExpr.not(isWordWrapMinifiedKey)
 	)
 });
+
+
+// View menu
+MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+	group: '5_editor',
+	command: {
+		id: TOGGLE_WORD_WRAP_ID,
+		title: nls.localize({ key: 'miToggleWordWrap', comment: ['&& denotes a mnemonic'] }, "Toggle &&Word Wrap")
+	},
+	order: 1
+});

src/vs/workbench/parts/debug/electron-browser/debug.contribution.ts

@@ -30,7 +30,7 @@ import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { DebugEditorModelManager } from 'vs/workbench/parts/debug/browser/debugEditorModelManager';
 import {
 	StepOverAction, ClearReplAction, FocusReplAction, StepIntoAction, StepOutAction, StartAction, RestartAction, ContinueAction, StopAction, DisconnectAction, PauseAction, AddFunctionBreakpointAction,
-	ConfigureAction, DisableAllBreakpointsAction, EnableAllBreakpointsAction, RemoveAllBreakpointsAction, RunAction, ReapplyBreakpointsAction, SelectAndStartAction, TerminateThreadAction
+	ConfigureAction, DisableAllBreakpointsAction, EnableAllBreakpointsAction, RemoveAllBreakpointsAction, RunAction, ReapplyBreakpointsAction, SelectAndStartAction, TerminateThreadAction, ToggleReplAction
 } from 'vs/workbench/parts/debug/browser/debugActions';
 import { DebugActionsWidget } from 'vs/workbench/parts/debug/browser/debugActionsWidget';
 import * as service from 'vs/workbench/parts/debug/electron-browser/debugService';
@@ -228,7 +228,27 @@ registerCommands();
 const statusBar = Registry.as<IStatusbarRegistry>(StatusExtensions.Statusbar);
 statusBar.registerStatusbarItem(new StatusbarItemDescriptor(DebugStatus, StatusbarAlignment.LEFT, 30 /* Low Priority */));
 
-// Register debug menu
+// View menu
+
+MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+	group: '3_views',
+	command: {
+		id: VIEWLET_ID,
+		title: nls.localize({ key: 'miViewDebug', comment: ['&& denotes a mnemonic'] }, "&&Debug")
+	},
+	order: 4
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+	group: '4_panels',
+	command: {
+		id: ToggleReplAction.ID,
+		title: nls.localize({ key: 'miToggleDebugConsole', comment: ['&& denotes a mnemonic'] }, "De&&bug Console")
+	},
+	order: 2
+});
+
+// Debug menu
 
 MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
 	group: '1_debug',

src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts

@@ -248,3 +248,14 @@ MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
 	},
 	order: 2
 });
+
+// View menu
+
+MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+	group: '3_views',
+	command: {
+		id: VIEWLET_ID,
+		title: localize({ key: 'miViewExtensions', comment: ['&& denotes a mnemonic'] }, "E&&xtensions")
+	},
+	order: 5
+});

src/vs/workbench/parts/files/electron-browser/files.contribution.ts

@@ -8,7 +8,7 @@
 import URI from 'vs/base/common/uri';
 import { ViewletRegistry, Extensions as ViewletExtensions, ViewletDescriptor, ToggleViewletAction } from 'vs/workbench/browser/viewlet';
 import * as nls from 'vs/nls';
-import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { SyncActionDescriptor, MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
@@ -371,3 +371,13 @@ configurationRegistry.registerConfiguration({
 		},
 	}
 });
+
+// View menu
+MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+	group: '3_views',
+	command: {
+		id: VIEWLET_ID,
+		title: nls.localize({ key: 'miViewExplorer', comment: ['&& denotes a mnemonic'] }, "&&Explorer")
+	},
+	order: 1
+});

src/vs/workbench/parts/markers/electron-browser/markers.contribution.ts

@@ -212,3 +212,12 @@ function registerAction(desc: IActionDescriptor) {
 		});
 	}
 }
+
+MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+	group: '4_panels',
+	command: {
+		id: ToggleMarkersPanelAction.ID,
+		title: localize({ key: 'miMarker', comment: ['&& denotes a mnemonic'] }, "&&Problems")
+	},
+	order: 4
+});

src/vs/workbench/parts/output/electron-browser/output.contribution.ts

@@ -187,3 +187,12 @@ CommandsRegistry.registerCommand(COMMAND_OPEN_LOG_VIEWER, function (accessor: Se
 	}
 	return null;
 });
+
+MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+	group: '4_panels',
+	command: {
+		id: ToggleOutputAction.ID,
+		title: nls.localize({ key: 'miToggleOutput', comment: ['&& denotes a mnemonic'] }, "&&Output")
+	},
+	order: 1
+});

src/vs/workbench/parts/quickopen/browser/quickopen.contribution.ts

@@ -9,7 +9,7 @@ import * as env from 'vs/base/common/platform';
 import * as nls from 'vs/nls';
 import { QuickOpenHandlerDescriptor, IQuickOpenRegistry, Extensions as QuickOpenExtensions } from 'vs/workbench/browser/quickopen';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { SyncActionDescriptor, MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
 import { GotoSymbolAction, GOTO_SYMBOL_PREFIX, SCOPE_PREFIX, GotoSymbolHandler } from 'vs/workbench/parts/quickopen/browser/gotoSymbolHandler';
@@ -144,4 +144,24 @@ Registry.as<IQuickOpenRegistry>(QuickOpenExtensions.Quickopen).registerQuickOpen
 			}
 		]
 	)
-);
\ No newline at end of file
+);
+
+// View menu
+
+MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+	group: '1_open',
+	command: {
+		id: ShowAllCommandsAction.ID,
+		title: nls.localize({ key: 'miCommandPalette', comment: ['&& denotes a mnemonic'] }, "&&Command Palette...")
+	},
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+	group: '1_open',
+	command: {
+		id: OpenViewPickerAction.ID,
+		title: nls.localize({ key: 'miOpenView', comment: ['&& denotes a mnemonic'] }, "&&Open View...")
+	},
+	order: 2
+});

src/vs/workbench/parts/scm/electron-browser/scm.contribution.ts

@@ -13,7 +13,7 @@ import { ViewletRegistry, Extensions as ViewletExtensions, ViewletDescriptor, To
 import { VIEWLET_ID } from 'vs/workbench/parts/scm/common/scm';
 import { IWorkbenchActionRegistry, Extensions as WorkbenchActionExtensions } from 'vs/workbench/common/actions';
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
-import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { StatusUpdater, StatusBarController } from './scmActivity';
 import { SCMViewlet } from 'vs/workbench/parts/scm/electron-browser/scmViewlet';
@@ -88,3 +88,14 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).regis
 		}
 	}
 });
+
+// View menu
+
+MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+	group: '3_views',
+	command: {
+		id: VIEWLET_ID,
+		title: localize({ key: 'miViewSCM', comment: ['&& denotes a mnemonic'] }, "S&&CM")
+	},
+	order: 3
+});

src/vs/workbench/parts/search/electron-browser/search.contribution.ts

@@ -615,3 +615,14 @@ registerLanguageCommand('_executeWorkspaceSymbolProvider', function (accessor, a
 	}
 	return getWorkspaceSymbols(query);
 });
+
+// View menu
+
+MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+	group: '3_views',
+	command: {
+		id: VIEW_ID,
+		title: nls.localize({ key: 'miViewSearch', comment: ['&& denotes a mnemonic'] }, "&&Search")
+	},
+	order: 2
+});

src/vs/workbench/parts/terminal/common/terminalMenu.ts

@@ -9,6 +9,18 @@ import { TERMINAL_COMMAND_ID } from 'vs/workbench/parts/terminal/common/terminal
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 
 export function setupTerminalMenu() {
+
+	// View menu
+
+	MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
+		group: '4_panels',
+		command: {
+			id: TERMINAL_COMMAND_ID.TOGGLE,
+			title: nls.localize({ key: 'miToggleIntegratedTerminal', comment: ['&& denotes a mnemonic'] }, "&&Integrated Terminal")
+		},
+		order: 3
+	});
+
 	// Manage
 	const manageGroup = '1_manage';
 	MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, {
@@ -105,4 +117,4 @@ export function setupTerminalMenu() {
 		},
 		order: 4
 	});
-}
\ No newline at end of file
+}