Merge pull request #27 from CodinGame/make-errors-catchable

[FEAT] Make unexpected errors catchable

Author: CGNonofr

src/languages/index.ts

@@ -39,13 +39,23 @@ for (const languageId of languagesIds) {
 
   monaco.languages.setTokenizationSupportFactory(languageId, {
     createTokenizationSupport: async () => {
-      return getOrCreateTextMateTokensProvider(languageId).catch(async err => {
+      return getOrCreateTextMateTokensProvider(languageId).catch(async (error: Error) => {
         const monarchLoader = monarchLanguageLoader[languageId]
         if (monarchLoader != null) {
-          console.warn(`Failed to load TextMate grammar for language ${languageId}, fallback to monarch`, err)
-          monaco.languages.setMonarchTokensProvider(languageId, (await monarchLoader()).language)
+          monaco.errorHandler.onUnexpectedError(new Error(`Failed to load TextMate grammar for language ${languageId}, fallback to monarch`, {
+            cause: error
+          }))
+          try {
+            monaco.languages.setMonarchTokensProvider(languageId, (await monarchLoader()).language)
+          } catch (error) {
+            monaco.errorHandler.onUnexpectedError(new Error(`Failed to load Monarch grammar for language ${languageId}`, {
+              cause: error as Error
+            }))
+          }
         } else {
-          console.warn(`Failed to load TextMate grammar for language ${languageId} and no fallback monarch`, err)
+          monaco.errorHandler.onUnexpectedError(new Error(`Failed to load TextMate grammar for language ${languageId} and no fallback monarch`, {
+            cause: error
+          }))
         }
         return null
       })
@@ -87,7 +97,9 @@ languageService.onDidEncounterLanguage(async (languageId) => {
   }
 
   loadLanguageConfiguration(languageId).catch(error => {
-    console.error('Unable to load language configuration', error)
+    monaco.errorHandler.onUnexpectedError(new Error(`Unable to load language configuration for language ${languageId}`, {
+      cause: error
+    }))
   })
 })
 

src/languages/textMate/CGTMGrammarFactory.ts

@@ -16,7 +16,9 @@ const getOnigLib = async (binaryUrl: string): Promise<vscodeTextmate.IOnigLib> =
       createOnigString
     }
   } catch (error) {
-    console.error('Unable to load wasm', error)
+    monaco.errorHandler.onUnexpectedError(new Error('Unable to load vscode-oniguruma wasm', {
+      cause: error as Error
+    }))
     throw error
   }
 }
@@ -32,7 +34,11 @@ export default class CGTMGrammarFactory extends monaco.extra.TMGrammarFactory {
     const grammarFactoryHost: monaco.extra.ITMGrammarFactoryHost = {
       // eslint-disable-next-line no-console
       logTrace: console.debug,
-      logError: console.error,
+      logError: (msg, error: Error) => {
+        monaco.errorHandler.onUnexpectedError(new Error(msg, {
+          cause: error
+        }))
+      },
       async readFile (resource: monaco.Uri): Promise<string> {
         const scopeName = resource.path.slice(resource.path.lastIndexOf('/') + 1, -'.json'.length)
         const grammarLoader = scopeGrammarLoader[scopeName]

src/monaco.ts

@@ -21,8 +21,10 @@ monaco.extra.StandaloneServices.initialize({
 
 // Force EOL to be '\n' even on Windows
 const configurationService = monaco.extra.StandaloneServices.get(monaco.extra.IConfigurationService)
-configurationService.updateValue('files.eol', '\n').catch(err => {
-  console.error('Unable to set file eol', err)
+configurationService.updateValue('files.eol', '\n').catch((error: Error) => {
+  monaco.errorHandler.onUnexpectedError(new Error('Unable to set file eol', {
+    cause: error
+  }))
 })
 
 monaco.errorHandler.setUnexpectedErrorHandler(error => {

src/theme/index.ts

@@ -35,7 +35,9 @@ for (const themeExtensionPoint of (defaultThemes as VSCodeTheme[])) {
     extensionName: themeExtensionPoint.extension,
     extensionIsBuiltin: true
   }).catch((error: Error) => {
-    console.error('Unable to define vscode theme', error)
+    monaco.errorHandler.onUnexpectedError(new Error(`Unable to define "${themeExtensionPoint.id}" vscode theme`, {
+      cause: error
+    }))
   })
 }