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

[javadoc] Fix target for links containing modules

Browse Source 
#IDEA-370363 Fixed

GitOrigin-RevId: 4d315abe60cb933413d2d42d1a742d67f6721c12
This commit is contained in:
Louis Vignier
2025-05-07 18:16:29 +02:00
committed by intellij-monorepo-bot
parent c58062bd51
commit 3fb1e43d0d
6 changed files with 51 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
java/java-psi-impl/src/com/intellij/codeInsight/javadoc/JavaDocUtil.java
View File

@@ -88,29 +88,45 @@ public final class JavaDocUtil {
context = context.getNavigationElement();
}
int poundIndex = refText.indexOf('#');
final JavaPsiFacade facade = JavaPsiFacade.getInstance(manager.getProject());
if (poundIndex < 0) {
PsiClass aClass = findClassFromRef(manager, facade, refText, context);
String refTextCorrected = refText;
if (refText.contains("/")) {
// Module link
if (refText.endsWith("/")) {
PsiJavaModule module = findModuleFromRef(manager, facade, StringUtil.trimEnd(refText, '/'));
if (module != null) {
return useNavigationElement ? module.getNavigationElement() : module;
}
}
// Not a module link: remove the module part
int slashIndex = refText.indexOf('/');
if (slashIndex < refText.length() - 1) refTextCorrected = refText.substring(refText.indexOf('/') + 1);
}
int poundIndex = refTextCorrected.indexOf('#');
if (poundIndex < 0) {
PsiClass aClass = findClassFromRef(manager, facade, refTextCorrected, context);
if (aClass != null) {
return useNavigationElement ? aClass.getNavigationElement() : aClass;
}
PsiPackage aPackage = facade.findPackage(refText);
if (aPackage!=null) return aPackage;
PsiPackage aPackage = facade.findPackage(refTextCorrected);
if (aPackage != null) {
return aPackage;
}
return null;
}
else {
String classRef = refText.substring(0, poundIndex).trim();
String classRef = refTextCorrected.substring(0, poundIndex).trim();
if (!classRef.isEmpty()) {
PsiClass aClass = findClassFromRef(manager, facade, classRef, context);
if (aClass == null) return null;
PsiElement member = findReferencedMember(aClass, refText.substring(poundIndex + 1), context);
PsiElement member = findReferencedMember(aClass, refTextCorrected.substring(poundIndex + 1), context);
return useNavigationElement && member != null ? member.getNavigationElement() : member;
}
else {
String memberRefText = refText.substring(1);
String memberRefText = refTextCorrected.substring(1);
PsiElement scope = context;
while (scope != null && !(scope instanceof PsiFile)) {
if (scope instanceof PsiClass) {
@@ -143,6 +159,13 @@ public final class JavaDocUtil {
return aClass;
}
private static PsiJavaModule findModuleFromRef(@NotNull PsiManager manager,
@NotNull JavaPsiFacade facade,
@NotNull String refText) {
GlobalSearchScope projectScope = GlobalSearchScope.allScope(manager.getProject());
return facade.findModules(refText, projectScope).stream().findFirst().orElse(null);
}
private static @Nullable PsiElement findReferencedMember(@NotNull PsiClass aClass, @NotNull String memberRefText, PsiElement context) {
int parenthIndex = memberRefText.indexOf('(');
if (parenthIndex < 0) {