Make tests about varargs compatible with 1.2 and 1.3 versions

2018-07-05 23:45:59 +03:00
parent c032a02373
commit 513b27f65f
17 changed files with 203 additions and 25 deletions
@@ -1,5 +1,6 @@
 // !WITH_NEW_INFERENCE
 // !CHECK_TYPE
+// !LANGUAGE: +ProhibitAssigningSingleElementsToVarargsInNamedForm

 fun <T> array1(vararg a : T) = a

@@ -11,7 +12,7 @@ fun main(args : Array<String>) {
    join(1, "2", "3")
    join(<!NON_VARARG_SPREAD!>*<!>1, "2")
    join(1, *<!TYPE_MISMATCH!>"2"<!>)
-    join(x = 1, a = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION!>"2"<!>)
+    join(x = 1, a = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR!>"2"<!>)
    join(x = <!NON_VARARG_SPREAD!>*<!>1, a = *<!TYPE_MISMATCH!>"2"<!>)
    join(x = 1, a = *a)
    join(x = 1, a = *<!TYPE_MISMATCH!>b<!>)
@@ -26,13 +27,13 @@ fun main(args : Array<String>) {
    join(1, "4", *a, *<!TYPE_MISMATCH!>b<!>, "3")
    join(a = *a, x = 1)
    join(a = *<!TYPE_MISMATCH!>b<!>, x = 1)
-    join(a = <!TYPE_MISMATCH, ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION!>a<!>, x = 1)
+    join(a = <!TYPE_MISMATCH, ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR!>a<!>, x = 1)

    joinG<String>(1, "2")
    joinG<String>(<!NON_VARARG_SPREAD!>*<!>1, "2")
    joinG<String>(1, *<!TYPE_MISMATCH!>"2"<!>)
    joinG<String>(x = 1, a = *a)
-    joinG<String>(x = 1, a = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION!>"2"<!>)
+    joinG<String>(x = 1, a = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR!>"2"<!>)
    joinG<String>(x = <!NON_VARARG_SPREAD!>*<!>1, a = *<!TYPE_MISMATCH!>"2"<!>)
    joinG<String>(1, *a)
    joinG<String>(1, *a, "3")
@@ -45,7 +46,7 @@ fun main(args : Array<String>) {
    joinG(<!NON_VARARG_SPREAD!>*<!>1, "2")
    <!OI;TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR!>joinG<!>(1, *<!TYPE_MISMATCH!>"2"<!>)
    joinG(x = 1, a = *a)
-    joinG(x = 1, a = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION!>"2"<!>)
+    joinG(x = 1, a = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR!>"2"<!>)
    <!OI;TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR!>joinG<!>(x = <!NON_VARARG_SPREAD!>*<!>1, a = *<!TYPE_MISMATCH!>"2"<!>)
    joinG(1, *a)
    joinG(1, *a, "3")
@@ -1,5 +1,5 @@
 // !WITH_NEW_INFERENCE
-// !LANGUAGE: +ArrayLiteralsInAnnotations
+// !LANGUAGE: +ArrayLiteralsInAnnotations, +ProhibitAssigningSingleElementsToVarargsInNamedForm

 annotation class Ann1(vararg val a: String = [])
 annotation class Ann2(vararg val a: Int = [1, 2])
@@ -23,7 +23,7 @@ fun test1_2() {}
@Ann2(*[])
 fun test2() {}

-@Ann3(a = *<!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_ANNOTATION!>[0f, <!DIVISION_BY_ZERO!>1 / 0f<!>]<!>)
+@Ann3(a = *<!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_ANNOTATION_ERROR!>[0f, <!DIVISION_BY_ZERO!>1 / 0f<!>]<!>)
 fun test3() {}

@Ann5(Ann4(*["/"]))
@@ -1,3 +1,4 @@
+// !LANGUAGE: +ProhibitAssigningSingleElementsToVarargsInNamedForm
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 object X1
@@ -7,6 +8,6 @@ fun overloadedFun(arg: String, vararg args: String) = X1
 fun overloadedFun(arg: String, vararg args: String, flag: Boolean = true) = X2

 val test1a: X1 = overloadedFun("", "")
-val test1b: X1 = overloadedFun("", args = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION!>""<!>)
+val test1b: X1 = overloadedFun("", args = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR!>""<!>)
 val test1c: X2 = overloadedFun("", "", "", flag = true)

@@ -1,3 +1,4 @@
+// !LANGUAGE: +ProhibitAssigningSingleElementsToVarargsInNamedForm
 // !DIAGNOSTICS: -UNUSED_PARAMETER

 object X1
@@ -8,5 +9,5 @@ fun overloadedFun5(s: String, vararg ss: String) = X2

 val test1 = <!OVERLOAD_RESOLUTION_AMBIGUITY!>overloadedFun5<!>("")
 val test2 = <!OVERLOAD_RESOLUTION_AMBIGUITY!>overloadedFun5<!>("", "")
-val test3: X2 = overloadedFun5(s = "", ss = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION!>""<!>)
-val test4: X1 = overloadedFun5(ss = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION!>""<!>)
+val test3: X2 = overloadedFun5(s = "", ss = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR!>""<!>)
+val test4: X1 = overloadedFun5(ss = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR!>""<!>)
@@ -1,4 +1,4 @@
-// !LANGUAGE: -ProhibitNonConstValuesAsVarargsInAnnotations
+// !LANGUAGE: -ProhibitNonConstValuesAsVarargsInAnnotations, -ProhibitAssigningSingleElementsToVarargsInNamedForm

 val nonConstArray = longArrayOf(0)
 fun nonConstFun(): LongArray = TODO()
@@ -1,4 +1,4 @@
-// !LANGUAGE: +ProhibitNonConstValuesAsVarargsInAnnotations
+// !LANGUAGE: +ProhibitNonConstValuesAsVarargsInAnnotations, +ProhibitAssigningSingleElementsToVarargsInNamedForm

 val nonConstArray = longArrayOf(0)
 fun nonConstFun(): LongArray = TODO()
@@ -0,0 +1,30 @@
+// !LANGUAGE: +ArrayLiteralsInAnnotations, +AssigningArraysToVarargsInNamedFormInAnnotations, +ProhibitAssigningSingleElementsToVarargsInNamedForm
+
+// FILE: JavaAnn.java
+
+@interface JavaAnn {
+    String[] value() default {};
+    String[] path() default {};
+}
+
+// FILE: test.kt
+
+annotation class Ann(vararg val s: String)
+
+@Ann(s = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_ANNOTATION_ERROR!>"value"<!>)
+fun test1() {}
+
+@Ann(s = *<!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_ANNOTATION!>arrayOf("value")<!>)
+fun test2() {}
+
+@Ann(s = *<!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_ANNOTATION!>["value"]<!>)
+fun test3() {}
+
+@JavaAnn(value = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_ANNOTATION_ERROR!>"value"<!>)
+fun test4() {}
+
+@JavaAnn("value", path = arrayOf("path"))
+fun test5() {}
+
+@JavaAnn("value", path = ["path"])
+fun test6() {}
@@ -1,4 +1,4 @@
-// !LANGUAGE: +ArrayLiteralsInAnnotations, +AssigningArraysToVarargsInNamedFormInAnnotations
+// !LANGUAGE: +ArrayLiteralsInAnnotations, +AssigningArraysToVarargsInNamedFormInAnnotations, -ProhibitAssigningSingleElementsToVarargsInNamedForm

 // FILE: JavaAnn.java

@@ -0,0 +1,25 @@
+package
+
+@Ann(s = {"value"}) public fun test1(): kotlin.Unit
+@Ann(s = {"value"}) public fun test2(): kotlin.Unit
+@Ann(s = {"value"}) public fun test3(): kotlin.Unit
+@JavaAnn(value = {"value"}) public fun test4(): kotlin.Unit
+@JavaAnn(path = {"path"}, value = {"value"}) public fun test5(): kotlin.Unit
+@JavaAnn(path = {"path"}, value = {"value"}) public fun test6(): kotlin.Unit
+
+public final annotation class Ann : kotlin.Annotation {
+    public constructor Ann(/*0*/ vararg s: kotlin.String /*kotlin.Array<out kotlin.String>*/)
+    public final val s: kotlin.Array<out kotlin.String>
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public/*package*/ final annotation class JavaAnn : kotlin.Annotation {
+    public/*package*/ constructor JavaAnn(/*0*/ vararg value: kotlin.String /*kotlin.Array<out kotlin.String>*/ = ..., /*1*/ path: kotlin.Array<kotlin.String> = ...)
+    public final val path: kotlin.Array<kotlin.String>
+    public final val value: kotlin.Array<kotlin.String>
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
@@ -0,0 +1,60 @@
+// !LANGUAGE: +AssigningArraysToVarargsInNamedFormInAnnotations, +ProhibitAssigningSingleElementsToVarargsInNamedForm
+// !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_VARIABLE
+// !WITH_NEW_INFERENCE
+
+fun foo(vararg s: Int) {}
+
+open class Cls(vararg p: Long)
+
+fun test(i: IntArray) {
+    foo(s = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR!>1<!>)
+    foo(s = <!TYPE_MISMATCH, ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR!>i<!>)
+    foo(s = *i)
+    foo(s = <!TYPE_MISMATCH, ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR!>intArrayOf(1)<!>)
+    foo(s = *intArrayOf(1))
+    foo(1)
+
+    Cls(p = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR!>1<!>)
+
+    class Sub : Cls(p = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR!>1<!>)
+
+    val c = object : Cls(p = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR!>1<!>) {}
+
+    foo(s = *intArrayOf(elements = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR!>1<!>))
+}
+
+
+fun anyFoo(vararg a: Any) {}
+
+fun testAny() {
+    anyFoo(a = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR!>""<!>)
+    anyFoo(a = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR!>arrayOf("")<!>)
+    anyFoo(a = *arrayOf(""))
+}
+
+fun <T> genFoo(vararg t: T) {}
+
+fun testGen() {
+    genFoo<Int>(t = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR!>1<!>)
+    genFoo<Int?>(t = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR!>null<!>)
+    genFoo<Array<Int>>(t = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR!>arrayOf()<!>)
+    genFoo<Array<Int>>(t = *arrayOf(arrayOf()))
+
+    genFoo(t = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR!>""<!>)
+    genFoo(t = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR!>arrayOf("")<!>)
+    genFoo(t = *arrayOf(""))
+}
+
+fun manyFoo(vararg v: Int) {}
+fun manyFoo(vararg s: String) {}
+
+fun testMany(a: Any) {
+    manyFoo(v = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR!>1<!>)
+    manyFoo(s = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR!>""<!>)
+
+    <!NONE_APPLICABLE!>manyFoo<!>(a)
+    <!NI;NONE_APPLICABLE!>manyFoo<!>(<!NI;DEBUG_INFO_MISSING_UNRESOLVED!>v<!> = <!OI;ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR, OI;TYPE_MISMATCH!>a<!>)
+    <!NI;NONE_APPLICABLE!>manyFoo<!>(<!NI;DEBUG_INFO_MISSING_UNRESOLVED!>s<!> = <!OI;ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR, OI;TYPE_MISMATCH!>a<!>)
+    manyFoo(v = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR!>a as Int<!>)
+    manyFoo(s = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR!>a as String<!>)
+}
@@ -1,4 +1,4 @@
-// !LANGUAGE: +AssigningArraysToVarargsInNamedFormInAnnotations
+// !LANGUAGE: +AssigningArraysToVarargsInNamedFormInAnnotations, -ProhibitAssigningSingleElementsToVarargsInNamedForm
 // !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_VARIABLE
 // !WITH_NEW_INFERENCE

@@ -0,0 +1,18 @@
+package
+
+public fun anyFoo(/*0*/ vararg a: kotlin.Any /*kotlin.Array<out kotlin.Any>*/): kotlin.Unit
+public fun foo(/*0*/ vararg s: kotlin.Int /*kotlin.IntArray*/): kotlin.Unit
+public fun </*0*/ T> genFoo(/*0*/ vararg t: T /*kotlin.Array<out T>*/): kotlin.Unit
+public fun manyFoo(/*0*/ vararg s: kotlin.String /*kotlin.Array<out kotlin.String>*/): kotlin.Unit
+public fun manyFoo(/*0*/ vararg v: kotlin.Int /*kotlin.IntArray*/): kotlin.Unit
+public fun test(/*0*/ i: kotlin.IntArray): kotlin.Unit
+public fun testAny(): kotlin.Unit
+public fun testGen(): kotlin.Unit
+public fun testMany(/*0*/ a: kotlin.Any): kotlin.Unit
+
+public open class Cls {
+    public constructor Cls(/*0*/ vararg p: kotlin.Long /*kotlin.LongArray*/)
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
@@ -0,0 +1,22 @@
+package
+
+@Anno1(s = {"foo"}) @Anno2(i = {1}) public fun f1(): kotlin.Unit
+@Anno1(s = {"foo"}) @Anno2(i = {1}) public fun f2(): kotlin.Unit
+public fun foo(/*0*/ vararg ints: kotlin.Int /*kotlin.IntArray*/): kotlin.Unit
+public fun test(): kotlin.Unit
+
+public final annotation class Anno1 : kotlin.Annotation {
+    public constructor Anno1(/*0*/ vararg s: kotlin.String /*kotlin.Array<out kotlin.String>*/)
+    public final val s: kotlin.Array<out kotlin.String>
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public final annotation class Anno2 : kotlin.Annotation {
+    public constructor Anno2(/*0*/ vararg i: kotlin.Int /*kotlin.IntArray*/)
+    public final val i: kotlin.IntArray
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
@@ -22065,14 +22065,24 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
                runTest("compiler/testData/diagnostics/tests/varargs/assigningArraysToVarargsInAnnotations.kt");
            }

-            @TestMetadata("assigningSingleElementsInNamedFormAnnDeprecation.kt")
-            public void testAssigningSingleElementsInNamedFormAnnDeprecation() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormAnnDeprecation.kt");
+            @TestMetadata("assigningSingleElementsInNamedFormAnnDeprecation_after.kt")
+            public void testAssigningSingleElementsInNamedFormAnnDeprecation_after() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormAnnDeprecation_after.kt");
            }

-            @TestMetadata("assigningSingleElementsInNamedFormFunDeprecation.kt")
-            public void testAssigningSingleElementsInNamedFormFunDeprecation() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation.kt");
+            @TestMetadata("assigningSingleElementsInNamedFormAnnDeprecation_before.kt")
+            public void testAssigningSingleElementsInNamedFormAnnDeprecation_before() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormAnnDeprecation_before.kt");
+            }
+
+            @TestMetadata("assigningSingleElementsInNamedFormFunDeprecation_after.kt")
+            public void testAssigningSingleElementsInNamedFormFunDeprecation_after() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_after.kt");
+            }
+
+            @TestMetadata("assigningSingleElementsInNamedFormFunDeprecation_before.kt")
+            public void testAssigningSingleElementsInNamedFormFunDeprecation_before() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_before.kt");
            }

            @TestMetadata("kt1781.kt")
@@ -22065,14 +22065,24 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing
                runTest("compiler/testData/diagnostics/tests/varargs/assigningArraysToVarargsInAnnotations.kt");
            }

-            @TestMetadata("assigningSingleElementsInNamedFormAnnDeprecation.kt")
-            public void testAssigningSingleElementsInNamedFormAnnDeprecation() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormAnnDeprecation.kt");
+            @TestMetadata("assigningSingleElementsInNamedFormAnnDeprecation_after.kt")
+            public void testAssigningSingleElementsInNamedFormAnnDeprecation_after() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormAnnDeprecation_after.kt");
            }

-            @TestMetadata("assigningSingleElementsInNamedFormFunDeprecation.kt")
-            public void testAssigningSingleElementsInNamedFormFunDeprecation() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation.kt");
+            @TestMetadata("assigningSingleElementsInNamedFormAnnDeprecation_before.kt")
+            public void testAssigningSingleElementsInNamedFormAnnDeprecation_before() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormAnnDeprecation_before.kt");
+            }
+
+            @TestMetadata("assigningSingleElementsInNamedFormFunDeprecation_after.kt")
+            public void testAssigningSingleElementsInNamedFormFunDeprecation_after() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_after.kt");
+            }
+
+            @TestMetadata("assigningSingleElementsInNamedFormFunDeprecation_before.kt")
+            public void testAssigningSingleElementsInNamedFormFunDeprecation_before() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_before.kt");
            }

            @TestMetadata("kt1781.kt")