microsoft#41071 Update the view quickpick list and add open view in views menu

sandy081 · sandy081 · commit fb1d21936ba1 · 2018-01-24T11:47:03.000+01:00
diff --git a/src/vs/code/electron-main/menus.ts b/src/vs/code/electron-main/menus.ts
@@ -683,6 +683,7 @@ export class CodeMenu {
 		}
 
 		const commands = this.createMenuItem(nls.localize({ key: 'miCommandPalette', comment: ['&& denotes a mnemonic'] }, "&&Command Palette..."), 'workbench.action.showCommands');
+		const openView = this.createMenuItem(nls.localize({ key: 'miOpenView', comment: ['&& denotes a mnemonic'] }, "&&Open View..."), 'workbench.action.openView');
 
 		const fullscreen = new MenuItem(this.withKeybinding('workbench.action.toggleFullScreen', { label: this.mnemonicLabel(nls.localize({ key: 'miToggleFullScreen', comment: ['&& denotes a mnemonic'] }, "Toggle &&Full Screen")), click: () => this.windowsMainService.getLastActiveWindow().toggleFullScreen(), enabled: this.windowsMainService.getWindowCount() > 0 }));
 		const toggleZenMode = this.createMenuItem(nls.localize('miToggleZenMode', "Toggle Zen Mode"), 'workbench.action.toggleZenMode');
@@ -729,6 +730,7 @@ export class CodeMenu {
 
 		arrays.coalesce([
 			commands,
+			openView,
 			__separator__(),
 			explorer,
 			search,
diff --git a/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts b/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts
@@ -138,40 +138,27 @@ export class ViewPickerHandler extends QuickOpenHandler {
 
 		// Viewlets
 		const viewlets = this.viewletService.getViewlets();
+		viewlets.forEach((viewlet, index) => viewEntries.push(new ViewEntry(viewlet.name, nls.localize('views', "Views"), () => this.viewletService.openViewlet(viewlet.id, true).done(null, errors.onUnexpectedError))));
+
+		// Panels
+		const panels = this.panelService.getPanels();
+		panels.forEach((panel, index) => viewEntries.push(new ViewEntry(panel.name, nls.localize('panels', "Panels"), () => this.panelService.openPanel(panel.id, true).done(null, errors.onUnexpectedError))));
+
+		// Views
 		viewlets.forEach((viewlet, index) => {
 			const viewLocation: ViewLocation = viewlet.id === EXPLORER_VIEWLET_ID ? ViewLocation.Explorer
 				: viewlet.id === DEBUG_VIEWLET_ID ? ViewLocation.Debug
 					: viewlet.id === EXTENSIONS_VIEWLET_ID ? ViewLocation.Extensions
 						: null;
 
-			const viewEntriesForViewlet: ViewEntry[] = viewLocation ? getViewEntriesForViewlet(viewlet, viewLocation)
-				: [new ViewEntry(viewlet.name, nls.localize('views', "Views"), () => this.viewletService.openViewlet(viewlet.id, true).done(null, errors.onUnexpectedError))];
-
-			viewEntries.push(...viewEntriesForViewlet);
-		});
-
-		const terminals = this.terminalService.terminalInstances;
-
-		// Panels
-		const panels = this.panelService.getPanels().filter(p => {
-			if (p.id === OUTPUT_PANEL_ID) {
-				return false; // since we already show output channels below
+			if (viewLocation) {
+				const viewEntriesForViewlet: ViewEntry[] = getViewEntriesForViewlet(viewlet, viewLocation);
+				viewEntries.push(...viewEntriesForViewlet);
 			}
-
-			if (p.id === TERMINAL_PANEL_ID && terminals.length > 0) {
-				return false; // since we already show terminal instances below
-			}
-
-			return true;
-		});
-		panels.forEach((panel, index) => {
-			const panelsCategory = nls.localize('panels', "Panels");
-			const entry = new ViewEntry(panel.name, panelsCategory, () => this.panelService.openPanel(panel.id, true).done(null, errors.onUnexpectedError));
-
-			viewEntries.push(entry);
 		});
 
 		// Terminals
+		const terminals = this.terminalService.terminalInstances;
 		terminals.forEach((terminal, index) => {
 			const terminalsCategory = nls.localize('terminals', "Terminal");
 			const entry = new ViewEntry(nls.localize('terminalTitle', "{0}: {1}", index + 1, terminal.title), terminalsCategory, () => {
