Add ability to test jet file is in scope

compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliJetFilesProvider.java

@@ -18,6 +18,7 @@ package org.jetbrains.jet.cli.jvm.compiler;
 
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.util.Function;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.java.JetFilesProvider;
 
@@ -27,7 +28,7 @@ import java.util.List;
 
 public class CliJetFilesProvider extends JetFilesProvider {
     private final JetCoreEnvironment environment;
-    private Function<JetFile,Collection<JetFile>> all_files = new Function<JetFile, Collection<JetFile>>() {
+    private final Function<JetFile,Collection<JetFile>> allFiles = new Function<JetFile, Collection<JetFile>>() {
         @Override
         public Collection<JetFile> fun(JetFile file) {
             return environment.getSourceFiles();
@@ -41,11 +42,11 @@ public class CliJetFilesProvider extends JetFilesProvider {
 
     @Override
     public Function<JetFile, Collection<JetFile>> sampleToAllFilesInModule() {
-        return all_files;
+        return allFiles;
     }
 
     @Override
-    public List<JetFile> allInScope(GlobalSearchScope scope) {
+    public List<JetFile> allInScope(@NotNull GlobalSearchScope scope) {
         List<JetFile> answer = new ArrayList<JetFile>();
         for (JetFile file : environment.getSourceFiles()) {
             if (scope.contains(file.getVirtualFile())) {
@@ -54,4 +55,9 @@ public class CliJetFilesProvider extends JetFilesProvider {
         }
         return answer;
     }
+
+    @Override
+    public boolean isFileInScope(@NotNull JetFile file, @NotNull GlobalSearchScope scope) {
+        return scope.contains(file.getVirtualFile()) && environment.getSourceFiles().contains(file);
+    }
 }

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JetFilesProvider.java

@@ -22,6 +22,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.util.Function;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.psi.JetPsiUtil;
 import org.jetbrains.jet.lang.resolve.name.FqName;
@@ -45,7 +46,8 @@ public abstract class JetFilesProvider {
     }
 
     public abstract Function<JetFile, Collection<JetFile>> sampleToAllFilesInModule();
-    public abstract Collection<JetFile> allInScope(GlobalSearchScope scope);
+    public abstract Collection<JetFile> allInScope(@NotNull GlobalSearchScope scope);
+    public abstract boolean isFileInScope(@NotNull JetFile file, @NotNull GlobalSearchScope scope);
 
     public static class SameJetFilePredicate implements Predicate<PsiFile> {
         private final FqName name;

idea/src/org/jetbrains/jet/plugin/project/PluginJetFilesProvider.java

@@ -34,6 +34,8 @@ import com.intellij.psi.PsiManager;
 import com.intellij.psi.search.FileTypeIndex;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.util.Function;
+import com.intellij.util.containers.ContainerUtil;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.java.JetFilesProvider;
@@ -96,29 +98,39 @@ public class PluginJetFilesProvider extends JetFilesProvider {
         return WHOLE_PROJECT_DECLARATION_PROVIDER;
     }
 
+    private boolean isKotlinSourceVirtualFile(@NotNull VirtualFile virtualFile) {
+        return ProjectFileIndex.SERVICE.getInstance(project).isInSourceContent(virtualFile) &&
+               !JetPluginUtil.isKtFileInGradleProjectInWrongFolder(virtualFile, project);
+    }
+
     @Override
-    public Collection<JetFile> allInScope(GlobalSearchScope scope) {
+    public Collection<JetFile> allInScope(@NotNull GlobalSearchScope scope) {
         final PsiManager manager = PsiManager.getInstance(project);
 
-        Collection<JetFile> jetFiles = Collections2.transform(FileTypeIndex.getFiles(JetFileType.INSTANCE, scope),
+        Collection<JetFile> jetFiles = ContainerUtil.map(
-               new com.google.common.base.Function<VirtualFile, JetFile>() {
+                FileTypeIndex.getFiles(JetFileType.INSTANCE, scope),
-                   @Override
+                new Function<VirtualFile, JetFile>() {
-                   public JetFile apply(@Nullable VirtualFile file) {
+                    @Override
-                       if (file == null ||
+                    public JetFile fun(@Nullable VirtualFile file) {
-                           !ProjectFileIndex.SERVICE.getInstance(project).isInSourceContent(file) ||
+                        if (file == null || !isKotlinSourceVirtualFile(file)) {
-                           JetPluginUtil.isKtFileInGradleProjectInWrongFolder(file, project)) {
+                            return null;
-                           return null;
+                        }
-                       }
 
-                       PsiFile psiFile = manager.findFile(file);
+                        PsiFile psiFile = manager.findFile(file);
-                       if (!(psiFile instanceof JetFile)) {
+                        if (!(psiFile instanceof JetFile)) {
-                           return null;
+                            return null;
-                       }
+                        }
 
-                       return ((JetFile) psiFile);
+                        return ((JetFile) psiFile);
-                   }
+                    }
-               });
+                });
 
         return Sets.newHashSet(Collections2.filter(jetFiles, Predicates.<JetFile>notNull()));
     }
+
+    @Override
+    public boolean isFileInScope(@NotNull JetFile file, @NotNull GlobalSearchScope scope) {
+        VirtualFile virtualFile = file.getVirtualFile();
+        return virtualFile != null && scope.contains(virtualFile) && isKotlinSourceVirtualFile(virtualFile);
+    }
 }