From 9c730dddbebc508985c84c0b5cc43d044c393015 Mon Sep 17 00:00:00 2001 From: Dmitry Batrak Date: Fri, 20 Nov 2015 17:33:23 +0300 Subject: [PATCH] IDEA-148027 recognize html links to package summary in javadoc update following IDEA-CR-6894 --- .../intellij/codeInsight/javadoc/JavaDocInfoGenerator.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java b/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java index d69fdf945acb..6d013641eb96 100644 --- a/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java +++ b/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java @@ -321,11 +321,9 @@ public class JavaDocInfoGenerator { relativeLink = relativeLink.replace('/', '.'); String qualifiedTargetName = packageName.isEmpty() ? relativeLink : packageName + "." + relativeLink; - int lastDotPosition = qualifiedTargetName.lastIndexOf('.'); - String lastComponent = qualifiedTargetName.substring(lastDotPosition + 1); JavaPsiFacade javaPsiFacade = JavaPsiFacade.getInstance(contextElement.getProject()); - targetElement = "package-summary".equals(lastComponent) - ? javaPsiFacade.findPackage(qualifiedTargetName.substring(0, lastDotPosition)) + targetElement = "package-summary".equals(StringUtil.getShortName(qualifiedTargetName)) + ? javaPsiFacade.findPackage(StringUtil.getPackageName(qualifiedTargetName)) : javaPsiFacade.findClass(qualifiedTargetName, contextElement.getResolveScope()); } if (targetElement == null) return null;