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

Do not check visibility of enum entries in explicit api mode

Browse Source 
Although they're instances of DeclarationDescriptorWithVisibility,
they can't have visibilities

#KT-37040 Fixed
This commit is contained in:
Leonid Startsev
2020-03-06 18:41:18 +03:00
parent 753d4b3cbd
commit 5d73550b48
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ExplicitApiDeclarationChecker.kt
+2 -1
View File
@@ -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. * 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 (state == ExplicitApiMode.DISABLED) return
if (descriptor !is DeclarationDescriptorWithVisibility) 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 if (!descriptor.isEffectivelyPublicApi) return
checkVisibilityModifier(state, declaration, descriptor, context) checkVisibilityModifier(state, declaration, descriptor, context)
compiler/testData/diagnostics/testsWithExplicitApi/classes.kt
Vendored
+7 -2
View File
@@ -39,6 +39,11 @@ public data class FooData(val i: Int, val s: String)
<!NO_EXPLICIT_VISIBILITY_IN_API_MODE!>data class FooData2<!>(val i: Int, val s: String) <!NO_EXPLICIT_VISIBILITY_IN_API_MODE!>data class FooData2<!>(val i: Int, val s: String)
public class WithNested { public class WithNested {
<!NO_EXPLICIT_VISIBILITY_IN_API_MODE!>class Nested<!> {} <!NO_EXPLICIT_VISIBILITY_IN_API_MODE!>
<!NO_EXPLICIT_VISIBILITY_IN_API_MODE!>inner class Inner<!> {} class Nested<!> {}
<!NO_EXPLICIT_VISIBILITY_IN_API_MODE!>
inner class Inner<!> {}
} }
<!NO_EXPLICIT_VISIBILITY_IN_API_MODE!>enum class Foo<!> { A, B }
public enum class Bar { A, B }