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

[java] module-info.class -> module-info.java navigation

Browse Source
This commit is contained in:
Roman Shevchenko
2017-04-28 14:14:32 +02:00
parent 5ef59d28e1
commit 9f34684040
1 changed files with 30 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
+30 -19
View File
@@ -49,7 +49,11 @@ import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.*;
import java.util.List;
import java.util.Properties;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Stream;
/**
* @author yole
@@ -100,28 +104,35 @@ public class JavaPsiImplementationHelperImpl extends JavaPsiImplementationHelper
@NotNull
@Override
public PsiElement getClsFileNavigationElement(PsiJavaFile clsFile) {
Function<VirtualFile, VirtualFile> finder = null;
PsiClass[] classes = clsFile.getClasses();
if (classes.length == 0) return clsFile;
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) || !orderEntry.isValid()) continue;
for (VirtualFile root : orderEntry.getFiles(OrderRootType.SOURCES)) {
VirtualFile source = root.findFileByRelativePath(relativePath);
if (source != null && source.isValid()) {
PsiFile psiSource = clsFile.getManager().findFile(source);
if (psiSource instanceof PsiClassOwner) {
return psiSource;
}
}
if (classes.length > 0) {
String sourceFileName = ((ClsClassImpl)classes[0]).getSourceFileName();
String packageName = clsFile.getPackageName();
String relativePath = packageName.isEmpty() ? sourceFileName : packageName.replace('.', '/') + '/' + sourceFileName;
finder = root -> root.findFileByRelativePath(relativePath);
}
else {
PsiJavaModule module = clsFile.getModuleDeclaration();
if (module != null) {
String moduleName = module.getName();
finder = root -> moduleName.equals(root.getName()) ? root.findChild(PsiJavaModule.MODULE_INFO_FILE) : null;
}
}
return clsFile;
if (finder == null) return clsFile;
ProjectFileIndex index = ProjectFileIndex.SERVICE.getInstance(clsFile.getProject());
return index.getOrderEntriesForFile(clsFile.getContainingFile().getVirtualFile()).stream()
.filter(entry -> entry instanceof LibraryOrSdkOrderEntry && entry.isValid())
.flatMap(entry -> Stream.of(entry.getFiles(OrderRootType.SOURCES)))
.map(finder)
.filter(source -> source != null && source.isValid())
.map(clsFile.getManager()::findFile)
.filter(PsiClassOwner.class::isInstance)
.findFirst()
.orElse(clsFile);
}
@NotNull