Use DescriptorVisibilities.isPrivate instead of simple equality

This commit is contained in:
Roman Artemev
2021-06-02 17:02:15 +03:00
committed by TeamCityServer
parent 55793d078c
commit ae3a2d4e71
3 changed files with 3 additions and 6 deletions
@@ -44,7 +44,7 @@ class TypeTranslatorImpl(
CommonSupertypes.commonSupertype(types) CommonSupertypes.commonSupertype(types)
override fun isTypeAliasAccessibleHere(typeAliasDescriptor: TypeAliasDescriptor): Boolean { override fun isTypeAliasAccessibleHere(typeAliasDescriptor: TypeAliasDescriptor): Boolean {
if (typeAliasDescriptor.visibility != DescriptorVisibilities.PRIVATE) return true if (!DescriptorVisibilities.isPrivate(typeAliasDescriptor.visibility)) return true
val psiFile = typeAliasDescriptor.source.getPsi()?.containingFile ?: return false val psiFile = typeAliasDescriptor.source.getPsi()?.containingFile ?: return false
@@ -168,9 +168,7 @@ abstract class TypeTranslator(
private fun SimpleType.toIrTypeAbbreviation(): IrTypeAbbreviation? { private fun SimpleType.toIrTypeAbbreviation(): IrTypeAbbreviation? {
// Abbreviated type's classifier might not be TypeAliasDescriptor in case it's MockClassDescriptor (not found in dependencies). // Abbreviated type's classifier might not be TypeAliasDescriptor in case it's MockClassDescriptor (not found in dependencies).
val typeAliasDescriptor = constructor.declarationDescriptor.let { val typeAliasDescriptor = constructor.declarationDescriptor as? TypeAliasDescriptor ?: return null
it as? TypeAliasDescriptor
} ?: return null
if (!isTypeAliasAccessibleHere(typeAliasDescriptor)) return null if (!isTypeAliasAccessibleHere(typeAliasDescriptor)) return null
@@ -33,8 +33,7 @@ class ManglerChecker(vararg _manglers: KotlinMangler<IrDeclaration>) : IrElement
if (declaration.parent is IrPackageFragment) { if (declaration.parent is IrPackageFragment) {
val vis = declaration as IrDeclarationWithVisibility val vis = declaration as IrDeclarationWithVisibility
if (vis.visibility == DescriptorVisibilities.PRIVATE) return true return DescriptorVisibilities.isPrivate(vis.visibility)
else return false
} }
return declaration.parent.accept(this, data) return declaration.parent.accept(this, data)