Handle exceptions in newly added API methods

Kotlin · Oct 13, 2021 · 7e98b03 · 7e98b03
1 parent c17c094
commit 7e98b03
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/...compiler/src/main/kotlin/org/jetbrains/kotlinx/jupyter/exceptions/ReplLibraryException.kt b/...compiler/src/main/kotlin/org/jetbrains/kotlinx/jupyter/exceptions/ReplLibraryException.kt
@@ -11,11 +11,13 @@ enum class LibraryProblemPart(val message: String) {
     INIT("init codes"),
     RESOURCES("resources definitions"),
     RENDERERS("renderers"),
+    THROWABLE_RENDERERS("throwable renderers"),
     CONVERTERS("converters (fields callbacks)"),
     CLASS_ANNOTATIONS("class annotations callbacks"),
     FILE_ANNOTATIONS("file annotations callbacks"),
     BEFORE_CELL_CALLBACKS("initCell codes (before-cell-execution callbacks)"),
     AFTER_CELL_CALLBACKS("after-cell-execution callbacks"),
+    INTERNAL_VARIABLES_MARKERS("internal variables markers"),
     SHUTDOWN("shutdown callbacks/codes"),
 }
 

diff --git a/src/main/kotlin/org/jetbrains/kotlinx/jupyter/codegen/ThrowableRenderersProcessorImpl.kt b/src/main/kotlin/org/jetbrains/kotlinx/jupyter/codegen/ThrowableRenderersProcessorImpl.kt
@@ -1,12 +1,27 @@
 package org.jetbrains.kotlinx.jupyter.codegen
 
 import org.jetbrains.kotlinx.jupyter.api.ThrowableRenderer
+import org.jetbrains.kotlinx.jupyter.exceptions.LibraryProblemPart
+import org.jetbrains.kotlinx.jupyter.exceptions.ReplLibraryException
+import org.jetbrains.kotlinx.jupyter.exceptions.rethrowAsLibraryException
 
 class ThrowableRenderersProcessorImpl : ThrowableRenderersProcessor {
     private val renderers = mutableListOf<ThrowableRenderer>()
 
     override fun renderThrowable(throwable: Throwable): Any? {
-        return renderers.firstOrNull { it.accepts(throwable) }?.render(throwable)
+        return try {
+            rethrowAsLibraryException(LibraryProblemPart.THROWABLE_RENDERERS) {
+                renderers.firstOrNull { it.accepts(throwable) }?.render(throwable)
+            }
+        } catch (ex: ReplLibraryException) {
+            """
+            Exception thrown while rendering another exception. Original exception:
+            ${throwable.stackTraceToString()}
+            
+            Rendering exception:
+            ${ex.stackTraceToString()}
+            """.trimIndent()
+        }
     }
 
     override fun register(renderer: ThrowableRenderer) {

diff --git a/...n/kotlin/org/jetbrains/kotlinx/jupyter/repl/impl/InternalVariablesMarkersProcessorImpl.kt b/...n/kotlin/org/jetbrains/kotlinx/jupyter/repl/impl/InternalVariablesMarkersProcessorImpl.kt
@@ -1,6 +1,8 @@
 package org.jetbrains.kotlinx.jupyter.repl.impl
 
 import org.jetbrains.kotlinx.jupyter.api.InternalVariablesMarker
+import org.jetbrains.kotlinx.jupyter.exceptions.LibraryProblemPart
+import org.jetbrains.kotlinx.jupyter.exceptions.rethrowAsLibraryException
 import org.jetbrains.kotlinx.jupyter.repl.InternalVariablesMarkersProcessor
 import kotlin.reflect.KProperty
 
@@ -12,6 +14,8 @@ class InternalVariablesMarkersProcessorImpl : InternalVariablesMarkersProcessor
     }
 
     override fun isInternal(property: KProperty<*>): Boolean {
-        return markers.any { it.isInternal(property) }
+        return rethrowAsLibraryException(LibraryProblemPart.INTERNAL_VARIABLES_MARKERS) {
+            markers.any { it.isInternal(property) }
+        }
     }
 }