toolbar: resolve keybindings for primary actions

src/vs/base/browser/ui/toolbar/toolbar.ts

@@ -23,6 +23,7 @@ export interface IToolBarOptions {
 	actionItemProvider?: IActionItemProvider;
 	ariaLabel?: string;
 	getKeyBinding?: (action: IAction) => Keybinding;
+	getKeyBindingLabel?: (key: Keybinding) => string;
 }
 
 /**
@@ -34,9 +35,12 @@ export class ToolBar {
 	private toggleMenuAction: ToggleMenuAction;
 	private toggleMenuActionItem: DropdownMenuActionItem;
 	private hasSecondaryActions: boolean;
+	private lookupKeybindings: boolean;
 
 	constructor(container: HTMLElement, contextMenuProvider: IContextMenuProvider, options: IToolBarOptions = { orientation: ActionsOrientation.HORIZONTAL }) {
 		this.options = options;
+		this.lookupKeybindings = typeof this.options.getKeyBinding === 'function' && typeof this.options.getKeyBindingLabel === 'function';
+
 		this.toggleMenuAction = new ToggleMenuAction(() => this.toggleMenuActionItem && this.toggleMenuActionItem.show());
 
 		let element = document.createElement('div');
@@ -111,22 +115,31 @@ export class ToolBar {
 			}
 
 			this.actionBar.clear();
-			this.actionBar.push(primaryActionsToSet, { icon: true, label: false });
+
+			primaryActionsToSet.forEach(action => {
+				this.actionBar.push(action, { icon: true, label: false, keybinding: this.getKeybindingLabel(action) });
+			});
 		};
 	}
 
-	public addPrimaryAction(primaryActions: IAction): () => void {
+	private getKeybindingLabel(action: IAction): string {
+		const key = this.lookupKeybindings ? this.options.getKeyBinding(action) : void 0;
+
+		return key ? this.options.getKeyBindingLabel(key) : void 0;
+	}
+
+	public addPrimaryAction(primaryAction: IAction): () => void {
 		return () => {
 
 			// Add after the "..." action if we have secondary actions
 			if (this.hasSecondaryActions) {
 				let itemCount = this.actionBar.length();
-				this.actionBar.push(primaryActions, { icon: true, label: false, index: itemCount });
+				this.actionBar.push(primaryAction, { icon: true, label: false, index: itemCount, keybinding: this.getKeybindingLabel(primaryAction) });
 			}
 
 			// Otherwise just add to the end
 			else {
-				this.actionBar.push(primaryActions, { icon: true, label: false });
+				this.actionBar.push(primaryAction, { icon: true, label: false, keybinding: this.getKeybindingLabel(primaryAction) });
 			}
 		};
 	}

src/vs/workbench/browser/parts/compositePart.ts

@@ -433,7 +433,8 @@ export abstract class CompositePart<T extends Composite> extends Part {
 					}
 
 					return null;
-				}
+				},
+				getKeyBindingLabel: (key) => this.keybindingService.getLabelFor(key)
 			});
 		});
 

src/vs/workbench/browser/parts/editor/titleControl.ts

@@ -248,7 +248,8 @@ export abstract class TitleControl implements ITitleAreaControl {
 				}
 
 				return null;
-			}
+			},
+			getKeyBindingLabel: (key) => this.keybindingService.getLabelFor(key)
 		});
 
 		// Action Run Handling

src/vs/workbench/browser/viewlet.ts

@@ -334,7 +334,8 @@ export abstract class AdaptiveCollapsibleViewletView extends FixedCollapsibleVie
 				}
 
 				return null;
-			}
+			},
+			getKeyBindingLabel: (key) => this.keybindingService.getLabelFor(key)
 		});
 		this.toolBar.actionRunner = this.actionRunner;
 		this.toolBar.setActions(prepareActions(this.getActions()), prepareActions(this.getSecondaryActions()))();
@@ -470,7 +471,8 @@ export abstract class CollapsibleViewletView extends CollapsibleView implements
 				}
 
 				return null;
-			}
+			},
+			getKeyBindingLabel: (key) => this.keybindingService.getLabelFor(key)
 		});
 		this.toolBar.actionRunner = this.actionRunner;
 		this.toolBar.setActions(prepareActions(this.getActions()), prepareActions(this.getSecondaryActions()))();

src/vs/workbench/parts/debug/browser/debugActions.ts

@@ -30,7 +30,6 @@ import EditorContextKeys = editorCommon.EditorContextKeys;
 export class AbstractDebugAction extends Action {
 
 	protected toDispose: lifecycle.IDisposable[];
-	private keybinding: string;
 
 	constructor(
 		id: string, label: string, cssClass: string,
@@ -42,11 +41,6 @@ export class AbstractDebugAction extends Action {
 		this.toDispose = [];
 		this.toDispose.push(this.debugService.onDidChangeState((state) => this.updateEnablement(state)));
 
-		const keys = this.keybindingService.lookupKeybindings(id).map(k => this.keybindingService.getLabelFor(k));
-		if (keys && keys.length) {
-			this.keybinding = keys[0];
-		}
-
 		this.updateLabel(label);
 		this.updateEnablement(this.debugService.state);
 	}
@@ -56,11 +50,7 @@ export class AbstractDebugAction extends Action {
 	}
 
 	protected updateLabel(newLabel: string): void {
-		if (this.keybinding) {
-			this.label = nls.localize('debugActionLabelAndKeybinding', "{0} ({1})", newLabel, this.keybinding);
-		} else {
-			this.label = newLabel;
-		}
+		this.label = newLabel;
 	}
 
 	protected updateEnablement(state: debug.State): void {