quick access - tweak aria labels

src/vs/platform/quickinput/browser/helpQuickAccess.ts

@@ -22,7 +22,7 @@ export class HelpQuickAccessProvider implements IQuickAccessProvider {
 
 	constructor(@IQuickInputService private readonly quickInputService: IQuickInputService) { }
 
-	provide(picker: IQuickPick<IHelpQuickAccessPickItem>, token: CancellationToken): IDisposable {
+	provide(picker: IQuickPick<IHelpQuickAccessPickItem>): IDisposable {
 		const disposables = new DisposableStore();
 
 		// Open a picker with the selected value if picked
@@ -57,7 +57,7 @@ export class HelpQuickAccessProvider implements IQuickAccessProvider {
 		const globalProviders: IHelpQuickAccessPickItem[] = [];
 		const editorProviders: IHelpQuickAccessPickItem[] = [];
 
-		for (const provider of this.registry.getQuickAccessProviders().sort((p1, p2) => p1.prefix.localeCompare(p2.prefix))) {
+		for (const provider of this.registry.getQuickAccessProviders().sort((providerA, providerB) => providerA.prefix.localeCompare(providerB.prefix))) {
 			for (const helpEntry of provider.helpEntries) {
 				const prefix = helpEntry.prefix || provider.prefix;
 				const label = prefix || '\u2026' /* ... */;
@@ -65,8 +65,8 @@ export class HelpQuickAccessProvider implements IQuickAccessProvider {
 				(helpEntry.needsEditor ? editorProviders : globalProviders).push({
 					prefix,
 					label,
-					description: helpEntry.description,
-					ariaLabel: localize('entryAriaLabel', "{0}, picker help", label)
+					ariaLabel: localize('entryAriaLabel', "{0}, quick access help picker", label),
+					description: helpEntry.description
 				});
 			}
 		}

src/vs/workbench/contrib/debug/browser/debugQuickAccess.ts

@@ -47,13 +47,18 @@ export class StartDebugQuickAccessProvider extends PickerQuickAccessProvider<IPi
 				// Launch entry
 				picks.push({
 					label: config.name,
-					ariaLabel: localize('entryAriaLabel', "{0}, debug", config.name),
+					ariaLabel: localize('entryAriaLabel', "{0}, debug picker", config.name),
 					description: this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE ? config.launch.name : '',
 					highlights: { label: highlights },
 					buttons: [{
 						iconClass: 'codicon-gear',
 						tooltip: localize('customizeTask', "Configure Launch Configuration")
 					}],
+					trigger: () => {
+						config.launch.openConfigFile(false, false);
+
+						return TriggerAction.CLOSE_PICKER;
+					},
 					accept: async () => {
 						if (StartAction.isEnabled(this.debugService)) {
 							this.debugService.getConfigurationManager().selectConfiguration(config.launch, config.name);
@@ -63,11 +68,6 @@ export class StartDebugQuickAccessProvider extends PickerQuickAccessProvider<IPi
 								this.notificationService.error(error);
 							}
 						}
-					},
-					trigger: () => {
-						config.launch.openConfigFile(false, false);
-
-						return TriggerAction.CLOSE_PICKER;
 					}
 				});
 			}
@@ -89,7 +89,7 @@ export class StartDebugQuickAccessProvider extends PickerQuickAccessProvider<IPi
 			// Add Config entry
 			picks.push({
 				label,
-				ariaLabel: localize('entryAriaLabel', "{0}, debug", label),
+				ariaLabel: localize('entryAriaLabel', "{0}, debug picker", label),
 				description: this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE ? launch.name : '',
 				highlights: { label: withNullAsUndefined(matchesFuzzy(filter, label, true)) },
 				accept: () => this.commandService.executeCommand('debug.addConfiguration', launch.uri.toString())

src/vs/workbench/contrib/quickaccess/browser/viewQuickAccess.ts

@@ -95,6 +95,7 @@ export class ViewQuickAccessProvider extends PickerQuickAccessProvider<IViewQuic
 				if (this.contextKeyService.contextMatchesRules(view.when)) {
 					result.push({
 						label: view.name,
+						ariaLabel: localize('viewPickAriaLabel', "{0}, view picker", view.name),
 						containerLabel: viewlet.name,
 						accept: () => this.viewsService.openView(view.id, true)
 					});
@@ -110,6 +111,7 @@ export class ViewQuickAccessProvider extends PickerQuickAccessProvider<IViewQuic
 			if (this.includeViewlet(viewlet)) {
 				viewEntries.push({
 					label: viewlet.name,
+					ariaLabel: localize('viewPickAriaLabel', "{0}, view picker", viewlet.name),
 					containerLabel: localize('views', "Side Bar"),
 					accept: () => this.viewletService.openViewlet(viewlet.id, true)
 				});
@@ -121,6 +123,7 @@ export class ViewQuickAccessProvider extends PickerQuickAccessProvider<IViewQuic
 		for (const panel of panels) {
 			viewEntries.push({
 				label: panel.name,
+				ariaLabel: localize('viewPickAriaLabel', "{0}, view picker", panel.name),
 				containerLabel: localize('panels', "Panel"),
 				accept: () => this.panelService.openPanel(panel.id, true)
 			});
@@ -137,8 +140,10 @@ export class ViewQuickAccessProvider extends PickerQuickAccessProvider<IViewQuic
 		// Terminals
 		this.terminalService.terminalTabs.forEach((tab, tabIndex) => {
 			tab.terminalInstances.forEach((terminal, terminalIndex) => {
+				const label = localize('terminalTitle', "{0}: {1}", `${tabIndex + 1}.${terminalIndex + 1}`, terminal.title);
 				viewEntries.push({
-					label: localize('terminalTitle', "{0}: {1}", `${tabIndex + 1}.${terminalIndex + 1}`, terminal.title),
+					label,
+					ariaLabel: localize('viewPickAriaLabel', "{0}, view picker", label),
 					containerLabel: localize('terminals', "Terminal"),
 					accept: async () => {
 						await this.terminalService.showPanel(true);
@@ -152,8 +157,10 @@ export class ViewQuickAccessProvider extends PickerQuickAccessProvider<IViewQuic
 		// Output Channels
 		const channels = this.outputService.getChannelDescriptors();
 		for (const channel of channels) {
+			const label = channel.log ? localize('logChannel', "Log ({0})", channel.label) : channel.label;
 			viewEntries.push({
-				label: channel.log ? localize('logChannel', "Log ({0})", channel.label) : channel.label,
+				label,
+				ariaLabel: localize('viewPickAriaLabel', "{0}, view picker", label),
 				containerLabel: localize('channels', "Output"),
 				accept: () => this.outputService.showChannel(channel.id)
 			});

src/vs/workbench/contrib/tasks/browser/tasksQuickAccess.ts

@@ -59,14 +59,12 @@ export class TasksQuickAccessProvider extends PickerQuickAccessProvider<IPickerQ
 				taskMap[key] = task;
 			}
 		}
-
-		recentlyUsedTasks.keys().forEach(key => {
+		for (const key of recentlyUsedTasks.keys()) {
 			const task = taskMap[key];
 			if (task) {
 				recent.push(task);
 			}
-		});
-
+		}
 		for (const task of tasks) {
 			const key = task.getRecentlyUsedKey();
 			if (!key || !recentlyUsedTasks.has(key)) {
@@ -83,13 +81,13 @@ export class TasksQuickAccessProvider extends PickerQuickAccessProvider<IPickerQ
 
 		// Fill picks in sorted order
 
-		this.fillPicks(taskPicks, filter, recent, localize('recentlyUsed', 'recently used tasks'));
+		this.fillPicks(taskPicks, filter, recent, localize('recentlyUsed', "recently used tasks"));
 
 		configured.sort((a, b) => sorter.compare(a, b));
-		this.fillPicks(taskPicks, filter, configured, localize('configured', 'configured tasks'));
+		this.fillPicks(taskPicks, filter, configured, localize('configured', "configured tasks"));
 
 		detected.sort((a, b) => sorter.compare(a, b));
-		this.fillPicks(taskPicks, filter, detected, localize('detected', 'detected tasks'));
+		this.fillPicks(taskPicks, filter, detected, localize('detected', "detected tasks"));
 
 		return taskPicks;
 	}
@@ -107,7 +105,7 @@ export class TasksQuickAccessProvider extends PickerQuickAccessProvider<IPickerQ
 			}
 			taskPicks.push({
 				label: task._label,
-				ariaLabel: localize('entryAriaLabel', "{0}, tasks", task._label),
+				ariaLabel: localize('entryAriaLabel', "{0}, tasks picker", task._label),
 				description: this.taskService.getTaskDescription(task),
 				highlights: { label: highlights },
 				buttons: (() => {
@@ -122,9 +120,6 @@ export class TasksQuickAccessProvider extends PickerQuickAccessProvider<IPickerQ
 
 					return buttons;
 				})(),
-				accept: () => {
-					this.taskService.run(task, { attachProblemMatcher: true });
-				},
 				trigger: () => {
 					if (ContributedTask.is(task)) {
 						this.taskService.customize(task, undefined, true);
@@ -133,6 +128,9 @@ export class TasksQuickAccessProvider extends PickerQuickAccessProvider<IPickerQ
 					}
 
 					return TriggerAction.CLOSE_PICKER;
+				},
+				accept: () => {
+					this.taskService.run(task, { attachProblemMatcher: true });
 				}
 			});
 		}

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

@@ -48,10 +48,6 @@ export class TerminalQuickAccessProvider extends PickerQuickAccessProvider<IPick
 								tooltip: localize('killTerminal', "Kill Terminal Instance")
 							}
 						],
-						accept: () => {
-							this.terminalService.setActiveInstance(terminal);
-							this.terminalService.showPanel(true);
-						},
 						trigger: buttonIndex => {
 							switch (buttonIndex) {
 								case 0:
@@ -63,6 +59,10 @@ export class TerminalQuickAccessProvider extends PickerQuickAccessProvider<IPick
 							}
 
 							return TriggerAction.NO_ACTION;
+						},
+						accept: () => {
+							this.terminalService.setActiveInstance(terminal);
+							this.terminalService.showPanel(true);
 						}
 					});
 				}
@@ -75,8 +75,8 @@ export class TerminalQuickAccessProvider extends PickerQuickAccessProvider<IPick
 
 		const createTerminalLabel = localize("workbench.action.terminal.newplus", "Create New Integrated Terminal");
 		terminalPicks.push({
-			label: '$(plus) ' + createTerminalLabel,
-			ariaLabel: localize('termCreateEntryAriaLabel', "{0}, create new terminal", createTerminalLabel),
+			label: `$(plus) ${createTerminalLabel}`,
+			ariaLabel: localize('termEntryAriaLabel', "{0}, terminal picker", createTerminalLabel),
 			accept: () => this.commandService.executeCommand('workbench.action.terminal.new')
 		});