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

Do not report NON_FINAL_MEMBER_IN_FINAL_CLASS on open members in enum classes

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-10-09 22:02:15 +04:00
parent 4136c80358
commit 6eae62c235
5 changed files with 101 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java
+4 -1
View File
@@ -36,6 +36,7 @@ import static org.jetbrains.jet.lang.diagnostics.Errors.*;
import static org.jetbrains.jet.lang.resolve.BindingContext.TYPE;
import static org.jetbrains.jet.lang.resolve.BindingContext.TYPE_PARAMETER;
import static org.jetbrains.jet.lang.resolve.DescriptorUtils.classCanHaveAbstractMembers;
import static org.jetbrains.jet.lang.resolve.DescriptorUtils.classCanHaveOpenMembers;
public class DeclarationsChecker {
@NotNull
@@ -337,10 +338,12 @@ public class DeclarationsChecker {
}
private void checkOpenMembers(ClassDescriptorWithResolutionScopes classDescriptor) {
if (classCanHaveOpenMembers(classDescriptor)) return;
for (CallableMemberDescriptor memberDescriptor : classDescriptor.getDeclaredCallableMembers()) {
if (memberDescriptor.getKind() != CallableMemberDescriptor.Kind.DECLARATION) continue;
JetNamedDeclaration member = (JetNamedDeclaration) DescriptorToSourceUtils.descriptorToDeclaration(memberDescriptor);
if (member != null && classDescriptor.getModality() == Modality.FINAL && member.hasModifier(JetTokens.OPEN_KEYWORD)) {
if (member != null && member.hasModifier(JetTokens.OPEN_KEYWORD)) {
trace.report(NON_FINAL_MEMBER_IN_FINAL_CLASS.on(member));
}
}
compiler/testData/diagnostics/tests/enum/openMemberInEnum.kt
+17
View File
@@ -0,0 +1,17 @@
enum class EnumWithOpenMembers {
E1 {
override fun foo() = 1
override val bar: String = "a"
}
E2 {
<!OVERRIDING_FINAL_MEMBER!>override<!> fun f() = 3
<!OVERRIDING_FINAL_MEMBER!>override<!> val b = 4
}
open fun foo() = 1
open val bar: String = ""
fun f() = 2
val b = 3
}
compiler/testData/diagnostics/tests/enum/openMemberInEnum.txt
+70
View File
@@ -0,0 +1,70 @@
package
internal final enum class EnumWithOpenMembers : kotlin.Enum<EnumWithOpenMembers> {
private constructor EnumWithOpenMembers()
internal final val b: kotlin.Int = 3
internal open val bar: kotlin.String = ""
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final fun f(): kotlin.Int
internal open fun foo(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public enum entry E1 : EnumWithOpenMembers {
private constructor E1()
internal final override /*1*/ /*fake_override*/ val b: kotlin.Int
internal open override /*1*/ val bar: kotlin.String = "a"
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final override /*1*/ /*fake_override*/ fun f(): kotlin.Int
internal open override /*1*/ fun foo(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public class object <class-object-for-E1> : EnumWithOpenMembers.E1 {
private constructor <class-object-for-E1>()
internal final override /*1*/ /*fake_override*/ val b: kotlin.Int
internal open override /*1*/ /*fake_override*/ val bar: kotlin.String
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final override /*1*/ /*fake_override*/ fun f(): kotlin.Int
internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
public enum entry E2 : EnumWithOpenMembers {
private constructor E2()
internal open override /*1*/ val b: kotlin.Int = 4
internal open override /*1*/ /*fake_override*/ val bar: kotlin.String
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open override /*1*/ fun f(): kotlin.Int
internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public class object <class-object-for-E2> : EnumWithOpenMembers.E2 {
private constructor <class-object-for-E2>()
internal open override /*1*/ /*fake_override*/ val b: kotlin.Int
internal open override /*1*/ /*fake_override*/ val bar: kotlin.String
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open override /*1*/ /*fake_override*/ fun f(): kotlin.Int
internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
// Static members
public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): EnumWithOpenMembers
public final /*synthesized*/ fun values(): kotlin.Array<EnumWithOpenMembers>
}
compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+6
View File
@@ -3889,6 +3889,12 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
doTest(fileName);
}
@TestMetadata("openMemberInEnum.kt")
public void testOpenMemberInEnum() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/openMemberInEnum.kt");
doTest(fileName);
}
@TestMetadata("starImportNestedClassAndEntries.kt")
public void testStarImportNestedClassAndEntries() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.kt");
core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java
+4
View File
@@ -405,4 +405,8 @@ public class DescriptorUtils {
public static boolean classCanHaveAbstractMembers(@NotNull ClassDescriptor classDescriptor) {
return classDescriptor.getModality() == Modality.ABSTRACT || classDescriptor.getKind() == ClassKind.ENUM_CLASS;
}
public static boolean classCanHaveOpenMembers(@NotNull ClassDescriptor classDescriptor) {
return classDescriptor.getModality() != Modality.FINAL || classDescriptor.getKind() == ClassKind.ENUM_CLASS;
}
}