Replaced passing MemberFilter to constructor with method overriding.

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/CliSourcesMemberFilter.kt

@@ -1,43 +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.lang.resolve.kotlin.incremental
-
-import org.jetbrains.jet.lang.psi.JetFile
-import org.jetbrains.jet.descriptors.serialization.descriptors.MemberFilter
-import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf
-import org.jetbrains.jet.descriptors.serialization.NameResolver
-import org.jetbrains.jet.descriptors.serialization.JavaProtoBuf
-import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils
-import org.jetbrains.jet.lang.resolve.java.JvmClassName
-
-public class CliSourcesMemberFilter(files: Collection<JetFile>, removedPackageParts: Collection<JvmClassName>): MemberFilter {
-    val packagePartClassNames = (
-            files.map { PackagePartClassUtils.getPackagePartInternalName(it) }
-            + removedPackageParts.map { it.getInternalName() }
-        ).toSet()
-
-    override fun acceptPackagePartClass(container: PackageFragmentDescriptor, member: ProtoBuf.Callable, nameResolver: NameResolver): Boolean {
-        if (member.hasExtension(JavaProtoBuf.implClassName)) {
-            val shortName = nameResolver.getName(member.getExtension(JavaProtoBuf.implClassName)!!)
-            val fqName = container.fqName.child(shortName)
-            val internalName = JvmClassName.byFqNameWithoutInnerClasses(fqName).getInternalName()
-            return internalName !in packagePartClassNames
-        }
-        return true
-    }
-}

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalPackageFragmentProvider.kt

@@ -40,6 +40,11 @@ import org.jetbrains.jet.utils.addToStdlib.singletonOrEmptyList
 import org.jetbrains.jet.storage.NotNullLazyValue
 import org.jetbrains.jet.lang.psi.JetNamedFunction
 import org.jetbrains.jet.lang.psi.JetProperty
+import org.jetbrains.jet.descriptors.serialization.ProtoBuf
+import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils
+import org.jetbrains.jet.descriptors.serialization.JavaProtoBuf
+import org.jetbrains.jet.lang.resolve.java.JvmClassName
+import org.jetbrains.jet.descriptors.serialization.PackageData
 
 public class IncrementalPackageFragmentProvider(
         sourceFiles: Collection<JetFile>,
@@ -52,7 +57,10 @@ public class IncrementalPackageFragmentProvider(
 
 ) : PackageFragmentProvider {
 
-    val memberFilter = CliSourcesMemberFilter(sourceFiles, incrementalCache.getRemovedPackageParts(moduleId, sourceFiles))
+    val packagePartsToNotLoadFromCache = (
+            sourceFiles.map { PackagePartClassUtils.getPackagePartInternalName(it) }
+                    + incrementalCache.getRemovedPackageParts(moduleId, sourceFiles).map { it.getInternalName() }
+            ).toSet()
     val fqNameToSubFqNames = MultiMap<FqName, FqName>()
     val fqNameToPackageFragment = HashMap<FqName, PackageFragmentDescriptor>()
 
@@ -107,22 +115,32 @@ public class IncrementalPackageFragmentProvider(
                 JetScope.EMPTY
             }
             else {
-                val packageData = JavaProtoBufUtil.readPackageDataFrom(packageDataBytes)
-                DeserializedPackageMemberScope(
-                        storageManager,
-                        this,
-                        deserializers,
-                        memberFilter,
-                        descriptorFinder,
-                        packageData
-                )
+                IncrementalPackageScope(JavaProtoBufUtil.readPackageDataFrom(packageDataBytes))
             }
-
         }
 
         override fun getMemberScope(): JetScope {
             return _memberScope()
         }
+
+        private inner class IncrementalPackageScope(val packageData: PackageData) : DeserializedPackageMemberScope(
+                storageManager, this@IncrementalPackageFragment, deserializers, descriptorFinder, packageData
+        ) {
+            override fun filteredMemberProtos(allMemberProtos: Collection<ProtoBuf.Callable>): Collection<ProtoBuf.Callable> {
+                return allMemberProtos
+                        .filter {
+                            member ->
+                            if (member.hasExtension(JavaProtoBuf.implClassName)) {
+                                val shortName = packageData.getNameResolver().getName(member.getExtension(JavaProtoBuf.implClassName)!!)
+                                val internalName = JvmClassName.byFqNameWithoutInnerClasses(fqName.child(shortName)).getInternalName()
+                                internalName !in packagePartsToNotLoadFromCache
+                            }
+                            else {
+                                true
+                            }
+                        }
+            }
+        }
     }
 }