From 94deddef7f5a6ec570100dd69b4e75809b44cbbc Mon Sep 17 00:00:00 2001 From: Victor Petukhov Date: Wed, 16 Dec 2020 10:24:12 +0300 Subject: [PATCH] Revert "Minor: cover negative cases with test +m" This reverts commit 04a4f9cd --- .../JvmStaticInPrivateCompanionChecker.kt | 10 +++---- .../jvmStatic/privateCompanionObject.fir.kt | 29 +------------------ .../jvmStatic/privateCompanionObject.kt | 29 +------------------ .../jvmStatic/privateCompanionObject.txt | 21 -------------- 4 files changed, 6 insertions(+), 83 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JvmStaticInPrivateCompanionChecker.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JvmStaticInPrivateCompanionChecker.kt index 9eeb7b44d48..e08d7f0ecae 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JvmStaticInPrivateCompanionChecker.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JvmStaticInPrivateCompanionChecker.kt @@ -18,16 +18,14 @@ import org.jetbrains.kotlin.utils.addToStdlib.safeAs class JvmStaticInPrivateCompanionChecker : DeclarationChecker { override fun check(declaration: KtDeclaration, descriptor: DeclarationDescriptor, context: DeclarationCheckerContext) { - val containingDeclaration = descriptor.containingDeclaration - if (containingDeclaration !is ClassDescriptor - || !containingDeclaration.isCompanionObject - || !Visibilities.isPrivate(containingDeclaration.visibility.delegate) - ) return + descriptor.containingDeclaration.safeAs()?.takeIf { + it.isCompanionObject && Visibilities.isPrivate(it.visibility.delegate) + } ?: return val jvmStaticAnnotation = descriptor.annotations.findAnnotation(JVM_STATIC_ANNOTATION_FQ_NAME) ?: return - val reportTarget = jvmStaticAnnotation.source.safeAs()?.psi ?: return + val reportTarget = jvmStaticAnnotation.source.safeAs()?.psi ?: declaration context.trace.report(JVM_STATIC_IN_PRIVATE_COMPANION.on(reportTarget)) } } \ No newline at end of file diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/privateCompanionObject.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/privateCompanionObject.fir.kt index e6dac1eb6b0..4b6f9d5ae3b 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/privateCompanionObject.fir.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/privateCompanionObject.fir.kt @@ -26,31 +26,4 @@ class WithPrivateCompanion { @JvmStatic fun staticFunction() {} } -} - -class WithPublicCompanion { - 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() {} - } -} +} \ No newline at end of file diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/privateCompanionObject.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/privateCompanionObject.kt index 0adcfbf6b42..1c718ce215b 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/privateCompanionObject.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/privateCompanionObject.kt @@ -26,31 +26,4 @@ class WithPrivateCompanion { @JvmStatic fun staticFunction() {} } -} - -class WithPublicCompanion { - 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() {} - } -} +} \ No newline at end of file diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/privateCompanionObject.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/privateCompanionObject.txt index c04308bf1bd..f6ceea5ca4d 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/privateCompanionObject.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/privateCompanionObject.txt @@ -20,24 +20,3 @@ public final class WithPrivateCompanion { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } } - -public final class WithPublicCompanion { - public constructor WithPublicCompanion() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - - public companion object Companion { - private constructor Companion() - @kotlin.jvm.JvmStatic public final val staticVal1: kotlin.Int = 42 - @get:kotlin.jvm.JvmStatic public final val staticVal2: kotlin.Int - @get:kotlin.jvm.JvmStatic public final val staticVal3: kotlin.Int = 42 - @kotlin.jvm.JvmStatic public final var staticVar1: kotlin.Int - @get:kotlin.jvm.JvmStatic @set:kotlin.jvm.JvmStatic public final var staticVar2: kotlin.Int - @get:kotlin.jvm.JvmStatic @set:kotlin.jvm.JvmStatic public final var staticVar3: kotlin.Int - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - @kotlin.jvm.JvmStatic public final fun staticFunction(): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - } -}