J2K: use arrayOf instead of array and similar

j2k/src/org/jetbrains/kotlin/j2k/ast/Expressions.kt

@@ -173,10 +173,10 @@ class ClassLiteralExpression(val type: Type): Expression() {
 fun createArrayInitializerExpression(arrayType: ArrayType, initializers: List<Expression>, needExplicitType: Boolean = true) : MethodCallExpression {
     val elementType = arrayType.elementType
     val createArrayFunction = if (elementType is PrimitiveType)
-            (elementType.toNotNullType().canonicalCode() + "Array").decapitalize()
+            (elementType.toNotNullType().canonicalCode() + "ArrayOf").decapitalize()
         else if (needExplicitType)
-            arrayType.toNotNullType().canonicalCode().decapitalize()
+            "arrayOf<" + arrayType.elementType.canonicalCode() + ">"
         else
-            "array"
+            "arrayOf"
     return MethodCallExpression.buildNotNull(null, createArrayFunction, initializers)
 }

j2k/testData/fileOrElement/annotations/annotationInterface1.kt

@@ -4,6 +4,6 @@ import java.lang.annotation.Target
 annotation class Anon(public val stringArray: Array<String>, public val intArray: IntArray, // string
                       public val string: String)
 
-Anon(string = "a", stringArray = array("a", "b"), intArray = intArray(1, 2))
+Anon(string = "a", stringArray = arrayOf("a", "b"), intArray = intArrayOf(1, 2))
 Target(ElementType.CONSTRUCTOR, ElementType.FIELD)
 annotation class I

j2k/testData/fileOrElement/annotations/annotationInterface2.kt

@@ -1,4 +1,4 @@
-annotation class Anon(public val s: String = "a", public val stringArray: Array<String> = array("a", "b"), public val intArray: IntArray)
+annotation class Anon(public val s: String = "a", public val stringArray: Array<String> = arrayOf("a", "b"), public val intArray: IntArray)
 
-Anon(intArray = intArray(1, 2))
+Anon(intArray = intArrayOf(1, 2))
 class A

j2k/testData/fileOrElement/annotations/annotationInterface4.kt

@@ -9,5 +9,5 @@ interface I2
 Anon("c", "d", x = 1)
 interface I3
 
-Anon(value = *array("c", "d"))
+Anon(value = *arrayOf("c", "d"))
 interface I4

j2k/testData/fileOrElement/annotations/annotationUsages.kt

@@ -1,13 +1,13 @@
 import javaApi.*
 
-Anon1(value = *array("a"), stringArray = array("b"), intArray = intArray(1, 2), string = "x")
+Anon1(value = *arrayOf("a"), stringArray = arrayOf("b"), intArray = intArrayOf(1, 2), string = "x")
 Anon2(value = "a", intValue = 1, charValue = 'a')
-Anon3(e = E.A, stringArray = array(), value = *array("a", "b"))
+Anon3(e = E.A, stringArray = arrayOf(), value = *arrayOf("a", "b"))
 Anon4("x", "y")
 Anon5(1)
 Anon6("x", "y")
 Anon7(String::class, StringBuilder::class)
-Anon8(classes = array(String::class, StringBuilder::class))
+Anon8(classes = arrayOf(String::class, StringBuilder::class))
 class C {
     Anon5(1) deprecated("") private val field1 = 0
 

j2k/testData/fileOrElement/arrayInitializerExpression/doubleArray.kt

@@ -1 +1 @@
-val a = doubleArray(1.0, 2.0, 3.0)
+val a = doubleArrayOf(1.0, 2.0, 3.0)

j2k/testData/fileOrElement/arrayInitializerExpression/doubleArrayWithVariables.kt

@@ -1,4 +1,4 @@
 val a = 0.0
 val b = 0.0
 val c = 0.0
-val ds = doubleArray(a, b, c)
+val ds = doubleArrayOf(a, b, c)

j2k/testData/fileOrElement/arrayInitializerExpression/floatArray.kt

@@ -1 +1 @@
-val a = floatArray(1f, 2f, 3.0f)
+val a = floatArrayOf(1f, 2f, 3.0f)

j2k/testData/fileOrElement/arrayInitializerExpression/javaLangDoubleArray.kt

@@ -1 +1 @@
-val a = array(1.0, 2.0, 3.0)
+val a = arrayOf(1.0, 2.0, 3.0)

j2k/testData/fileOrElement/arrayInitializerExpression/javaLangFloatArray.kt

@@ -1 +1 @@
-val a = array(1.0f, 2f, 3f)
+val a = arrayOf(1.0f, 2f, 3f)

j2k/testData/fileOrElement/arrayInitializerExpression/newByte.kt

@@ -1 +1 @@
-val a = byteArray(1, 2, 3)
+val a = byteArrayOf(1, 2, 3)

j2k/testData/fileOrElement/arrayInitializerExpression/newInt.kt

@@ -1 +1 @@
-intArray(1, 2, 3)
+intArrayOf(1, 2, 3)

j2k/testData/fileOrElement/arrayInitializerExpression/oneDim.kt

@@ -1 +1 @@
-val a = intArray(1, 2, 3)
+val a = intArrayOf(1, 2, 3)

j2k/testData/fileOrElement/arrayInitializerExpression/oneDimWithVariables.kt

@@ -1,4 +1,4 @@
 val a = 0
 val b = 0
 val c = 0
-val `is` = intArray(a, b, c)
+val `is` = intArrayOf(a, b, c)

j2k/testData/fileOrElement/arrayInitializerExpression/twoDim.kt

@@ -1 +1 @@
-val a = array(intArray(1, 2, 3), intArray(4, 5, 6), intArray(7, 8, 9))
+val a = arrayOf(intArrayOf(1, 2, 3), intArrayOf(4, 5, 6), intArrayOf(7, 8, 9))

j2k/testData/fileOrElement/arrayType/arrayInitializationStatement.kt

@@ -1 +1 @@
-val d2 = array<IntArray>()
+val d2 = arrayOf<IntArray>()

j2k/testData/fileOrElement/arrayType/longArray.kt

@@ -1 +1 @@
-val a = longArray(1, 2, 3)
+val a = longArrayOf(1, 2, 3)

j2k/testData/fileOrElement/arrayType/newIntArray.kt

@@ -1 +1 @@
-val a = intArray(1, 2, 3)
+val a = intArrayOf(1, 2, 3)

j2k/testData/fileOrElement/arrayType/newStringArray.kt

@@ -1 +1 @@
-val a = array("abc")
+val a = arrayOf("abc")

j2k/testData/fileOrElement/classExpression/complexExample.kt

@@ -1 +1 @@
-val constrArgTypes = array<Class<*>>(javaClass<Array<String>>(), javaClass<String>())
+val constrArgTypes = arrayOf<Class<*>>(javaClass<Array<String>>(), javaClass<String>())

j2k/testData/fileOrElement/function/varVararg.kt

@@ -3,6 +3,6 @@ package demo
 class Test {
     fun test(vararg args: Any) {
         var args = args
-        args = array(1, 2, 3)
+        args = arrayOf(1, 2, 3)
     }
 }

j2k/testData/fileOrElement/methodCallExpression/vararg2.kt

@@ -2,8 +2,8 @@ import javaApi.WithVarargConstructor
 
 class X {
     fun foo() {
-        val o1 = WithVarargConstructor(1, *array<Any>("a"))
+        val o1 = WithVarargConstructor(1, *arrayOf<Any>("a"))
-        val o2 = WithVarargConstructor(2, array<Any>("a"), array<Any>("b"))
+        val o2 = WithVarargConstructor(2, arrayOf<Any>("a"), arrayOf<Any>("b"))
         val o3 = WithVarargConstructor(2, "a")
     }
 }