introduce some order into commands

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

@@ -29,6 +29,7 @@ import { DEFAULT_TERMINAL_WINDOWS, DEFAULT_TERMINAL_LINUX_READY, DEFAULT_TERMINA
 import { WinTerminalService, MacTerminalService, LinuxTerminalService } from 'vs/workbench/parts/execution/electron-browser/terminalService';
 import { IHistoryService } from 'vs/workbench/services/history/common/history';
 import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
+import { EditorFocusedInOpenEditorsContext } from 'vs/workbench/parts/files/electron-browser/fileCommands';
 
 if (env.isWindows) {
 	registerSingleton(ITerminalService, WinTerminalService);
@@ -236,18 +237,22 @@ CommandsRegistry.registerCommand({
 });
 
 MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
-	group: 'file',
+	group: '1_files',
+	order: 30,
 	command: {
 		id: OPEN_CONSOLE_COMMAND_ID,
 		title: env.isWindows ? nls.localize('scopedConsoleActionWin', "Open in Command Prompt") :
 			nls.localize('scopedConsoleActionMacLinux', "Open in Terminal")
-	}
+	},
+	when: EditorFocusedInOpenEditorsContext
 });
 
 MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
-	group: 'file',
+	group: '1_files',
+	order: 30,
 	command: {
 		id: OPEN_INTEGRATED_TERMINAL_COMMAND_ID,
 		title: nls.localize('openFolderInIntegratedTerminal', "Open in Terminal")
-	}
+	},
+	when: EditorFocusedInOpenEditorsContext
 });

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

@@ -659,43 +659,28 @@ function registerFileCommands(): void {
 function registerMenuItems(): void {
 
 	MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
-		group: 'compare',
+		group: '1_files',
+		order: 10,
 		command: {
-			id: COMPARE_WITH_SAVED_COMMAND_ID,
-			title: nls.localize('compareWithSaved', "Compare with Saved")
-		},
-		when: EditorFocusedInOpenEditorsContext
-	});
-
-	MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
-		group: 'compare',
-		command: {
-			id: SELECT_FOR_COMPARE_COMMAND_ID,
-			title: nls.localize('compareSource', "Select for Compare")
-		},
-		when: EditorFocusedInOpenEditorsContext
-	});
-
-	MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
-		group: 'compare',
-		command: {
-			id: COMPARE_RESOURCE_COMMAND_ID,
-			title: nls.localize('compareWithChosen', "Compare With Chosen")
+			id: OPEN_TO_SIDE_COMMAND_ID,
+			title: nls.localize('openToSide', "Open to the Side")
 		},
 		when: EditorFocusedInOpenEditorsContext
 	});
 
 	MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
-		group: 'file',
+		group: '1_files',
+		order: 20,
 		command: {
-			id: OPEN_TO_SIDE_COMMAND_ID,
-			title: nls.localize('openToSide', "Open to the Side")
+			id: REVEAL_IN_EXPLORER_COMMAND_ID,
+			title: isWindows ? nls.localize('revealInWindows', "Reveal in Explorer") : isMacintosh ? nls.localize('revealInMac', "Reveal in Finder") : nls.localize('openContainer', "Open Containing Folder")
 		},
 		when: EditorFocusedInOpenEditorsContext
 	});
 
 	MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
-		group: 'file',
+		group: '1_files',
+		order: 40,
 		command: {
 			id: COPY_PATH_COMMAND_ID,
 			title: nls.localize('copyPath', "Copy Path")
@@ -704,16 +689,18 @@ function registerMenuItems(): void {
 	});
 
 	MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
-		group: 'file',
+		group: '2_save',
+		order: 10,
 		command: {
-			id: REVEAL_IN_EXPLORER_COMMAND_ID,
-			title: isWindows ? nls.localize('revealInWindows', "Reveal in Explorer") : isMacintosh ? nls.localize('revealInMac', "Reveal in Finder") : nls.localize('openContainer', "Open Containing Folder")
+			id: SAVE_FILE_COMMAND_ID,
+			title: SAVE_FILE_LABEL
 		},
-		when: EditorFocusedInOpenEditorsContext
+		when: ContextKeyExpr.and(EditorFocusedInOpenEditorsContext)
 	});
 
 	MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
-		group: 'save',
+		group: '2_save',
+		order: 20,
 		command: {
 			id: REVERT_FILE_COMMAND_ID,
 			title: nls.localize('revert', "Revert File")
@@ -722,7 +709,7 @@ function registerMenuItems(): void {
 	});
 
 	MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
-		group: 'save',
+		group: '2_save',
 		command: {
 			id: SAVE_FILE_AS_COMMAND_ID,
 			title: SAVE_FILE_AS_LABEL
@@ -731,16 +718,7 @@ function registerMenuItems(): void {
 	});
 
 	MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
-		group: 'save',
-		command: {
-			id: SAVE_FILE_COMMAND_ID,
-			title: SAVE_FILE_LABEL
-		},
-		when: ContextKeyExpr.and(EditorFocusedInOpenEditorsContext)
-	});
-
-	MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
-		group: 'save',
+		group: '2_save',
 		command: {
 			id: SAVE_ALL_COMMAND_ID,
 			title: SAVE_ALL_LABEL
@@ -749,7 +727,7 @@ function registerMenuItems(): void {
 	});
 
 	MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
-		group: 'save',
+		group: '2_save',
 		command: {
 			id: SAVE_ALL_IN_GROUP_COMMAND_ID,
 			title: SAVE_ALL_IN_GROUP_LABEL
@@ -758,7 +736,7 @@ function registerMenuItems(): void {
 	});
 
 	MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
-		group: 'save',
+		group: '2_save',
 		command: {
 			id: SAVE_FILES_COMMAND_ID,
 			title: SAVE_FILES_LABEL
@@ -767,23 +745,38 @@ function registerMenuItems(): void {
 	});
 
 	MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
-		group: 'close',
+		group: '3_compare',
+		order: 10,
 		command: {
-			id: CLOSE_EDITORS_IN_GROUP_COMMAND_ID,
-			title: CLOSE_EDITORS_IN_GROUP_LABEL
-		}
+			id: COMPARE_WITH_SAVED_COMMAND_ID,
+			title: nls.localize('compareWithSaved', "Compare with Saved")
+		},
+		when: EditorFocusedInOpenEditorsContext
 	});
 
 	MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
-		group: 'close',
+		group: '3_compare',
+		order: 20,
 		command: {
-			id: CLOSE_UNMODIFIED_EDITORS_COMMAND_ID,
-			title: CLOSE_UNMODIFIED_EDITORS_LABEL
-		}
+			id: COMPARE_RESOURCE_COMMAND_ID,
+			title: nls.localize('compareWithChosen', "Compare With Chosen")
+		},
+		when: EditorFocusedInOpenEditorsContext
 	});
 
 	MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
-		group: 'close',
+		group: '3_compare',
+		order: 30,
+		command: {
+			id: SELECT_FOR_COMPARE_COMMAND_ID,
+			title: nls.localize('compareSource', "Select for Compare")
+		},
+		when: EditorFocusedInOpenEditorsContext
+	});
+
+	MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
+		group: '4_close',
+		order: 10,
 		command: {
 			id: CLOSE_EDITOR_COMMAND_ID,
 			title: CLOSE_EDITOR_LABEL
@@ -792,11 +785,30 @@ function registerMenuItems(): void {
 	});
 
 	MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
-		group: 'close',
+		group: '4_close',
+		order: 20,
 		command: {
 			id: CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID,
 			title: CLOSE_OTHER_EDITORS_IN_GROUP_LABEL
 		},
 		when: EditorFocusedInOpenEditorsContext
 	});
+
+	MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
+		group: '4_close',
+		order: 30,
+		command: {
+			id: CLOSE_UNMODIFIED_EDITORS_COMMAND_ID,
+			title: CLOSE_UNMODIFIED_EDITORS_LABEL
+		}
+	});
+
+	MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
+		group: '4_close',
+		order: 40,
+		command: {
+			id: CLOSE_EDITORS_IN_GROUP_COMMAND_ID,
+			title: CLOSE_EDITORS_IN_GROUP_LABEL
+		}
+	});
 }