From 2817e1a5f1efa2abb8e220e7efe94d62afca13dd Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <Nikolay.Krasko@jetbrains.com>
Date: Tue, 15 Nov 2016 21:56:01 +0300
Subject: [PATCH] Avoid failure on first() call

---
 .../idea/debugger/stepping/KotlinSteppingCommandProvider.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 f9756bf7805..5c561fa410b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSteppingCommandProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSteppingCommandProvider.kt
@@ -365,7 +365,7 @@ fun getStepOverAction(
         // Pretend we had already did a backing step
         methodLocations
                 .filter(::isLocationSuitable)
-                .first { it.ktLineNumber() == location.ktLineNumber() }
+                .firstOrNull { it.ktLineNumber() == location.ktLineNumber() } ?: location
     }
     else {
         location