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.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