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.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<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> {
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 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) {
this.project = project;
@@ -112,7 +112,7 @@ public class JavaElementFinder extends PsiElementFinder implements JavaPsiFacade
if (qualifiedName.getFqName().startsWith("java.")) return PsiClass.EMPTY_ARRAY;
List<PsiClass> answer = new SmartList<PsiClass>();
final List<JetFile> filesInScope = collectProjectJetFiles(project, scope);
final Collection<JetFile> 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<JetFile> psiFiles = collectProjectJetFiles(project, GlobalSearchScope.allScope(project));
final Collection<JetFile> 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<JetFile> psiFiles = collectProjectJetFiles(project, GlobalSearchScope.allScope(project));
final Collection<JetFile> psiFiles = collectProjectJetFiles(project, GlobalSearchScope.allScope(project));
Set<PsiPackage> answer = new HashSet<PsiPackage>();
@@ -223,7 +223,7 @@ public class JavaElementFinder extends PsiElementFinder implements JavaPsiFacade
@Override
public PsiClass[] getClasses(@NotNull PsiPackage psiPackage, @NotNull GlobalSearchScope scope) {
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());
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<JetFile> collectProjectJetFiles(final Project project, @NotNull final GlobalSearchScope scope) {
List<JetFile> cachedFiles = jetFiles.get(scope);
private synchronized Collection<JetFile> collectProjectJetFiles(final Project project, @NotNull final GlobalSearchScope scope) {
Collection<JetFile> cachedFiles = jetFiles.get(scope);
if (cachedFiles == null) {
cachedFiles = JetFilesProvider.getInstance(project).allInScope(scope);