From 192ce59a63da14b0e09d0f2149c21fa1da12ee6c Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Mon, 5 Oct 2015 21:26:10 +0300
Subject: [PATCH] Inlined function

---
 .../KotlinFunctionParameterInfoHandler.kt     | 34 ++++++++-----------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinFunctionParameterInfoHandler.kt b/idea/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinFunctionParameterInfoHandler.kt
index 3726bd08b74..46b2c33675c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinFunctionParameterInfoHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinFunctionParameterInfoHandler.kt
@@ -101,7 +101,21 @@ class KotlinFunctionParameterInfoHandler : ParameterInfoHandlerWithTabActionSupp
     }
 
     override fun findElementForUpdatingParameterInfo(context: UpdateParameterInfoContext): JetValueArgumentList? {
-        return findCallAndUpdateContext(context)
+        var element = context.file.findElementAt(context.offset) ?: return null
+        var parent = element.parent
+        while (parent != null && parent !is JetValueArgumentList) {
+            element = element!!.parent
+            parent = parent.parent
+        }
+        if (parent == null) return null
+
+        val argumentList = parent as JetValueArgumentList
+        if (element is JetValueArgument) {
+            val i = argumentList.arguments.indexOf(element)
+            context.setCurrentParameter(i)
+            context.setHighlightedParameter(element)
+        }
+        return argumentList
     }
 
     override fun updateParameterInfo(argumentList: JetValueArgumentList, context: UpdateParameterInfoContext) {
@@ -268,24 +282,6 @@ class KotlinFunctionParameterInfoHandler : ParameterInfoHandlerWithTabActionSupp
             return (argumentList.parent as? JetCallElement)?.getCallNameExpression()
         }
 
-        private fun findCallAndUpdateContext(context: UpdateParameterInfoContext): JetValueArgumentList? {
-            var element = context.file.findElementAt(context.offset) ?: return null
-            var parent = element.parent
-            while (parent != null && parent !is JetValueArgumentList) {
-                element = element!!.parent
-                parent = parent.parent
-            }
-            if (parent == null) return null
-
-            val argumentList = parent as JetValueArgumentList
-            if (element is JetValueArgument) {
-                val i = argumentList.arguments.indexOf(element)
-                context.setCurrentParameter(i)
-                context.setHighlightedParameter(element)
-            }
-            return argumentList
-        }
-
         private data class SignatureInfo(
                 val substitutedDescriptor: FunctionDescriptor,
                 val argumentToParameter: (ValueArgument) -> ValueParameterDescriptor?,