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

Rename Visibility to DescriptorVisibility

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-09-01 16:06:06 +03:00
parent 2bcd8ee07f
commit d1fd1da56f
379 changed files with 2240 additions and 2250 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.frontend/src/org/jetbrains/kotlin/js/descriptorUtils/descriptorUtils.kt
+2 -2
View File
@@ -53,5 +53,5 @@ fun DeclarationDescriptor.shouldBeExported(config: JsConfig): Boolean =
private fun EffectiveVisibility.shouldBeExported(config: JsConfig): Boolean {
if (publicApi) return true
if (config.configuration.getBoolean(JSConfigurationKeys.FRIEND_PATHS_DISABLED)) return false
return toVisibility() == Visibilities.INTERNAL
}
return toVisibility() == DescriptorVisibilities.INTERNAL
}
js/js.frontend/src/org/jetbrains/kotlin/js/naming/NameSuggestion.kt
+5 -5
View File
@@ -288,7 +288,7 @@ class NameSuggestion {
is PackageFragmentDescriptor -> when {
effectiveVisibility.isPublicAPI -> mangledAndStable()
effectiveVisibility == Visibilities.INTERNAL -> mangledInternal()
effectiveVisibility == DescriptorVisibilities.INTERNAL -> mangledInternal()
else -> regularAndUnstable()
}
@@ -297,16 +297,16 @@ class NameSuggestion {
descriptor is FunctionDescriptor && descriptor.isEnumValueOfMethod() -> mangledAndStable()
// Make all public declarations stable
effectiveVisibility == Visibilities.PUBLIC -> mangledAndStable()
effectiveVisibility == DescriptorVisibilities.PUBLIC -> mangledAndStable()
descriptor.isOverridableOrOverrides -> mangledAndStable()
// Make all protected declarations of non-final public classes stable
effectiveVisibility == Visibilities.PROTECTED &&
effectiveVisibility == DescriptorVisibilities.PROTECTED &&
!containingDeclaration.isFinalClass &&
containingDeclaration.visibility.isPublicAPI -> mangledAndStable()
effectiveVisibility == Visibilities.INTERNAL -> mangledInternal()
effectiveVisibility == DescriptorVisibilities.INTERNAL -> mangledInternal()
// Mangle (but make unstable) all non-public API of public classes
containingDeclaration.visibility.isPublicAPI && !containingDeclaration.isFinalClass -> mangledPrivate()
@@ -383,4 +383,4 @@ fun Char.isES5IdentifierPart() =
fun String.isValidES5Identifier() =
isNotEmpty() &&
first().isES5IdentifierStart() &&
drop(1).all { it.isES5IdentifierPart() }
drop(1).all { it.isES5IdentifierPart() }
js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsExternalChecker.kt
+1 -1
View File
@@ -216,7 +216,7 @@ object JsExternalChecker : DeclarationChecker {
private fun isPrivateMemberOfExternalClass(descriptor: DeclarationDescriptor): Boolean {
if (descriptor is PropertyAccessorDescriptor && descriptor.visibility == descriptor.correspondingProperty.visibility) return false
if (descriptor !is MemberDescriptor || descriptor.visibility != Visibilities.PRIVATE) return false
if (descriptor !is MemberDescriptor || descriptor.visibility != DescriptorVisibilities.PRIVATE) return false
val containingDeclaration = descriptor.containingDeclaration as? ClassDescriptor ?: return false
return AnnotationsUtils.isNativeObject(containingDeclaration)
js/js.frontend/src/org/jetbrains/kotlin/js/resolve/nativeAnnotationCheckers.kt
+2 -2
View File
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.js.resolve
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.descriptors.FunctionDescriptor
import org.jetbrains.kotlin.descriptors.Visibilities
import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
import org.jetbrains.kotlin.diagnostics.DiagnosticSink
import org.jetbrains.kotlin.js.PredefinedAnnotation
import org.jetbrains.kotlin.js.resolve.diagnostics.ErrorsJs
@@ -44,7 +44,7 @@ internal abstract class AbstractNativeAnnotationsChecker(private val requiredAnn
return
}
val isMember = !DescriptorUtils.isTopLevelDeclaration(descriptor) && descriptor.visibility != Visibilities.LOCAL
val isMember = !DescriptorUtils.isTopLevelDeclaration(descriptor) && descriptor.visibility != DescriptorVisibilities.LOCAL
val isExtension = DescriptorUtils.isExtension(descriptor)
if (isMember && (isExtension || !AnnotationsUtils.isNativeObject(descriptor)) ||
js/js.frontend/src/org/jetbrains/kotlin/js/translate/utils/AnnotationsUtils.java
+1 -1
View File
@@ -119,7 +119,7 @@ public final class AnnotationsUtils {
public static boolean isExportedObject(@NotNull DeclarationDescriptor descriptor, @NotNull BindingContext bindingContext) {
if (descriptor instanceof MemberDescriptor) {
MemberDescriptor memberDescriptor = (MemberDescriptor) descriptor;
if (memberDescriptor.getVisibility() != Visibilities.PUBLIC) return false;
if (memberDescriptor.getVisibility() != DescriptorVisibilities.PUBLIC) return false;
}
if (hasAnnotationOrInsideAnnotatedClass(descriptor, JS_EXPORT)) return true;
js/js.translator/src/org/jetbrains/kotlin/js/translate/context/UsageTracker.kt
+1 -1
View File
@@ -54,7 +54,7 @@ class UsageTracker(
if (descriptor is FakeCallableDescriptorForObject) return
// local named function
if (descriptor is FunctionDescriptor && descriptor.visibility == Visibilities.LOCAL) {
if (descriptor is FunctionDescriptor && descriptor.visibility == DescriptorVisibilities.LOCAL) {
captureIfNeed(descriptor)
}
// local variable
js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassModelGenerator.kt
+2 -2
View File
@@ -108,7 +108,7 @@ class ClassModelGenerator(val context: TranslationContext) {
private fun copySimpleMember(descriptor: ClassDescriptor, member: CallableMemberDescriptor, model: JsClassModel) {
// Special case: fake descriptor denotes (possible multiple) private members from different super interfaces
if (member.visibility == Visibilities.INVISIBLE_FAKE) return copyInvisibleFakeMember(descriptor, member, model)
if (member.visibility == DescriptorVisibilities.INVISIBLE_FAKE) return copyInvisibleFakeMember(descriptor, member, model)
val memberToCopy = findMemberToCopy(member) ?: return
val classToCopyFrom = memberToCopy.containingDeclaration as ClassDescriptor
@@ -260,7 +260,7 @@ class ClassModelGenerator(val context: TranslationContext) {
val fromDescriptor = bridge.from
val toDescriptor = bridge.to
if (toDescriptor.visibility == Visibilities.INVISIBLE_FAKE) return
if (toDescriptor.visibility == DescriptorVisibilities.INVISIBLE_FAKE) return
val sourceName = context.getNameForDescriptor(fromDescriptor).ident
val targetName = context.getNameForDescriptor(toDescriptor).ident
js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LiteralFunctionTranslator.kt
+1 -1
View File
@@ -258,6 +258,6 @@ private fun HasName.getStaticRef(): JsNode? {
private fun isLocalInlineDeclaration(descriptor: CallableDescriptor): Boolean {
return descriptor is FunctionDescriptor
&& descriptor.getVisibility() == Visibilities.LOCAL
&& descriptor.getVisibility() == DescriptorVisibilities.LOCAL
&& InlineUtil.isInline(descriptor)
}
js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallableReferenceTranslator.kt
+1 -1
View File
@@ -223,7 +223,7 @@ object CallableReferenceTranslator {
private fun isSetterVisible(descriptor: PropertyDescriptor, context: TranslationContext): Boolean {
val setter = descriptor.setter ?: return false
if (setter.visibility != Visibilities.PRIVATE) return true
if (setter.visibility != DescriptorVisibilities.PRIVATE) return true
val classDescriptor = context.classDescriptor ?: return false
val outerClasses = generateSequence<DeclarationDescriptor>(classDescriptor) { it.containingDeclaration }
js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/signatureUtils.kt
+1 -1
View File
@@ -33,7 +33,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.module
// it's hard to do it unintentionally.
fun generateSignature(descriptor: DeclarationDescriptor): String? {
if (DescriptorUtils.isDescriptorWithLocalVisibility(descriptor)) return null
if (descriptor is DeclarationDescriptorWithVisibility && descriptor.visibility == Visibilities.PRIVATE &&
if (descriptor is DeclarationDescriptorWithVisibility && descriptor.visibility == DescriptorVisibilities.PRIVATE &&
!AnnotationsUtils.isNativeObject(descriptor) && !AnnotationsUtils.isLibraryObject(descriptor)
) {
return null