Deprecate escaped modifiers and unescaped annotations

This commit is contained in:
Denis Zharkov
2015-09-08 12:11:30 +03:00
parent 25cd9de71a
commit 676ca86ea4
184 changed files with 979 additions and 787 deletions
@@ -3,52 +3,52 @@ import kotlin.jvm.JvmStatic
class A {
companion object {
JvmStatic fun a1() {
@JvmStatic fun a1() {
}
}
object A {
JvmStatic fun a2() {
@JvmStatic fun a2() {
}
}
fun test() {
val s = object {
<!JVM_STATIC_NOT_IN_OBJECT!>JvmStatic fun a3()<!> {
<!JVM_STATIC_NOT_IN_OBJECT!>@JvmStatic fun a3()<!> {
}
}
}
<!JVM_STATIC_NOT_IN_OBJECT!>JvmStatic fun a4()<!> {
<!JVM_STATIC_NOT_IN_OBJECT!>@JvmStatic fun a4()<!> {
}
}
interface B {
companion object {
<!JVM_STATIC_NOT_IN_OBJECT!>JvmStatic fun a1()<!> {
<!JVM_STATIC_NOT_IN_OBJECT!>@JvmStatic fun a1()<!> {
}
}
object A {
JvmStatic fun a2() {
@JvmStatic fun a2() {
}
}
fun test() {
val s = object {
<!JVM_STATIC_NOT_IN_OBJECT!>JvmStatic fun a3()<!> {
<!JVM_STATIC_NOT_IN_OBJECT!>@JvmStatic fun a3()<!> {
}
}
}
<!JVM_STATIC_NOT_IN_OBJECT!>JvmStatic fun a4()<!> {
<!JVM_STATIC_NOT_IN_OBJECT!>@JvmStatic fun a4()<!> {
}
}