Report warning on @JvmStatic in private companion objects

Deprecation cycle to prohibit in 1.5.
^KT-25114 In Progress
This commit is contained in:
Pavel Kirpichenkov
2020-10-15 12:49:42 +03:00
parent d769ca06ab
commit 9669ab1468
6 changed files with 72 additions and 10 deletions
@@ -0,0 +1,29 @@
// Issue: KT-25114
// !DIAGNOSTICS: -UNUSED_PARAMETER
class WithPrivateCompanion {
private companion object {
@JvmStatic
val staticVal1: Int = 42
val staticVal2: Int
@JvmStatic get() = 42
@get:JvmStatic
val staticVal3: Int = 42
@JvmStatic
var staticVar1: Int = 42
var staticVar2: Int
@JvmStatic get() = 42
@JvmStatic set(value) {}
@get: JvmStatic
@set: JvmStatic
var staticVar3: Int = 42
@JvmStatic
fun staticFunction() {}
}
}
@@ -1,30 +1,29 @@
// Issue: KT-25114
// FIR_IDENTICAL
// !DIAGNOSTICS: -UNUSED_PARAMETER
class WithPrivateCompanion {
private companion object {
@JvmStatic
<!JVM_STATIC_IN_PRIVATE_COMPANION!>@JvmStatic<!>
val staticVal1: Int = 42
val staticVal2: Int
@JvmStatic get() = 42
<!JVM_STATIC_IN_PRIVATE_COMPANION!>@JvmStatic<!> get() = 42
@get:JvmStatic
<!JVM_STATIC_IN_PRIVATE_COMPANION!>@get:JvmStatic<!>
val staticVal3: Int = 42
@JvmStatic
<!JVM_STATIC_IN_PRIVATE_COMPANION!>@JvmStatic<!>
var staticVar1: Int = 42
var staticVar2: Int
@JvmStatic get() = 42
@JvmStatic set(value) {}
<!JVM_STATIC_IN_PRIVATE_COMPANION!>@JvmStatic<!> get() = 42
<!JVM_STATIC_IN_PRIVATE_COMPANION!>@JvmStatic<!> set(value) {}
@get: JvmStatic
@set: JvmStatic
<!JVM_STATIC_IN_PRIVATE_COMPANION!>@get: JvmStatic<!>
<!JVM_STATIC_IN_PRIVATE_COMPANION!>@set: JvmStatic<!>
var staticVar3: Int = 42
@JvmStatic
<!JVM_STATIC_IN_PRIVATE_COMPANION!>@JvmStatic<!>
fun staticFunction() {}
}
}