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
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.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<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
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);
}
}
idea/src/org/jetbrains/jet/plugin/project/PluginJetFilesProvider.java
+25 -22
View File
@@ -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<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());
public Collection<JetFile> 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<JetFile> jetFiles = Collections2.transform(FileTypeIndex.getFiles(JetFileType.INSTANCE, scope),
new com.google.common.base.Function<VirtualFile, JetFile>() {
@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.<JetFile>notNull()));
}
}