Put enum entries into enum in lazy resolve

compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/FilteringClassLikeInfo.java

@@ -1,116 +0,0 @@
-/*
- * Copyright 2010-2013 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.jet.lang.resolve.lazy.data;
-
-import com.google.common.base.Predicate;
-import com.google.common.collect.Collections2;
-import com.google.common.collect.Lists;
-import com.intellij.psi.PsiElement;
-import jet.Function0;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lang.descriptors.ClassKind;
-import org.jetbrains.jet.lang.psi.*;
-import org.jetbrains.jet.lang.resolve.name.FqName;
-import org.jetbrains.jet.storage.NotNullLazyValue;
-import org.jetbrains.jet.storage.StorageManager;
-
-import java.util.List;
-
-public class FilteringClassLikeInfo implements JetClassLikeInfo {
-    private final JetClassLikeInfo delegate;
-    private final NotNullLazyValue<List<JetDeclaration>> filteredDeclarations;
-
-    public FilteringClassLikeInfo(
-            @NotNull StorageManager storageManager,
-            @NotNull final JetClassLikeInfo delegate,
-            @NotNull final Predicate<? super JetDeclaration> declarationFilter
-    ) {
-        this.delegate = delegate;
-        this.filteredDeclarations = storageManager.createLazyValue(new Function0<List<JetDeclaration>>() {
-            @Override
-            public List<JetDeclaration> invoke() {
-                return Lists.newArrayList(Collections2.filter(delegate.getDeclarations(), declarationFilter));
-            }
-        });
-    }
-
-    @NotNull
-    @Override
-    public FqName getContainingPackageFqName() {
-        return delegate.getContainingPackageFqName();
-    }
-
-    @Override
-    @NotNull
-    public List<JetDelegationSpecifier> getDelegationSpecifiers() {
-        return delegate.getDelegationSpecifiers();
-    }
-
-    @Override
-    @Nullable
-    public JetModifierList getModifierList() {
-        return delegate.getModifierList();
-    }
-
-    @Override
-    @Nullable
-    public JetClassObject getClassObject() {
-        return delegate.getClassObject();
-    }
-
-    @Override
-    @NotNull
-    public PsiElement getScopeAnchor() {
-        return delegate.getScopeAnchor();
-    }
-
-    @Override
-    @Nullable
-    public JetClassOrObject getCorrespondingClassOrObject() {
-        return delegate.getCorrespondingClassOrObject();
-    }
-
-    @Override
-    @NotNull
-    public List<JetTypeParameter> getTypeParameters() {
-        return delegate.getTypeParameters();
-    }
-
-    @Override
-    @NotNull
-    public List<? extends JetParameter> getPrimaryConstructorParameters() {
-        return delegate.getPrimaryConstructorParameters();
-    }
-
-    @Override
-    @NotNull
-    public ClassKind getClassKind() {
-        return delegate.getClassKind();
-    }
-
-    @Override
-    @NotNull
-    public List<JetDeclaration> getDeclarations() {
-        return filteredDeclarations.invoke();
-    }
-
-    @Override
-    public String toString() {
-        return "filtering " + delegate.toString();
-    }
-}

compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java

@@ -17,7 +17,6 @@
 package org.jetbrains.jet.lang.resolve.lazy.descriptors;
 
 import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.Lists;
 import com.intellij.psi.PsiElement;
@@ -37,7 +36,6 @@ import org.jetbrains.jet.lang.resolve.lazy.ForceResolveUtil;
 import org.jetbrains.jet.lang.resolve.lazy.LazyDescriptor;
 import org.jetbrains.jet.lang.resolve.lazy.ResolveSession;
 import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider;
-import org.jetbrains.jet.lang.resolve.lazy.data.FilteringClassLikeInfo;
 import org.jetbrains.jet.lang.resolve.lazy.data.JetClassInfoUtil;
 import org.jetbrains.jet.lang.resolve.lazy.data.JetClassLikeInfo;
 import org.jetbrains.jet.lang.resolve.lazy.data.SyntheticClassObjectInfo;
@@ -58,8 +56,6 @@ import static org.jetbrains.jet.lang.resolve.ModifiersChecker.*;
 import static org.jetbrains.jet.lang.resolve.name.SpecialNames.getClassObjectName;
 
 public class LazyClassDescriptor extends ClassDescriptorBase implements LazyDescriptor, ClassDescriptor {
-
-    private static final Predicate<Object> ONLY_ENUM_ENTRIES = Predicates.instanceOf(JetEnumEntry.class);
     private static final Predicate<JetType> VALID_SUPERTYPE = new Predicate<JetType>() {
         @Override
         public boolean apply(JetType type) {
@@ -100,9 +96,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements LazyDesc
         }
 
         this.originalClassInfo = classLikeInfo;
-        JetClassLikeInfo classLikeInfoForMembers = classLikeInfo.getClassKind() != ClassKind.ENUM_CLASS ? classLikeInfo : noEnumEntries();
+        this.declarationProvider = resolveSession.getDeclarationProviderFactory().getClassMemberDeclarationProvider(classLikeInfo);
-        this.declarationProvider =
-                resolveSession.getDeclarationProviderFactory().getClassMemberDeclarationProvider(classLikeInfoForMembers);
 
         this.unsubstitutedMemberScope = new LazyClassMemberScope(resolveSession, declarationProvider, this);
 
@@ -271,13 +265,9 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements LazyDesc
                 return JetClassInfoUtil.createClassLikeInfo(objectDeclaration);
             }
         }
-        else if (getKind() == ClassKind.OBJECT || getKind() == ClassKind.ENUM_ENTRY) {
+        else if (getKind() == ClassKind.OBJECT || getKind() == ClassKind.ENUM_ENTRY || getKind() == ClassKind.ENUM_CLASS) {
             return new SyntheticClassObjectInfo(originalClassInfo, this);
         }
-        else if (getKind() == ClassKind.ENUM_CLASS) {
-            // Enum classes always have class objects, and enum constants are their members
-            return enumClassObjectInfo();
-        }
         return null;
     }
 
@@ -478,42 +468,8 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements LazyDesc
         }
     }
 
-    @NotNull
-    private JetClassLikeInfo noEnumEntries() {
-        return new FilteringClassLikeInfo(resolveSession.getStorageManager(), originalClassInfo, Predicates.not(ONLY_ENUM_ENTRIES));
-    }
-
-    @NotNull
-    private JetClassLikeInfo enumClassObjectInfo() {
-        return new FilteringClassLikeInfo(resolveSession.getStorageManager(), originalClassInfo, ONLY_ENUM_ENTRIES) {
-            @Override
-            public JetClassOrObject getCorrespondingClassOrObject() {
-                return null;
-            }
-
-            @NotNull
-            @Override
-            public ClassKind getClassKind() {
-                return ClassKind.CLASS_OBJECT;
-            }
-
-            @NotNull
-            @Override
-            public List<? extends JetParameter> getPrimaryConstructorParameters() {
-                return Collections.emptyList();
-            }
-
-            @NotNull
-            @Override
-            public List<JetTypeParameter> getTypeParameters() {
-                return Collections.emptyList();
-            }
-        };
-    }
-
     @NotNull
     private ScopeProvider getScopeProvider() {
         return resolveSession.getInjector().getScopeProvider();
     }
-
 }

compiler/testData/lazyResolve/namespaceComparator/enum.txt

@@ -9,29 +9,29 @@ internal final enum class Test : jet.Enum<test.Test> {
         /*primary*/ private constructor <class-object-for-Test>()
         public final /*synthesized*/ fun valueOf(/*0*/ value: jet.String): test.Test
         public final /*synthesized*/ fun values(): jet.Array<test.Test>
