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

EA-38787 Exception because of enumeration without name

Browse Source
This commit is contained in:
Nikolay Krasko
2012-09-17 17:14:55 +04:00
parent 7c41ec517f
commit db830c88b4
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java
+1 -1
View File
@@ -282,7 +282,7 @@ public class TypeHierarchyResolver {
if (mutableClassDescriptor.getKind() == ClassKind.ENUM_CLASS) { if (mutableClassDescriptor.getKind() == ClassKind.ENUM_CLASS) {
MutableClassDescriptor classObjectDescriptor = new MutableClassDescriptor( MutableClassDescriptor classObjectDescriptor = new MutableClassDescriptor(
mutableClassDescriptor, outerScope, ClassKind.CLASS_OBJECT, mutableClassDescriptor, outerScope, ClassKind.CLASS_OBJECT,
getClassObjectName(klass.getName())); getClassObjectName(JetPsiUtil.safeName(klass.getName())));
mutableClassDescriptor.getBuilder().setClassObjectDescriptor(classObjectDescriptor); mutableClassDescriptor.getBuilder().setClassObjectDescriptor(classObjectDescriptor);
classObjectDescriptor.setModality(Modality.FINAL); classObjectDescriptor.setModality(Modality.FINAL);
classObjectDescriptor.setVisibility(ModifiersChecker.resolveVisibilityFromModifiers(klass)); classObjectDescriptor.setVisibility(ModifiersChecker.resolveVisibilityFromModifiers(klass));
compiler/testData/diagnostics/tests/enum/enumWithEmptyName.kt
+2
View File
@@ -0,0 +1,2 @@
enum class<!SYNTAX!><!> {
}
compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+6 -4
View File
@@ -15,16 +15,13 @@
*/ */
package org.jetbrains.jet.checkers; package org.jetbrains.jet.checkers;
import junit.framework.Assert;
import junit.framework.Test; import junit.framework.Test;
import junit.framework.TestSuite; import junit.framework.TestSuite;
import java.io.File;
import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.JetTestUtils;
import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.InnerTestClasses;
import org.jetbrains.jet.test.TestMetadata; import org.jetbrains.jet.test.TestMetadata;
import org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve; import java.io.File;
/** This class is generated by {@link org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve}. DO NOT MODIFY MANUALLY */ /** This class is generated by {@link org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve}. DO NOT MODIFY MANUALLY */
@InnerTestClasses({JetDiagnosticsTestGenerated.Tests.class, JetDiagnosticsTestGenerated.Script.class}) @InnerTestClasses({JetDiagnosticsTestGenerated.Tests.class, JetDiagnosticsTestGenerated.Script.class})
@@ -1377,6 +1374,11 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
doTest("compiler/testData/diagnostics/tests/enum/enumStarImport.kt"); doTest("compiler/testData/diagnostics/tests/enum/enumStarImport.kt");
} }
@TestMetadata("enumWithEmptyName.kt")
public void testEnumWithEmptyName() throws Exception {
doTest("compiler/testData/diagnostics/tests/enum/enumWithEmptyName.kt");
}
@TestMetadata("importEnumFromJava.kt") @TestMetadata("importEnumFromJava.kt")
public void testImportEnumFromJava() throws Exception { public void testImportEnumFromJava() throws Exception {
doTest("compiler/testData/diagnostics/tests/enum/importEnumFromJava.kt"); doTest("compiler/testData/diagnostics/tests/enum/importEnumFromJava.kt");