From 01112d1daaa7e5610bcad47ad262ba9741f44eba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= Date: Fri, 2 Feb 2024 14:51:43 +0100 Subject: [PATCH] fix: backport VSCode fix --- scripts/vscode.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/scripts/vscode.patch b/scripts/vscode.patch index 7b995fcb..f064aa5a 100644 --- a/scripts/vscode.patch +++ b/scripts/vscode.patch @@ -4642,6 +4642,19 @@ index fb13ac6c764..f8c6873926c 100644 this._cachedResolver = new KeybindingResolver(defaults, overrides, (str) => this._log(str)); } return this._cachedResolver; +diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts +index c55684f0424..bb50e96ff77 100644 +--- a/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts ++++ b/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.ts +@@ -396,7 +396,7 @@ export class BrowserKeyboardMapperFactoryBase extends Disposable { + private async _getBrowserKeyMapping(keyboardEvent?: IKeyboardEvent): Promise { + if ((navigator as any).keyboard) { + try { +- return (navigator as any).keyboard.getLayoutMap().then((e: any) => { ++ return await (navigator as any).keyboard.getLayoutMap().then((e: any) => { + const ret: IKeyboardMapping = {}; + for (const key of e) { + ret[key[0]] = { diff --git a/src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker.ts b/src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker.ts index e8c8239b35f..9017a971ee5 100644 --- a/src/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker.ts