Moved getPackageFilesWithCallables to frontend.java and reused it.

2014-06-19 17:54:33 +04:00
parent b76a9e8e27
commit cea272fb39
4 changed files with 29 additions and 35 deletions
@@ -16,18 +16,26 @@

 package org.jetbrains.jet.lang.resolve.kotlin;

+import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.PathUtil;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedCallableMemberDescriptor;
 import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor;
+import org.jetbrains.jet.lang.psi.JetDeclaration;
 import org.jetbrains.jet.lang.psi.JetFile;
+import org.jetbrains.jet.lang.psi.JetNamedFunction;
+import org.jetbrains.jet.lang.psi.JetProperty;
 import org.jetbrains.jet.lang.resolve.java.JvmClassName;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.org.objectweb.asm.Type;

+import java.util.Collection;
+import java.util.List;
+
 import static org.jetbrains.jet.lang.resolve.java.PackageClassUtils.getPackageClassFqName;

 public class PackagePartClassUtils {
@@ -70,4 +78,19 @@ public class PackagePartClassUtils {
        FqName packageFqName = ((PackageFragmentDescriptor) callable.getContainingDeclaration()).getFqName();
        return packageFqName.child(BaseDescriptorLoader.getPackagePartClassName(callable));
    }
+
+    @NotNull
+    public static List<JetFile> getPackageFilesWithCallables(@NotNull Collection<JetFile> packageFiles) {
+        return ContainerUtil.filter(packageFiles, new Condition<JetFile>() {
+            @Override
+            public boolean value(JetFile packageFile) {
+                for (JetDeclaration declaration : packageFile.getDeclarations()) {
+                    if (declaration instanceof JetProperty || declaration instanceof JetNamedFunction) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+        });
+    }
 }
@@ -79,10 +79,8 @@ public class IncrementalPackageFragmentProvider(
            fqNameToPackageFragment[fqName] = IncrementalPackageFragment(fqName)
        }

-        for (source in sourceFiles) {
-            if (source.getDeclarations().any { it is JetProperty || it is JetNamedFunction }) {
-                createPackageFragment(source.getPackageFqName())
-            }
+        for (source in PackagePartClassUtils.getPackageFilesWithCallables(sourceFiles)) {
+            createPackageFragment(source.getPackageFqName())
        }

        for (fqName in incrementalCache.getPackagesWithRemovedFiles(moduleId, sourceFiles)) {