azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
plugins/allopen/allopen-cli/src/AllOpenDeclarationAttributeAltererExtension.kt
-5
View File
@@ -22,7 +22,6 @@ import org.jetbrains.kotlin.descriptors.Modality
import org.jetbrains.kotlin.extensions.AnnotationBasedExtension import org.jetbrains.kotlin.extensions.AnnotationBasedExtension
import org.jetbrains.kotlin.extensions.DeclarationAttributeAltererExtension import org.jetbrains.kotlin.extensions.DeclarationAttributeAltererExtension
import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.psi.KtCallableDeclaration
import org.jetbrains.kotlin.psi.KtModifierListOwner import org.jetbrains.kotlin.psi.KtModifierListOwner
import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingContext
@@ -49,10 +48,6 @@ abstract class AbstractAllOpenDeclarationAttributeAltererExtension : Declaration
return null return null
} }
if (modifierListOwner.hasModifier(KtTokens.PRIVATE_KEYWORD) && modifierListOwner is KtCallableDeclaration) {
return null
}
val descriptor = declaration as? ClassDescriptor ?: containingDeclaration ?: return null val descriptor = declaration as? ClassDescriptor ?: containingDeclaration ?: return null
if (descriptor.hasSpecialAnnotation(modifierListOwner)) { if (descriptor.hasSpecialAnnotation(modifierListOwner)) {
return if (!isImplicitModality && modifierListOwner.hasModifier(KtTokens.FINAL_KEYWORD)) return if (!isImplicitModality && modifierListOwner.hasModifier(KtTokens.FINAL_KEYWORD))
plugins/allopen/allopen-cli/testData/bytecodeListing/privateMembers.txt
Vendored
+1 -1
View File
@@ -14,7 +14,7 @@ class Test {
protected @org.jetbrains.annotations.NotNull method getProtectedProp(): java.lang.String protected @org.jetbrains.annotations.NotNull method getProtectedProp(): java.lang.String
public @org.jetbrains.annotations.NotNull method getPublicProp(): java.lang.String public @org.jetbrains.annotations.NotNull method getPublicProp(): java.lang.String
public method internalMethod$test_module(): void public method internalMethod$test_module(): void
private final method privateMethod(): void private method privateMethod(): void
protected method protectedMethod(): void protected method protectedMethod(): void
public method publicMethod(): void public method publicMethod(): void
} }