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

[FIR] Add support for JVM_STATIC_NOT_IN_OBJECT_OR_COMPANION diagnostic

Browse Source
This commit is contained in:
Nikolay Lunyak
2021-07-29 16:03:03 +03:00
parent 276bfd9305
commit c2e5583780
19 changed files with 138 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/annotationsOnUseSiteTargets.fir.kt
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
interface Test {
@get:JvmStatic
val a: Int
<!JVM_STATIC_NOT_IN_OBJECT_OR_COMPANION!>@get:JvmStatic
val a: Int<!>
@get:JvmName("1")
val b: Int
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constructorProperty.fir.kt
Vendored
-4
View File
@@ -1,4 +0,0 @@
// !LANGUAGE: -JvmStaticInInterface
class A(@JvmStatic val z: Int) {
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constructorProperty.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !LANGUAGE: -JvmStaticInInterface
class A(<!JVM_STATIC_NOT_IN_OBJECT_OR_CLASS_COMPANION!>@JvmStatic val z: Int<!>) {
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constructorProperty_LL13.fir.kt
Vendored
-4
View File
@@ -1,4 +0,0 @@
// !LANGUAGE: +JvmStaticInInterface
class A(@JvmStatic val z: Int) {
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/constructorProperty_LL13.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !LANGUAGE: +JvmStaticInInterface
class A(<!JVM_STATIC_NOT_IN_OBJECT_OR_COMPANION!>@JvmStatic val z: Int<!>) {
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/functions.fir.kt
Vendored
+3 -3
View File
@@ -21,7 +21,7 @@ class A {
}
}
@JvmStatic fun a4() {
<!JVM_STATIC_NOT_IN_OBJECT_OR_CLASS_COMPANION!>@JvmStatic fun a4()<!> {
}
}
@@ -47,7 +47,7 @@ interface B {
}
}
@JvmStatic fun a4() {
<!JVM_STATIC_NOT_IN_OBJECT_OR_CLASS_COMPANION!>@JvmStatic fun a4()<!> {
}
}
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/functions_LL13.fir.kt
Vendored
+3 -3
View File
@@ -21,7 +21,7 @@ class A {
}
}
@JvmStatic fun a4() {
<!JVM_STATIC_NOT_IN_OBJECT_OR_COMPANION!>@JvmStatic fun a4()<!> {
}
}
@@ -47,7 +47,7 @@ interface B {
}
}
@JvmStatic fun a4() {
<!JVM_STATIC_NOT_IN_OBJECT_OR_COMPANION!>@JvmStatic fun a4()<!> {
}
}
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/property.fir.kt
Vendored
+2 -2
View File
@@ -37,9 +37,9 @@ class A {
}
var p:Int = 1
@JvmStatic set(p1: Int) {
<!JVM_STATIC_NOT_IN_OBJECT_OR_CLASS_COMPANION!>@JvmStatic set(p1: Int)<!> {
p = 1
}
@JvmStatic val z2 = 1;
<!JVM_STATIC_NOT_IN_OBJECT_OR_CLASS_COMPANION!>@JvmStatic val z2<!> = 1;
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/property_LL13.fir.kt
Vendored
+2 -2
View File
@@ -37,9 +37,9 @@ class A {
}
var p:Int = 1
@JvmStatic set(p1: Int) {
<!JVM_STATIC_NOT_IN_OBJECT_OR_COMPANION!>@JvmStatic set(p1: Int)<!> {
p = 1
}
@JvmStatic val z2 = 1;
<!JVM_STATIC_NOT_IN_OBJECT_OR_COMPANION!>@JvmStatic val z2<!> = 1;
}