From f38a4f509d7f91cc5c98622a172b04d5dc62d875 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Wed, 20 Dec 2017 16:01:37 +0300
Subject: [PATCH] Minor: code rearrange

---
 .../debugger/KotlinPositionManagerFactory.java     |  3 ++-
 .../jetbrains/kotlin/idea/debugger/debuggerUtil.kt | 14 +++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManagerFactory.java b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManagerFactory.java
index cfd92bfd536..a5220ed1fd0 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManagerFactory.java
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManagerFactory.java
@@ -19,10 +19,11 @@ package org.jetbrains.kotlin.idea.debugger;
 import com.intellij.debugger.PositionManager;
 import com.intellij.debugger.PositionManagerFactory;
 import com.intellij.debugger.engine.DebugProcess;
+import org.jetbrains.annotations.NotNull;
 
 public class KotlinPositionManagerFactory extends PositionManagerFactory {
     @Override
-    public PositionManager createPositionManager(DebugProcess process) {
+    public PositionManager createPositionManager(@NotNull DebugProcess process) {
         return new KotlinPositionManager(process);
     }
 }
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/debuggerUtil.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/debuggerUtil.kt
index e9c9cffdc2e..a7578cbc321 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/debuggerUtil.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/debuggerUtil.kt
@@ -49,17 +49,17 @@ fun numberOfInlinedFunctions(visibleVariables: List<LocalVariableProxyImpl>): In
 
 fun isInsideInlineArgument(inlineArgument: KtFunction, location: Location, debugProcess: DebugProcessImpl): Boolean {
     val visibleVariables = location.visibleVariables(debugProcess)
-
-    val context = KotlinDebuggerCaches.getOrCreateTypeMapper(inlineArgument).bindingContext
-
-    val lambdaOrdinal = runReadAction { lambdaOrdinalByArgument(inlineArgument, context) }
     val markerLocalVariables = visibleVariables.filter { it.name().startsWith(JvmAbi.LOCAL_VARIABLE_NAME_PREFIX_INLINE_ARGUMENT) }
 
+    val context = KotlinDebuggerCaches.getOrCreateTypeMapper(inlineArgument).bindingContext
+    val lambdaOrdinal = runReadAction { lambdaOrdinalByArgument(inlineArgument, context) }
     val functionName = runReadAction { functionNameByArgument(inlineArgument, context) }
 
-    return markerLocalVariables.firstOrNull {
-        lambdaOrdinalByLocalVariable(it.name()) == lambdaOrdinal && functionNameByLocalVariable(it.name()) == functionName
-    } != null
+    return markerLocalVariables
+            .map { it.name() }
+            .any { variableName ->
+                lambdaOrdinalByLocalVariable(variableName) == lambdaOrdinal && functionNameByLocalVariable(variableName) == functionName
+            }
 }
 
 fun <T : Any> DebugProcessImpl.invokeInManagerThread(f: (DebuggerContextImpl) -> T?): T? {