azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deprecate escaped modifiers and unescaped annotations

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/constructors.kt
Vendored
+3 -3
View File
@@ -1,9 +1,9 @@
import kotlin.jvm.JvmStatic
class A {
<!WRONG_ANNOTATION_TARGET!>JvmStatic<!> constructor() {}
<!WRONG_ANNOTATION_TARGET!>@JvmStatic<!> constructor() {}
inner class B {
<!WRONG_ANNOTATION_TARGET!>JvmStatic<!> constructor() {}
<!WRONG_ANNOTATION_TARGET!>@JvmStatic<!> constructor() {}
}
}
class C <!WRONG_ANNOTATION_TARGET!>JvmStatic<!> constructor()
class C <!WRONG_ANNOTATION_TARGET!>@JvmStatic<!> constructor()
compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.kt
Vendored
+8 -8
View File
@@ -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()<!> {
}
}
compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.kt
Vendored
+1 -1
View File
@@ -31,7 +31,7 @@ class A {
<!OVERRIDE_CANNOT_BE_STATIC!>@JvmStatic override val base1: Int<!> = 0
JvmStatic open fun f() {}
@JvmStatic open fun f() {}
override val base2: Int = 0
<!OVERRIDE_CANNOT_BE_STATIC!>@JvmStatic get<!>