From 7889756d1ae0d8d3023afd24bf121dc99e246475 Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Mon, 28 Jan 2019 12:01:27 +0300
Subject: [PATCH] New J2K: Convert type arguments in TypeMappingConversion

---
 .../kotlin/j2k/conversions/TypeMappingConversion.kt       | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TypeMappingConversion.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TypeMappingConversion.kt
index 95cb207d4b8..12ea89329a7 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TypeMappingConversion.kt
+++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/TypeMappingConversion.kt
@@ -56,7 +56,13 @@ class TypeMappingConversion(val context: ConversionContext) : RecursiveApplicabl
     }
 
     private fun JKTypeArgumentList.fixTypeArguments(classSymbol: JKClassSymbol): JKTypeArgumentList {
-        if (typeArguments.isNotEmpty()) return this
+        if (typeArguments.isNotEmpty()) {
+            return JKTypeArgumentListImpl(
+                typeArguments.map { typeArgument ->
+                    JKTypeElementImpl(typeArgument.type.mapType(null))
+                }
+            )
+        }
         val typeParametersCount = classSymbol.expectedTypeParametersCount()
         return when (typeParametersCount) {
             0 -> this