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

Light Classes: Do not add "final" modifier to enum light classes

Browse Source
This commit is contained in:
Alexey Sedunov
2014-11-14 16:33:17 +03:00
parent 7170209760
commit a6479bfc90
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
+2 -1
View File
@@ -142,7 +142,8 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
} }
if (!jetClass.hasModifier(JetTokens.OPEN_KEYWORD) && !isAbstract) { if (!jetClass.hasModifier(JetTokens.OPEN_KEYWORD) && !isAbstract) {
isFinal = true; // Light-class mode: Do not make enum classes final since PsiClass corresponding to enum is expected to be inheritable from
isFinal = !(jetClass.isEnum() && state.getClassBuilderMode() == ClassBuilderMode.LIGHT_CLASSES);
} }
isStatic = !jetClass.isInner(); isStatic = !jetClass.isInner();
} }
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForExplicitDeclaration.java
+1 -1
View File
@@ -431,7 +431,7 @@ public class KotlinLightClassForExplicitDeclaration extends KotlinWrappingLightC
if (isAbstract(classOrObject)) { if (isAbstract(classOrObject)) {
psiModifiers.add(PsiModifier.ABSTRACT); psiModifiers.add(PsiModifier.ABSTRACT);
} }
else if (!classOrObject.hasModifier(OPEN_KEYWORD)) { else if (!(classOrObject.hasModifier(OPEN_KEYWORD) || (classOrObject instanceof JetClass && ((JetClass) classOrObject).isEnum()))) {
psiModifiers.add(PsiModifier.FINAL); psiModifiers.add(PsiModifier.FINAL);
} }
compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassStructureTest.java
+1 -1
View File
@@ -76,7 +76,7 @@ public abstract class KotlinLightClassStructureTest extends KotlinAsJavaTestBase
} }
public void testEnum() { public void testEnum() {
checkModifiers("test.Enum", PUBLIC, FINAL, ENUM); checkModifiers("test.Enum", PUBLIC, ENUM);
} }
public void testTrait() { public void testTrait() {