mru cache for keyboard layouts

rebornix · rebornix · commit cc8341563d1b · 2019-06-16T16:34:11.000-07:00
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayoutProvider.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayoutProvider.ts
@@ -223,7 +223,7 @@ export class KeyboardLayoutProvider {
 	public static readonly INSTANCE: KeyboardLayoutProvider = new KeyboardLayoutProvider();
 
 	private _layoutInfos: KeyboardLayoutInfo[] = [];
-	// private _mru: KeyboardLayoutInfo[] = [];
+	private _mru: KeyboardLayoutInfo[] = [];
 	private _active: KeyboardLayoutInfo | null;
 
 	private constructor() {
@@ -232,6 +232,7 @@ export class KeyboardLayoutProvider {
 
 	registerKeyboardLayout(layout: KeyboardLayoutInfo) {
 		this._layoutInfos.push(layout);
+		this._mru = this._layoutInfos;
 	}
 
 	get activeKeyboardLayout() {
@@ -244,13 +245,25 @@ export class KeyboardLayoutProvider {
 
 	setActive(keymap: IKeyboardMapping) {
 		this._active = this.getMatchedKeyboardLayout(keymap);
+
+		if (!this._active) {
+			return;
+		}
+		const index = this._mru.indexOf(this._active);
+
+		if (index === 0) {
+			return;
+		}
+
+		this._mru.splice(index, 1);
+		this._mru.unshift(this._active);
 	}
 
 	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];
+		for (let i = 0; i < this._mru.length; i++) {
+			if (this._mru[i].fuzzyEqual(keymap)) {
+				return this._mru[i];
 			}
 		}
 
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts
@@ -64,6 +64,10 @@ export class BrowserKeyboardMapperFactory {
 		}
 
 		this.getBrowserKeyMap().then(keyMap => {
+			// might be false positive
+			if (KeyboardLayoutProvider.INSTANCE.isActive(keyMap)) {
+				return;
+			}
 			KeyboardLayoutProvider.INSTANCE.setActive(keyMap);
 			let currentKeyboardLayout = KeyboardLayoutProvider.INSTANCE.activeKeyboardLayout;
 
@@ -152,6 +156,7 @@ export class BrowserKeyboardMapperFactory {
 			return false;
 		}
 
+		// TODO, this assumption is wrong as `browserEvent.key` doesn't necessarily equal expectedValue from real keymap
 		if (!isDead && standardKeyboardEvent.browserEvent.key !== expectedValue) {
 			return false;
 		}

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,10 @@ export class BrowserKeyboardMapperFactory {`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`this.getBrowserKeyMap().then(keyMap => {`
	`67`	`+ // might be false positive`
	`68`	`+ if (KeyboardLayoutProvider.INSTANCE.isActive(keyMap)) {`
	`69`	`+ return;`
	`70`	`+ }`
`67`	`71`	`KeyboardLayoutProvider.INSTANCE.setActive(keyMap);`
`68`	`72`	`let currentKeyboardLayout = KeyboardLayoutProvider.INSTANCE.activeKeyboardLayout;`
`69`	`73`
`@@ -152,6 +156,7 @@ export class BrowserKeyboardMapperFactory {`
`152`	`156`	`return false;`
`153`	`157`	`}`
`154`	`158`
	`159`	+ // TODO, this assumption is wrong as `browserEvent.key` doesn't necessarily equal expectedValue from real keymap
`155`	`160`	`if (!isDead && standardKeyboardEvent.browserEvent.key !== expectedValue) {`
`156`	`161`	`return false;`
`157`	`162`	`}`