azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove duplicates and speeding-up PluginJetFilesProvider.allInScope

Browse Source
This commit is contained in:
Nikolay Krasko
2012-08-23 15:52:21 +04:00
parent 3da2cd8f2f
commit 57d4a28a94
4 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JetFilesProvider.java
+1 -3
View File
@@ -22,8 +22,6 @@ package org.jetbrains.jet.lang.resolve.java;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.project.Project; 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.PsiFile;
import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.util.Function; import com.intellij.util.Function;
@@ -50,7 +48,7 @@ public abstract class JetFilesProvider {
} }
public abstract Function<JetFile, Collection<JetFile>> sampleToAllFilesInModule(); public abstract Function<JetFile, Collection<JetFile>> sampleToAllFilesInModule();
public abstract List<JetFile> allInScope(GlobalSearchScope scope); public abstract Collection<JetFile> allInScope(GlobalSearchScope scope);
public static class SameJetFilePredicate implements Predicate<PsiFile> { public static class SameJetFilePredicate implements Predicate<PsiFile> {
private final FqName name; private final FqName name;
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java
+7 -7
View File
@@ -45,7 +45,7 @@ public class JavaElementFinder extends PsiElementFinder implements JavaPsiFacade
private final Project project; private final Project project;
private final PsiManager psiManager; private final PsiManager psiManager;
private WeakHashMap<GlobalSearchScope, List<JetFile>> jetFiles = new WeakHashMap<GlobalSearchScope, List<JetFile>>(); private final WeakHashMap<GlobalSearchScope, Collection<JetFile>> jetFiles = new WeakHashMap<GlobalSearchScope, Collection<JetFile>>();
public JavaElementFinder(Project project) { public JavaElementFinder(Project project) {
this.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; if (qualifiedName.getFqName().startsWith("java.")) return PsiClass.EMPTY_ARRAY;
List<PsiClass> answer = new SmartList<PsiClass>(); List<PsiClass> answer = new SmartList<PsiClass>();
final List<JetFile> filesInScope = collectProjectJetFiles(project, scope); final Collection<JetFile> filesInScope = collectProjectJetFiles(project, scope);
for (JetFile file : filesInScope) { for (JetFile file : filesInScope) {
final FqName packageName = JetPsiUtil.getFQName(file); final FqName packageName = JetPsiUtil.getFQName(file);
if (packageName != null && qualifiedName.getFqName().startsWith(packageName.getFqName())) { if (packageName != null && qualifiedName.getFqName().startsWith(packageName.getFqName())) {
@@ -189,7 +189,7 @@ public class JavaElementFinder extends PsiElementFinder implements JavaPsiFacade
FqName fqName = new FqName(qualifiedNameString); FqName fqName = new FqName(qualifiedNameString);
final List<JetFile> psiFiles = collectProjectJetFiles(project, GlobalSearchScope.allScope(project)); final Collection<JetFile> psiFiles = collectProjectJetFiles(project, GlobalSearchScope.allScope(project));
for (JetFile psiFile : psiFiles) { for (JetFile psiFile : psiFiles) {
if (QualifiedNamesUtil.isSubpackageOf(JetPsiUtil.getFQName(psiFile), fqName)) { if (QualifiedNamesUtil.isSubpackageOf(JetPsiUtil.getFQName(psiFile), fqName)) {
@@ -203,7 +203,7 @@ public class JavaElementFinder extends PsiElementFinder implements JavaPsiFacade
@NotNull @NotNull
@Override @Override
public PsiPackage[] getSubPackages(@NotNull PsiPackage psiPackage, @NotNull GlobalSearchScope scope) { public PsiPackage[] getSubPackages(@NotNull PsiPackage psiPackage, @NotNull GlobalSearchScope scope) {
final List<JetFile> psiFiles = collectProjectJetFiles(project, GlobalSearchScope.allScope(project)); final Collection<JetFile> psiFiles = collectProjectJetFiles(project, GlobalSearchScope.allScope(project));
Set<PsiPackage> answer = new HashSet<PsiPackage>(); Set<PsiPackage> answer = new HashSet<PsiPackage>();
@@ -223,7 +223,7 @@ public class JavaElementFinder extends PsiElementFinder implements JavaPsiFacade
@Override @Override
public PsiClass[] getClasses(@NotNull PsiPackage psiPackage, @NotNull GlobalSearchScope scope) { public PsiClass[] getClasses(@NotNull PsiPackage psiPackage, @NotNull GlobalSearchScope scope) {
List<PsiClass> answer = new SmartList<PsiClass>(); List<PsiClass> answer = new SmartList<PsiClass>();
final List<JetFile> filesInScope = collectProjectJetFiles(project, scope); final Collection<JetFile> filesInScope = collectProjectJetFiles(project, scope);
FqName packageFQN = new FqName(psiPackage.getQualifiedName()); FqName packageFQN = new FqName(psiPackage.getQualifiedName());
for (JetFile file : filesInScope) { for (JetFile file : filesInScope) {
if (packageFQN.equals(JetPsiUtil.getFQName(file))) { if (packageFQN.equals(JetPsiUtil.getFQName(file))) {
@@ -246,8 +246,8 @@ public class JavaElementFinder extends PsiElementFinder implements JavaPsiFacade
jetFiles.clear(); jetFiles.clear();
} }
private synchronized List<JetFile> collectProjectJetFiles(final Project project, @NotNull final GlobalSearchScope scope) { private synchronized Collection<JetFile> collectProjectJetFiles(final Project project, @NotNull final GlobalSearchScope scope) {
List<JetFile> cachedFiles = jetFiles.get(scope); Collection<JetFile> cachedFiles = jetFiles.get(scope);
if (cachedFiles == null) { if (cachedFiles == null) {
cachedFiles = JetFilesProvider.getInstance(project).allInScope(scope); cachedFiles = JetFilesProvider.getInstance(project).allInScope(scope);
idea/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeWithCache.java
+2 -2
View File
@@ -58,7 +58,6 @@ import org.jetbrains.jet.lang.types.lang.JetStandardLibrary;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.List;
/** /**
* @author Pavel Talanov * @author Pavel Talanov
@@ -202,7 +201,7 @@ public final class AnalyzerFacadeWithCache {
InjectorForJavaDescriptorResolver injector = new InjectorForJavaDescriptorResolver( InjectorForJavaDescriptorResolver injector = new InjectorForJavaDescriptorResolver(
fileProject, new BindingTraceContext(), javaModule, BuiltinsScopeExtensionMode.ALL); fileProject, new BindingTraceContext(), javaModule, BuiltinsScopeExtensionMode.ALL);
List<JetFile> files = JetFilesProvider.getInstance(fileProject).allInScope(GlobalSearchScope.allScope(fileProject)); Collection<JetFile> 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 // Given file can differ from the original because it can be a virtual copy with some modifications
JetFile originalFile = (JetFile) file.getOriginalFile(); JetFile originalFile = (JetFile) file.getOriginalFile();
@@ -244,6 +243,7 @@ public final class AnalyzerFacadeWithCache {
} }
if (psiClassFinder.findPsiPackage(fqName) != null) { if (psiClassFinder.findPsiPackage(fqName) != null) {
JavaPackageScope javaPackageScope = javaDescriptorResolver.getJavaPackageScope(fqName, namespaceDescriptor); JavaPackageScope javaPackageScope = javaDescriptorResolver.getJavaPackageScope(fqName, namespaceDescriptor);
assert javaPackageScope != null;
namespaceMemberScope.importScope(javaPackageScope); namespaceMemberScope.importScope(javaPackageScope);
} }
} }
idea/src/org/jetbrains/jet/plugin/project/PluginJetFilesProvider.java
+25 -22
View File
@@ -19,8 +19,9 @@
*/ */
package org.jetbrains.jet.plugin.project; 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.google.common.collect.Sets;
import com.intellij.openapi.compiler.ex.CompilerPathsEx;
import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.FileTypeManager; import com.intellij.openapi.fileTypes.FileTypeManager;
import com.intellij.openapi.module.Module; 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.ContentIterator;
import com.intellij.openapi.roots.ModuleFileIndex; import com.intellij.openapi.roots.ModuleFileIndex;
import com.intellij.openapi.roots.ModuleRootManager; 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.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiFile; import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiManager; import com.intellij.psi.PsiManager;
import com.intellij.psi.search.FileTypeIndex;
import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.util.Function; import com.intellij.util.Function;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.java.JetFilesProvider; import org.jetbrains.jet.lang.resolve.java.JetFilesProvider;
import org.jetbrains.jet.plugin.JetFileType; 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 { public class PluginJetFilesProvider extends JetFilesProvider {
private final Project project; private final Project project;
@@ -93,28 +98,26 @@ public class PluginJetFilesProvider extends JetFilesProvider {
} }
@Override @Override
public List<JetFile> allInScope(final GlobalSearchScope scope) { public Collection<JetFile> allInScope(final GlobalSearchScope scope) {
final List<JetFile> answer = new ArrayList<JetFile>();
final FileTypeManager fileTypeManager = FileTypeManager.getInstance();
List<VirtualFile> contentRoots = Arrays.asList(ProjectRootManager.getInstance(project).getContentRoots());
final PsiManager manager = PsiManager.getInstance(project); final PsiManager manager = PsiManager.getInstance(project);
CompilerPathsEx.visitFiles(contentRoots, new CompilerPathsEx.FileVisitor() { Collection<JetFile> jetFiles = Collections2.transform(FileTypeIndex.getFiles(JetFileType.INSTANCE, scope),
@Override new com.google.common.base.Function<VirtualFile, JetFile>() {
protected void acceptFile(VirtualFile file, String fileRoot, String filePath) { @Override
final FileType fileType = fileTypeManager.getFileTypeByFile(file); public JetFile apply(@Nullable VirtualFile file) {
if (fileType != JetFileType.INSTANCE) return; if (file == null || !ProjectFileIndex.SERVICE.getInstance(project).isInContent(file)) {
return null;
}
if (scope.accept(file)) { PsiFile psiFile = manager.findFile(file);
final PsiFile psiFile = manager.findFile(file); if (!(psiFile instanceof JetFile)) {
if (psiFile instanceof JetFile) { return null;
answer.add((JetFile) psiFile); }
}
}
}
});
return answer; return ((JetFile) psiFile);
}
});
return Sets.newHashSet(Collections2.filter(jetFiles, Predicates.<JetFile>notNull()));
} }
} }