Skip to content

Commit

Permalink
fix: backport VSCode fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Loïc Mangeonjean committed Feb 2, 2024
1 parent ac3f828 commit 01112d1
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions scripts/vscode.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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<IRawMixedKeyboardMapping | null> {
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
Expand Down

0 comments on commit 01112d1

Please sign in to comment.