From 71e8cddaa6721755d030504091abe39548048c74 Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Wed, 24 Jul 2019 17:55:03 +0900
Subject: [PATCH] Minor: Fix NI error in KotlinPositionManager

---
 .../jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt b/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt
index 8489b115bde..9b2aaabdd91 100644
--- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt
+++ b/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt
@@ -204,10 +204,8 @@ class KotlinPositionManager(private val myDebugProcess: DebugProcess) : MultiReq
         val methodName = location.method().name()
         return when {
             JvmAbi.isGetterName(methodName) -> {
-                val parameterForGetter = contextElement.primaryConstructor?.valueParameters?.firstOrNull {
-                    it.hasValOrVar() && it.name != null && JvmAbi.getterName(it.name!!) == methodName
-                } ?: return null
-                parameterForGetter
+                val valueParameters = contextElement.primaryConstructor?.valueParameters ?: emptyList()
+                valueParameters.find { it.hasValOrVar() && it.name != null && JvmAbi.getterName(it.name!!) == methodName }
             }
             methodName == "<init>" -> contextElement.primaryConstructor
             else -> null