Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-26 19:44:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #11868: Check that the user keybindings are parsed as an array

Browse Source
This commit is contained in:
Alex Dima
2016-09-27 15:23:36 +03:00
parent 09ece5594d
commit fc44d0fcc6
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts
View File

@@ -147,14 +147,22 @@ export class WorkbenchKeybindingService extends KeybindingService {
this._beginListening(domNode);
}
private _safeGetConfig(): IUserFriendlyKeybinding[] {
let rawConfig = this.userKeybindings.getConfig();
if (Array.isArray(rawConfig)) {
return rawConfig;
}
return [];
}
public customKeybindingsCount(): number {
let userKeybindings = this.userKeybindings.getConfig();
let userKeybindings = this._safeGetConfig();
return userKeybindings.length;
}
protected _getExtraKeybindings(isFirstTime: boolean): IKeybindingItem[] {
let extraUserKeybindings: IUserFriendlyKeybinding[] = this.userKeybindings.getConfig();
let extraUserKeybindings: IUserFriendlyKeybinding[] = this._safeGetConfig();
if (!isFirstTime) {
let cnt = extraUserKeybindings.length;