@codingame/monaco-editor-wrapper 1.13.1 → 1.14.2

package/dist/languages/textMate/index.d.ts

@@ -1,3 +1,3 @@
 import * as monaco from 'monaco-editor';
 import './semanticTokens';
-export declare function getOrCreateTextMateTokensProvider(languageId: string): Promise<monaco.languages.ITokenizationSupport>;
+export declare function getOrCreateTextMateTokensProvider(languageId: string): Promise<monaco.languages.ITokenizationSupport | null>;

package/dist/main.js

@@ -161,8 +161,12 @@ const themes = [];
 async function defineVSCodeTheme(id, vscodeThemeLoader, themeExtensionPoint, extensionData) {
   var _themeExtensionPoint$, _themeExtensionPoint$2, _ref, _themeExtensionPoint$3, _themeExtensionPoint$4;
 
-  const path = "/theme-".concat(id, ".json");
-  const rootUri = monaco$2.Uri.file((_themeExtensionPoint$ = themeExtensionPoint === null || themeExtensionPoint === void 0 ? void 0 : (_themeExtensionPoint$2 = themeExtensionPoint.path) === null || _themeExtensionPoint$2 === void 0 ? void 0 : _themeExtensionPoint$2.slice(1)) !== null && _themeExtensionPoint$ !== void 0 ? _themeExtensionPoint$ : path);
+  const path = "/theme-".concat(id, ".json"); // Do not use `file` scheme or monaco will replace `/` by `\` on windows
+
+  const rootUri = monaco$2.Uri.from({
+    scheme: 'browser',
+    path: (_themeExtensionPoint$ = themeExtensionPoint === null || themeExtensionPoint === void 0 ? void 0 : (_themeExtensionPoint$2 = themeExtensionPoint.path) === null || _themeExtensionPoint$2 === void 0 ? void 0 : _themeExtensionPoint$2.slice(1)) !== null && _themeExtensionPoint$ !== void 0 ? _themeExtensionPoint$ : path
+  });
   const themeData = monaco$2.extra.ColorThemeData.fromExtensionTheme(_objectSpread2({
     id,
     path: path,
@@ -211,7 +215,9 @@ const getOnigLib = async binaryUrl => {
       createOnigString
     };
   } catch (error) {
-    console.error('Unable to load wasm', error);
+    monaco$2.errorHandler.onUnexpectedError(new Error('Unable to load vscode-oniguruma wasm', {
+      cause: error
+    }));
     throw error;
   }
 };
@@ -229,7 +235,11 @@ class CGTMGrammarFactory extends monaco$2.extra.TMGrammarFactory {
     const grammarFactoryHost = {
       // eslint-disable-next-line no-console
       logTrace: console.debug,
-      logError: console.error,
+      logError: (msg, error) => {
+        monaco$2.errorHandler.onUnexpectedError(new Error(msg, {
+          cause: error
+        }));
+      },
 
       async readFile(resource) {
         const scopeName = resource.path.slice(resource.path.lastIndexOf('/') + 1, -'.json'.length);
@@ -1499,7 +1509,10 @@ for (const contribution of extensions.semanticTokenScopes) {
 function createGrammarFactory() {
   const languageService = monaco$2.extra.StandaloneServices.get(monaco$2.languages.ILanguageService);
   const parsedGrammars = rawGrammars.map(grammar => _objectSpread2(_objectSpread2({}, monaco$2.extra.parseTextMateGrammar(grammar, languageService)), {}, {
-    location: monaco$2.Uri.file(grammar.scopeName + '.json')
+    location: monaco$2.Uri.from({
+      scheme: 'browser',
+      path: grammar.scopeName + '.json'
+    })
   }));
   return new CGTMGrammarFactory(parsedGrammars, loader$3, onigFile);
 }
@@ -1526,7 +1539,7 @@ async function createTextMateTokensProvider(languageId) {
   } = await grammarFactory.createGrammar(languageId, encodedLanguageId);
 
   if (grammar == null) {
-    throw new Error("No grammar found for language ".concat(languageId));
+    return null;
   }
 
   const tokenization = new monaco$2.extra.TMTokenization(grammar, initialState, containsEmbeddedLanguages);
@@ -3518,14 +3531,25 @@ for (const languageId of languagesIds) {
   });
   monaco$2.languages.setTokenizationSupportFactory(languageId, {
     createTokenizationSupport: async () => {
-      return getOrCreateTextMateTokensProvider(languageId).catch(async err => {
+      return getOrCreateTextMateTokensProvider(languageId).catch(async error => {
         const monarchLoader = languageLoader[languageId];
 
         if (monarchLoader != null) {
-          console.warn("Failed to load TextMate grammar for language ".concat(languageId, ", fallback to monarch"), err);
-          monaco$2.languages.setMonarchTokensProvider(languageId, (await monarchLoader()).language);
+          monaco$2.errorHandler.onUnexpectedError(new Error("Failed to load TextMate grammar for language ".concat(languageId, ", fallback to monarch"), {
+            cause: error
+          }));
+
+          try {
+            monaco$2.languages.setMonarchTokensProvider(languageId, (await monarchLoader()).language);
+          } catch (error) {
+            monaco$2.errorHandler.onUnexpectedError(new Error("Failed to load Monarch grammar for language ".concat(languageId), {
+              cause: error
+            }));
+          }
         } else {
-          console.warn("Failed to load TextMate grammar for language ".concat(languageId, " and no fallback monarch"), err);
+          monaco$2.errorHandler.onUnexpectedError(new Error("Failed to load TextMate grammar for language ".concat(languageId, " and no fallback monarch"), {
+            cause: error
+          }));
         }
 
         return null;
@@ -3568,7 +3592,9 @@ languageService.onDidEncounterLanguage(async languageId => {
   }
 
   loadLanguageConfiguration(languageId).catch(error => {
-    console.error('Unable to load language configuration', error);
+    monaco$2.errorHandler.onUnexpectedError(new Error("Unable to load language configuration for language ".concat(languageId), {
+      cause: error
+    }));
   });
 });
 
@@ -3716,7 +3742,9 @@ for (const themeExtensionPoint of defaultThemes) {
     extensionName: themeExtensionPoint.extension,
     extensionIsBuiltin: true
   }).catch(error => {
-    console.error('Unable to define vscode theme', error);
+    monaco$2.errorHandler.onUnexpectedError(new Error("Unable to define \"".concat(themeExtensionPoint.id, "\" vscode theme"), {
+      cause: error
+    }));
   });
 }
 
@@ -4171,8 +4199,10 @@ monaco$2.extra.StandaloneServices.initialize({
 }); // Force EOL to be '\n' even on Windows
 
 const configurationService = monaco$2.extra.StandaloneServices.get(monaco$2.extra.IConfigurationService);
-configurationService.updateValue('files.eol', '\n').catch(err => {
-  console.error('Unable to set file eol', err);
+configurationService.updateValue('files.eol', '\n').catch(error => {
+  monaco$2.errorHandler.onUnexpectedError(new Error('Unable to set file eol', {
+    cause: error
+  }));
 });
 monaco$2.errorHandler.setUnexpectedErrorHandler(error => {
   console.warn('Unexpected error', error);

package/package.json

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