arrays of any dimension are supported

src/org/jetbrains/jet/j2k/ast/ArrayWithoutInitializationExpression.java

@@ -20,33 +20,34 @@ public class ArrayWithoutInitializationExpression extends Expression {
   @NotNull
   @Override
   public String toKotlin() {
-    if (myType.getKind() == Kind.ARRAY_TYPE) {
-      if (myExpressions.size() == 1)
-        return oneDim(myType, myExpressions.get(0));
-      if (myExpressions.size() == 2) {
-        Type innerType = ((ArrayType) myType).getInnerType();
-        return oneDim(myType, myExpressions.get(0), "{" + SPACE +
-          oneDim(innerType, myExpressions.get(1)) + SPACE + "}");
-      }
-    }
+    if (myType.getKind() == Kind.ARRAY_TYPE)
+      return constructInnerType((ArrayType) myType, myExpressions);
     return getConstructorName(myType);
   }
 
-  private static String oneDim(Type type, Expression size) {
+  @NotNull
+  private static String constructInnerType(@NotNull ArrayType hostType, @NotNull List<Expression> expressions) {
+    if (expressions.size() == 1)
+      return oneDim(hostType, expressions.get(0));
+    Type innerType = hostType.getInnerType();
+    if (expressions.size() > 1 && innerType.getKind() == Kind.ARRAY_TYPE)
+      return oneDim(hostType, expressions.get(0), "{" + constructInnerType((ArrayType) innerType, expressions.subList(1, expressions.size())) + "}");
+    return getConstructorName(hostType);
+  }
+
+  @NotNull
+  private static String oneDim(@NotNull Type type, @NotNull Expression size) {
     return oneDim(type, size, EMPTY);
   }
 
-  private static String oneDim(Type type, Expression size, String init) {
+  @NotNull
+  private static String oneDim(@NotNull Type type, @NotNull Expression size, @NotNull String init) {
     String commaWithInit = init.isEmpty() ? EMPTY : COMMA_WITH_SPACE + init;
     return getConstructorName(type) + "(" + size.toKotlin() + commaWithInit + ")";
   }
 
-  public static String getConstructorName(Type type) {
-//    if (type instanceof ArrayType) {
-//      String innerTypeStr = ((ArrayType) type).getInnerType().toKotlin().toLowerCase();
-//      if (PRIMITIVE_TYPES.contains(innerTypeStr))
-//        return innerTypeStr + "Array";
-//    }
+  @NotNull
+  public static String getConstructorName(@NotNull Type type) {
     return AstUtil.replaceLastQuest(type.toKotlin());
   }
 }

src/org/jetbrains/jet/j2k/util/AstUtil.java

@@ -82,13 +82,15 @@ public class AstUtil {
       return "(" + f + ")" + s;
   }
 
-  public static <T> T getOrElse(@NotNull Map<T, T> map, T e, T orElse) {
+  @NotNull
+  public static <T> T getOrElse(@NotNull Map<T, T> map, @NotNull T e, @NotNull T orElse) {
     if (map.containsKey(e))
       return map.get(e);
     return orElse;
   }
 
-  public static String replaceLastQuest(String str) {
+  @NotNull
+  public static String replaceLastQuest(@NotNull String str) {
     if (str.endsWith("?"))
       return str.substring(0, str.length() - 1);
     return str;

testData/ast/arrayType/statement/arrayInitializationStatementWithDimension3d.jav

@@ -0,0 +1 @@
+int [][][] d3 = new int[5][5][];

testData/ast/arrayType/statement/arrayInitializationStatementWithDimension3d.kt

@@ -0,0 +1 @@
+var d3 : Array<Array<IntArray?>?>? = Array<Array<IntArray?>?>(5, {Array<IntArray?>(5)})

testData/ast/arrayType/statement/arrayInitializationStatementWithDimensionExplicit.kt

@@ -1 +1 @@
-var d2 : Array<IntArray?>? = Array<IntArray?>(5, { IntArray(5) })
+var d2 : Array<IntArray?>? = Array<IntArray?>(5, {IntArray(5)})

testData/ast/arrayType/statement/d2StringEmptyArray.kt

@@ -1 +1 @@
-var ss : Array<Array<String?>?>? = Array<Array<String?>?>(5, { Array<String?>(5) })
+var ss : Array<Array<String?>?>? = Array<Array<String?>?>(5, {Array<String?>(5)})

testData/ast/arrayType/statement/d3StringEmptyArray.jav

@@ -0,0 +1 @@
+String [][][] sss = new String[5][5][5];

testData/ast/arrayType/statement/d3StringEmptyArray.kt

@@ -0,0 +1 @@
+var sss : Array<Array<Array<String?>?>?>? = Array<Array<Array<String?>?>?>(5, {Array<Array<String?>?>(5, {Array<String?>(5)})})