AllOpen: Make private members open again because of KT-19047

This commit is contained in:
Yan Zhulanow
2017-07-17 23:30:59 +03:00
committed by Yan Zhulanow
parent 5ff014f89d
commit 3bb7febeb8
2 changed files with 1 additions and 6 deletions
@@ -22,7 +22,6 @@ import org.jetbrains.kotlin.descriptors.Modality
import org.jetbrains.kotlin.extensions.AnnotationBasedExtension
import org.jetbrains.kotlin.extensions.DeclarationAttributeAltererExtension
import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.psi.KtCallableDeclaration
import org.jetbrains.kotlin.psi.KtModifierListOwner
import org.jetbrains.kotlin.resolve.BindingContext
@@ -49,10 +48,6 @@ abstract class AbstractAllOpenDeclarationAttributeAltererExtension : Declaration
return null
}
if (modifierListOwner.hasModifier(KtTokens.PRIVATE_KEYWORD) && modifierListOwner is KtCallableDeclaration) {
return null
}
val descriptor = declaration as? ClassDescriptor ?: containingDeclaration ?: return null
if (descriptor.hasSpecialAnnotation(modifierListOwner)) {
return if (!isImplicitModality && modifierListOwner.hasModifier(KtTokens.FINAL_KEYWORD))