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

Optimized JetSourceNavigationHelper.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-03-15 19:44:43 +04:00
parent 7f71c09049
commit ff739c7aa8
1 changed files with 45 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java
+45 -41
View File
@@ -21,12 +21,13 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.OrderEntry; import com.intellij.openapi.roots.OrderEntry;
import com.intellij.openapi.roots.OrderRootType; import com.intellij.openapi.roots.OrderRootType;
import com.intellij.openapi.roots.ProjectFileIndex; import com.intellij.openapi.roots.ProjectFileIndex;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile; import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiManager; import com.intellij.psi.impl.cache.CacheManager;
import com.intellij.util.Processor; import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.search.GlobalSearchScopes;
import com.intellij.psi.search.UsageSearchContext;
import jet.Tuple2; import jet.Tuple2;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@@ -39,7 +40,6 @@ import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.FqName; import org.jetbrains.jet.lang.resolve.FqName;
import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor;
import org.jetbrains.jet.plugin.JetFileType;
import org.jetbrains.jet.resolve.DescriptorRenderer; import org.jetbrains.jet.resolve.DescriptorRenderer;
import org.jetbrains.jet.util.slicedmap.WritableSlice; import org.jetbrains.jet.util.slicedmap.WritableSlice;
@@ -59,17 +59,21 @@ public class JetSourceNavigationHelper {
@Nullable @Nullable
private static<D extends ClassOrNamespaceDescriptor> Tuple2<BindingContext, D> private static<D extends ClassOrNamespaceDescriptor> Tuple2<BindingContext, D>
getBindingContextAndClassOrNamespaceDescriptor(@NotNull WritableSlice<FqName, D> slice, getBindingContextAndClassOrNamespaceDescriptor(@NotNull WritableSlice<FqName, D> slice,
@NotNull PsiElement psiElement, @NotNull JetDeclaration declaration,
@Nullable FqName fqName) { @Nullable FqName fqName) {
if (fqName == null) { if (fqName == null) {
return null; return null;
} }
for (VirtualFile sourceDir : getAllSourceDirs(psiElement)) { final Project project = declaration.getProject();
BindingContext bindingContext = analyzeLibrary(sourceDir, psiElement.getProject()); final List<JetFile> libraryFiles = findAllSourceFilesWhichContainIdentifier(declaration);
D descriptor = bindingContext.get(slice, fqName); BindingContext bindingContext = AnalyzingUtils.analyzeFiles(project,
if (descriptor != null) { ModuleConfiguration.EMPTY,
return new Tuple2<BindingContext, D>(bindingContext, descriptor); libraryFiles,
} Predicates.<PsiFile>alwaysTrue(),
JetControlFlowDataTraceFactory.EMPTY);
D descriptor = bindingContext.get(slice, fqName);
if (descriptor != null) {
return new Tuple2<BindingContext, D>(bindingContext, descriptor);
} }
return null; return null;
} }
@@ -80,8 +84,9 @@ public class JetSourceNavigationHelper {
} }
@Nullable @Nullable
private static Tuple2<BindingContext, NamespaceDescriptor> getBindingContextAndNamespaceDescriptor(@NotNull JetFile decompiledNamespaceFile) { private static Tuple2<BindingContext, NamespaceDescriptor> getBindingContextAndNamespaceDescriptor(@NotNull JetDeclaration declaration) {
return getBindingContextAndClassOrNamespaceDescriptor(BindingContext.FQNAME_TO_NAMESPACE_DESCRIPTOR, decompiledNamespaceFile, JetPsiUtil.getFQName(decompiledNamespaceFile)); JetFile file = (JetFile) declaration.getContainingFile();
return getBindingContextAndClassOrNamespaceDescriptor(BindingContext.FQNAME_TO_NAMESPACE_DESCRIPTOR, declaration, JetPsiUtil.getFQName(file));
} }
@Nullable @Nullable
@@ -93,38 +98,37 @@ public class JetSourceNavigationHelper {
return (JetClass) declaration; return (JetClass) declaration;
} }
private static BindingContext analyzeLibrary(VirtualFile sourceDir, final Project project) {
final List<JetFile> libraryFiles = new ArrayList<JetFile>();
VfsUtil.processFilesRecursively(sourceDir, new Processor<VirtualFile>() {
@Override
public boolean process(VirtualFile virtualFile) {
if (virtualFile.getFileType() == JetFileType.INSTANCE) {
libraryFiles.add((JetFile) PsiManager.getInstance(project).findFile(virtualFile));
}
return true;
}
});
return AnalyzingUtils.analyzeFiles(project,
ModuleConfiguration.EMPTY,
libraryFiles,
Predicates.<PsiFile>alwaysTrue(),
JetControlFlowDataTraceFactory.EMPTY);
}
@NotNull @NotNull
private static List<VirtualFile> getAllSourceDirs(@NotNull PsiElement psiElement) { private static GlobalSearchScope createLibrarySourcesScopeForFile(@NotNull VirtualFile libraryFile, @NotNull Project project) {
List<VirtualFile> allSourceDirs = new ArrayList<VirtualFile>(); ProjectFileIndex projectFileIndex = ProjectFileIndex.SERVICE.getInstance(project);
VirtualFile decompiledFile = psiElement.getContainingFile().getVirtualFile(); GlobalSearchScope resultScope = GlobalSearchScope.EMPTY_SCOPE;
if (decompiledFile != null) { for (OrderEntry orderEntry : projectFileIndex.getOrderEntriesForFile(libraryFile)) {
ProjectFileIndex projectFileIndex = ProjectFileIndex.SERVICE.getInstance(psiElement.getProject()); for (VirtualFile sourceDir : orderEntry.getFiles(OrderRootType.SOURCES)) {
List<OrderEntry> orderEntries = projectFileIndex.getOrderEntriesForFile(decompiledFile); resultScope = resultScope.uniteWith(GlobalSearchScopes.directoryScope(project, sourceDir, true));
for (OrderEntry orderEntry : orderEntries) {
Collections.addAll(allSourceDirs, orderEntry.getFiles(OrderRootType.SOURCES));
} }
} }
return resultScope;
}
return allSourceDirs; private static List<JetFile> findAllSourceFilesWhichContainIdentifier(@NotNull JetDeclaration jetDeclaration) {
VirtualFile libraryFile = jetDeclaration.getContainingFile().getVirtualFile();
String name = jetDeclaration.getName();
if (libraryFile == null || name == null) {
return Collections.emptyList();
}
Project project = jetDeclaration.getProject();
CacheManager cacheManager = CacheManager.SERVICE.getInstance(project);
PsiFile[] filesWithWord = cacheManager.getFilesWithWord(name,
UsageSearchContext.IN_CODE, createLibrarySourcesScopeForFile(libraryFile, project),
true);
List<JetFile> jetFiles = new ArrayList<JetFile>();
for (PsiFile psiFile : filesWithWord) {
if (psiFile instanceof JetFile) {
jetFiles.add((JetFile) psiFile);
}
}
return jetFiles;
} }
@Nullable @Nullable
@@ -139,7 +143,7 @@ public class JetSourceNavigationHelper {
PsiElement declarationContainer = decompiledDeclaration.getParent(); PsiElement declarationContainer = decompiledDeclaration.getParent();
if (declarationContainer instanceof JetFile) { if (declarationContainer instanceof JetFile) {
Tuple2<BindingContext, NamespaceDescriptor> bindingContextAndNamespaceDescriptor = getBindingContextAndNamespaceDescriptor((JetFile) declarationContainer); Tuple2<BindingContext, NamespaceDescriptor> bindingContextAndNamespaceDescriptor = getBindingContextAndNamespaceDescriptor(decompiledDeclaration);
if (bindingContextAndNamespaceDescriptor == null) return null; if (bindingContextAndNamespaceDescriptor == null) return null;
BindingContext bindingContext = bindingContextAndNamespaceDescriptor._1; BindingContext bindingContext = bindingContextAndNamespaceDescriptor._1;
NamespaceDescriptor namespaceDescriptor = bindingContextAndNamespaceDescriptor._2; NamespaceDescriptor namespaceDescriptor = bindingContextAndNamespaceDescriptor._2;