Merge pull request #14 from CodinGame/fix-keybinding-service-now-singleton

Fix keybinding service usage which is now a singleton

Author: CGNonofr

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-editor-wrapper",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "private": false,
   "description": "Enhanced Monaco editor with TextMate grammars and more",
   "scripts": {
@@ -24,7 +24,7 @@
   "dependencies": {
     "@codingame/monaco-emacs": "^0.2.3",
     "delay": ">=5.0.0",
-    "monaco-editor": "npm:@codingame/monaco-editor@^0.32.0",
+    "monaco-editor": "npm:@codingame/monaco-editor@^0.32.1",
     "monaco-vim": "^0.2.0",
     "vscode-oniguruma": "^1.6.1"
   },

package.json

@@ -3,7 +3,7 @@ import { createEditor, registerEditorOpenHandler, registerTextModelContentProvid
 import { addVSCodeTheme } from './theme'
 import { updateUserConfiguration, registerConfigurations, registerDefaultConfigurations, onConfigurationChanged, getConfiguration } from './configuration'
 import { getMonacoLanguage } from './languages'
-import { updateEditorKeybindings } from './keybindings'
+import { updateKeybindings, updateEditorKeybindingsMode } from './keybindings'
 import { getThemeData } from './theme/registry'
 import type { IVSCodeTheme } from './theme/tools'
 
@@ -21,7 +21,8 @@ export {
   updateUserConfiguration,
   getConfiguration,
   onConfigurationChanged,
-  updateEditorKeybindings,
+  updateEditorKeybindingsMode,
+  updateKeybindings,
 
   getMonacoLanguage,
   registerTextModelContentProvider,

src/index.ts

@@ -1,13 +1,17 @@
 import * as monaco from 'monaco-editor'
 import EmacsExtension from '@codingame/monaco-emacs'
-import { updateKeybindings } from './keybindingHelper'
 import { initVimMode } from './vim'
 
-export function updateEditorKeybindings (
+const keybindingService = monaco.extra.StandaloneServices.get(monaco.extra.IKeybindingService) as monaco.extra.StandaloneKeybindingService
+
+export function updateKeybindings (bindings: monaco.extra.IUserFriendlyKeybinding[]): void {
+  keybindingService.setUserKeybindings(bindings)
+}
+
+export function updateEditorKeybindingsMode (
   editor: monaco.editor.IStandaloneCodeEditor,
   keyBindingsMode: 'classic' | 'vim' | 'emacs' = 'classic',
-  statusBarElement: Element,
-  keyBindings?: monaco.extra.IUserFriendlyKeybinding[]
+  statusBarElement: Element
 ): monaco.IDisposable {
   switch (keyBindingsMode) {
     case 'vim': {
@@ -19,11 +23,8 @@ export function updateEditorKeybindings (
       return emacsExtension
     }
     default: {
-      updateKeybindings(editor, keyBindings ?? [])
       return {
-        dispose: () => {
-          updateKeybindings(editor, [])
-        }
+        dispose: () => {}
       }
     }
   }

src/keybindings/index.ts

@@ -1,5 +1,7 @@
 import * as monaco from 'monaco-editor'
 
-export function updateKeybindings (editor: monaco.editor.IStandaloneCodeEditor, bindings: monaco.extra.IUserFriendlyKeybinding[]): void {
-  (editor as monaco.editor.StandaloneCodeEditor)._standaloneKeybindingService!.setUserKeybindings(bindings)
+const keybindingService = monaco.extra.StandaloneServices.get(monaco.extra.IKeybindingService) as monaco.extra.StandaloneKeybindingService
+
+export function updateKeybindings (bindings: monaco.extra.IUserFriendlyKeybinding[]): void {
+  keybindingService.setUserKeybindings(bindings)
 }