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

Kapt: Support type parameters in asMemberOf() (KT-13804)

Browse Source 
(cherry picked from commit 0d97d73)
This commit is contained in:
Yan Zhulanow
2016-09-15 22:42:45 +03:00
committed by Yan Zhulanow
parent 415acfbd05
commit e04f834a0e
3 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/annotation-processing/src/org/jetbrains/kotlin/annotation/processing/impl/KotlinTypes.kt
+10 -8
View File
@@ -22,10 +22,7 @@ import com.intellij.psi.impl.source.PsiImmediateClassType
import com.intellij.psi.search.GlobalSearchScope
import com.intellij.psi.util.*
import org.jetbrains.kotlin.java.model.JeElement
import org.jetbrains.kotlin.java.model.elements.JeClassInitializerExecutableElement
import org.jetbrains.kotlin.java.model.elements.JeMethodExecutableElement
import org.jetbrains.kotlin.java.model.elements.JeTypeElement
import org.jetbrains.kotlin.java.model.elements.JeVariableElement
import org.jetbrains.kotlin.java.model.elements.*
import org.jetbrains.kotlin.java.model.types.*
import javax.lang.model.element.Element
import javax.lang.model.element.TypeElement
@@ -250,12 +247,16 @@ class KotlinTypes(
val containingType = containing.psiType
val member = (element as JeElement).psi as? PsiMember ?: return element.asType()
val memberContainingClass = member.containingClass ?: return element.asType()
val relevantSuperType = if (memberContainingClass == containingType.resolve()) {
val memberOwnerClass = when (member) {
is PsiTypeParameter -> member.owner as? PsiClass
else -> member.containingClass
} ?: return element.asType()
val relevantSuperType = if (memberOwnerClass == containingType.resolve()) {
containingType
} else {
containingType.superTypes.findSuperType(memberContainingClass) ?: return element.asType()
containingType.superTypes.findSuperType(memberOwnerClass) ?: return element.asType()
}
val resolveResult = relevantSuperType.resolveGenerics()
@@ -270,7 +271,8 @@ class KotlinTypes(
JeMethodExecutableTypeMirror(method, signature, returnType)
}
is JeVariableElement -> substitutor.substitute(element.psi.type).toJeType(psiManager())
else -> throw IllegalArgumentException("Invalid element type: $element")
is JeTypeParameterElement -> substitutor.substitute(element.psi)?.toJeType(psiManager()) ?: element.asType()
else -> throw IllegalArgumentException("Invalid element type: ${element.javaClass.name} ($element)")
}
}