Fixes microsoft#86133: Reverse resolved keybindings

alexdima · alexdima · commit 67bbaaee9364 · 2019-12-05T17:12:37.000+01:00
diff --git a/src/vs/workbench/services/keybinding/browser/keybindingService.ts b/src/vs/workbench/services/keybinding/browser/keybindingService.ts
@@ -338,7 +338,8 @@ export class WorkbenchKeybindingService extends AbstractKeybindingService {
 				}
 
 				const resolvedKeybindings = this.resolveKeybinding(keybinding);
-				for (const resolvedKeybinding of resolvedKeybindings) {
+				for (let i = resolvedKeybindings.length - 1; i >= 0; i--) {
+					const resolvedKeybinding = resolvedKeybindings[i];
 					result[resultLen++] = new ResolvedKeybindingItem(resolvedKeybinding, item.command, item.commandArgs, when, isDefault);
 				}
 			}
diff --git a/src/vs/workbench/services/keybinding/electron-browser/nativeKeymapService.ts b/src/vs/workbench/services/keybinding/electron-browser/nativeKeymapService.ts
@@ -61,7 +61,7 @@ export class KeyboardMapperFactory {
 	private static _isUSStandard(_kbInfo: nativeKeymap.IKeyboardLayoutInfo): boolean {
 		if (OS === OperatingSystem.Linux) {
 			const kbInfo = <nativeKeymap.ILinuxKeyboardLayoutInfo>_kbInfo;
-			return (kbInfo && kbInfo.layout === 'us');
+			return (kbInfo && (kbInfo.layout === 'us' || /^us,/.test(kbInfo.layout)));
 		}
 
 		if (OS === OperatingSystem.Macintosh) {

Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,8 @@ export class WorkbenchKeybindingService extends AbstractKeybindingService {`
`338`	`338`	`}`
`339`	`339`
`340`	`340`	`const resolvedKeybindings = this.resolveKeybinding(keybinding);`
`341`		`- for (const resolvedKeybinding of resolvedKeybindings) {`
	`341`	`+ for (let i = resolvedKeybindings.length - 1; i >= 0; i--) {`
	`342`	`+ const resolvedKeybinding = resolvedKeybindings[i];`
`342`	`343`	`result[resultLen++] = new ResolvedKeybindingItem(resolvedKeybinding, item.command, item.commandArgs, when, isDefault);`
`343`	`344`	`}`
`344`	`345`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ export class KeyboardMapperFactory {`
`61`	`61`	`private static _isUSStandard(_kbInfo: nativeKeymap.IKeyboardLayoutInfo): boolean {`
`62`	`62`	`if (OS === OperatingSystem.Linux) {`
`63`	`63`	`const kbInfo = <nativeKeymap.ILinuxKeyboardLayoutInfo>_kbInfo;`
`64`		`- return (kbInfo && kbInfo.layout === 'us');`
	`64`	`+ return (kbInfo && (kbInfo.layout === 'us' \|\| /^us,/.test(kbInfo.layout)));`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`if (OS === OperatingSystem.Macintosh) {`