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

Cleanup (minor optimization)

Browse Source
This commit is contained in:
Roman Shevchenko
2014-09-15 16:51:34 +04:00
parent 63666657f5
commit d5260274a9
1 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/JavaPsiImplementationHelperImpl.java
+14 -19
View File
@@ -43,12 +43,10 @@ import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
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;
@@ -114,26 +112,23 @@ public class JavaPsiImplementationHelperImpl extends JavaPsiImplementationHelper
@NotNull
@Override
public PsiElement getClsFileNavigationElement(PsiJavaFile clsFile) {
String packageName = clsFile.getPackageName();
PsiClass[] classes = clsFile.getClasses();
if (classes.length == 0) return clsFile;
String sourceFileName = ((ClsClassImpl)classes[0]).getSourceFileName();
String relativeFilePath = packageName.isEmpty() ? sourceFileName : packageName.replace('.', '/') + '/' + sourceFileName;
final VirtualFile vFile = clsFile.getContainingFile().getVirtualFile();
ProjectFileIndex projectFileIndex = ProjectFileIndex.SERVICE.getInstance(clsFile.getProject());
final Set<VirtualFile> sourceRoots = ContainerUtil.newLinkedHashSet();
for (OrderEntry orderEntry : projectFileIndex.getOrderEntriesForFile(vFile)) {
if (orderEntry instanceof LibraryOrSdkOrderEntry) {
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;
String sourceFileName = ((ClsClassImpl)classes[0]).getSourceFileName();
String packageName = clsFile.getPackageName();
String relativePath = packageName.isEmpty() ? sourceFileName : packageName.replace('.', '/') + '/' + sourceFileName;
ProjectFileIndex index = ProjectFileIndex.SERVICE.getInstance(clsFile.getProject());
for (OrderEntry orderEntry : index.getOrderEntriesForFile(clsFile.getContainingFile().getVirtualFile())) {
if (!(orderEntry instanceof LibraryOrSdkOrderEntry)) continue;
for (VirtualFile root : orderEntry.getFiles(OrderRootType.SOURCES)) {
VirtualFile source = root.findFileByRelativePath(relativePath);
if (source != null) {
PsiFile psiSource = clsFile.getManager().findFile(source);
if (psiSource instanceof PsiClassOwner) {
return psiSource;
}
}
}
}