ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode a4177f50c475fc0fa278a78235e3bee9ffdec781 (#8649)

Browse Source 
* Merge from vscode a4177f50c475fc0fa278a78235e3bee9ffdec781

* distro

* fix tests
This commit is contained in:
Anthony Dresser
2019-12-11 22:42:23 -08:00
committed by GitHub
parent 82974a2135
commit 4ba6a979ba
280 changed files with 10898 additions and 14231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/services/keybinding/browser/keymapService.ts
View File

@@ -349,7 +349,7 @@ export class BrowserKeyboardMapperFactoryBase {
// The value is empty when the key is not a printable character, we skip validation.
if (keyboardEvent.ctrlKey || keyboardEvent.metaKey) {
setTimeout(() => {
this._getBrowserKeyMapping().then((keymap: IKeyboardMapping) => {
this._getBrowserKeyMapping().then((keymap: IRawMixedKeyboardMapping | null) => {
if (this.isKeyMappingActive(keymap)) {
return;
}