+    }
+    
+    public enum entry A : test.Test {
+        /*primary*/ private constructor A()
+        public final override /*1*/ /*fake_override*/ fun name(): jet.String
+        public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
         
-        public enum entry A : test.Test {
+        public class object <class-object-for-A> : test.Test.A {
-            /*primary*/ private constructor A()
+            /*primary*/ private constructor <class-object-for-A>()
             public final override /*1*/ /*fake_override*/ fun name(): jet.String
             public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
-            
-            public class object <class-object-for-A> : test.Test.A {
-                /*primary*/ private constructor <class-object-for-A>()
-                public final override /*1*/ /*fake_override*/ fun name(): jet.String
-                public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
-            }
         }
+    }
+    
+    public enum entry B : test.Test {
+        /*primary*/ private constructor B()
+        public final override /*1*/ /*fake_override*/ fun name(): jet.String
+        public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
         
-        public enum entry B : test.Test {
+        public class object <class-object-for-B> : test.Test.B {
-            /*primary*/ private constructor B()
+            /*primary*/ private constructor <class-object-for-B>()
             public final override /*1*/ /*fake_override*/ fun name(): jet.String
             public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
-            
-            public class object <class-object-for-B> : test.Test.B {
-                /*primary*/ private constructor <class-object-for-B>()
-                public final override /*1*/ /*fake_override*/ fun name(): jet.String
-                public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
-            }
         }
     }
 }