azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Uast: ULambdaExpression returns proper functionalInterfaceType for SamAdapterExtensionFunctionDescriptor (KT-25297)

Browse Source
This commit is contained in:
Nicolay Mitropolsky
2018-07-07 11:13:48 +03:00
committed by xiexed
parent 2c7687195c
commit dd0e3cd135
4 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/internal/kotlinInternalUastUtils.kt
+11 -2
View File
@@ -46,10 +46,12 @@ import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
import org.jetbrains.kotlin.resolve.DescriptorUtils
import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
import org.jetbrains.kotlin.resolve.calls.model.ArgumentMatch
import org.jetbrains.kotlin.resolve.constants.IntegerValueTypeConstructor
import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor
import org.jetbrains.kotlin.synthetic.SamAdapterExtensionFunctionDescriptor
import org.jetbrains.kotlin.type.MapPsiToAsmDesc
import org.jetbrains.kotlin.types.*
import org.jetbrains.kotlin.types.typeUtil.isInterface
@@ -302,8 +304,15 @@ internal fun KotlinULambdaExpression.getFunctionalInterfaceType(): PsiType? {
if (parent is KtLambdaArgument) run {
val callExpression = parent.parent as? KtCallExpression ?: return@run
val resolvedCall = callExpression.getResolvedCall(callExpression.analyze()) ?: return@run
val samConstructorDescriptor = resolvedCall.candidateDescriptor as? SamConstructorDescriptor ?: return@run
return samConstructorDescriptor.returnType?.getFunctionalInterfaceType(this, psi)
val candidateDescriptor = resolvedCall.candidateDescriptor
when (candidateDescriptor) {
is SamConstructorDescriptor -> return candidateDescriptor.returnType?.getFunctionalInterfaceType(this, psi)
is SamAdapterExtensionFunctionDescriptor -> {
val index = (resolvedCall.getArgumentMapping(parent) as? ArgumentMatch)?.valueParameter?.index ?: return@run
val parameterDescriptor = candidateDescriptor.baseDescriptorForSynthetic.valueParameters.getOrNull(index) ?: return@run
return parameterDescriptor.type.getFunctionalInterfaceType(this, psi)
}
}
}
return psi.getExpectedType()?.getFunctionalInterfaceType(this, psi)
}
plugins/uast-kotlin/tests/KotlinUastApiTest.kt
+4
View File
@@ -371,6 +371,10 @@ class KotlinUastApiTest : AbstractKotlinUastTest() {
fun testUtilsStreamLambda() {
doTest("Lambdas") { _, file ->
val lambda = file.findElementByTextFromPsi<ULambdaExpression>("{ it.isEmpty() }")
assertEquals(
"java.util.function.Predicate<? super java.lang.String>",
lambda.functionalInterfaceType?.canonicalText
)
assertEquals(
"kotlin.jvm.functions.Function1<? super java.lang.String,? extends java.lang.Boolean>",
lambda.getExpressionType()?.canonicalText
plugins/uast-kotlin/tests/KotlinUastApiTest.kt.172
+4
View File
@@ -220,6 +220,10 @@ class KotlinUastApiTest : AbstractKotlinUastTest() {
fun testUtilsStreamLambda() {
doTest("Lambdas") { _, file ->
val lambda = file.findElementByTextFromPsi<ULambdaExpression>("{ it.isEmpty() }")
assertEquals(
"java.util.function.Predicate<? super java.lang.String>",
lambda.functionalInterfaceType?.canonicalText
)
assertEquals(
"kotlin.jvm.functions.Function1<? super java.lang.String,? extends java.lang.Boolean>",
lambda.getExpressionType()?.canonicalText
plugins/uast-kotlin/tests/KotlinUastApiTest.kt.173
+4
View File
@@ -335,6 +335,10 @@ class KotlinUastApiTest : AbstractKotlinUastTest() {
fun testUtilsStreamLambda() {
doTest("Lambdas") { _, file ->
val lambda = file.findElementByTextFromPsi<ULambdaExpression>("{ it.isEmpty() }")
assertEquals(
"java.util.function.Predicate<? super java.lang.String>",
lambda.functionalInterfaceType?.canonicalText
)
assertEquals(
"kotlin.jvm.functions.Function1<? super java.lang.String,? extends java.lang.Boolean>",
lambda.getExpressionType()?.canonicalText