From 5d73550b48a3057f9a1f432ffc7391a36d370518 Mon Sep 17 00:00:00 2001 From: Leonid Startsev Date: Fri, 6 Mar 2020 18:41:18 +0300 Subject: [PATCH] Do not check visibility of enum entries in explicit api mode Although they're instances of DeclarationDescriptorWithVisibility, they can't have visibilities #KT-37040 Fixed --- .../resolve/checkers/ExplicitApiDeclarationChecker.kt | 3 ++- .../diagnostics/testsWithExplicitApi/classes.kt | 11 ++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ExplicitApiDeclarationChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ExplicitApiDeclarationChecker.kt index 468d9bc99bd..560ebee81e8 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ExplicitApiDeclarationChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ExplicitApiDeclarationChecker.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -21,6 +21,7 @@ class ExplicitApiDeclarationChecker : DeclarationChecker { if (state == ExplicitApiMode.DISABLED) return if (descriptor !is DeclarationDescriptorWithVisibility) return + if (descriptor is ClassDescriptor && descriptor.kind == ClassKind.ENUM_ENTRY) return // Enum entries does not have visibilities if (!descriptor.isEffectivelyPublicApi) return checkVisibilityModifier(state, declaration, descriptor, context) diff --git a/compiler/testData/diagnostics/testsWithExplicitApi/classes.kt b/compiler/testData/diagnostics/testsWithExplicitApi/classes.kt index af2abfdf7ec..e40083cff2d 100644 --- a/compiler/testData/diagnostics/testsWithExplicitApi/classes.kt +++ b/compiler/testData/diagnostics/testsWithExplicitApi/classes.kt @@ -39,6 +39,11 @@ public data class FooData(val i: Int, val s: String) data class FooData2(val i: Int, val s: String) public class WithNested { - class Nested {} - inner class Inner {} -} \ No newline at end of file + + class Nested {} + + inner class Inner {} +} + +enum class Foo { A, B } +public enum class Bar { A, B } \ No newline at end of file