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

Kapt: Do not substitute type arguments for PsiClassReferenceType

Browse Source 
(cherry picked from commit 3954c71)
This commit is contained in:
Yan Zhulanow
2016-08-30 16:20:31 +03:00
committed by Yan Zhulanow
parent cacec67044
commit 7a00b028af
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/java-model-wrappers/src/org/jetbrains/kotlin/java/model/types/JeDeclaredType.kt
+1
View File
@@ -50,6 +50,7 @@ class JeDeclaredType(
override fun getTypeArguments(): List<TypeMirror> { override fun getTypeArguments(): List<TypeMirror> {
return when (psiType) { return when (psiType) {
is PsiClassReferenceType -> psiType.parameters.map { it.toJeType(psiManager) }
is PsiClassType -> { is PsiClassType -> {
val substitutor = psiType.resolveGenerics().substitutor val substitutor = psiType.resolveGenerics().substitutor
val psiClass = psiType.resolve() ?: return psiType.parameters.map { it.toJeType(psiManager) } val psiClass = psiType.resolve() ?: return psiType.parameters.map { it.toJeType(psiManager) }