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

Revert "[all-open] Don't affect private declarations to change their modality to open"

Browse Source 
This reverts commit baeee8988e.
This commit is contained in:
Victor Petukhov
2021-09-27 10:22:08 +03:00
parent 80312789b2
commit c3773d14bb
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/allopen/allopen-cli/src/AllOpenDeclarationAttributeAltererExtension.kt
+1 -1
View File
@@ -43,7 +43,7 @@ abstract class AbstractAllOpenDeclarationAttributeAltererExtension : Declaration
currentModality: Modality, currentModality: Modality,
isImplicitModality: Boolean isImplicitModality: Boolean
): Modality? { ): Modality? {
if (currentModality != Modality.FINAL || modifierListOwner.isPrivate()) { if (currentModality != Modality.FINAL) {
return null return null
} }
plugins/allopen/allopen-cli/testData/bytecodeListing/privateMembers.kt
Vendored
-2
View File
@@ -13,6 +13,4 @@ private class Test {
internal fun internalMethod() {} internal fun internalMethod() {}
internal val internalProp: String = "" internal val internalProp: String = ""
private tailrec fun privateTailrecMethod() {}
} }
plugins/allopen/allopen-cli/testData/bytecodeListing/privateMembers.txt
Vendored
+2 -3
View File
@@ -6,7 +6,7 @@ public annotation class AllOpen {
@AllOpen @AllOpen
@kotlin.Metadata @kotlin.Metadata
final class Test { class Test {
// source: 'privateMembers.kt' // source: 'privateMembers.kt'
private final @org.jetbrains.annotations.NotNull field internalProp: java.lang.String private final @org.jetbrains.annotations.NotNull field internalProp: java.lang.String
private final field privateProp: java.lang.String private final field privateProp: java.lang.String
@@ -17,8 +17,7 @@ final 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
private final method privateTailrecMethod(): void
protected method protectedMethod(): void protected method protectedMethod(): void
public method publicMethod(): void public method publicMethod(): void
} }