diff --git a/java/java-impl/src/com/intellij/codeInsight/javadoc/AnnotationDocGenerator.java b/java/java-impl/src/com/intellij/codeInsight/javadoc/AnnotationDocGenerator.java
index 4d0f114b0145..9a43c473f0c9 100644
--- a/java/java-impl/src/com/intellij/codeInsight/javadoc/AnnotationDocGenerator.java
+++ b/java/java-impl/src/com/intellij/codeInsight/javadoc/AnnotationDocGenerator.java
@@ -97,7 +97,7 @@ public class AnnotationDocGenerator {
     buffer.append("@");
     String name = forceShortNames ? myNameReference.getReferenceName() : myNameReference.getText();
     if (type != null && generateLink) {
-      JavaDocInfoGenerator.generateLink(buffer, myTargetClass, name, false);
+      JavaDocInfoGenerator.generateLink(buffer, myTargetClass, name, format == AnnotationFormat.JavaDocComplete);
     } else {
       buffer.append(name);
     }
diff --git a/java/java-tests/testData/codeInsight/javadocIG/documentationForJdkClassWithReferencesToClassesFromJavaLang.html b/java/java-tests/testData/codeInsight/javadocIG/documentationForJdkClassWithReferencesToClassesFromJavaLang.html
index 2c8e87e0f4e5..4ac29ff86353 100644
--- a/java/java-tests/testData/codeInsight/javadocIG/documentationForJdkClassWithReferencesToClassesFromJavaLang.html
+++ b/java/java-tests/testData/codeInsight/javadocIG/documentationForJdkClassWithReferencesToClassesFromJavaLang.html
@@ -5,4 +5,4 @@ public abstract&nbsp;boolean&nbsp;<b>contains</b>(<a href="psi_element://java.la
        at least one element <tt>e</tt> such that
        <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>.
       
-       <p></div><table class='sections'><p><tr><td valign='top' class='section'><p>Overrides:</td><td><p><a href="psi_element://java.util.Collection#contains(java.lang.Object)"><code>contains</code></a> in interface <a href="psi_element://java.util.Collection"><code>Collection</code></a></td><tr><td valign='top' class='section'><p>Params:</td><td>o &ndash; element whose presence in this list is to be tested  </td><tr><td valign='top' class='section'><p>Returns:</td><td><p><tt>true</tt> if this list contains the specified element  </td><tr><td valign='top' class='section'><p>Throws:</td><td><p><a href="psi_element://java.lang.ClassCastException"><code>ClassCastException</code></a> &ndash; if the type of the specified element          is incompatible with this list  (<a href="psi_element://java.util.Collection###optional-restrictions">optional</a>)  <p><a href="psi_element://java.lang.NullPointerException"><code>NullPointerException</code></a> &ndash; if the specified element is null and this          list does not permit null elements  (<a href="psi_element://java.util.Collection###optional-restrictions">optional</a>)</td><tr><td valign='top' class='section'><p><i>Inferred</i> annotations:</td><td><p><i>@<a href="psi_element://org.jetbrains.annotations.Contract"><code>org.jetbrains.annotations.Contract</code></a>(pure = true)</i></td></table>
\ No newline at end of file
+       <p></div><table class='sections'><p><tr><td valign='top' class='section'><p>Overrides:</td><td><p><a href="psi_element://java.util.Collection#contains(java.lang.Object)"><code>contains</code></a> in interface <a href="psi_element://java.util.Collection"><code>Collection</code></a></td><tr><td valign='top' class='section'><p>Params:</td><td>o &ndash; element whose presence in this list is to be tested  </td><tr><td valign='top' class='section'><p>Returns:</td><td><p><tt>true</tt> if this list contains the specified element  </td><tr><td valign='top' class='section'><p>Throws:</td><td><p><a href="psi_element://java.lang.ClassCastException"><code>ClassCastException</code></a> &ndash; if the type of the specified element          is incompatible with this list  (<a href="psi_element://java.util.Collection###optional-restrictions">optional</a>)  <p><a href="psi_element://java.lang.NullPointerException"><code>NullPointerException</code></a> &ndash; if the specified element is null and this          list does not permit null elements  (<a href="psi_element://java.util.Collection###optional-restrictions">optional</a>)</td><tr><td valign='top' class='section'><p><i>Inferred</i> annotations:</td><td><p><i>@<a href="psi_element://org.jetbrains.annotations.Contract">org.jetbrains.annotations.Contract</a>(pure = true)</i></td></table>
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/javadocIG/documentationForUncheckedExceptionsInSupers.html b/java/java-tests/testData/codeInsight/javadocIG/documentationForUncheckedExceptionsInSupers.html
index ad7b6d41efb3..fe9e7ccd9f67 100644
--- a/java/java-tests/testData/codeInsight/javadocIG/documentationForUncheckedExceptionsInSupers.html
+++ b/java/java-tests/testData/codeInsight/javadocIG/documentationForUncheckedExceptionsInSupers.html
@@ -5,4 +5,4 @@ boolean&nbsp;<b>contains</b>(<a href="psi_element://java.lang.Object"><code>Obje
        contains at least one element <tt>e</tt> such that
        <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>.
       
-       </td><tr><td valign='top' class='section'><p>Overrides:</td><td><p><a href="psi_element://java.util.Collection#contains(java.lang.Object)"><code>contains</code></a> in interface <a href="psi_element://java.util.Collection"><code>Collection</code></a><br><a href="psi_element://I#contains(java.lang.Object)"><code>contains</code></a> in interface <a href="psi_element://I"><code>I</code></a></td><tr><td valign='top' class='section'><p>Params:</td><td>o &ndash; element whose presence in this collection is to be tested  </td><tr><td valign='top' class='section'><p>Returns:</td><td><p><tt>true</tt> if this collection contains the specified          element  </td><tr><td valign='top' class='section'><p>Throws:</td><td><p><a href="psi_element://java.lang.ClassCastException"><code>ClassCastException</code></a> &ndash; if the type of the specified element          is incompatible with this collection          (<a href="psi_element://My###optional-restrictions">optional</a>)  <p><a href="psi_element://java.lang.NullPointerException"><code>NullPointerException</code></a> &ndash; if the specified element is null and this          collection does not permit null elements          (<a href="psi_element://My###optional-restrictions">optional</a>)</td><tr><td valign='top' class='section'><p><i>Inferred</i> annotations:</td><td><p><i>@<a href="psi_element://org.jetbrains.annotations.Contract"><code>org.jetbrains.annotations.Contract</code></a>(pure = true)</i></td></table>
\ No newline at end of file
+       </td><tr><td valign='top' class='section'><p>Overrides:</td><td><p><a href="psi_element://java.util.Collection#contains(java.lang.Object)"><code>contains</code></a> in interface <a href="psi_element://java.util.Collection"><code>Collection</code></a><br><a href="psi_element://I#contains(java.lang.Object)"><code>contains</code></a> in interface <a href="psi_element://I"><code>I</code></a></td><tr><td valign='top' class='section'><p>Params:</td><td>o &ndash; element whose presence in this collection is to be tested  </td><tr><td valign='top' class='section'><p>Returns:</td><td><p><tt>true</tt> if this collection contains the specified          element  </td><tr><td valign='top' class='section'><p>Throws:</td><td><p><a href="psi_element://java.lang.ClassCastException"><code>ClassCastException</code></a> &ndash; if the type of the specified element          is incompatible with this collection          (<a href="psi_element://My###optional-restrictions">optional</a>)  <p><a href="psi_element://java.lang.NullPointerException"><code>NullPointerException</code></a> &ndash; if the specified element is null and this          collection does not permit null elements          (<a href="psi_element://My###optional-restrictions">optional</a>)</td><tr><td valign='top' class='section'><p><i>Inferred</i> annotations:</td><td><p><i>@<a href="psi_element://org.jetbrains.annotations.Contract">org.jetbrains.annotations.Contract</a>(pure = true)</i></td></table>
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/javadocIG/enumValueOf.html b/java/java-tests/testData/codeInsight/javadocIG/enumValueOf.html
index 64d6dbfe8f16..0246e6509ba0 100644
--- a/java/java-tests/testData/codeInsight/javadocIG/enumValueOf.html
+++ b/java/java-tests/testData/codeInsight/javadocIG/enumValueOf.html
@@ -1,4 +1,4 @@
 <html><head><base href="placeholder"></head><body><div class='definition'><pre><a href="psi_element://En"><code>En</code></a><br><i>@<a href="psi_element://org.jetbrains.annotations.Contract"><code>Contract</code></a>(pure = true)</i>&nbsp;
 static&nbsp;int&nbsp;<b>valueOf</b>(int&nbsp;i)</pre></div><div class='content'>
      myjavadoc
-     <p></div><table class='sections'><p><tr><td valign='top' class='section'><p>Params:</td><td>i &ndash;  </td><tr><td valign='top' class='section'><p>Returns:</td><td><p></td><tr><td valign='top' class='section'><p><i>Inferred</i> annotations:</td><td><p><i>@<a href="psi_element://org.jetbrains.annotations.Contract"><code>org.jetbrains.annotations.Contract</code></a>(pure = true)</i></td></table>
\ No newline at end of file
+     <p></div><table class='sections'><p><tr><td valign='top' class='section'><p>Params:</td><td>i &ndash;  </td><tr><td valign='top' class='section'><p>Returns:</td><td><p></td><tr><td valign='top' class='section'><p><i>Inferred</i> annotations:</td><td><p><i>@<a href="psi_element://org.jetbrains.annotations.Contract">org.jetbrains.annotations.Contract</a>(pure = true)</i></td></table>
\ No newline at end of file

Overrides:	`contains` in interface `Collection`
Params:	o – element whose presence in this list is to be tested
Returns:	`true` if this list contains the specified element
Throws:	`ClassCastException` – if the type of the specified element is incompatible with this list (optional) `NullPointerException` – if the specified element is null and this list does not permit null elements (optional)
Inferred annotations:	@org.jetbrains.annotations.Contract(pure = true)
Params:	i –
Returns:
Inferred annotations:	@`org.jetbrains.annotations.Contract`(pure = true)