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

fix KT-2167 (enum generation)

Browse Source 
#KT-2167 fixed
This commit is contained in:
Stepan Koltsov
2012-06-02 02:18:29 +04:00
parent a5eaa3abe3
commit 139e376f7c
3 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java
+15
View File
@@ -311,6 +311,21 @@ public class JetTypeMapper {
throw new IllegalStateException("missed something");
}
if (descriptor instanceof ClassDescriptor) {
ClassDescriptor klass = (ClassDescriptor) descriptor;
if (klass.getKind() == ClassKind.OBJECT) {
if (klass.getContainingDeclaration() instanceof ClassDescriptor) {
ClassDescriptor containingKlass = (ClassDescriptor) klass.getContainingDeclaration();
if (containingKlass.getKind() == ClassKind.ENUM_CLASS) {
return getFQName(containingKlass);
}
}
}
else if (klass.getKind() == ClassKind.ENUM_ENTRY) {
return getFQName(klass.getContainingDeclaration());
}
}
DeclarationDescriptor container = descriptor.getContainingDeclaration();
Name name = descriptor.getName();
if(JetPsiUtil.NO_NAME_PROVIDED.equals(name)) {