KT-14859 "Parameter Info" doesn't work properly in one case
#KT-14859 fixed
This commit is contained in:
+2
-2
@@ -358,8 +358,8 @@ abstract class KotlinParameterInfoWithCallHandlerBase<TArgumentList : KtElement,
|
|||||||
// First try to find strictly matching descriptor, then one with the same declaration.
|
// 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.
|
// The second way is needed for the case when the descriptor was invalidated and new one has been built.
|
||||||
// See testLocalFunctionBug().
|
// See testLocalFunctionBug().
|
||||||
val resolvedCall = candidates.singleOrNull { it.resultingDescriptor.original == overload.original }
|
val resolvedCall = candidates.firstOrNull { it.resultingDescriptor.original == overload.original }
|
||||||
?: candidates.singleOrNull { descriptorsEqual(it.resultingDescriptor, overload) }
|
?: candidates.firstOrNull { descriptorsEqual(it.resultingDescriptor, overload) }
|
||||||
?: return null
|
?: return null
|
||||||
val resultingDescriptor = resolvedCall.resultingDescriptor
|
val resultingDescriptor = resolvedCall.resultingDescriptor
|
||||||
|
|
||||||
|
|||||||
@@ -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 */
|
||||||
@@ -95,6 +95,12 @@ public class ParameterInfoTestGenerated extends AbstractParameterInfoTest {
|
|||||||
doTest(fileName);
|
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")
|
@TestMetadata("ExtensionOnClassObject.kt")
|
||||||
public void testExtensionOnClassObject() throws Exception {
|
public void testExtensionOnClassObject() throws Exception {
|
||||||
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/ExtensionOnClassObject.kt");
|
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/ExtensionOnClassObject.kt");
|
||||||
|
|||||||
Reference in New Issue
Block a user