Merge from vscode 1df23554b2e3d5f1efc6fbc76ee61d3f7f186c6d

src/vs/workbench/contrib/terminal/browser/terminaQuickAccess.ts

@@ -0,0 +1,86 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { localize } from 'vs/nls';
+import { IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
+import { IPickerQuickAccessItem, PickerQuickAccessProvider, TriggerAction } from 'vs/platform/quickinput/common/quickAccess';
+import { matchesFuzzy } from 'vs/base/common/filters';
+import { ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal';
+import { ICommandService } from 'vs/platform/commands/common/commands';
+import { TERMINAL_COMMAND_ID } from 'vs/workbench/contrib/terminal/common/terminal';
+
+export class TerminalQuickAccessProvider extends PickerQuickAccessProvider<IPickerQuickAccessItem> {
+
+	static PREFIX = 'term ';
+
+	constructor(
+		@ITerminalService private readonly terminalService: ITerminalService,
+		@ICommandService private readonly commandService: ICommandService,
+	) {
+		super(TerminalQuickAccessProvider.PREFIX);
+	}
+
+	protected getPicks(filter: string): Array<IPickerQuickAccessItem | IQuickPickSeparator> {
+		const terminalPicks: Array<IPickerQuickAccessItem | IQuickPickSeparator> = [];
+
+		const terminalTabs = this.terminalService.terminalTabs;
+		for (let tabIndex = 0; tabIndex < terminalTabs.length; tabIndex++) {
+			const terminalTab = terminalTabs[tabIndex];
+			for (let terminalIndex = 0; terminalIndex < terminalTab.terminalInstances.length; terminalIndex++) {
+				const terminal = terminalTab.terminalInstances[terminalIndex];
+				const label = `${tabIndex + 1}.${terminalIndex + 1}: ${terminal.title}`;
+
+				const highlights = matchesFuzzy(filter, label, true);
+				if (highlights) {
+					terminalPicks.push({
+						label,
+						ariaLabel: localize('termEntryAriaLabel', "{0}, terminal picker", label),
+						highlights: { label: highlights },
+						buttons: [
+							{
+								iconClass: 'codicon-gear',
+								tooltip: localize('renameTerminal', "Rename Terminal")
+							},
+							{
+								iconClass: 'codicon-trash',
+								tooltip: localize('killTerminal', "Kill Terminal Instance")
+							}
+						],
+						trigger: buttonIndex => {
+							switch (buttonIndex) {
+								case 0:
+									this.commandService.executeCommand(TERMINAL_COMMAND_ID.RENAME, terminal);
+									return TriggerAction.NO_ACTION;
+								case 1:
+									terminal.dispose(true);
+									return TriggerAction.REFRESH_PICKER;
+							}
+
+							return TriggerAction.NO_ACTION;
+						},
+						accept: () => {
+							this.terminalService.setActiveInstance(terminal);
+							this.terminalService.showPanel(true);
+						}
+					});
+				}
+			}
+		}
+
+		if (terminalPicks.length > 0) {
+			terminalPicks.push({ type: 'separator' });
+		}
+
+		const createTerminalLabel = localize("workbench.action.terminal.newplus", "Create New Integrated Terminal");
+		terminalPicks.push({
+			label: `$(plus) ${createTerminalLabel}`,
+			ariaLabel: localize('termEntryAriaLabel', "{0}, terminal picker", createTerminalLabel),
+			accept: () => this.commandService.executeCommand('workbench.action.terminal.new')
+		});
+
+		return terminalPicks;
+
+	}
+}

src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts

@@ -39,6 +39,8 @@ import { ITerminalService } from 'vs/workbench/contrib/terminal/browser/terminal
 import { BrowserFeatures } from 'vs/base/browser/canIUse';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
+import { IQuickAccessRegistry, Extensions as QuickAccessExtensions } from 'vs/platform/quickinput/common/quickAccess';
+import { TerminalQuickAccessProvider } from 'vs/workbench/contrib/terminal/browser/terminaQuickAccess';
 
 registerSingleton(ITerminalService, TerminalService, true);
 
@@ -60,6 +62,16 @@ quickOpenRegistry.registerQuickOpenHandler(
 	)
 );
 
+const quickAccessRegistry = (Registry.as<IQuickAccessRegistry>(QuickAccessExtensions.Quickaccess));
+
+quickAccessRegistry.registerQuickAccessProvider({
+	ctor: TerminalQuickAccessProvider,
+	prefix: TerminalQuickAccessProvider.PREFIX,
+	contextKey: inTerminalsPicker,
+	placeholder: nls.localize('tasksQuickAccessPlaceholder', "Type the name of a terminal to open."),
+	helpEntries: [{ description: nls.localize('tasksQuickAccessHelp', "Show All Opened Terminals"), needsEditor: false }]
+});
+
 const quickOpenNavigateNextInTerminalPickerId = 'workbench.action.quickOpenNavigateNextInTerminalPicker';
 CommandsRegistry.registerCommand(
 	{ id: quickOpenNavigateNextInTerminalPickerId, handler: getQuickNavigateHandler(quickOpenNavigateNextInTerminalPickerId, true) });