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 999cfc03a347..dbcd9200e259 100644 --- a/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java +++ b/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java @@ -1213,7 +1213,8 @@ public class JavaDocInfoGenerator { if (aClass != null) { String qName = aClass.getQualifiedName(); if (qName != null) { - return StringUtil.repeat("../", StringUtil.countChars(qName, '.') + 1); + String path = StringUtil.repeat("../", StringUtil.countChars(qName, '.')); + return path.isEmpty() ? "" : path.substring(0, path.length() - 1); } } diff --git a/java/java-tests/testData/codeInsight/javadocIG/docRoot.html b/java/java-tests/testData/codeInsight/javadocIG/docRoot.html new file mode 100644 index 000000000000..475156ffc76e --- /dev/null +++ b/java/java-tests/testData/codeInsight/javadocIG/docRoot.html @@ -0,0 +1,4 @@ +
foo.bar
class Baz
+extends Object
+ link +

\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/javadocIG/docRoot.java b/java/java-tests/testData/codeInsight/javadocIG/docRoot.java new file mode 100644 index 000000000000..1d272b1f0d12 --- /dev/null +++ b/java/java-tests/testData/codeInsight/javadocIG/docRoot.java @@ -0,0 +1,6 @@ +package foo.bar; + +/** + * link + */ +class Baz {} \ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/javadoc/JavaDocInfoGeneratorTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/javadoc/JavaDocInfoGeneratorTest.java index a19addbed771..81befa2783ad 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInsight/javadoc/JavaDocInfoGeneratorTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/javadoc/JavaDocInfoGeneratorTest.java @@ -239,6 +239,10 @@ public class JavaDocInfoGeneratorTest extends CodeInsightTestCase { doTestAtCaret(); } + public void testDocRoot() throws Exception { + doTestClass(); + } + private void doTestClass() throws Exception { PsiClass psiClass = getTestClass(); verifyJavaDoc(psiClass);