keyboard layout service is async in browser

rebornix · rebornix · commit e39072b66066 · 2019-06-16T16:13:11.000-07:00
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayoutProvider.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayoutProvider.ts
@@ -224,10 +224,10 @@ export class KeyboardLayoutProvider {
 
 	private _layoutInfos: KeyboardLayoutInfo[] = [];
 	// private _mru: KeyboardLayoutInfo[] = [];
-	private _active: KeyboardLayoutInfo;
+	private _active: KeyboardLayoutInfo | null;
 
 	private constructor() {
-		this._active = EN_US;
+		this._active = null;
 	}
 
 	registerKeyboardLayout(layout: KeyboardLayoutInfo) {
@@ -246,15 +246,15 @@ export class KeyboardLayoutProvider {
 		this._active = this.getMatchedKeyboardLayout(keymap);
 	}
 
-	getMatchedKeyboardLayout(keymap: IKeyboardMapping): KeyboardLayoutInfo {
+	getMatchedKeyboardLayout(keymap: IKeyboardMapping): KeyboardLayoutInfo | null {
 		// TODO go through mru list instead of _layoutInfos
 		for (let i = 0; i < this._layoutInfos.length; i++) {
 			if (this._layoutInfos[i].fuzzyEqual(keymap)) {
 				return this._layoutInfos[i];
 			}
 		}
 
-		return EN_US;
+		return null;
 	}
 
 	getKeyboardLayouts(): KeyboardLayoutInfo[] {
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts
@@ -65,8 +65,11 @@ export class BrowserKeyboardMapperFactory {
 
 		this.getBrowserKeyMap().then(keyMap => {
 			KeyboardLayoutProvider.INSTANCE.setActive(keyMap);
-			let currentKeyboardLayout = KeyboardLayoutProvider.INSTANCE.activeKeyboardLayout.layout;
-			this._setKeyboardData(currentKeyboardLayout, keyMap);
+			let currentKeyboardLayout = KeyboardLayoutProvider.INSTANCE.activeKeyboardLayout;
+
+			if (currentKeyboardLayout) {
+				this._setKeyboardData(currentKeyboardLayout.layout, keyMap);
+			}
 		});
 	}
 
@@ -110,6 +113,10 @@ export class BrowserKeyboardMapperFactory {
 
 		const standardKeyboardEvent = keyboardEvent as StandardKeyboardEvent;
 		const currentKeymap = KeyboardLayoutProvider.INSTANCE.activeKeyboardLayout;
+		if (!currentKeymap) {
+			return true;
+		}
+
 		const mapping = currentKeymap.value[standardKeyboardEvent.code];
 
 		if (!mapping) {
@@ -207,7 +214,13 @@ export class BrowserKeyboardMapperFactory {
 					};
 				}
 
-				return KeyboardLayoutProvider.INSTANCE.getMatchedKeyboardLayout(ret).value;
+				const matchedKeyboardLayout = KeyboardLayoutProvider.INSTANCE.getMatchedKeyboardLayout(ret);
+
+				if (matchedKeyboardLayout) {
+					return matchedKeyboardLayout.value;
+				}
+
+				return {};
 			});
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -224,10 +224,10 @@ export class KeyboardLayoutProvider {`
`224`	`224`
`225`	`225`	`private _layoutInfos: KeyboardLayoutInfo[] = [];`
`226`	`226`	`// private _mru: KeyboardLayoutInfo[] = [];`
`227`		`- private _active: KeyboardLayoutInfo;`
	`227`	`+ private _active: KeyboardLayoutInfo \| null;`
`228`	`228`
`229`	`229`	`private constructor() {`
`230`		`- this._active = EN_US;`
	`230`	`+ this._active = null;`
`231`	`231`	`}`
`232`	`232`
`233`	`233`	`registerKeyboardLayout(layout: KeyboardLayoutInfo) {`
`@@ -246,15 +246,15 @@ export class KeyboardLayoutProvider {`
`246`	`246`	`this._active = this.getMatchedKeyboardLayout(keymap);`
`247`	`247`	`}`
`248`	`248`
`249`		`- getMatchedKeyboardLayout(keymap: IKeyboardMapping): KeyboardLayoutInfo {`
	`249`	`+ getMatchedKeyboardLayout(keymap: IKeyboardMapping): KeyboardLayoutInfo \| null {`
`250`	`250`	`// TODO go through mru list instead of _layoutInfos`
`251`	`251`	`for (let i = 0; i < this._layoutInfos.length; i++) {`
`252`	`252`	`if (this._layoutInfos[i].fuzzyEqual(keymap)) {`
`253`	`253`	`return this._layoutInfos[i];`
`254`	`254`	`}`
`255`	`255`	`}`
`256`	`256`
`257`		`- return EN_US;`
	`257`	`+ return null;`
`258`	`258`	`}`
`259`	`259`
`260`	`260`	`getKeyboardLayouts(): KeyboardLayoutInfo[] {`