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

Extract getEnumEntriesScope utility method

Browse Source
This commit is contained in:
Alexander Udalov
2013-08-28 18:00:02 +04:00
parent c0a30929c1
commit de062274e9
4 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorSerializer.java
+2 -3
View File
@@ -25,6 +25,7 @@ import org.jetbrains.jet.renderer.DescriptorRenderer;
import java.util.*;
import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getEnumEntriesScope;
import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isTopLevelOrInnerClass;
public class DescriptorSerializer {
@@ -127,9 +128,7 @@ public class DescriptorSerializer {
}
if (classDescriptor.getKind() == ClassKind.ENUM_CLASS) {
ClassDescriptor classObject = classDescriptor.getClassObjectDescriptor();
assert classObject != null : "Enum class object shouldn't be null: " + classDescriptor;
for (ClassDescriptor descriptor : classObject.getDefaultType().getMemberScope().getObjectDescriptors()) {
for (ClassDescriptor descriptor : getEnumEntriesScope(classDescriptor).getObjectDescriptors()) {
if (descriptor.getKind() == ClassKind.ENUM_ENTRY) {
builder.addEnumEntry(nameTable.getSimpleNameIndex(descriptor.getName()));
}