diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JetFilesProvider.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JetFilesProvider.java index 65b6ea471fe..6270e773260 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JetFilesProvider.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JetFilesProvider.java @@ -22,8 +22,6 @@ package org.jetbrains.jet.lang.resolve.java; import com.google.common.base.Predicate; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.UserDataHolder; -import com.intellij.openapi.util.UserDataHolderBase; import com.intellij.psi.PsiFile; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.util.Function; @@ -50,7 +48,7 @@ public abstract class JetFilesProvider { } public abstract Function> sampleToAllFilesInModule(); - public abstract List allInScope(GlobalSearchScope scope); + public abstract Collection allInScope(GlobalSearchScope scope); public static class SameJetFilePredicate implements Predicate { private final FqName name; diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java index 63d6ba3a0ce..699eaa54a29 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java @@ -45,7 +45,7 @@ public class JavaElementFinder extends PsiElementFinder implements JavaPsiFacade private final Project project; private final PsiManager psiManager; - private WeakHashMap> jetFiles = new WeakHashMap>(); + private final WeakHashMap> jetFiles = new WeakHashMap>(); public JavaElementFinder(Project project) { this.project = project; @@ -112,7 +112,7 @@ public class JavaElementFinder extends PsiElementFinder implements JavaPsiFacade if (qualifiedName.getFqName().startsWith("java.")) return PsiClass.EMPTY_ARRAY; List answer = new SmartList(); - final List filesInScope = collectProjectJetFiles(project, scope); + final Collection filesInScope = collectProjectJetFiles(project, scope); for (JetFile file : filesInScope) { final FqName packageName = JetPsiUtil.getFQName(file); if (packageName != null && qualifiedName.getFqName().startsWith(packageName.getFqName())) { @@ -189,7 +189,7 @@ public class JavaElementFinder extends PsiElementFinder implements JavaPsiFacade FqName fqName = new FqName(qualifiedNameString); - final List psiFiles = collectProjectJetFiles(project, GlobalSearchScope.allScope(project)); + final Collection psiFiles = collectProjectJetFiles(project, GlobalSearchScope.allScope(project)); for (JetFile psiFile : psiFiles) { if (QualifiedNamesUtil.isSubpackageOf(JetPsiUtil.getFQName(psiFile), fqName)) { @@ -203,7 +203,7 @@ public class JavaElementFinder extends PsiElementFinder implements JavaPsiFacade @NotNull @Override public PsiPackage[] getSubPackages(@NotNull PsiPackage psiPackage, @NotNull GlobalSearchScope scope) { - final List psiFiles = collectProjectJetFiles(project, GlobalSearchScope.allScope(project)); + final Collection psiFiles = collectProjectJetFiles(project, GlobalSearchScope.allScope(project)); Set answer = new HashSet(); @@ -223,7 +223,7 @@ public class JavaElementFinder extends PsiElementFinder implements JavaPsiFacade @Override public PsiClass[] getClasses(@NotNull PsiPackage psiPackage, @NotNull GlobalSearchScope scope) { List answer = new SmartList(); - final List filesInScope = collectProjectJetFiles(project, scope); + final Collection filesInScope = collectProjectJetFiles(project, scope); FqName packageFQN = new FqName(psiPackage.getQualifiedName()); for (JetFile file : filesInScope) { if (packageFQN.equals(JetPsiUtil.getFQName(file))) { @@ -246,8 +246,8 @@ public class JavaElementFinder extends PsiElementFinder implements JavaPsiFacade jetFiles.clear(); } - private synchronized List collectProjectJetFiles(final Project project, @NotNull final GlobalSearchScope scope) { - List cachedFiles = jetFiles.get(scope); + private synchronized Collection collectProjectJetFiles(final Project project, @NotNull final GlobalSearchScope scope) { + Collection cachedFiles = jetFiles.get(scope); if (cachedFiles == null) { cachedFiles = JetFilesProvider.getInstance(project).allInScope(scope); diff --git a/idea/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeWithCache.java b/idea/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeWithCache.java index e376cd9564f..cc291a3b18a 100644 --- a/idea/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeWithCache.java +++ b/idea/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeWithCache.java @@ -58,7 +58,6 @@ import org.jetbrains.jet.lang.types.lang.JetStandardLibrary; import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import java.util.List; /** * @author Pavel Talanov @@ -202,7 +201,7 @@ public final class AnalyzerFacadeWithCache { InjectorForJavaDescriptorResolver injector = new InjectorForJavaDescriptorResolver( fileProject, new BindingTraceContext(), javaModule, BuiltinsScopeExtensionMode.ALL); - List files = JetFilesProvider.getInstance(fileProject).allInScope(GlobalSearchScope.allScope(fileProject)); + Collection files = JetFilesProvider.getInstance(fileProject).allInScope(GlobalSearchScope.allScope(fileProject)); // Given file can differ from the original because it can be a virtual copy with some modifications JetFile originalFile = (JetFile) file.getOriginalFile(); @@ -244,6 +243,7 @@ public final class AnalyzerFacadeWithCache { } if (psiClassFinder.findPsiPackage(fqName) != null) { JavaPackageScope javaPackageScope = javaDescriptorResolver.getJavaPackageScope(fqName, namespaceDescriptor); + assert javaPackageScope != null; namespaceMemberScope.importScope(javaPackageScope); } } diff --git a/idea/src/org/jetbrains/jet/plugin/project/PluginJetFilesProvider.java b/idea/src/org/jetbrains/jet/plugin/project/PluginJetFilesProvider.java index 65743eb3017..3430457a42b 100644 --- a/idea/src/org/jetbrains/jet/plugin/project/PluginJetFilesProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/project/PluginJetFilesProvider.java @@ -19,8 +19,9 @@ */ package org.jetbrains.jet.plugin.project; +import com.google.common.base.Predicates; +import com.google.common.collect.Collections2; import com.google.common.collect.Sets; -import com.intellij.openapi.compiler.ex.CompilerPathsEx; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.fileTypes.FileTypeManager; import com.intellij.openapi.module.Module; @@ -29,17 +30,21 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ContentIterator; import com.intellij.openapi.roots.ModuleFileIndex; import com.intellij.openapi.roots.ModuleRootManager; -import com.intellij.openapi.roots.ProjectRootManager; +import com.intellij.openapi.roots.ProjectFileIndex; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiManager; +import com.intellij.psi.search.FileTypeIndex; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.util.Function; +import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.java.JetFilesProvider; import org.jetbrains.jet.plugin.JetFileType; -import java.util.*; +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; public class PluginJetFilesProvider extends JetFilesProvider { private final Project project; @@ -93,28 +98,26 @@ public class PluginJetFilesProvider extends JetFilesProvider { } @Override - public List allInScope(final GlobalSearchScope scope) { - final List answer = new ArrayList(); - - final FileTypeManager fileTypeManager = FileTypeManager.getInstance(); - List contentRoots = Arrays.asList(ProjectRootManager.getInstance(project).getContentRoots()); + public Collection allInScope(final GlobalSearchScope scope) { final PsiManager manager = PsiManager.getInstance(project); - CompilerPathsEx.visitFiles(contentRoots, new CompilerPathsEx.FileVisitor() { - @Override - protected void acceptFile(VirtualFile file, String fileRoot, String filePath) { - final FileType fileType = fileTypeManager.getFileTypeByFile(file); - if (fileType != JetFileType.INSTANCE) return; + Collection jetFiles = Collections2.transform(FileTypeIndex.getFiles(JetFileType.INSTANCE, scope), + new com.google.common.base.Function() { + @Override + public JetFile apply(@Nullable VirtualFile file) { + if (file == null || !ProjectFileIndex.SERVICE.getInstance(project).isInContent(file)) { + return null; + } - if (scope.accept(file)) { - final PsiFile psiFile = manager.findFile(file); - if (psiFile instanceof JetFile) { - answer.add((JetFile) psiFile); - } - } - } - }); + PsiFile psiFile = manager.findFile(file); + if (!(psiFile instanceof JetFile)) { + return null; + } - return answer; + return ((JetFile) psiFile); + } + }); + + return Sets.newHashSet(Collections2.filter(jetFiles, Predicates.notNull())); } }