SystemSh0cker/monaco-editor
1
0
Fork 0
mirror of https://github.com/microsoft/monaco-editor.git synced 2025-12-22 15:05:39 +01:00
Code Issues Projects Releases Packages Activity

Adopt latest monaco-editor-core

Browse source
This commit is contained in:
Alex Dima 2021-12-29 01:08:27 +01:00
parent 6e73daa1d2
commit 3a58c2a6ba
No known key found for this signature in database
GPG key ID: 39563C1504FDD0C9
6 changed files with 184 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/basic-languages/_.contribution.ts
View file

@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { languages } from '../fillers/monaco-editor-core';
import { languages, editor } from '../fillers/monaco-editor-core';
interface ILang extends languages.ILanguageExtensionPoint {
loader: () => Promise<ILangImpl>;
@ -40,10 +40,6 @@ class LazyLanguageLoader {
});
}
public whenLoaded(): Promise<ILangImpl> {
return this._lazyLoadPromise;
}
public load(): Promise<ILangImpl> {
if (!this._loadingTriggered) {
this._loadingTriggered = true;
@ -56,8 +52,12 @@ class LazyLanguageLoader {
}
}
export function loadLanguage(languageId: string): Promise<ILangImpl> {
return LazyLanguageLoader.getOrCreate(languageId).load();
export async function loadLanguage(languageId: string): Promise<void> {
await LazyLanguageLoader.getOrCreate(languageId).load();
// trigger tokenizer creation by instantiating a model
const model = editor.createModel('', languageId);
model.dispose();
}
export function registerLanguage(def: ILang): void {
@ -67,13 +67,14 @@ export function registerLanguage(def: ILang): void {
languages.register(def);
const lazyLanguageLoader = LazyLanguageLoader.getOrCreate(languageId);
languages.setMonarchTokensProvider(
languageId,
lazyLanguageLoader.whenLoaded().then((mod) => mod.language)
);
languages.onLanguage(languageId, () => {
lazyLanguageLoader.load().then((mod) => {
languages.setLanguageConfiguration(languageId, mod.conf);
});
languages.registerTokensProviderFactory(languageId, {
create: async (): Promise<languages.IMonarchLanguage> => {
const mod = await lazyLanguageLoader.load();
return mod.language;
}
});
languages.onLanguage(languageId, async () => {
const mod = await lazyLanguageLoader.load();
languages.setLanguageConfiguration(languageId, mod.conf);
});
}