From 5c52bdc684c0c0572def466ee4c41bf2f03de089 Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com>
Date: Mon, 23 Jan 2017 16:58:45 +0300
Subject: [PATCH] KT-14859 "Parameter Info" doesn't work properly in one case 
 #KT-14859 fixed

---
 .../KotlinFunctionParameterInfoHandler.kt             |  4 ++--
 .../functionCall/ExtensionOnCapturedScopeChange.kt    | 11 +++++++++++
 .../parameterInfo/ParameterInfoTestGenerated.java     |  6 ++++++
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 idea/testData/parameterInfo/functionCall/ExtensionOnCapturedScopeChange.kt

diff --git a/idea/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinFunctionParameterInfoHandler.kt b/idea/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinFunctionParameterInfoHandler.kt
index 7918d3a756c..6b688a714df 100644
--- a/idea/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinFunctionParameterInfoHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinFunctionParameterInfoHandler.kt
@@ -358,8 +358,8 @@ abstract class KotlinParameterInfoWithCallHandlerBase<TArgumentList : KtElement,
         // First try to find strictly matching descriptor, then one with the same declaration.
         // The second way is needed for the case when the descriptor was invalidated and new one has been built.
         // See testLocalFunctionBug().
-        val resolvedCall = candidates.singleOrNull { it.resultingDescriptor.original == overload.original }
-                           ?: candidates.singleOrNull { descriptorsEqual(it.resultingDescriptor, overload) }
+        val resolvedCall = candidates.firstOrNull { it.resultingDescriptor.original == overload.original }
+                           ?: candidates.firstOrNull { descriptorsEqual(it.resultingDescriptor, overload) }
                            ?: return null
         val resultingDescriptor = resolvedCall.resultingDescriptor
 
diff --git a/idea/testData/parameterInfo/functionCall/ExtensionOnCapturedScopeChange.kt b/idea/testData/parameterInfo/functionCall/ExtensionOnCapturedScopeChange.kt
new file mode 100644
index 00000000000..917a77fa5d2
--- /dev/null
+++ b/idea/testData/parameterInfo/functionCall/ExtensionOnCapturedScopeChange.kt
@@ -0,0 +1,11 @@
+fun String.method1(fn: String.() -> Unit = {}) {}
+
+fun String.method2(param1: Int) {}
+
+fun String.method3() {
+    method1 {
+        method2(<caret>)
+    }
+}
+
+/* Text: (<highlight>param1: Int</highlight>), Disabled: false, Strikeout: false, Green: true */
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/ParameterInfoTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/ParameterInfoTestGenerated.java
index 051b1dbea17..d1ad463622f 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/ParameterInfoTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/ParameterInfoTestGenerated.java
@@ -95,6 +95,12 @@ public class ParameterInfoTestGenerated extends AbstractParameterInfoTest {
             doTest(fileName);
         }
 
+        @TestMetadata("ExtensionOnCapturedScopeChange.kt")
+        public void testExtensionOnCapturedScopeChange() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/ExtensionOnCapturedScopeChange.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("ExtensionOnClassObject.kt")
         public void testExtensionOnClassObject() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/ExtensionOnClassObject.kt");