From 46f9e02c069d66b70e9058640ea8f36346bcdeb1 Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Fri, 12 Aug 2016 03:30:02 +0300
Subject: [PATCH] Kapt: Fix type arguments order for JeDeclaredType, should not
 use substitutor (cherry picked from commit a9c77e1)

---
 .../kotlin/java/model/types/JeDeclaredType.kt          | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

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 649ce6796aa..8dd9c189378 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
@@ -52,15 +52,7 @@ class JeDeclaredType(
         if (psiType.isRaw) return emptyList()
         
         return when (psiType) {
-            is PsiClassReferenceType -> {
-                val substitutor = psiType.resolveGenerics().substitutor
-                if (substitutor.isValid) {
-                    substitutor.substitutionMap.map { it.value.toJeType(psiManager) }
-                }
-                else {
-                    emptyList()
-                }
-            }
+            is PsiClassReferenceType -> psiType.parameters.map { it.toJeType(psiManager) }
             else -> emptyList()
         }
     }