Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-29 09:43:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Keybinding text is not upadated on the menu (fixes #32574)

Browse Source
This commit is contained in:
Benjamin Pasero
2017-08-16 07:51:03 +02:00
parent 728b2f9ad7
commit 0da5dc44ab
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/code/electron-main/keyboard.ts
+4 -4
View File
@@ -108,10 +108,6 @@ export class KeybindingsResolver {
private registerListeners(): void {
// Resolve keybindings when any first window is loaded
const onceOnWindowReady = once(this.windowsService.onWindowReady);
onceOnWindowReady(win => this.resolveKeybindings(win));
// Listen to resolved keybindings from window
ipc.on('vscode:keybindingsResolved', (event, rawKeybindings: string) => {
let keybindings: IKeybinding[] = [];
@@ -148,6 +144,10 @@ export class KeybindingsResolver {
}
});
// Resolve keybindings when any first window is loaded
const onceOnWindowReady = once(this.windowsService.onWindowReady);
onceOnWindowReady(win => this.resolveKeybindings(win));
// Resolve keybindings again when keybindings.json changes
this.keybindingsWatcher.onDidUpdateConfiguration(() => this.resolveKeybindings());
src/vs/workbench/electron-browser/window.ts
+1 -1
View File
@@ -341,7 +341,7 @@ export class ElectronWindow extends Themable {
}
private resolveKeybindings(actionIds: string[]): TPromise<{ id: string; label: string, isNative: boolean; }[]> {
return this.partService.joinCreation().then(() => {
return TPromise.join([this.partService.joinCreation(), this.extensionService.onReady()]).then(() => {
return arrays.coalesce(actionIds.map(id => {
const binding = this.keybindingService.lookupKeybinding(id);
if (!binding) {