New J2K: Convert type arguments in TypeMappingConversion

2019-01-28 12:01:27 +03:00
parent d2a4ff172d
commit 7889756d1a
1 changed files with 7 additions and 1 deletions
@@ -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