Made code more clear

This commit is contained in:
Valentin Kipyatkov
2015-02-17 21:33:35 +03:00
parent 5c904b6a94
commit 84027124db
@@ -45,15 +45,15 @@ public fun DeclarationDescriptor.canBeReferencedViaImport(): Boolean {
(this is CallableDescriptor && DescriptorUtils.isStaticDeclaration(this))) {
return !getName().isSpecial()
}
val parent = getContainingDeclaration()!!
if (parent !is ClassDescriptor || !parent.canBeReferencedViaImport()) {
return false
val parentClass = getContainingDeclaration() as? ClassDescriptor ?: return false
if (!parentClass.canBeReferencedViaImport()) return false
return when (this) {
is ConstructorDescriptor -> !parentClass.isInner() // inner class constructors can't be referenced via import
is ClassDescriptor -> true
else -> false
}
// inner class constructors can't be referenced via import
if (this is ConstructorDescriptor && parent.isInner()) {
return false
}
return this is ClassDescriptor || this is ConstructorDescriptor
}
public fun JetType.canBeReferencedViaImport(): Boolean {