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 4d59c1911969..ea94587775d0 100644
--- a/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
+++ b/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
@@ -472,14 +472,14 @@ public class JavaDocInfoGenerator {
if (generateClassSignature(buffer, aClass, SignaturePlace.Javadoc)) return;
buffer.append("");
- new NonCodeAnnotationGenerator(aClass, buffer).explainAnnotations();
-
PsiDocComment comment = getDocComment(aClass);
if (comment != null) {
generateCommonSection(buffer, comment);
generateTypeParametersSection(buffer, aClass);
}
+ new NonCodeAnnotationGenerator(aClass, buffer).explainAnnotations();
+
if (generatePrologueAndEpilogue) generateEpilogue(buffer);
}
@@ -626,8 +626,6 @@ public class JavaDocInfoGenerator {
generateFieldSignature(buffer, field, SignaturePlace.Javadoc);
buffer.append("");
- new NonCodeAnnotationGenerator(field, buffer).explainAnnotations();
-
ColorUtil.appendColorPreview(field, buffer);
PsiDocComment comment = getDocComment(field);
@@ -635,6 +633,8 @@ public class JavaDocInfoGenerator {
generateCommonSection(buffer, comment);
}
+ new NonCodeAnnotationGenerator(field, buffer).explainAnnotations();
+
if (generatePrologueAndEpilogue) generateEpilogue(buffer);
}
@@ -908,8 +908,6 @@ public class JavaDocInfoGenerator {
buffer.append("");
buffer.append("");
- new NonCodeAnnotationGenerator(parameter, buffer).explainAnnotations();
-
final PsiElement method = PsiTreeUtil.getParentOfType(parameter, PsiMethod.class, PsiLambdaExpression.class);
if (method instanceof PsiMethod) {
@@ -927,6 +925,8 @@ public class JavaDocInfoGenerator {
}
}
+ new NonCodeAnnotationGenerator(parameter, buffer).explainAnnotations();
+
if (generatePrologueAndEpilogue) generateEpilogue(buffer);
}
@@ -964,8 +964,6 @@ public class JavaDocInfoGenerator {
generateMethodSignature(buffer, method, SignaturePlace.Javadoc);
buffer.append("");
- new NonCodeAnnotationGenerator(method, buffer).explainAnnotations();
-
PsiDocComment comment = getMethodDocComment(method);
generateMethodDescription(buffer, method, comment);
@@ -988,6 +986,8 @@ public class JavaDocInfoGenerator {
generateSeeAlsoSection(buffer, comment);
}
+ new NonCodeAnnotationGenerator(method, buffer).explainAnnotations();
+
if (generatePrologueAndEpilogue) generateEpilogue(buffer);
}
diff --git a/java/java-tests/testData/codeInsight/javadocIG/documentationForJdkClassWithReferencesToClassesFromJavaLang.html b/java/java-tests/testData/codeInsight/javadocIG/documentationForJdkClassWithReferencesToClassesFromJavaLang.html
index 27d71bdd9006..2baf4afa4386 100644
--- a/java/java-tests/testData/codeInsight/javadocIG/documentationForJdkClassWithReferencesToClassesFromJavaLang.html
+++ b/java/java-tests/testData/codeInsight/javadocIG/documentationForJdkClassWithReferencesToClassesFromJavaLang.html
@@ -1,13 +1,12 @@
java.util.List<E>@Contract(pure = true)
public abstract boolean contains(Object o)
-Inferred annotations available:
-
-
Returns true if this list contains the specified element.
More formally, returns true if and only if this list contains
at least one element e such that
(o==null ? e==null : o.equals(e)).
- - Overrides:
contains in interface Collection
- Parameters:
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)
\ No newline at end of file
+ - Overrides:
contains in interface Collection
- Parameters:
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 available:
+