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

Allow to use @JvmStatic in interface companion object

Browse Source
This commit is contained in:
Mikhael Bogdanov
2018-01-23 11:22:58 +01:00
parent 2340756b88
commit c4da370b0b
21 changed files with 483 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/functions.kt
Vendored
+5 -5
View File
@@ -14,20 +14,20 @@ class A {
fun test() {
val s = object {
<!JVM_STATIC_NOT_IN_OBJECT!>@JvmStatic fun a3()<!> {
<!JVM_STATIC_NOT_IN_OBJECT_OR_CLASS_COMPANION!>@JvmStatic fun a3()<!> {
}
}
}
<!JVM_STATIC_NOT_IN_OBJECT!>@JvmStatic fun a4()<!> {
<!JVM_STATIC_NOT_IN_OBJECT_OR_CLASS_COMPANION!>@JvmStatic fun a4()<!> {
}
}
interface B {
companion object {
<!JVM_STATIC_NOT_IN_OBJECT!>@JvmStatic fun a1()<!> {
<!JVM_STATIC_NOT_IN_OBJECT_OR_CLASS_COMPANION!>@JvmStatic fun a1()<!> {
}
}
@@ -40,13 +40,13 @@ interface B {
fun test() {
val s = object {
<!JVM_STATIC_NOT_IN_OBJECT!>@JvmStatic fun a3()<!> {
<!JVM_STATIC_NOT_IN_OBJECT_OR_CLASS_COMPANION!>@JvmStatic fun a3()<!> {
}
}
}
<!JVM_STATIC_NOT_IN_OBJECT!>@JvmStatic fun a4()<!> {
<!JVM_STATIC_NOT_IN_OBJECT_OR_CLASS_COMPANION!>@JvmStatic fun a4()<!> {
}
}