diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationArrayValueDefault.kt b/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationArrayValueDefault.kt index a2b5a807f99..6447d401420 100644 --- a/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationArrayValueDefault.kt +++ b/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationArrayValueDefault.kt @@ -1,7 +1,7 @@ @JavaAnn class MyClass1 @JavaAnn() class MyClass2 @JavaAnn("asd") class MyClass3 -@JavaAnn(*array()) class MyClass4 +@JavaAnn(*arrayOf()) class MyClass4 fun box(): String { diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationArrayValueNoDefault.kt b/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationArrayValueNoDefault.kt index 2171ee2eeb1..7e68cc3fcd0 100644 --- a/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationArrayValueNoDefault.kt +++ b/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationArrayValueNoDefault.kt @@ -1,7 +1,7 @@ @JavaAnn class MyClass1 @JavaAnn() class MyClass2 @JavaAnn("asd") class MyClass3 -@JavaAnn(*array()) class MyClass4 +@JavaAnn(*arrayOf()) class MyClass4 fun box(): String { diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/arrayClassParameter.kt b/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/arrayClassParameter.kt index 8931185631c..57de26c2159 100644 --- a/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/arrayClassParameter.kt +++ b/compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/arrayClassParameter.kt @@ -1,7 +1,7 @@ class O class K -@JavaAnn(args = array(O::class, K::class)) class MyClass +@JavaAnn(args = arrayOf(O::class, K::class)) class MyClass fun box(): String { val args = javaClass().getAnnotation(javaClass()).args() diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationArrayValueDefault.kt b/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationArrayValueDefault.kt index 623ed356116..093cce629d5 100644 --- a/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationArrayValueDefault.kt +++ b/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationArrayValueDefault.kt @@ -1,7 +1,7 @@ @JavaAnn class MyClass1 @JavaAnn() class MyClass2 @JavaAnn("asd") class MyClass3 -@JavaAnn(*array()) class MyClass4 +@JavaAnn(*arrayOf()) class MyClass4 fun box(): String { diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationArrayValueNoDefault.kt b/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationArrayValueNoDefault.kt index bd14ac00527..ae11701bb07 100644 --- a/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationArrayValueNoDefault.kt +++ b/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationArrayValueNoDefault.kt @@ -1,7 +1,7 @@ @JavaAnn class MyClass1 @JavaAnn() class MyClass2 @JavaAnn("asd") class MyClass3 -@JavaAnn(*array()) class MyClass4 +@JavaAnn(*arrayOf()) class MyClass4 fun box(): String { diff --git a/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/arrayClassParameter.kt b/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/arrayClassParameter.kt index 8931185631c..57de26c2159 100644 --- a/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/arrayClassParameter.kt +++ b/compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/arrayClassParameter.kt @@ -1,7 +1,7 @@ class O class K -@JavaAnn(args = array(O::class, K::class)) class MyClass +@JavaAnn(args = arrayOf(O::class, K::class)) class MyClass fun box(): String { val args = javaClass().getAnnotation(javaClass()).args() diff --git a/compiler/testData/codegen/boxAgainstJava/callableReference/staticMethod.kt b/compiler/testData/codegen/boxAgainstJava/callableReference/staticMethod.kt index 5e42d2a5920..1820b2123cc 100644 --- a/compiler/testData/codegen/boxAgainstJava/callableReference/staticMethod.kt +++ b/compiler/testData/codegen/boxAgainstJava/callableReference/staticMethod.kt @@ -1,5 +1,5 @@ fun box(): String { - val args = array("Fail") + val args = arrayOf("Fail") (A::main)(args) return args[0] } diff --git a/compiler/testData/codegen/boxInline/builders/builders.1.kt b/compiler/testData/codegen/boxInline/builders/builders.1.kt index d6b45d5e316..685f51ae3c0 100644 --- a/compiler/testData/codegen/boxInline/builders/builders.1.kt +++ b/compiler/testData/codegen/boxInline/builders/builders.1.kt @@ -2,7 +2,7 @@ import builders.* fun testAllInline() : String { - val args = array("1", "2", "3") + val args = arrayOf("1", "2", "3") val result = html { val htmlVal = 0 @@ -42,7 +42,7 @@ fun testAllInline() : String { } fun testHtmlNoInline() : String { - val args = array("1", "2", "3") + val args = arrayOf("1", "2", "3") val result = htmlNoInline() { val htmlVal = 0 @@ -82,7 +82,7 @@ fun testHtmlNoInline() : String { } fun testBodyNoInline() : String { - val args = array("1", "2", "3") + val args = arrayOf("1", "2", "3") val result = html { val htmlVal = 0 @@ -122,7 +122,7 @@ fun testBodyNoInline() : String { } fun testBodyHtmlNoInline() : String { - val args = array("1", "2", "3") + val args = arrayOf("1", "2", "3") val result = htmlNoInline { val htmlVal = 0 diff --git a/compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.1.kt b/compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.1.kt index e41f9e450cf..282d321d2bc 100644 --- a/compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.1.kt +++ b/compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.1.kt @@ -3,7 +3,7 @@ import builders.* import kotlin.InlineOption.* inline fun testAllInline(f: () -> String) : String { - val args = array("1", "2", "3") + val args = arrayOf("1", "2", "3") val result = html { val htmlVal = 0 @@ -43,7 +43,7 @@ inline fun testAllInline(f: () -> String) : String { } inline fun testHtmlNoInline(crossinline f: () -> String) : String { - val args = array("1", "2", "3") + val args = arrayOf("1", "2", "3") val result = htmlNoInline() { val htmlVal = 0 @@ -83,7 +83,7 @@ inline fun testHtmlNoInline(crossinline f: () -> String) : String { } inline fun testBodyNoInline(crossinline f: () -> String) : String { - val args = array("1", "2", "3") + val args = arrayOf("1", "2", "3") val result = html { val htmlVal = 0 @@ -123,7 +123,7 @@ inline fun testBodyNoInline(crossinline f: () -> String) : String { } inline fun testBodyHtmlNoInline(crossinline f: () -> String) : String { - val args = array("1", "2", "3") + val args = arrayOf("1", "2", "3") val result = htmlNoInline { val htmlVal = 0 diff --git a/compiler/testData/codegen/boxWithStdlib/annotations/defaultParameterValues.kt b/compiler/testData/codegen/boxWithStdlib/annotations/defaultParameterValues.kt index 1b40bdcfc35..bddd0c9b3da 100644 --- a/compiler/testData/codegen/boxWithStdlib/annotations/defaultParameterValues.kt +++ b/compiler/testData/codegen/boxWithStdlib/annotations/defaultParameterValues.kt @@ -7,8 +7,8 @@ annotation class Ann( val a: Ann2 = Ann2(), val e: MyEnum = MyEnum.A, val c: KClass<*> = A::class, - val ia: IntArray = intArray(1, 2), - val sa: Array = array("a", "b") + val ia: IntArray = intArrayOf(1, 2), + val sa: Array = arrayOf("a", "b") ) fun box(): String { diff --git a/compiler/testData/codegen/boxWithStdlib/annotations/varargInAnnotationParameter.kt b/compiler/testData/codegen/boxWithStdlib/annotations/varargInAnnotationParameter.kt index 8f069b9606d..44ec665afab 100644 --- a/compiler/testData/codegen/boxWithStdlib/annotations/varargInAnnotationParameter.kt +++ b/compiler/testData/codegen/boxWithStdlib/annotations/varargInAnnotationParameter.kt @@ -5,15 +5,15 @@ annotation class Ann(vararg val p: Int) @Ann(1) class MyClass2 @Ann(1, 2) class MyClass3 -@Ann(*intArray()) class MyClass4 -@Ann(*intArray(1)) class MyClass5 -@Ann(*intArray(1, 2)) class MyClass6 +@Ann(*intArrayOf()) class MyClass4 +@Ann(*intArrayOf(1)) class MyClass5 +@Ann(*intArrayOf(1, 2)) class MyClass6 @Ann(p = 1) class MyClass7 -@Ann(p = *intArray()) class MyClass8 -@Ann(p = *intArray(1)) class MyClass9 -@Ann(p = *intArray(1, 2)) class MyClass10 +@Ann(p = *intArrayOf()) class MyClass8 +@Ann(p = *intArrayOf(1)) class MyClass9 +@Ann(p = *intArrayOf(1, 2)) class MyClass10 fun box(): String { test(javaClass(), "") diff --git a/compiler/testData/codegen/boxWithStdlib/arrays/cloneArray.kt b/compiler/testData/codegen/boxWithStdlib/arrays/cloneArray.kt index 656b19794e3..214798f5958 100644 --- a/compiler/testData/codegen/boxWithStdlib/arrays/cloneArray.kt +++ b/compiler/testData/codegen/boxWithStdlib/arrays/cloneArray.kt @@ -1,13 +1,13 @@ import java.util.Arrays.equals fun box(): String { - val s = array("live", "long") + val s = arrayOf("live", "long") val t = s.clone() t : Array if (!equals(s, t)) return "Fail string" if (s identityEquals t) return "Fail string identity" - val ss = array(s, s) + val ss = arrayOf(s, s) val tt = ss.clone() tt : Array> if (!equals(ss, tt)) return "Fail string[]" diff --git a/compiler/testData/codegen/boxWithStdlib/arrays/clonePrimitiveArrays.kt b/compiler/testData/codegen/boxWithStdlib/arrays/clonePrimitiveArrays.kt index 413033f31cf..61b45b5ef9c 100644 --- a/compiler/testData/codegen/boxWithStdlib/arrays/clonePrimitiveArrays.kt +++ b/compiler/testData/codegen/boxWithStdlib/arrays/clonePrimitiveArrays.kt @@ -1,35 +1,35 @@ import java.util.Arrays.equals fun box(): String { - val i = intArray(1, 2) + val i = intArrayOf(1, 2) if (!equals(i, i.clone())) return "Fail int" if (i.clone() identityEquals i) return "Fail int identity" - val j = longArray(1L, 2L) + val j = longArrayOf(1L, 2L) if (!equals(j, j.clone())) return "Fail long" if (j.clone() identityEquals j) return "Fail long identity" - val s = shortArray(1.toShort(), 2.toShort()) + val s = shortArrayOf(1.toShort(), 2.toShort()) if (!equals(s, s.clone())) return "Fail short" if (s.clone() identityEquals s) return "Fail short identity" - val b = byteArray(1.toByte(), 2.toByte()) + val b = byteArrayOf(1.toByte(), 2.toByte()) if (!equals(b, b.clone())) return "Fail byte" if (b.clone() identityEquals b) return "Fail byte identity" - val c = charArray('a', 'b') + val c = charArrayOf('a', 'b') if (!equals(c, c.clone())) return "Fail char" if (c.clone() identityEquals c) return "Fail char identity" - val d = doubleArray(1.0, -1.0) + val d = doubleArrayOf(1.0, -1.0) if (!equals(d, d.clone())) return "Fail double" if (d.clone() identityEquals d) return "Fail double identity" - val f = floatArray(1f, -1f) + val f = floatArrayOf(1f, -1f) if (!equals(f, f.clone())) return "Fail float" if (f.clone() identityEquals f) return "Fail float identity" - val z = booleanArray(true, false) + val z = booleanArrayOf(true, false) if (!equals(z, z.clone())) return "Fail boolean" if (z.clone() identityEquals z) return "Fail boolean identity" diff --git a/compiler/testData/codegen/boxWithStdlib/arrays/inProjectionAsParameter.kt b/compiler/testData/codegen/boxWithStdlib/arrays/inProjectionAsParameter.kt index e70e5ad4292..d89fdf1f02b 100644 --- a/compiler/testData/codegen/boxWithStdlib/arrays/inProjectionAsParameter.kt +++ b/compiler/testData/codegen/boxWithStdlib/arrays/inProjectionAsParameter.kt @@ -1,9 +1,9 @@ fun test(y: Array>) { - y[0] = kotlin.array("OK") + y[0] = kotlin.arrayOf("OK") } fun box() : String { - val x : Array> = kotlin.array(kotlin.array(1)) + val x : Array> = kotlin.arrayOf(kotlin.arrayOf(1)) test(x) return x[0][0] as String } \ No newline at end of file diff --git a/compiler/testData/codegen/boxWithStdlib/arrays/inProjectionOfArray.kt b/compiler/testData/codegen/boxWithStdlib/arrays/inProjectionOfArray.kt index 7d1a9988b6a..e05c96dce56 100644 --- a/compiler/testData/codegen/boxWithStdlib/arrays/inProjectionOfArray.kt +++ b/compiler/testData/codegen/boxWithStdlib/arrays/inProjectionOfArray.kt @@ -1,10 +1,10 @@ fun box(): String { - val x : Array> = array(array(1)) + val x : Array> = arrayOf(arrayOf(1)) val y : Array> = x if (y.size() != 1) return "fail 1" - y[0] = array("OK") + y[0] = arrayOf("OK") return x[0][0] as String } \ No newline at end of file diff --git a/compiler/testData/codegen/boxWithStdlib/arrays/inProjectionOfList.kt b/compiler/testData/codegen/boxWithStdlib/arrays/inProjectionOfList.kt index 2a3d23ba837..a16ca38a1c9 100644 --- a/compiler/testData/codegen/boxWithStdlib/arrays/inProjectionOfList.kt +++ b/compiler/testData/codegen/boxWithStdlib/arrays/inProjectionOfList.kt @@ -1,5 +1,5 @@ fun box(): String { - val x: Array> = array(listOf(1)) + val x: Array> = arrayOf(listOf(1)) val y : Array> = x if (y.size() != 1) return "fail 1" diff --git a/compiler/testData/codegen/boxWithStdlib/arrays/kt3771.kt b/compiler/testData/codegen/boxWithStdlib/arrays/kt3771.kt index 9341b533e86..60db734b833 100644 --- a/compiler/testData/codegen/boxWithStdlib/arrays/kt3771.kt +++ b/compiler/testData/codegen/boxWithStdlib/arrays/kt3771.kt @@ -5,7 +5,7 @@ fun fill(dest : Array, v : String) { fun box() : String { //fun main(args : Array) { val s : String = "bar" - val any : Array = array(1, "foo", 1.234) + val any : Array = arrayOf(1, "foo", 1.234) fill(any, s) /* shouldn't throw ClassCastException: [Ljava.lang.Object; cannot be cast to [Ljava.lang.String; diff --git a/compiler/testData/codegen/boxWithStdlib/arrays/kt4357.kt b/compiler/testData/codegen/boxWithStdlib/arrays/kt4357.kt index 842701bf9f6..0bbb28adb38 100644 --- a/compiler/testData/codegen/boxWithStdlib/arrays/kt4357.kt +++ b/compiler/testData/codegen/boxWithStdlib/arrays/kt4357.kt @@ -1,8 +1,8 @@ fun box(): String { - val array = intArray(11, 12, 13) + val array = intArrayOf(11, 12, 13) val p = array get 0 if (p != 11) return "fail 1: $p" - val stringArray = array("OK", "FAIL") + val stringArray = arrayOf("OK", "FAIL") return stringArray get 0 } \ No newline at end of file diff --git a/compiler/testData/codegen/boxWithStdlib/arrays/kt7009.kt b/compiler/testData/codegen/boxWithStdlib/arrays/kt7009.kt index d1c7fb6b78b..6adbc2e7923 100644 --- a/compiler/testData/codegen/boxWithStdlib/arrays/kt7009.kt +++ b/compiler/testData/codegen/boxWithStdlib/arrays/kt7009.kt @@ -1,4 +1,4 @@ fun box() : String { - val value = (1 to doubleArray(1.0)).second[0] + val value = (1 to doubleArrayOf(1.0)).second[0] return if (value == 1.0) "OK" else "fail" } \ No newline at end of file diff --git a/compiler/testData/codegen/boxWithStdlib/arrays/kt7338.kt b/compiler/testData/codegen/boxWithStdlib/arrays/kt7338.kt index 1762a9d516f..2f893e040de 100644 --- a/compiler/testData/codegen/boxWithStdlib/arrays/kt7338.kt +++ b/compiler/testData/codegen/boxWithStdlib/arrays/kt7338.kt @@ -3,5 +3,5 @@ fun foo(x : Any): String { } fun box(): String { - return foo(array("OK")) + return foo(arrayOf("OK")) } \ No newline at end of file diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/property/extensionToArray.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/property/extensionToArray.kt index d80032edb5f..455b69ae0cf 100644 --- a/compiler/testData/codegen/boxWithStdlib/callableReference/property/extensionToArray.kt +++ b/compiler/testData/codegen/boxWithStdlib/callableReference/property/extensionToArray.kt @@ -2,5 +2,5 @@ val Array.firstElement: String get() = get(0) fun box(): String { val p = Array::firstElement - return p.get(array("OK", "Fail")) + return p.get(arrayOf("OK", "Fail")) } diff --git a/compiler/testData/codegen/bytecodeText/statements/statementsComposition.kt b/compiler/testData/codegen/bytecodeText/statements/statementsComposition.kt index 7a7419770c1..aedb610b584 100644 --- a/compiler/testData/codegen/bytecodeText/statements/statementsComposition.kt +++ b/compiler/testData/codegen/bytecodeText/statements/statementsComposition.kt @@ -1,6 +1,6 @@ fun foo() { - val array = intArray(1,2,3) + val array = intArrayOf(1,2,3) var count = 0 for (element in array) if (element > 0) count++ diff --git a/compiler/testData/repl/primitiveTypes/arrayOfBoxed.repl b/compiler/testData/repl/primitiveTypes/arrayOfBoxed.repl index 6eccb6c639b..156713172ee 100644 --- a/compiler/testData/repl/primitiveTypes/arrayOfBoxed.repl +++ b/compiler/testData/repl/primitiveTypes/arrayOfBoxed.repl @@ -1,8 +1,8 @@ ->>> array(1, 2)[0] // KT-5622 +>>> arrayOf(1, 2)[0] // KT-5622 1 ->>> array(1, 2)[1] +>>> arrayOf(1, 2)[1] 2 ->>> array(1, 2).get(0) +>>> arrayOf(1, 2).get(0) 1 ->>> intArray(1)[0] +>>> intArrayOf(1)[0] 1 diff --git a/compiler/testData/resolveConstructorDelegationCalls/varargs.kt b/compiler/testData/resolveConstructorDelegationCalls/varargs.kt index c213aa26973..2518a7dae3e 100644 --- a/compiler/testData/resolveConstructorDelegationCalls/varargs.kt +++ b/compiler/testData/resolveConstructorDelegationCalls/varargs.kt @@ -3,5 +3,5 @@ open class B { } class A : B { - constructor(vararg x: Int): super(*x, *intArray(1, 2, 3), 4) {} + constructor(vararg x: Int): super(*x, *intArrayOf(1, 2, 3), 4) {} } diff --git a/compiler/testData/resolveConstructorDelegationCalls/varargs.txt b/compiler/testData/resolveConstructorDelegationCalls/varargs.txt index 8a448c9d7c0..c8c322dde0a 100644 --- a/compiler/testData/resolveConstructorDelegationCalls/varargs.txt +++ b/compiler/testData/resolveConstructorDelegationCalls/varargs.txt @@ -3,7 +3,7 @@ open class B { } class A : B { - constructor(vararg x: Int): super(*x, *intArray(1, 2, 3), 4) {} + constructor(vararg x: Int): super(*x, *intArrayOf(1, 2, 3), 4) {} } @@ -18,5 +18,5 @@ Extension receiver = NO_RECEIVER Value arguments mapping: SUCCESS x : IntArray = x -SUCCESS x : IntArray = intArray(1, 2, 3) +SUCCESS x : IntArray = intArrayOf(1, 2, 3) SUCCESS x : IntArray = 4 diff --git a/compiler/testData/resolvedCalls/secondaryConstructors/varargs.kt b/compiler/testData/resolvedCalls/secondaryConstructors/varargs.kt index e5f66ae4b41..84ff705fabc 100644 --- a/compiler/testData/resolvedCalls/secondaryConstructors/varargs.kt +++ b/compiler/testData/resolvedCalls/secondaryConstructors/varargs.kt @@ -2,4 +2,4 @@ class A { constructor(vararg x: Int) {} } -val y = A(0, *intArray(1, 2, 3), 4)) \ No newline at end of file +val y = A(0, *intArrayOf(1, 2, 3), 4)) \ No newline at end of file diff --git a/compiler/testData/resolvedCalls/secondaryConstructors/varargs.txt b/compiler/testData/resolvedCalls/secondaryConstructors/varargs.txt index cebf588508e..9d6a7a0dd17 100644 --- a/compiler/testData/resolvedCalls/secondaryConstructors/varargs.txt +++ b/compiler/testData/resolvedCalls/secondaryConstructors/varargs.txt @@ -2,7 +2,7 @@ class A { constructor(vararg x: Int) {} } -val y = A(0, *intArray(1, 2, 3), 4)) +val y = A(0, *intArrayOf(1, 2, 3), 4)) Resolved call: @@ -16,5 +16,5 @@ Extension receiver = NO_RECEIVER Value arguments mapping: SUCCESS x : IntArray = 0 -SUCCESS x : IntArray = intArray(1, 2, 3) +SUCCESS x : IntArray = intArrayOf(1, 2, 3) SUCCESS x : IntArray = 4 diff --git a/compiler/testData/serialization/builtinsSerializer/annotationArguments/annotation.kt b/compiler/testData/serialization/builtinsSerializer/annotationArguments/annotation.kt index 8f489f853be..09c7b752245 100644 --- a/compiler/testData/serialization/builtinsSerializer/annotationArguments/annotation.kt +++ b/compiler/testData/serialization/builtinsSerializer/annotationArguments/annotation.kt @@ -7,8 +7,8 @@ annotation class JustAnnotation(val annotation: Empty) annotation class AnnotationArray(val annotationArray: Array) @JustAnnotation(Empty()) -@AnnotationArray(array()) +@AnnotationArray(arrayOf()) class C1 -@AnnotationArray(array(JustAnnotation(Empty()), JustAnnotation(Empty()))) +@AnnotationArray(arrayOf(JustAnnotation(Empty()), JustAnnotation(Empty()))) class C2 diff --git a/compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.kt b/compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.kt index 4c8d81e754d..d3ab2c9dcc0 100644 --- a/compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.kt +++ b/compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.kt @@ -11,8 +11,8 @@ annotation class JustEnum(val weapon: Weapon) annotation class EnumArray(val enumArray: Array) @JustEnum(Weapon.SCISSORS) -@EnumArray(array()) +@EnumArray(arrayOf()) class C1 -@EnumArray(array(Weapon.PAPER, Weapon.ROCK)) +@EnumArray(arrayOf(Weapon.PAPER, Weapon.ROCK)) class C2 diff --git a/compiler/testData/serialization/builtinsSerializer/annotationArguments/primitiveArrays.kt b/compiler/testData/serialization/builtinsSerializer/annotationArguments/primitiveArrays.kt index 930842f82be..a003d1f04ef 100644 --- a/compiler/testData/serialization/builtinsSerializer/annotationArguments/primitiveArrays.kt +++ b/compiler/testData/serialization/builtinsSerializer/annotationArguments/primitiveArrays.kt @@ -12,25 +12,25 @@ annotation class PrimitiveArrays( ) @PrimitiveArrays( - byteArray = byteArray(-7, 7), - charArray = charArray('%', 'z'), - shortArray = shortArray(239), - intArray = intArray(239017, -1), - longArray = longArray(123456789123456789L), - floatArray = floatArray(2.72f, 0f), - doubleArray = doubleArray(-3.14), - booleanArray = booleanArray(true, false, true) + byteArray = byteArrayOf(-7, 7), + charArray = charArrayOf('%', 'z'), + shortArray = shortArrayOf(239), + intArray = intArrayOf(239017, -1), + longArray = longArrayOf(123456789123456789L), + floatArray = floatArrayOf(2.72f, 0f), + doubleArray = doubleArrayOf(-3.14), + booleanArray = booleanArrayOf(true, false, true) ) class C1 @PrimitiveArrays( - byteArray = byteArray(), - charArray = charArray(), - shortArray = shortArray(), - intArray = intArray(), - longArray = longArray(), - floatArray = floatArray(), - doubleArray = doubleArray(), - booleanArray = booleanArray() + byteArray = byteArrayOf(), + charArray = charArrayOf(), + shortArray = shortArrayOf(), + intArray = intArrayOf(), + longArray = longArrayOf(), + floatArray = floatArrayOf(), + doubleArray = doubleArrayOf(), + booleanArray = booleanArrayOf() ) class C2 diff --git a/compiler/testData/serialization/builtinsSerializer/annotationArguments/string.kt b/compiler/testData/serialization/builtinsSerializer/annotationArguments/string.kt index 435cda93509..92860cd716a 100644 --- a/compiler/testData/serialization/builtinsSerializer/annotationArguments/string.kt +++ b/compiler/testData/serialization/builtinsSerializer/annotationArguments/string.kt @@ -5,8 +5,8 @@ annotation class JustString(val string: String) annotation class StringArray(val stringArray: Array) @JustString("kotlin") -@StringArray(array()) +@StringArray(arrayOf()) class C1 -@StringArray(array("java", "")) +@StringArray(arrayOf("java", "")) class C2 diff --git a/compiler/testData/serialization/builtinsSerializer/compileTimeConstants.kt b/compiler/testData/serialization/builtinsSerializer/compileTimeConstants.kt index b49a411c60c..21829e79f19 100644 --- a/compiler/testData/serialization/builtinsSerializer/compileTimeConstants.kt +++ b/compiler/testData/serialization/builtinsSerializer/compileTimeConstants.kt @@ -16,7 +16,7 @@ val booleanConst: Boolean = true val floatConst: Float = 2.0f val doubleConst: Double = 3.0 val enumConst: Weapon? = Weapon.ROCK -val arrayConst: Any = byteArray(1,2) +val arrayConst: Any = byteArrayOf(1,2) val a = 10 val b = a + 20 @@ -32,7 +32,7 @@ class Class { val floatConst: Float = 2.0f val doubleConst: Double = 3.0 val enumConst: Weapon? = Weapon.ROCK - val arrayConst: Any = byteArray(1,2) + val arrayConst: Any = byteArrayOf(1,2) val a = 10 val b = a + 20 } diff --git a/compiler/testData/serialization/js/dynamicConstants.kt b/compiler/testData/serialization/js/dynamicConstants.kt index fb45f090c89..7c5f9855d8a 100644 --- a/compiler/testData/serialization/js/dynamicConstants.kt +++ b/compiler/testData/serialization/js/dynamicConstants.kt @@ -17,7 +17,7 @@ val booleanConst: dynamic = true val floatConst: dynamic = 2.0f val doubleConst: dynamic = 3.0 val enumConst: dynamic = Weapon.ROCK -val arrayConst: dynamic = byteArray(1,2) +val arrayConst: dynamic = byteArrayOf(1,2) val dynamicConst: dynamic = 100 class Class { @@ -31,6 +31,6 @@ class Class { val floatConst: dynamic = 2.0f val doubleConst: dynamic = 3.0 val enumConst: dynamic = Weapon.ROCK - val arrayConst: dynamic = byteArray(1,2) + val arrayConst: dynamic = byteArrayOf(1,2) val dynamicConst: dynamic = 100 } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AnnotationGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/AnnotationGenTest.java index b69cf3ac634..453b2f02e7a 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/AnnotationGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/AnnotationGenTest.java @@ -319,7 +319,7 @@ public class AnnotationGenTest extends CodegenTestCase { "" + "@java.lang.annotation.Retention(RetentionPolicy.RUNTIME) annotation class A(val a: Array)\n" + "" + - "@A(array(\"239\",\"932\")) class B()"); + "@A(arrayOf(\"239\",\"932\")) class B()"); Class aClass = generateClass("A"); Retention annotation = (Retention)aClass.getAnnotation(Retention.class); @@ -354,7 +354,7 @@ public class AnnotationGenTest extends CodegenTestCase { "" + "@java.lang.annotation.Retention(RetentionPolicy.RUNTIME) annotation class A(val a: IntArray)\n" + "" + - "@A(intArray(239,932)) class B()"); + "@A(intArrayOf(239,932)) class B()"); Class aClass = generateClass("A"); Retention annotation = (Retention)aClass.getAnnotation(Retention.class); @@ -411,7 +411,7 @@ public class AnnotationGenTest extends CodegenTestCase { "" + "@Retention(RetentionPolicy.RUNTIME) annotation class A(val a: Array)\n" + "" + - "@A(array(Retention(RetentionPolicy.RUNTIME),Retention(RetentionPolicy.SOURCE))) class B()"); + "@A(arrayOf(Retention(RetentionPolicy.RUNTIME),Retention(RetentionPolicy.SOURCE))) class B()"); Class aClass = generateClass("A"); Method[] methods = aClass.getDeclaredMethods(); diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AnnotationDescriptorResolveTest.java b/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AnnotationDescriptorResolveTest.java index d6ee3fe83c8..291690f6ae4 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AnnotationDescriptorResolveTest.java +++ b/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AnnotationDescriptorResolveTest.java @@ -50,7 +50,7 @@ public class AnnotationDescriptorResolveTest extends AbstractAnnotationDescripto } public void testIntArrayAnnotation() throws IOException { - String content = getContent("AnnIntArray(intArray(1, 2))"); + String content = getContent("AnnIntArray(intArrayOf(1, 2))"); String expectedAnnotation = "@AnnIntArray(a = {1, 2})"; doTest(content, expectedAnnotation); } @@ -68,13 +68,13 @@ public class AnnotationDescriptorResolveTest extends AbstractAnnotationDescripto } public void testStringArrayAnnotation() throws IOException { - String content = getContent("AnnStringArray(array(\"a\"))"); + String content = getContent("AnnStringArray(arrayOf(\"a\"))"); String expectedAnnotation = "@AnnStringArray(a = {\"a\"})"; doTest(content, expectedAnnotation); } public void testEnumArrayAnnotation() throws IOException { - String content = getContent("AnnArrayOfEnum(array(MyEnum.A))"); + String content = getContent("AnnArrayOfEnum(arrayOf(MyEnum.A))"); String expectedAnnotation = "@AnnArrayOfEnum(a = {MyEnum.A})"; doTest(content, expectedAnnotation); } diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibraryRegressionTest.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibraryRegressionTest.java index 033efad3ce8..c097d0171e9 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibraryRegressionTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibraryRegressionTest.java @@ -56,7 +56,7 @@ public class NavigateToLibraryRegressionTest extends LightCodeInsightFixtureTest public void testRefToFunctionWithVararg() { - PsiElement navigationElement = configureAndResolve("val x = arrayList(\"\", \"\")"); + PsiElement navigationElement = configureAndResolve("val x = arrayListOf(\"\", \"\")"); assertSame(JetLanguage.INSTANCE, navigationElement.getLanguage()); }