Replaced passing MemberFilter to constructor with method overriding.

core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.java

@@ -20,6 +20,7 @@ import kotlin.Function0;
 import kotlin.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.ReadOnly;
 import org.jetbrains.jet.descriptors.serialization.DescriptorDeserializer;
 import org.jetbrains.jet.descriptors.serialization.Flags;
 import org.jetbrains.jet.descriptors.serialization.ProtoBuf;
@@ -52,8 +53,7 @@ public abstract class DeserializedMemberScope implements JetScope {
     private final DeclarationDescriptor containingDeclaration;
     private final DescriptorDeserializer deserializer;
 
-    // Never modified after creation
-    private final Map<Name, List<ProtoBuf.Callable>> membersProtos;
+    private final NotNullLazyValue<Map<Name, List<ProtoBuf.Callable>>> membersProtos;
 
     private final MemoizedFunctionToNotNull<Name, Collection<FunctionDescriptor>> functions;
     private final MemoizedFunctionToNotNull<Name, Collection<VariableDescriptor>> properties;
@@ -63,12 +63,17 @@ public abstract class DeserializedMemberScope implements JetScope {
             @NotNull StorageManager storageManager,
             @NotNull DeclarationDescriptor containingDeclaration,
             @NotNull DescriptorDeserializer deserializer,
-            @NotNull Collection<ProtoBuf.Callable> membersList
+            @NotNull final Collection<ProtoBuf.Callable> membersList
     ) {
         this.containingDeclaration = containingDeclaration;
         this.deserializer = deserializer;
 
-        this.membersProtos = groupByName(membersList);
+        this.membersProtos = storageManager.createLazyValue(new Function0<Map<Name, List<ProtoBuf.Callable>>>() {
+            @Override
+            public Map<Name, List<ProtoBuf.Callable>> invoke() {
+                return groupByName(filteredMemberProtos(membersList));
+            }
+        });
         this.functions = storageManager.createMemoizedFunction(new Function1<Name, Collection<FunctionDescriptor>>() {
             @Override
             public Collection<FunctionDescriptor> invoke(Name name) {
@@ -89,6 +94,12 @@ public abstract class DeserializedMemberScope implements JetScope {
         });
     }
 
+    @NotNull
+    @ReadOnly
+    protected Collection<ProtoBuf.Callable> filteredMemberProtos(@NotNull Collection<ProtoBuf.Callable> allMemberProtos) {
+        return allMemberProtos;
+    }
+
     @NotNull
     private Map<Name, List<ProtoBuf.Callable>> groupByName(@NotNull Collection<ProtoBuf.Callable> membersList) {
         Map<Name, List<ProtoBuf.Callable>> map = new HashMap<Name, List<ProtoBuf.Callable>>();
@@ -106,7 +117,7 @@ public abstract class DeserializedMemberScope implements JetScope {
 
     @NotNull
     private <D extends CallableMemberDescriptor> Collection<D> computeMembersByName(Name name, Filter<ProtoBuf.Callable.CallableKind> callableKind) {
-        List<ProtoBuf.Callable> memberProtos = membersProtos.get(name);
+        List<ProtoBuf.Callable> memberProtos = membersProtos.invoke().get(name);
 
         Collection<D> descriptors = new LinkedHashSet<D>(memberProtos != null ? memberProtos.size() : 0);
         if (memberProtos != null) {
@@ -191,7 +202,7 @@ public abstract class DeserializedMemberScope implements JetScope {
     private Collection<DeclarationDescriptor> computeAllDescriptors() {
         Collection<DeclarationDescriptor> result = new LinkedHashSet<DeclarationDescriptor>(0);
 
-        for (Name name : membersProtos.keySet()) {
+        for (Name name : membersProtos.invoke().keySet()) {
             result.addAll(getFunctions(name));
             result.addAll(getProperties(name));
         }

core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPackageMemberScope.java

@@ -41,13 +41,12 @@ public class DeserializedPackageMemberScope extends DeserializedMemberScope {
             @NotNull StorageManager storageManager,
             @NotNull PackageFragmentDescriptor packageDescriptor,
             @NotNull Deserializers deserializers,
-            @NotNull MemberFilter memberFilter,
             @NotNull DescriptorFinder descriptorFinder,
             @NotNull PackageData packageData
     ) {
         super(storageManager, packageDescriptor,
               DescriptorDeserializer.create(storageManager, packageDescriptor, packageData.getNameResolver(), descriptorFinder, deserializers),
-              getFilteredMembers(packageDescriptor, packageData.getPackageProto(), memberFilter, packageData.getNameResolver()));
+              packageData.getPackageProto().getMemberList());
         this.descriptorFinder = descriptorFinder;
         this.packageFqName = packageDescriptor.getFqName();
     }
@@ -79,20 +78,4 @@ public class DeserializedPackageMemberScope extends DeserializedMemberScope {
     protected ReceiverParameterDescriptor getImplicitReceiver() {
         return null;
     }
-
-    @NotNull
-    private static Collection<ProtoBuf.Callable> getFilteredMembers(
-            @NotNull PackageFragmentDescriptor packageDescriptor,
-            @NotNull ProtoBuf.Package packageProto,
-            @NotNull MemberFilter memberFilter,
-            @NotNull NameResolver nameResolver
-    ) {
-        List<ProtoBuf.Callable> result = new ArrayList<ProtoBuf.Callable>();
-        for (ProtoBuf.Callable member : packageProto.getMemberList()) {
-            if (memberFilter.acceptPackagePartClass(packageDescriptor, member, nameResolver)) {
-                result.add(member);
-            }
-        }
-        return result;
-    }
 }

core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/MemberFilter.kt

@@ -1,31 +0,0 @@
-/*
- * Copyright 2010-2014 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.descriptors.serialization.descriptors
-
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf
-import org.jetbrains.jet.descriptors.serialization.NameResolver
-import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor
-
-public trait MemberFilter {
-    fun acceptPackagePartClass(container: PackageFragmentDescriptor, member: ProtoBuf.Callable, nameResolver: NameResolver): Boolean
-
-    class object {
-        public val ALWAYS_TRUE: MemberFilter = object : MemberFilter {
-            override fun acceptPackagePartClass(container: PackageFragmentDescriptor, member: ProtoBuf.Callable, nameResolver: NameResolver): Boolean = true
-        }
-    }
-}