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

Debugger: fix exception when process is resumed during stepping

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2015-09-24 13:34:03 +03:00
parent 7234bf3572
commit 4fb4e0c21f
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSteppingCommandProvider.kt
+7 -3
View File
@@ -21,6 +21,7 @@ import com.intellij.debugger.engine.DebugProcessImpl
import com.intellij.debugger.engine.SuspendContextImpl
import com.intellij.debugger.engine.events.DebuggerCommandImpl
import com.intellij.debugger.impl.JvmSteppingCommandProvider
import com.intellij.debugger.jdi.StackFrameProxyImpl
import com.intellij.psi.PsiElement
import com.intellij.util.concurrency.Semaphore
import com.intellij.xdebugger.impl.XSourcePositionImpl
@@ -51,7 +52,7 @@ public class KotlinSteppingCommandProvider: JvmSteppingCommandProvider() {
if (suspendContext == null || suspendContext.isResumed) return null
val location = computeInManagerThread(suspendContext) {
it.frameProxy?.location()
it.safeFrameProxy?.location()
} ?: return null
val sourcePosition = suspendContext.debugProcess.positionManager.getSourcePosition(location) ?: return null
@@ -184,7 +185,7 @@ public class KotlinSteppingCommandProvider: JvmSteppingCommandProvider() {
if (suspendContext == null || suspendContext.isResumed) return null
val location = computeInManagerThread(suspendContext) {
it.frameProxy?.location()
it.safeFrameProxy?.location()
} ?: return null
val sourcePosition = suspendContext.debugProcess.positionManager.getSourcePosition(location) ?: return null
@@ -280,8 +281,11 @@ public class KotlinSteppingCommandProvider: JvmSteppingCommandProvider() {
return functionLiteralExpression.functionLiteral
}
private val SuspendContextImpl.safeFrameProxy: StackFrameProxyImpl?
get() = if (isResumed) null else frameProxy
private fun isKotlinStrataAvailable(suspendContext: SuspendContextImpl): Boolean {
val availableStrata = suspendContext.frameProxy?.location()?.declaringType()?.availableStrata() ?: return false
val availableStrata = suspendContext.safeFrameProxy?.location()?.declaringType()?.availableStrata() ?: return false
return availableStrata.contains("Kotlin")
}