MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 06:50:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

[debugger] Improve Kotlin evaluator runtime problems reporting

Browse Source 
(cherry picked from commit d70d0a58620eabe9fe36233c908d46abc04a2213)


IJ-CR-151042

GitOrigin-RevId: 30390daa0fe9e41293d1fa13bda026cfedfd5598
This commit is contained in:
Alexey.Merkulov
2024-11-25 21:22:22 +01:00
committed by intellij-monorepo-bot
parent 9afb971dd9
commit f40e3cec5f
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/kotlin/jvm-debugger/evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluatorBuilder.kt
View File

@@ -9,6 +9,7 @@ import com.intellij.debugger.engine.evaluation.EvaluateExceptionUtil
import com.intellij.debugger.engine.evaluation.EvaluationContextImpl
import com.intellij.debugger.engine.evaluation.expression.*
import com.intellij.debugger.impl.DebuggerUtilsEx
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.application.runReadAction
import com.intellij.openapi.diagnostic.Attachment
import com.intellij.openapi.diagnostic.ControlFlowException
@@ -53,6 +54,7 @@ import org.jetbrains.org.objectweb.asm.ClassReader
import org.jetbrains.org.objectweb.asm.Type
import org.jetbrains.org.objectweb.asm.tree.ClassNode
import java.util.*
import java.util.concurrent.CancellationException
import java.util.concurrent.ConcurrentHashMap
import java.util.concurrent.ExecutionException
import org.jetbrains.eval4j.Value as Eval4JValue
@@ -237,9 +239,20 @@ class KotlinEvaluator(val codeFragment: KtCodeFragment, private val sourcePositi
val result = if (classLoaderRef != null) {
try {
return evaluateWithCompilation(context, compiledData, classLoaderRef)
} catch (e: Throwable) {
LOG.warn("Compiling evaluator failed: " + e.message, e)
evaluateWithEval4J(context, compiledData, classLoaderRef)
} catch (original: Throwable) {
if (original is CancellationException) {
throw original
}
try {
evaluateWithEval4J(context, compiledData, classLoaderRef).also {
LOG.error("Eval4J success, but compiling evaluator failed with: " + original.message, original)
}
} catch (e: Throwable) {
if (!ApplicationManager.getApplication().isUnitTestMode()) {
LOG.error("Eval4J also failed: " + e.message, e)
}
throw original
}
}
} else {
evaluateWithEval4J(context, compiledData, context.classLoader)

1
plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/compilingEvaluator/inaccessibleMembers/inaccessibleMembers.out
View File

@@ -11,7 +11,6 @@ Compile bytecode for block { Foo.Nested(1, -5, "x").s }
Compile bytecode for block { Foo.Nested(1, -5, "x").boo() }
Compile bytecode for block { Foo.x }
Compile bytecode for block { Foo.x = 21 }
Compiling evaluator failed: Method threw 'java.lang.IllegalAccessException' exception.
Disconnected from the target VM
Process finished with exit code 0