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

[FIR] Add support for OVERRIDE_CANNOT_BE_STATIC diagnostic

Browse Source
This commit is contained in:
Nikolay Lunyak
2021-07-28 19:54:54 +03:00
parent 5607be3920
commit 276bfd9305
11 changed files with 99 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/finalAndAbstract.fir.kt
Vendored
+3 -3
View File
@@ -10,11 +10,11 @@ abstract class A {
object B: A() {
@JvmStatic override fun a() {}
<!OVERRIDE_CANNOT_BE_STATIC!>@JvmStatic override fun a() {}<!>
@JvmStatic override fun b() {}
<!OVERRIDE_CANNOT_BE_STATIC!>@JvmStatic override fun b() {}<!>
@JvmStatic final override fun c() {}
<!OVERRIDE_CANNOT_BE_STATIC!>@JvmStatic final override fun c() {}<!>
@JvmStatic <!NON_FINAL_MEMBER_IN_OBJECT!>open<!> fun d() {}
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/property.fir.kt
Vendored
+2 -2
View File
@@ -28,12 +28,12 @@ class A {
@JvmStatic val z = 1;
@JvmStatic override val base1: Int = 0
<!OVERRIDE_CANNOT_BE_STATIC!>@JvmStatic override val base1: Int = 0<!>
@JvmStatic <!NON_FINAL_MEMBER_IN_OBJECT!>open<!> fun f() {}
override val base2: Int = 0
@JvmStatic get
<!OVERRIDE_CANNOT_BE_STATIC!>@JvmStatic get<!>
}
var p:Int = 1
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/property_LL13.fir.kt
Vendored
+2 -2
View File
@@ -28,12 +28,12 @@ class A {
@JvmStatic val z = 1;
@JvmStatic override val base1: Int = 0
<!OVERRIDE_CANNOT_BE_STATIC!>@JvmStatic override val base1: Int = 0<!>
@JvmStatic <!NON_FINAL_MEMBER_IN_OBJECT!>open<!> fun f() {}
override val base2: Int = 0
@JvmStatic get
<!OVERRIDE_CANNOT_BE_STATIC!>@JvmStatic get<!>
}
var p:Int = 1