diff --git a/src/vs/platform/quickinput/browser/helpQuickAccess.ts b/src/vs/platform/quickinput/browser/helpQuickAccess.ts index dbfd72a891ab663da8ff5fc34bed1a472d9fbd5e..18efb7a5a610a76b070d62bf350cf1df29923440 100644 --- a/src/vs/platform/quickinput/browser/helpQuickAccess.ts +++ b/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, token: CancellationToken): IDisposable { + provide(picker: IQuickPick): 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 }); } } diff --git a/src/vs/workbench/contrib/debug/browser/debugQuickAccess.ts b/src/vs/workbench/contrib/debug/browser/debugQuickAccess.ts index 6825a6ab0aa723850f5ea0e49e34d108cb432a72..7c39c372d5280e5693e0a46330babecf0070dcda 100644 --- a/src/vs/workbench/contrib/debug/browser/debugQuickAccess.ts +++ b/src/vs/workbench/contrib/debug/browser/debugQuickAccess.ts @@ -47,13 +47,18 @@ export class StartDebugQuickAccessProvider extends PickerQuickAccessProvider { + 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 { - config.launch.openConfigFile(false, false); - - return TriggerAction.CLOSE_PICKER; } }); } @@ -89,7 +89,7 @@ export class StartDebugQuickAccessProvider extends PickerQuickAccessProvider this.commandService.executeCommand('debug.addConfiguration', launch.uri.toString()) diff --git a/src/vs/workbench/contrib/quickaccess/browser/viewQuickAccess.ts b/src/vs/workbench/contrib/quickaccess/browser/viewQuickAccess.ts index 0141925e954a3dab2d0135b7a0582bcfe3388f7a..dfe5eaeb3d2b5ccb8cb6c440cf87b3c083096511 100644 --- a/src/vs/workbench/contrib/quickaccess/browser/viewQuickAccess.ts +++ b/src/vs/workbench/contrib/quickaccess/browser/viewQuickAccess.ts @@ -95,6 +95,7 @@ export class ViewQuickAccessProvider extends PickerQuickAccessProvider this.viewsService.openView(view.id, true) }); @@ -110,6 +111,7 @@ export class ViewQuickAccessProvider extends PickerQuickAccessProvider this.viewletService.openViewlet(viewlet.id, true) }); @@ -121,6 +123,7 @@ export class ViewQuickAccessProvider extends PickerQuickAccessProvider this.panelService.openPanel(panel.id, true) }); @@ -137,8 +140,10 @@ export class ViewQuickAccessProvider extends PickerQuickAccessProvider { 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 this.outputService.showChannel(channel.id) }); diff --git a/src/vs/workbench/contrib/tasks/browser/tasksQuickAccess.ts b/src/vs/workbench/contrib/tasks/browser/tasksQuickAccess.ts index ed57a3eab38ca5afa8df55002f837423bf84d616..949d9a2c6a42cace099c6a08b779f508e801c220 100644 --- a/src/vs/workbench/contrib/tasks/browser/tasksQuickAccess.ts +++ b/src/vs/workbench/contrib/tasks/browser/tasksQuickAccess.ts @@ -59,14 +59,12 @@ export class TasksQuickAccessProvider extends PickerQuickAccessProvider { + 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 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 { @@ -122,9 +120,6 @@ export class TasksQuickAccessProvider extends PickerQuickAccessProvider { - 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 { + this.taskService.run(task, { attachProblemMatcher: true }); } }); } diff --git a/src/vs/workbench/contrib/terminal/browser/terminaQuickAccess.ts b/src/vs/workbench/contrib/terminal/browser/terminaQuickAccess.ts index 7ecc458527b4ab15f9d09398c9d776fb0fb4f388..a9dc1ccfafe5b6ea777ab96c99cceae17e6181c1 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminaQuickAccess.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminaQuickAccess.ts @@ -48,10 +48,6 @@ export class TerminalQuickAccessProvider extends PickerQuickAccessProvider { - this.terminalService.setActiveInstance(terminal); - this.terminalService.showPanel(true); - }, trigger: buttonIndex => { switch (buttonIndex) { case 0: @@ -63,6 +59,10 @@ export class TerminalQuickAccessProvider extends PickerQuickAccessProvider { + this.terminalService.setActiveInstance(terminal); + this.terminalService.showPanel(true); } }); } @@ -75,8 +75,8 @@ export class TerminalQuickAccessProvider extends PickerQuickAccessProvider this.commandService.executeCommand('workbench.action.terminal.new') });