Use DescriptorVisibilities.isPrivate instead of simple equality
This commit is contained in:
committed by
TeamCityServer
parent
55793d078c
commit
ae3a2d4e71
+1
-1
@@ -44,7 +44,7 @@ class TypeTranslatorImpl(
|
||||
CommonSupertypes.commonSupertype(types)
|
||||
|
||||
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
|
||||
|
||||
|
||||
@@ -168,9 +168,7 @@ abstract class TypeTranslator(
|
||||
|
||||
private fun SimpleType.toIrTypeAbbreviation(): IrTypeAbbreviation? {
|
||||
// Abbreviated type's classifier might not be TypeAliasDescriptor in case it's MockClassDescriptor (not found in dependencies).
|
||||
val typeAliasDescriptor = constructor.declarationDescriptor.let {
|
||||
it as? TypeAliasDescriptor
|
||||
} ?: return null
|
||||
val typeAliasDescriptor = constructor.declarationDescriptor as? TypeAliasDescriptor ?: return null
|
||||
|
||||
if (!isTypeAliasAccessibleHere(typeAliasDescriptor)) return null
|
||||
|
||||
|
||||
+1
-2
@@ -33,8 +33,7 @@ class ManglerChecker(vararg _manglers: KotlinMangler<IrDeclaration>) : IrElement
|
||||
|
||||
if (declaration.parent is IrPackageFragment) {
|
||||
val vis = declaration as IrDeclarationWithVisibility
|
||||
if (vis.visibility == DescriptorVisibilities.PRIVATE) return true
|
||||
else return false
|
||||
return DescriptorVisibilities.isPrivate(vis.visibility)
|
||||
}
|
||||
|
||||
return declaration.parent.accept(this, data)
|
||||
|
||||
Reference in New Issue
Block a user