Deprecate suppress annotation in favor of Suppress

This commit is contained in:
Denis Zharkov
2015-09-01 16:32:43 +03:00
parent 11fed1674e
commit bbc192fda5
140 changed files with 152 additions and 153 deletions
+6 -7
View File
@@ -1243,6 +1243,12 @@ public final class String : kotlin.Comparable<kotlin.String>, kotlin.CharSequenc
}
}
kotlin.annotation.target(allowedTargets = {AnnotationTarget.CLASSIFIER, AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.PROPERTY, AnnotationTarget.FIELD, AnnotationTarget.LOCAL_VARIABLE, AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.TYPE, AnnotationTarget.EXPRESSION, AnnotationTarget.FILE}) kotlin.annotation.annotation(retention = AnnotationRetention.SOURCE) public final class Suppress : kotlin.Annotation {
/*primary*/ public constructor Suppress(/*0*/ vararg names: kotlin.String /*kotlin.Array<out kotlin.String>*/)
internal final val names: kotlin.Array<out kotlin.String>
internal final fun <get-names>(): kotlin.Array<out kotlin.String>
}
public open class Throwable {
/*primary*/ public constructor Throwable(/*0*/ message: kotlin.String? = ..., /*1*/ cause: kotlin.Throwable? = ...)
public final fun getCause(): kotlin.Throwable?
@@ -1281,13 +1287,6 @@ kotlin.annotation.target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) ko
kotlin.annotation.target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) kotlin.annotation.annotation(mustBeDocumented = true, retention = AnnotationRetention.RUNTIME) public final class noinline : kotlin.Annotation {
/*primary*/ public constructor noinline()
}
kotlin.annotation.target(allowedTargets = {AnnotationTarget.CLASSIFIER, AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.PROPERTY, AnnotationTarget.FIELD, AnnotationTarget.LOCAL_VARIABLE, AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.TYPE, AnnotationTarget.EXPRESSION, AnnotationTarget.FILE}) kotlin.annotation.annotation(retention = AnnotationRetention.SOURCE) public final class suppress : kotlin.Annotation {
/*primary*/ public constructor suppress(/*0*/ vararg names: kotlin.String /*kotlin.Array<out kotlin.String>*/)
internal final val names: kotlin.Array<out kotlin.String>
internal final fun <get-names>(): kotlin.Array<out kotlin.String>
}
kotlin.annotation.target(allowedTargets = {AnnotationTarget.FUNCTION}) kotlin.annotation.annotation(retention = AnnotationRetention.SOURCE) public final class tailRecursive : kotlin.Annotation {
/*primary*/ public constructor tailRecursive()
}
+1 -1
View File
@@ -1,7 +1,7 @@
package android.app
public open class Activity {
public open fun findViewById(@suppress("UNUSED_PARAMETER") id: Int): android.view.View = null!!
public open fun findViewById(@Suppress("UNUSED_PARAMETER") id: Int): android.view.View = null!!
}
public open class Fragment {
+1 -1
View File
@@ -1,5 +1,5 @@
package android.view
public open class View {
public open fun findViewById(@suppress("UNUSED_PARAMETER") id: Int): android.view.View = null!!
public open fun findViewById(@Suppress("UNUSED_PARAMETER") id: Int): android.view.View = null!!
}
+1 -1
View File
@@ -1,5 +1,5 @@
package android.widget
public open class TextView : android.view.View() {
public fun setText(@suppress("UNUSED_PARAMETER") text: String) {}
public fun setText(@Suppress("UNUSED_PARAMETER") text: String) {}
}
@@ -3,7 +3,7 @@ tailRecursive fun badTails(x : Int) : Int {
return 1 + <!NON_TAIL_RECURSIVE_CALL!>badTails<!>(x - 1)
}
else if (x == 10) {
@suppress("NON_TAIL_RECURSIVE_CALL")
@Suppress("NON_TAIL_RECURSIVE_CALL")
return 1 + badTails(x - 1)
} else if (x >= 50) {
return badTails(x - 1)
@@ -1,5 +1,5 @@
@file:suppress("abc")
@file:Suppress("abc")
fun foo(): Int {
@suppress("xyz") return 1
@Suppress("xyz") return 1
}
@@ -1,4 +1,4 @@
suppress("warnings")
@Suppress("warnings")
class C {
fun foo(p: String??) {
// Make sure errors are not suppressed:
@@ -1,6 +1,6 @@
package
kotlin.suppress(names = {"warnings"}) internal final class C {
kotlin.Suppress(names = {"warnings"}) internal final class C {
public constructor C()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final fun foo(/*0*/ p: kotlin.String?): kotlin.Unit
@@ -1,5 +1,5 @@
class C {
suppress("warnings")
@Suppress("warnings")
companion object {
val foo: String?? = null as Nothing?
}
@@ -6,7 +6,7 @@ internal final class C {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
kotlin.suppress(names = {"warnings"}) public companion object Companion {
kotlin.Suppress(names = {"warnings"}) public companion object Companion {
private constructor Companion()
internal final val foo: kotlin.String? = null
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -1,4 +1,4 @@
fun foo() {
@suppress("warnings")
@Suppress("warnings")
("": String??)
}
@@ -1,4 +1,4 @@
class C {
suppress("warnings")
@Suppress("warnings")
fun foo(p: String??) {}
}
@@ -3,7 +3,7 @@ package
internal final class C {
public constructor C()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
kotlin.suppress(names = {"warnings"}) internal final fun foo(/*0*/ p: kotlin.String?): kotlin.Unit
kotlin.Suppress(names = {"warnings"}) internal final fun foo(/*0*/ p: kotlin.String?): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@@ -1,4 +1,4 @@
suppress("warnings")
@Suppress("warnings")
object C {
fun foo(p: String??) {}
}
@@ -1,6 +1,6 @@
package
kotlin.suppress(names = {"warnings"}) internal object C {
kotlin.Suppress(names = {"warnings"}) internal object C {
private constructor C()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final fun foo(/*0*/ p: kotlin.String?): kotlin.Unit
@@ -1,3 +1,3 @@
class C {
fun foo(suppress("warnings") p: String?? = "" as String) {}
fun foo(@Suppress("warnings") p: String?? = "" as String) {}
}
@@ -3,7 +3,7 @@ package
internal final class C {
public constructor C()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final fun foo(/*0*/ kotlin.suppress(names = {"warnings"}) p: kotlin.String? = ...): kotlin.Unit
internal final fun foo(/*0*/ kotlin.Suppress(names = {"warnings"}) p: kotlin.String? = ...): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@@ -1,4 +1,4 @@
class C {
suppress("warnings")
@Suppress("warnings")
val foo: String?? = null as Nothing?
}
@@ -2,7 +2,7 @@ package
internal final class C {
public constructor C()
kotlin.suppress(names = {"warnings"}) internal final val foo: kotlin.String? = null
kotlin.Suppress(names = {"warnings"}) internal final val foo: kotlin.String? = null
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
@@ -1,5 +1,5 @@
class C {
val foo: String?
@suppress("warnings")
@Suppress("warnings")
get(): String?? = null as Nothing?
}
@@ -1,5 +1,5 @@
suppress("REDUNDANT_NULLABLE")
@Suppress("REDUNDANT_NULLABLE")
class C {
suppress("UNNECESSARY_NOT_NULL_ASSERTION")
@Suppress("UNNECESSARY_NOT_NULL_ASSERTION")
fun foo(): String?? = ""!! <!USELESS_CAST!>as String??<!>
}
@@ -1,9 +1,9 @@
package
kotlin.suppress(names = {"REDUNDANT_NULLABLE"}) internal final class C {
kotlin.Suppress(names = {"REDUNDANT_NULLABLE"}) internal final class C {
public constructor C()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
kotlin.suppress(names = {"UNNECESSARY_NOT_NULL_ASSERTION"}) internal final fun foo(): kotlin.String?
kotlin.Suppress(names = {"UNNECESSARY_NOT_NULL_ASSERTION"}) internal final fun foo(): kotlin.String?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@@ -1,4 +1,4 @@
suppress("REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION")
@Suppress("REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION")
class C {
fun foo(): String?? = ""!! <!USELESS_CAST!>as String??<!>
}
@@ -1,6 +1,6 @@
package
kotlin.suppress(names = {"REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION"}) internal final class C {
kotlin.Suppress(names = {"REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION"}) internal final class C {
public constructor C()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final fun foo(): kotlin.String?
@@ -1,5 +1,5 @@
class C {
suppress("REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION")
@Suppress("REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION")
companion object {
val foo: String?? = ""!! <!USELESS_CAST!>as String??<!>
}
@@ -6,7 +6,7 @@ internal final class C {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
kotlin.suppress(names = {"REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION"}) public companion object Companion {
kotlin.Suppress(names = {"REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION"}) public companion object Companion {
private constructor Companion()
internal final val foo: kotlin.String?
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -1,4 +1,4 @@
fun foo(): Any? {
@suppress("REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION")
@Suppress("REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION")
return ""!! <!USELESS_CAST!>as String??<!>
}
@@ -1,4 +1,4 @@
class C {
suppress("REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION")
@Suppress("REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION")
fun foo(): String?? = ""!! <!USELESS_CAST!>as String??<!>
}
@@ -3,7 +3,7 @@ package
internal final class C {
public constructor C()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
kotlin.suppress(names = {"REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION"}) internal final fun foo(): kotlin.String?
kotlin.Suppress(names = {"REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION"}) internal final fun foo(): kotlin.String?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@@ -1,4 +1,4 @@
suppress("REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION")
@Suppress("REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION")
object C {
fun foo(): String?? = ""!! <!USELESS_CAST!>as String??<!>
}
@@ -1,6 +1,6 @@
package
kotlin.suppress(names = {"REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION"}) internal object C {
kotlin.Suppress(names = {"REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION"}) internal object C {
private constructor C()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final fun foo(): kotlin.String?
@@ -1,3 +1,3 @@
class C {
fun foo(suppress("REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION") p: String?? = ""!! <!USELESS_CAST!>as String??<!>) = p
fun foo(@Suppress("REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION") p: String?? = ""!! <!USELESS_CAST!>as String??<!>) = p
}
@@ -3,7 +3,7 @@ package
internal final class C {
public constructor C()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final fun foo(/*0*/ kotlin.suppress(names = {"REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION"}) p: kotlin.String? = ...): kotlin.String?
internal final fun foo(/*0*/ kotlin.Suppress(names = {"REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION"}) p: kotlin.String? = ...): kotlin.String?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@@ -1,4 +1,4 @@
class C {
suppress("REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION")
@Suppress("REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION")
val foo: String?? = ""!! <!USELESS_CAST!>as String??<!>
}
@@ -2,7 +2,7 @@ package
internal final class C {
public constructor C()
kotlin.suppress(names = {"REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION"}) internal final val foo: kotlin.String?
kotlin.Suppress(names = {"REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION"}) internal final val foo: 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
@@ -1,5 +1,5 @@
class C {
val foo: String?
@suppress("REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION")
@Suppress("REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION")
get(): String?? = ""!! <!USELESS_CAST!>as String??<!>
}
@@ -1,4 +1,4 @@
suppress("REDUNDANT_NULLABLE")
@Suppress("REDUNDANT_NULLABLE")
class C {
fun foo(): String?? = null <!USELESS_CAST!>as Nothing??<!>
}
@@ -1,6 +1,6 @@
package
kotlin.suppress(names = {"REDUNDANT_NULLABLE"}) internal final class C {
kotlin.Suppress(names = {"REDUNDANT_NULLABLE"}) internal final class C {
public constructor C()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final fun foo(): kotlin.String?
@@ -1,5 +1,5 @@
class C {
suppress("REDUNDANT_NULLABLE")
@Suppress("REDUNDANT_NULLABLE")
companion object {
val foo: String?? = null <!USELESS_CAST!>as Nothing??<!>
}
@@ -6,7 +6,7 @@ internal final class C {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
kotlin.suppress(names = {"REDUNDANT_NULLABLE"}) public companion object Companion {
kotlin.Suppress(names = {"REDUNDANT_NULLABLE"}) public companion object Companion {
private constructor Companion()
internal final val foo: kotlin.String? = null
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -1,4 +1,4 @@
fun foo(): Any? {
@suppress("REDUNDANT_NULLABLE")
@Suppress("REDUNDANT_NULLABLE")
return null <!USELESS_CAST!>as Nothing??<!>
}
@@ -1,4 +1,4 @@
class C {
suppress("REDUNDANT_NULLABLE")
@Suppress("REDUNDANT_NULLABLE")
fun foo(): String?? = null <!USELESS_CAST!>as Nothing??<!>
}
@@ -3,7 +3,7 @@ package
internal final class C {
public constructor C()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
kotlin.suppress(names = {"REDUNDANT_NULLABLE"}) internal final fun foo(): kotlin.String?
kotlin.Suppress(names = {"REDUNDANT_NULLABLE"}) internal final fun foo(): kotlin.String?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@@ -1,6 +1,6 @@
class C {
fun foo(): Any? {
@suppress("REDUNDANT_NULLABLE")
@Suppress("REDUNDANT_NULLABLE")
val v: String?? = null <!USELESS_CAST!>as Nothing??<!>
return v
}
@@ -1,4 +1,4 @@
suppress("REDUNDANT_NULLABLE")
@Suppress("REDUNDANT_NULLABLE")
object C {
fun foo(): String?? = null <!USELESS_CAST!>as Nothing??<!>
}
@@ -1,6 +1,6 @@
package
kotlin.suppress(names = {"REDUNDANT_NULLABLE"}) internal object C {
kotlin.Suppress(names = {"REDUNDANT_NULLABLE"}) internal object C {
private constructor C()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final fun foo(): kotlin.String?
@@ -1,3 +1,3 @@
class C {
fun foo(suppress("REDUNDANT_NULLABLE") p: String?? = null <!USELESS_CAST!>as Nothing??<!>) = p
fun foo(@Suppress("REDUNDANT_NULLABLE") p: String?? = null <!USELESS_CAST!>as Nothing??<!>) = p
}
@@ -3,7 +3,7 @@ package
internal final class C {
public constructor C()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final fun foo(/*0*/ kotlin.suppress(names = {"REDUNDANT_NULLABLE"}) p: kotlin.String? = ...): kotlin.String?
internal final fun foo(/*0*/ kotlin.Suppress(names = {"REDUNDANT_NULLABLE"}) p: kotlin.String? = ...): kotlin.String?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@@ -1,4 +1,4 @@
class C {
suppress("REDUNDANT_NULLABLE")
@Suppress("REDUNDANT_NULLABLE")
val foo: String?? = null <!USELESS_CAST!>as Nothing?<!>
}
@@ -2,7 +2,7 @@ package
internal final class C {
public constructor C()
kotlin.suppress(names = {"REDUNDANT_NULLABLE"}) internal final val foo: kotlin.String? = null
kotlin.Suppress(names = {"REDUNDANT_NULLABLE"}) internal final val foo: kotlin.String? = null
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
@@ -1,5 +1,5 @@
class C {
val foo: String?
@suppress("REDUNDANT_NULLABLE")
@Suppress("REDUNDANT_NULLABLE")
get(): String?? = null <!USELESS_CAST!>as Nothing??<!>
}
@@ -19,5 +19,5 @@ fun test(d: dynamic) {
// Checking specificity of `dynamic` vs `Nothing`
nothing(d).checkType { _<String>() }
nothing("").checkType { _<Int>() }
@suppress("UNREACHABLE_CODE") nothing(null!!).checkType { _<String>() }
@Suppress("UNREACHABLE_CODE") nothing(null!!).checkType { _<String>() }
}