azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactoring: Inline getInvokePolicy()

Browse Source
This commit is contained in:
Yan Zhulanow
2019-03-22 20:22:52 +03:00
parent b26f746514
commit 81a7f73db5
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/ExecutionContext.kt
+5 -1
View File
@@ -15,6 +15,7 @@ import com.intellij.debugger.jdi.StackFrameProxyImpl
import com.intellij.debugger.jdi.VirtualMachineProxyImpl import com.intellij.debugger.jdi.VirtualMachineProxyImpl
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.sun.jdi.* import com.sun.jdi.*
import com.sun.jdi.request.EventRequest
import org.jetbrains.org.objectweb.asm.Type import org.jetbrains.org.objectweb.asm.Type
class ExecutionContext(val evaluationContext: EvaluationContextImpl, val frameProxy: StackFrameProxyImpl) { class ExecutionContext(val evaluationContext: EvaluationContextImpl, val frameProxy: StackFrameProxyImpl) {
@@ -33,7 +34,10 @@ class ExecutionContext(val evaluationContext: EvaluationContextImpl, val framePr
val project: Project val project: Project
get() = evaluationContext.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) @Throws(EvaluateException::class)
fun invokeMethod(obj: ObjectReference, method: Method, args: List<Value?>): Value? { fun invokeMethod(obj: ObjectReference, method: Method, args: List<Value?>): Value? {
idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluatorBuilder.kt
-4
View File
@@ -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( fun Type.getClassDescriptor(
scope: GlobalSearchScope, scope: GlobalSearchScope,
mapBuiltIns: Boolean = true, mapBuiltIns: Boolean = true,