diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/ExecutionContext.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/ExecutionContext.kt index c80312d27d0..34de12213a7 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/ExecutionContext.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/ExecutionContext.kt @@ -15,6 +15,7 @@ import com.intellij.debugger.jdi.StackFrameProxyImpl import com.intellij.debugger.jdi.VirtualMachineProxyImpl import com.intellij.openapi.project.Project import com.sun.jdi.* +import com.sun.jdi.request.EventRequest import org.jetbrains.org.objectweb.asm.Type class ExecutionContext(val evaluationContext: EvaluationContextImpl, val frameProxy: StackFrameProxyImpl) { @@ -33,7 +34,10 @@ class ExecutionContext(val evaluationContext: EvaluationContextImpl, val framePr val project: Project get() = evaluationContext.project - val invokePolicy = evaluationContext.suspendContext.getInvokePolicy() + val invokePolicy = run { + val suspendContext = evaluationContext.suspendContext + if (suspendContext.suspendPolicy == EventRequest.SUSPEND_EVENT_THREAD) ObjectReference.INVOKE_SINGLE_THREADED else 0 + } @Throws(EvaluateException::class) fun invokeMethod(obj: ObjectReference, method: Method, args: List): Value? { diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluatorBuilder.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluatorBuilder.kt index 85a617016b7..ecef56fd14c 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluatorBuilder.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluatorBuilder.kt @@ -416,10 +416,6 @@ class KotlinEvaluator(val codeFragment: KtCodeFragment, val sourcePosition: Sour } } -internal fun SuspendContext.getInvokePolicy(): Int { - return if (suspendPolicy == EventRequest.SUSPEND_EVENT_THREAD) ObjectReference.INVOKE_SINGLE_THREADED else 0 -} - fun Type.getClassDescriptor( scope: GlobalSearchScope, mapBuiltIns: Boolean = true,