Skip to content

Commit dc17cef

Browse files
author
Benjamin Pasero
committed
quick access - tweak aria labels
1 parent 9428cdb commit dc17cef

5 files changed

Lines changed: 35 additions & 30 deletions

File tree

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export class HelpQuickAccessProvider implements IQuickAccessProvider {
2222

2323
constructor(@IQuickInputService private readonly quickInputService: IQuickInputService) { }
2424

25-
provide(picker: IQuickPick<IHelpQuickAccessPickItem>, token: CancellationToken): IDisposable {
25+
provide(picker: IQuickPick<IHelpQuickAccessPickItem>): IDisposable {
2626
const disposables = new DisposableStore();
2727

2828
// Open a picker with the selected value if picked
@@ -57,16 +57,16 @@ export class HelpQuickAccessProvider implements IQuickAccessProvider {
5757
const globalProviders: IHelpQuickAccessPickItem[] = [];
5858
const editorProviders: IHelpQuickAccessPickItem[] = [];
5959

60-
for (const provider of this.registry.getQuickAccessProviders().sort((p1, p2) => p1.prefix.localeCompare(p2.prefix))) {
60+
for (const provider of this.registry.getQuickAccessProviders().sort((providerA, providerB) => providerA.prefix.localeCompare(providerB.prefix))) {
6161
for (const helpEntry of provider.helpEntries) {
6262
const prefix = helpEntry.prefix || provider.prefix;
6363
const label = prefix || '\u2026' /* ... */;
6464

6565
(helpEntry.needsEditor ? editorProviders : globalProviders).push({
6666
prefix,
6767
label,
68-
description: helpEntry.description,
69-
ariaLabel: localize('entryAriaLabel', "{0}, picker help", label)
68+
ariaLabel: localize('entryAriaLabel', "{0}, quick access help picker", label),
69+
description: helpEntry.description
7070
});
7171
}
7272
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,18 @@ export class StartDebugQuickAccessProvider extends PickerQuickAccessProvider<IPi
4747
// Launch entry
4848
picks.push({
4949
label: config.name,
50-
ariaLabel: localize('entryAriaLabel', "{0}, debug", config.name),
50+
ariaLabel: localize('entryAriaLabel', "{0}, debug picker", config.name),
5151
description: this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE ? config.launch.name : '',
5252
highlights: { label: highlights },
5353
buttons: [{
5454
iconClass: 'codicon-gear',
5555
tooltip: localize('customizeTask', "Configure Launch Configuration")
5656
}],
57+
trigger: () => {
58+
config.launch.openConfigFile(false, false);
59+
60+
return TriggerAction.CLOSE_PICKER;
61+
},
5762
accept: async () => {
5863
if (StartAction.isEnabled(this.debugService)) {
5964
this.debugService.getConfigurationManager().selectConfiguration(config.launch, config.name);
@@ -63,11 +68,6 @@ export class StartDebugQuickAccessProvider extends PickerQuickAccessProvider<IPi
6368
this.notificationService.error(error);
6469
}
6570
}
66-
},
67-
trigger: () => {
68-
config.launch.openConfigFile(false, false);
69-
70-
return TriggerAction.CLOSE_PICKER;
7171
}
7272
});
7373
}
@@ -89,7 +89,7 @@ export class StartDebugQuickAccessProvider extends PickerQuickAccessProvider<IPi
8989
// Add Config entry
9090
picks.push({
9191
label,
92-
ariaLabel: localize('entryAriaLabel', "{0}, debug", label),
92+
ariaLabel: localize('entryAriaLabel', "{0}, debug picker", label),
9393
description: this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE ? launch.name : '',
9494
highlights: { label: withNullAsUndefined(matchesFuzzy(filter, label, true)) },
9595
accept: () => this.commandService.executeCommand('debug.addConfiguration', launch.uri.toString())

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ export class ViewQuickAccessProvider extends PickerQuickAccessProvider<IViewQuic
9595
if (this.contextKeyService.contextMatchesRules(view.when)) {
9696
result.push({
9797
label: view.name,
98+
ariaLabel: localize('viewPickAriaLabel', "{0}, view picker", view.name),
9899
containerLabel: viewlet.name,
99100
accept: () => this.viewsService.openView(view.id, true)
100101
});
@@ -110,6 +111,7 @@ export class ViewQuickAccessProvider extends PickerQuickAccessProvider<IViewQuic
110111
if (this.includeViewlet(viewlet)) {
111112
viewEntries.push({
112113
label: viewlet.name,
114+
ariaLabel: localize('viewPickAriaLabel', "{0}, view picker", viewlet.name),
113115
containerLabel: localize('views', "Side Bar"),
114116
accept: () => this.viewletService.openViewlet(viewlet.id, true)
115117
});
@@ -121,6 +123,7 @@ export class ViewQuickAccessProvider extends PickerQuickAccessProvider<IViewQuic
121123
for (const panel of panels) {
122124
viewEntries.push({
123125
label: panel.name,
126+
ariaLabel: localize('viewPickAriaLabel', "{0}, view picker", panel.name),
124127
containerLabel: localize('panels', "Panel"),
125128
accept: () => this.panelService.openPanel(panel.id, true)
126129
});
@@ -137,8 +140,10 @@ export class ViewQuickAccessProvider extends PickerQuickAccessProvider<IViewQuic
137140
// Terminals
138141
this.terminalService.terminalTabs.forEach((tab, tabIndex) => {
139142
tab.terminalInstances.forEach((terminal, terminalIndex) => {
143+
const label = localize('terminalTitle', "{0}: {1}", `${tabIndex + 1}.${terminalIndex + 1}`, terminal.title);
140144
viewEntries.push({
141-
label: localize('terminalTitle', "{0}: {1}", `${tabIndex + 1}.${terminalIndex + 1}`, terminal.title),
145+
label,
146+
ariaLabel: localize('viewPickAriaLabel', "{0}, view picker", label),
142147
containerLabel: localize('terminals', "Terminal"),
143148
accept: async () => {
144149
await this.terminalService.showPanel(true);
@@ -152,8 +157,10 @@ export class ViewQuickAccessProvider extends PickerQuickAccessProvider<IViewQuic
152157
// Output Channels
153158
const channels = this.outputService.getChannelDescriptors();
154159
for (const channel of channels) {
160+
const label = channel.log ? localize('logChannel', "Log ({0})", channel.label) : channel.label;
155161
viewEntries.push({
156-
label: channel.log ? localize('logChannel', "Log ({0})", channel.label) : channel.label,
162+
label,
163+
ariaLabel: localize('viewPickAriaLabel', "{0}, view picker", label),
157164
containerLabel: localize('channels', "Output"),
158165
accept: () => this.outputService.showChannel(channel.id)
159166
});

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

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,12 @@ export class TasksQuickAccessProvider extends PickerQuickAccessProvider<IPickerQ
5959
taskMap[key] = task;
6060
}
6161
}
62-
63-
recentlyUsedTasks.keys().forEach(key => {
62+
for (const key of recentlyUsedTasks.keys()) {
6463
const task = taskMap[key];
6564
if (task) {
6665
recent.push(task);
6766
}
68-
});
69-
67+
}
7068
for (const task of tasks) {
7169
const key = task.getRecentlyUsedKey();
7270
if (!key || !recentlyUsedTasks.has(key)) {
@@ -83,13 +81,13 @@ export class TasksQuickAccessProvider extends PickerQuickAccessProvider<IPickerQ
8381

8482
// Fill picks in sorted order
8583

86-
this.fillPicks(taskPicks, filter, recent, localize('recentlyUsed', 'recently used tasks'));
84+
this.fillPicks(taskPicks, filter, recent, localize('recentlyUsed', "recently used tasks"));
8785

8886
configured.sort((a, b) => sorter.compare(a, b));
89-
this.fillPicks(taskPicks, filter, configured, localize('configured', 'configured tasks'));
87+
this.fillPicks(taskPicks, filter, configured, localize('configured', "configured tasks"));
9088

9189
detected.sort((a, b) => sorter.compare(a, b));
92-
this.fillPicks(taskPicks, filter, detected, localize('detected', 'detected tasks'));
90+
this.fillPicks(taskPicks, filter, detected, localize('detected', "detected tasks"));
9391

9492
return taskPicks;
9593
}
@@ -107,7 +105,7 @@ export class TasksQuickAccessProvider extends PickerQuickAccessProvider<IPickerQ
107105
}
108106
taskPicks.push({
109107
label: task._label,
110-
ariaLabel: localize('entryAriaLabel', "{0}, tasks", task._label),
108+
ariaLabel: localize('entryAriaLabel', "{0}, tasks picker", task._label),
111109
description: this.taskService.getTaskDescription(task),
112110
highlights: { label: highlights },
113111
buttons: (() => {
@@ -122,9 +120,6 @@ export class TasksQuickAccessProvider extends PickerQuickAccessProvider<IPickerQ
122120

123121
return buttons;
124122
})(),
125-
accept: () => {
126-
this.taskService.run(task, { attachProblemMatcher: true });
127-
},
128123
trigger: () => {
129124
if (ContributedTask.is(task)) {
130125
this.taskService.customize(task, undefined, true);
@@ -133,6 +128,9 @@ export class TasksQuickAccessProvider extends PickerQuickAccessProvider<IPickerQ
133128
}
134129

135130
return TriggerAction.CLOSE_PICKER;
131+
},
132+
accept: () => {
133+
this.taskService.run(task, { attachProblemMatcher: true });
136134
}
137135
});
138136
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ export class TerminalQuickAccessProvider extends PickerQuickAccessProvider<IPick
4848
tooltip: localize('killTerminal', "Kill Terminal Instance")
4949
}
5050
],
51-
accept: () => {
52-
this.terminalService.setActiveInstance(terminal);
53-
this.terminalService.showPanel(true);
54-
},
5551
trigger: buttonIndex => {
5652
switch (buttonIndex) {
5753
case 0:
@@ -63,6 +59,10 @@ export class TerminalQuickAccessProvider extends PickerQuickAccessProvider<IPick
6359
}
6460

6561
return TriggerAction.NO_ACTION;
62+
},
63+
accept: () => {
64+
this.terminalService.setActiveInstance(terminal);
65+
this.terminalService.showPanel(true);
6666
}
6767
});
6868
}
@@ -75,8 +75,8 @@ export class TerminalQuickAccessProvider extends PickerQuickAccessProvider<IPick
7575

7676
const createTerminalLabel = localize("workbench.action.terminal.newplus", "Create New Integrated Terminal");
7777
terminalPicks.push({
78-
label: '$(plus) ' + createTerminalLabel,
79-
ariaLabel: localize('termCreateEntryAriaLabel', "{0}, create new terminal", createTerminalLabel),
78+
label: `$(plus) ${createTerminalLabel}`,
79+
ariaLabel: localize('termEntryAriaLabel', "{0}, terminal picker", createTerminalLabel),
8080
accept: () => this.commandService.executeCommand('workbench.action.terminal.new')
8181
});
8282

0 commit comments

Comments
 (0)