ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-30 16:50:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

revert vscode cahnges (#4879)

Browse Source
This commit is contained in:
Anthony Dresser
2019-04-05 09:15:38 -07:00
committed by GitHub
parent 572010ded1
commit 9bd7e30d18
9 changed files with 14 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vs/workbench/contrib/preferences/electron-browser/preferences.contribution.ts
View File

@@ -256,8 +256,8 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_E),
handler: (accessor, args: any) => {
const control = accessor.get(IEditorService).activeControl as IKeybindingsEditor;
if (control && control instanceof KeybindingsEditor && control.activeKeybindingEntry.keybindingItem.keybinding) {
control.defineWhenExpression(control.activeKeybindingEntry);
if (control && control instanceof KeybindingsEditor && control.activeKeybindingEntry!.keybindingItem.keybinding) {
control.defineWhenExpression(control.activeKeybindingEntry!);
}
}
});

2
src/vs/workbench/contrib/search/browser/searchActions.ts
View File

@@ -71,7 +71,7 @@ export function getSearchView(viewletService: IViewletService, panelService: IPa
return (activePanel as SearchPanel).getSearchView();
}
return null;
return undefined;
}
function doAppendKeyBindingLabel(label: string, keyBinding: ResolvedKeybinding | undefined): string {