MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

walk library src roots once when searching for class sources (IDEA-116085)

Browse Source
This commit is contained in:
peter
2013-11-07 21:31:42 +01:00
parent dfc71fcb82
commit 10976b3dd4
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/JavaPsiImplementationHelperImpl.java
+13 -10
View File
@@ -40,10 +40,12 @@ import com.intellij.psi.impl.source.codeStyle.ImportHelper;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.containers.ContainerUtil;
import gnu.trove.THashSet;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Collections;
import java.util.List;
import java.util.Properties;
import java.util.Set;
@@ -115,19 +117,20 @@ public class JavaPsiImplementationHelperImpl extends JavaPsiImplementationHelper
final VirtualFile vFile = clsFile.getContainingFile().getVirtualFile();
ProjectFileIndex projectFileIndex = ProjectFileIndex.SERVICE.getInstance(clsFile.getProject());
final List<OrderEntry> orderEntries = projectFileIndex.getOrderEntriesForFile(vFile);
for (OrderEntry orderEntry : orderEntries) {
VirtualFile[] files = orderEntry.getFiles(OrderRootType.SOURCES);
for (VirtualFile file : files) {
VirtualFile source = file.findFileByRelativePath(relativeFilePath);
if (source != null) {
PsiFile psiSource = clsFile.getManager().findFile(source);
if (psiSource instanceof PsiClassOwner) {
return psiSource;
}
final Set<VirtualFile> sourceRoots = ContainerUtil.newLinkedHashSet();
for (OrderEntry orderEntry : projectFileIndex.getOrderEntriesForFile(vFile)) {
Collections.addAll(sourceRoots, orderEntry.getFiles(OrderRootType.SOURCES));
}
for (VirtualFile root : sourceRoots) {
VirtualFile source = root.findFileByRelativePath(relativeFilePath);
if (source != null) {
PsiFile psiSource = clsFile.getManager().findFile(source);
if (psiSource instanceof PsiClassOwner) {
return psiSource;
}
}
}
return clsFile;
}