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

Effective visibility refactoring: calculate parent decriptor lazily, support checkPublishedApi flag

Browse Source
This commit is contained in:
Mikhael Bogdanov
2016-12-05 17:45:47 +01:00
parent 7af327c567
commit 00e2463014
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JavaVisibilities.java
+1 -1
View File
@@ -59,7 +59,7 @@ public class JavaVisibilities {
@NotNull @NotNull
@Override @Override
public EffectiveVisibility effectiveVisibility(@Nullable ClassDescriptor classDescriptor, boolean checkPublishedApi) { public EffectiveVisibility effectiveVisibility(@NotNull DeclarationDescriptor classDescriptor, boolean checkPublishedApi) {
return EffectiveVisibility.PackagePrivate.INSTANCE; return EffectiveVisibility.PackagePrivate.INSTANCE;
} }
}; };
core/descriptors/src/org/jetbrains/kotlin/descriptors/EffectiveVisibility.kt
+9 -7
View File
@@ -16,6 +16,7 @@
package org.jetbrains.kotlin.descriptors package org.jetbrains.kotlin.descriptors
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.DescriptorUtils
import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.KotlinType
import org.jetbrains.kotlin.descriptors.EffectiveVisibility.* import org.jetbrains.kotlin.descriptors.EffectiveVisibility.*
@@ -232,18 +233,19 @@ private fun lowerBound(first: EffectiveVisibility, args: List<EffectiveVisibilit
private fun lowerBound(args: List<EffectiveVisibility>) = private fun lowerBound(args: List<EffectiveVisibility>) =
if (args.isEmpty()) Public else lowerBound(args.first(), args.subList(1, args.size)) if (args.isEmpty()) Public else lowerBound(args.first(), args.subList(1, args.size))
private fun Visibility.forVisibility(descriptor: ClassDescriptor? = null, checkPublishedApi: Boolean = false): EffectiveVisibility = private fun Visibility.forVisibility(descriptor: DeclarationDescriptor, checkPublishedApi: Boolean = false): EffectiveVisibility =
when (this) { when (this) {
Visibilities.PRIVATE, Visibilities.PRIVATE_TO_THIS, Visibilities.INVISIBLE_FAKE -> Private Visibilities.PRIVATE, Visibilities.PRIVATE_TO_THIS, Visibilities.INVISIBLE_FAKE -> Private
Visibilities.PROTECTED -> Protected(descriptor) Visibilities.PROTECTED -> Protected(descriptor.containingDeclaration as? ClassDescriptor)
Visibilities.INTERNAL -> Internal Visibilities.INTERNAL -> if (!checkPublishedApi ||
!descriptor.annotations.hasAnnotation(KotlinBuiltIns.FQ_NAMES.publishedApi)) Internal else Public
Visibilities.PUBLIC -> Public Visibilities.PUBLIC -> Public
Visibilities.LOCAL -> Local Visibilities.LOCAL -> Local
// NB: visibility must be already normalized here, so e.g. no JavaVisibilities are possible at this point // NB: visibility must be already normalized here, so e.g. no JavaVisibilities are possible at this point
else -> throw AssertionError("Visibility $name is not allowed in forVisibility") else -> throw AssertionError("Visibility $name is not allowed in forVisibility")
} }
fun effectiveVisibility(visibility: Visibility, descriptor: ClassDescriptor?, checkPublishedApi: Boolean = false) = fun effectiveVisibility(visibility: Visibility, descriptor: DeclarationDescriptor, checkPublishedApi: Boolean = false) =
visibility.forVisibility(descriptor, checkPublishedApi) visibility.forVisibility(descriptor, checkPublishedApi)
enum class RelationToType(val description: String) { enum class RelationToType(val description: String) {
@@ -262,7 +264,7 @@ enum class RelationToType(val description: String) {
data class DescriptorWithRelation(val descriptor: ClassifierDescriptor, val relation: RelationToType) { data class DescriptorWithRelation(val descriptor: ClassifierDescriptor, val relation: RelationToType) {
fun effectiveVisibility() = fun effectiveVisibility() =
(descriptor as? ClassDescriptor)?.visibility?.effectiveVisibility(descriptor.containingDeclaration as? ClassDescriptor, false) ?: Public (descriptor as? ClassDescriptor)?.visibility?.effectiveVisibility(descriptor, false) ?: Public
override fun toString() = "$relation ${descriptor.name}" override fun toString() = "$relation ${descriptor.name}"
} }
@@ -276,7 +278,7 @@ fun ClassDescriptor.effectiveVisibility(checkPublishedApi: Boolean = false) = ef
private fun ClassDescriptor.effectiveVisibility(classes: Set<ClassDescriptor>, checkPublishedApi: Boolean): EffectiveVisibility = private fun ClassDescriptor.effectiveVisibility(classes: Set<ClassDescriptor>, checkPublishedApi: Boolean): EffectiveVisibility =
if (this in classes) Public if (this in classes) Public
else with(this.containingDeclaration as? ClassDescriptor) { else with(this.containingDeclaration as? ClassDescriptor) {
lowerBound(visibility.effectiveVisibility(this, checkPublishedApi), this?.effectiveVisibility(classes + this@effectiveVisibility, checkPublishedApi) ?: Public) lowerBound(visibility.effectiveVisibility(this@effectiveVisibility, checkPublishedApi), this?.effectiveVisibility(classes + this@effectiveVisibility, checkPublishedApi) ?: Public)
} }
// Should collect all dependent classifier descriptors, to get verbose diagnostic // Should collect all dependent classifier descriptors, to get verbose diagnostic
@@ -307,6 +309,6 @@ fun KotlinType.leastPermissiveDescriptor(base: EffectiveVisibility) = dependentD
fun DeclarationDescriptorWithVisibility.effectiveVisibility( fun DeclarationDescriptorWithVisibility.effectiveVisibility(
visibility: Visibility = this.visibility, checkPublishedApi: Boolean = false visibility: Visibility = this.visibility, checkPublishedApi: Boolean = false
): EffectiveVisibility = ): EffectiveVisibility =
lowerBound(visibility.effectiveVisibility(this.containingDeclaration as? ClassDescriptor, checkPublishedApi), lowerBound(visibility.effectiveVisibility(this, checkPublishedApi),
(this.containingDeclaration as? ClassDescriptor)?.effectiveVisibility(checkPublishedApi) ?: Public) (this.containingDeclaration as? ClassDescriptor)?.effectiveVisibility(checkPublishedApi) ?: Public)
core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibility.kt
+1 -1
View File
@@ -64,5 +64,5 @@ abstract class Visibility protected constructor(
open fun normalize(): Visibility = this open fun normalize(): Visibility = this
// Should be overloaded in Java visibilities // Should be overloaded in Java visibilities
open fun effectiveVisibility(descriptor: ClassDescriptor?, checkPublishedApi: Boolean) = effectiveVisibility(normalize(), descriptor, checkPublishedApi) open fun effectiveVisibility(descriptor: DeclarationDescriptor, checkPublishedApi: Boolean) = effectiveVisibility(normalize(), descriptor, checkPublishedApi)
} }