From 7a00b028af6e8dd1ff79fc9caffb83dc0bce9f04 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Tue, 30 Aug 2016 16:20:31 +0300 Subject: [PATCH] Kapt: Do not substitute type arguments for PsiClassReferenceType (cherry picked from commit 3954c71) --- .../src/org/jetbrains/kotlin/java/model/types/JeDeclaredType.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/java-model-wrappers/src/org/jetbrains/kotlin/java/model/types/JeDeclaredType.kt b/plugins/java-model-wrappers/src/org/jetbrains/kotlin/java/model/types/JeDeclaredType.kt index a83044dfbfe..6ac6bb5aff6 100644 --- a/plugins/java-model-wrappers/src/org/jetbrains/kotlin/java/model/types/JeDeclaredType.kt +++ b/plugins/java-model-wrappers/src/org/jetbrains/kotlin/java/model/types/JeDeclaredType.kt @@ -50,6 +50,7 @@ class JeDeclaredType( override fun getTypeArguments(): List { return when (psiType) { + is PsiClassReferenceType -> psiType.parameters.map { it.toJeType(psiManager) } is PsiClassType -> { val substitutor = psiType.resolveGenerics().substitutor val psiClass = psiType.resolve() ?: return psiType.parameters.map { it.toJeType(psiManager) }