New J2K: Add type arguments to multi-dimension array initializers

2019-03-26 16:42:57 +03:00
parent 99f3af9e85
commit 76b73542d9
1 changed files with 5 additions and 1 deletions
@@ -55,6 +55,9 @@ class ArrayInitializerConversion(private val context: ConversionContext) : Recur
            }
        }
        if (dimensions[1] !is JKStubExpression) {
+            val arrayType = dimensions.drop(1).fold(type) { currentType, _ ->
+                JKJavaArrayTypeImpl(currentType)
+            }
            return JKJavaMethodCallExpressionImpl(
                context.symbolProvider.provideByFqName("kotlin.Array"),
                JKArgumentListImpl(
@@ -63,7 +66,8 @@ class ArrayInitializerConversion(private val context: ConversionContext) : Recur
                        JKExpressionStatementImpl(buildArrayInitializer(dimensions.subList(1, dimensions.size), type)),
                        emptyList()
                    )
-                )
+                ),
+                JKTypeArgumentListImpl(listOf(JKTypeElementImpl(arrayType)))
            )
        }
        var resultType = JKClassTypeImpl(