From e423e9925393ca28586c41fb79c189cb9ec9e6e5 Mon Sep 17 00:00:00 2001
From: Natalia Ukhorskaya <natalia.ukhorskaya@jetbrains.com>
Date: Fri, 4 Sep 2015 20:18:12 +0300
Subject: [PATCH] Debugger for inline functions: make sure that context is
 suspended

---
 .../idea/debugger/stepping/KotlinSteppingCommandProvider.kt   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSteppingCommandProvider.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSteppingCommandProvider.kt
index f2b9ba7cfa1..b8f491ce8dd 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSteppingCommandProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSteppingCommandProvider.kt
@@ -45,7 +45,7 @@ public class KotlinSteppingCommandProvider: JvmSteppingCommandProvider() {
             ignoreBreakpoints: Boolean,
             stepSize: Int
     ): DebugProcessImpl.ResumeCommand? {
-        if (suspendContext == null) return null
+        if (suspendContext == null || suspendContext.isResumed) return null
 
         val location = computeInManagerThread(suspendContext) {
             it.frameProxy?.location()
@@ -80,7 +80,7 @@ public class KotlinSteppingCommandProvider: JvmSteppingCommandProvider() {
     }
 
     override fun getStepOutCommand(suspendContext: SuspendContextImpl?, stepSize: Int): DebugProcessImpl.ResumeCommand? {
-        if (suspendContext == null) return null
+        if (suspendContext == null || suspendContext.isResumed) return null
 
         val location = computeInManagerThread(suspendContext) {
             it.frameProxy?.location()