Revert "Report warning on @JvmStatic in private companion objects"
This reverts commit 9669ab14
This commit is contained in:
Vendored
-29
@@ -1,29 +0,0 @@
|
||||
// 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() {}
|
||||
}
|
||||
}
|
||||
Vendored
+10
-9
@@ -1,29 +1,30 @@
|
||||
// Issue: KT-25114
|
||||
// FIR_IDENTICAL
|
||||
// !DIAGNOSTICS: -UNUSED_PARAMETER
|
||||
|
||||
class WithPrivateCompanion {
|
||||
private companion object {
|
||||
<!JVM_STATIC_IN_PRIVATE_COMPANION!>@JvmStatic<!>
|
||||
@JvmStatic
|
||||
val staticVal1: Int = 42
|
||||
|
||||
val staticVal2: Int
|
||||
<!JVM_STATIC_IN_PRIVATE_COMPANION!>@JvmStatic<!> get() = 42
|
||||
@JvmStatic get() = 42
|
||||
|
||||
<!JVM_STATIC_IN_PRIVATE_COMPANION!>@get:JvmStatic<!>
|
||||
@get:JvmStatic
|
||||
val staticVal3: Int = 42
|
||||
|
||||
<!JVM_STATIC_IN_PRIVATE_COMPANION!>@JvmStatic<!>
|
||||
@JvmStatic
|
||||
var staticVar1: Int = 42
|
||||
|
||||
var staticVar2: Int
|
||||
<!JVM_STATIC_IN_PRIVATE_COMPANION!>@JvmStatic<!> get() = 42
|
||||
<!JVM_STATIC_IN_PRIVATE_COMPANION!>@JvmStatic<!> set(value) {}
|
||||
@JvmStatic get() = 42
|
||||
@JvmStatic set(value) {}
|
||||
|
||||
<!JVM_STATIC_IN_PRIVATE_COMPANION!>@get: JvmStatic<!>
|
||||
<!JVM_STATIC_IN_PRIVATE_COMPANION!>@set: JvmStatic<!>
|
||||
@get: JvmStatic
|
||||
@set: JvmStatic
|
||||
var staticVar3: Int = 42
|
||||
|
||||
<!JVM_STATIC_IN_PRIVATE_COMPANION!>@JvmStatic<!>
|
||||
@JvmStatic
|
||||
fun staticFunction() {}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user