Deprecate syntax for assigning single named arguments to varargs

See more in KT-20171
2017-09-13 16:01:10 +03:00
parent 68259f7939
commit b574ddfba0
6 changed files with 219 additions and 1 deletions
@@ -0,0 +1,30 @@
+// !LANGUAGE: +ArrayLiteralsInAnnotations, +AssigningArraysToVarargsInNamedFormInAnnotations
+
+// 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!>"value"<!>)
+fun test1() {}
+
+@Ann(s = *<!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM!>arrayOf("value")<!>)
+fun test2() {}
+
+@Ann(s = *<!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM!>["value"]<!>)
+fun test3() {}
+
+@JavaAnn(value = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM!>"value"<!>)
+fun test4() {}
+
+@JavaAnn("value", path = arrayOf("path"))
+fun test5() {}
+
+@JavaAnn("value", path = ["path"])
+fun test6() {}
@@ -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,59 @@
+// !LANGUAGE: +AssigningArraysToVarargsInNamedFormInAnnotations
+// !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_VARIABLE
+
+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!>1<!>)
+    foo(s = <!TYPE_MISMATCH, ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM!>i<!>)
+    foo(s = *i)
+    foo(s = <!TYPE_MISMATCH, ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM!>intArrayOf(1)<!>)
+    foo(s = *intArrayOf(1))
+    foo(1)
+
+    Cls(p = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM!>1<!>)
+
+    class Sub : Cls(p = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM!>1<!>)
+
+    val c = object : Cls(p = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM!>1<!>) {}
+
+    foo(s = *intArrayOf(elements = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM!>1<!>))
+}
+
+
+fun anyFoo(vararg a: Any) {}
+
+fun testAny() {
+    anyFoo(a = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM!>""<!>)
+    anyFoo(a = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM!>arrayOf("")<!>)
+    anyFoo(a = *arrayOf(""))
+}
+
+fun <T> genFoo(vararg t: T) {}
+
+fun testGen() {
+    genFoo<Int>(t = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM!>1<!>)
+    genFoo<Int?>(t = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM!>null<!>)
+    genFoo<Array<Int>>(t = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM!>arrayOf()<!>)
+    genFoo<Array<Int>>(t = *arrayOf(arrayOf()))
+
+    genFoo(t = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM!>""<!>)
+    genFoo(t = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM!>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!>1<!>)
+    manyFoo(s = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM!>""<!>)
+
+    <!NONE_APPLICABLE!>manyFoo<!>(a)
+    manyFoo(v = <!TYPE_MISMATCH, ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM!>a<!>)
+    manyFoo(s = <!TYPE_MISMATCH, ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM!>a<!>)
+    manyFoo(v = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM!>a as Int<!>)
+    manyFoo(s = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM!>a as String<!>)
+}
@@ -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
+}