Merge pull request #88 from CodinGame/fix-extension-keybindings

Fix extension keybindings handling

Author: CGNonofr

scripts/vscode.patch

@@ -24,6 +24,19 @@ index 8f4a1384e58..5607a27dd0c 100644
 
  		try {
  			await playAudio(url, this.getVolumeInPercent() / 100);
+diff --git a/src/vs/platform/keybinding/common/keybindingsRegistry.ts b/src/vs/platform/keybinding/common/keybindingsRegistry.ts
+index 9d56a6c8826..d6fb0f1ab0a 100644
+--- a/src/vs/platform/keybinding/common/keybindingsRegistry.ts
++++ b/src/vs/platform/keybinding/common/keybindingsRegistry.ts
+@@ -76,7 +76,7 @@ export interface IKeybindingsRegistry {
+ 	getDefaultKeybindings(): IKeybindingItem[];
+ }
+ 
+-class KeybindingsRegistryImpl implements IKeybindingsRegistry {
++export class KeybindingsRegistryImpl implements IKeybindingsRegistry {
+ 
+ 	private _coreKeybindings: LinkedList<IKeybindingItem>;
+ 	private _extensionKeybindings: IKeybindingItem[];
 diff --git a/src/vs/workbench/services/configuration/browser/configurationService.ts b/src/vs/workbench/services/configuration/browser/configurationService.ts
 index 4d68798fc9a..722c5f53b75 100644
 --- a/src/vs/workbench/services/configuration/browser/configurationService.ts

src/polyfill.ts

@@ -105,6 +105,9 @@ import { QuickInputService as MonacoQuickInputService } from 'monaco-editor/esm/
 import { QuickInputService as VScodeQuickInputService } from 'vscode/vs/platform/quickinput/browser/quickInputService.js'
 // @ts-ignore Creating a d.ts is not worth it
 import { TextModel as MonacoTextModel } from 'monaco-editor/esm/vs/editor/common/model/textModel.js'
+// @ts-ignore Creating a d.ts is not worth it
+import { Extensions as KeybindingsExtensions } from 'monaco-editor/esm/vs/platform/keybinding/common/keybindingsRegistry.js'
+import { KeybindingsRegistryImpl as VScodeKeybindingsRegistryImpl } from 'vscode/vs/platform/keybinding/common/keybindingsRegistry.js'
 import { ITextBuffer } from 'vs/editor/common/model'
 import { AudioCue } from 'vs/platform/audioCues/browser/audioCueService'
 import { onServicesInitialized } from './service-override/tools'
@@ -185,6 +188,8 @@ polyfillPrototypeSimple(MonacoListView.prototype, VScodeListView.prototype)
 polyfillPrototypeSimple(MonacoCallbackIterable.prototype, VScodeCallbackIterable.prototype)
 polyfillPrototypeSimple(MonacoSelectActionViewItem.prototype, VScodeSelectActionViewItem.prototype)
 polyfillPrototypeSimple(MonacoQuickInputService.prototype, VScodeQuickInputService.prototype)
+const keydinbingsRegistry = Registry.as<IConfigurationRegistry>(KeybindingsExtensions.EditorModes)
+polyfillPrototypeSimple(keydinbingsRegistry.constructor.prototype, VScodeKeybindingsRegistryImpl.prototype)
 
 MonacoTextModel.prototype.equalsTextBuffer = function (other: ITextBuffer): boolean {
   this._assertNotDisposed()