Merge pull request #16 from CodinGame/add-load-language-function

Add load language function

Author: CGNonofr

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-editor-wrapper",
-  "version": "1.7.0",
+  "version": "1.8.1",
   "private": false,
   "description": "Enhanced Monaco editor with TextMate grammars and more",
   "scripts": {

package.json

@@ -2,7 +2,7 @@ import * as monaco from 'monaco-editor'
 import { createEditor, registerEditorOpenHandler, registerTextModelContentProvider } from './monaco'
 import { addVSCodeTheme } from './theme'
 import { updateUserConfiguration, registerConfigurations, registerDefaultConfigurations, onConfigurationChanged, getConfiguration } from './configuration'
-import { getMonacoLanguage } from './languages'
+import { getMonacoLanguage, loadLanguage } from './languages'
 import { updateKeybindings, updateEditorKeybindingsMode } from './keybindings'
 import { getThemeData } from './theme/registry'
 import type { IVSCodeTheme } from './theme/tools'
@@ -26,7 +26,8 @@ export {
 
   getMonacoLanguage,
   registerTextModelContentProvider,
-  registerEditorOpenHandler
+  registerEditorOpenHandler,
+  loadLanguage
 }
 
 export type {

src/index.ts

@@ -1,5 +1,5 @@
 import * as monaco from 'monaco-editor'
-import { createTextMateTokensProvider } from './textMate'
+import { getOrCreateTextMateTokensProvider } from './textMate'
 import textMateLanguages from './extensions/languages.json'
 import { languageLoader as monarchLanguageLoader } from './monarch'
 import languageConfigurationLoader, { RawLanguageConfiguration } from './extensions/languageConfigurationLoader'
@@ -39,7 +39,7 @@ for (const languageId of languagesIds) {
 
   monaco.languages.setTokenizationSupportFactory(languageId, {
     createTokenizationSupport: async () => {
-      return createTextMateTokensProvider(languageId).catch(err => {
+      return getOrCreateTextMateTokensProvider(languageId).catch(err => {
         const monarchLoader = monarchLanguageLoader[languageId]
         if (monarchLoader != null) {
           console.warn(`Failed to load TextMate grammar for language ${languageId}, fallback to monarch`, err)
@@ -70,22 +70,25 @@ function parseLanguageConfiguration (config: RawLanguageConfiguration): monaco.e
   }
 }
 
+async function loadLanguageConfiguration (languageId: string) {
+  const loader = languageConfigurationLoader[languageId]
+  if (loader != null) {
+    const configuration = await loader()
+    monaco.extra.handleLanguageConfiguration(
+      languageId,
+      addCustomFoldingMarkers(parseLanguageConfiguration(configuration))
+    )
+  }
+}
+
 languageService.onDidEncounterLanguage(async (languageId) => {
   if (languageId === 'plaintext') {
     return
   }
 
-  const loader = languageConfigurationLoader[languageId]
-  if (loader != null) {
-    loader().then((configuration) => {
-      monaco.extra.handleLanguageConfiguration(
-        languageId,
-        addCustomFoldingMarkers(parseLanguageConfiguration(configuration))
-      )
-    }).catch(error => {
-      console.error('Unable to load language configuration', error)
-    })
-  }
+  loadLanguageConfiguration(languageId).catch(error => {
+    console.error('Unable to load language configuration', error)
+  })
 })
 
 function getMonacoLanguage (languageOrModeId: string): string {
@@ -103,6 +106,14 @@ function getMonacoLanguage (languageOrModeId: string): string {
   return 'plaintext'
 }
 
+async function loadLanguage (languageId: string): Promise<void> {
+  await Promise.all([
+    loadLanguageConfiguration(languageId),
+    getOrCreateTextMateTokensProvider(languageId)
+  ])
+}
+
 export {
-  getMonacoLanguage
+  getMonacoLanguage,
+  loadLanguage
 }

src/languages/index.ts

@@ -30,7 +30,7 @@ function getOrCreateGrammarFactory (): CGTMGrammarFactory {
 }
 
 const languageService = monaco.extra.StandaloneServices.get(monaco.languages.ILanguageService)
-export async function createTextMateTokensProvider (languageId: string): Promise<monaco.languages.ITokenizationSupport> {
+async function createTextMateTokensProvider (languageId: string): Promise<monaco.languages.ITokenizationSupport> {
   const grammarFactory = getOrCreateGrammarFactory()
   const encodedLanguageId = languageService.languageIdCodec.encodeLanguageId(languageId)
   const { grammar, initialState, containsEmbeddedLanguages } = await grammarFactory.createGrammar(languageId, encodedLanguageId)
@@ -44,3 +44,14 @@ export async function createTextMateTokensProvider (languageId: string): Promise
   })
   return new CGTMTokenizationSupport(languageId, encodedLanguageId, tokenization, grammar)
 }
+
+const tokenizationSupports = new Map<string, Promise<monaco.languages.ITokenizationSupport>>()
+
+export function getOrCreateTextMateTokensProvider (languageId: string): Promise<monaco.languages.ITokenizationSupport> {
+  let tokenizationSupportPromise = tokenizationSupports.get(languageId)
+  if (tokenizationSupportPromise == null) {
+    tokenizationSupportPromise = createTextMateTokensProvider(languageId)
+    tokenizationSupports.set(languageId, tokenizationSupportPromise)
+  }
+  return tokenizationSupportPromise
+}