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

Temporary workaround for KT-2619 Exception on using java enum in when.

Browse Source
This commit is contained in:
Pavel V. Talanov
2012-08-17 21:35:26 +04:00
parent dc2d21e0c9
commit 0796c98c81
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/cfg/WhenChecker.java
+6 -2
View File
@@ -29,7 +29,6 @@ import org.jetbrains.jet.lang.types.TypeProjection;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Set;
/** /**
* @author svtk * @author svtk
@@ -45,7 +44,12 @@ public class WhenChecker {
ClassDescriptor classDescriptor = (ClassDescriptor) declarationDescriptor; ClassDescriptor classDescriptor = (ClassDescriptor) declarationDescriptor;
if (classDescriptor.getKind() != ClassKind.ENUM_CLASS || classDescriptor.getModality().isOverridable()) return false; if (classDescriptor.getKind() != ClassKind.ENUM_CLASS || classDescriptor.getModality().isOverridable()) return false;
ClassDescriptor classObjectDescriptor = classDescriptor.getClassObjectDescriptor(); ClassDescriptor classObjectDescriptor = classDescriptor.getClassObjectDescriptor();
assert classObjectDescriptor != null; //TODO: workaround for KT-2619 Exception on using java enum in when.
// should provide correct checks for java enums
// may be obsolete once java and kotlin enum work the same way
if (classObjectDescriptor == null) {
return false;
}
JetScope memberScope = classObjectDescriptor.getMemberScope(Collections.<TypeProjection>emptyList()); JetScope memberScope = classObjectDescriptor.getMemberScope(Collections.<TypeProjection>emptyList());
Collection<ClassDescriptor> objectDescriptors = memberScope.getObjectDescriptors(); Collection<ClassDescriptor> objectDescriptors = memberScope.getObjectDescriptors();
boolean isExhaust = true; boolean isExhaust = true;