From 3cdcb9f59bfe4db1dac4bf0196c80e6a7cfdffab Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Thu, 21 Oct 2021 16:28:46 +0200 Subject: [PATCH] [javadoc] avoid empty `@` when annotation is not resolved red @ and normal colored class name is better than just @ without anything GitOrigin-RevId: 261add13fcd2c9269ced5c5fb4fce17b389b914b --- .../intellij/codeInsight/javadoc/AnnotationDocGenerator.java | 2 +- java/java-tests/testData/codeInsight/javadocIG/annotations.html | 2 +- .../testData/codeInsight/javadocIG/methodFormatting.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 cc63a6748379..7b6ebdb113ae 100644 --- a/java/java-impl/src/com/intellij/codeInsight/javadoc/AnnotationDocGenerator.java +++ b/java/java-impl/src/com/intellij/codeInsight/javadoc/AnnotationDocGenerator.java @@ -146,7 +146,7 @@ public final class AnnotationDocGenerator { .create() .generateLink(buffer, myTargetClass, styledName, format == AnnotationFormat.JavaDocComplete); } - else if (!red && name != null) { + else if (name != null) { appendStyledSpan(doSyntaxHighlighting, isForRenderedDoc, buffer, JavaHighlightingColors.ANNOTATION_NAME_ATTRIBUTES, name); } if (red) buffer.append(""); diff --git a/java/java-tests/testData/codeInsight/javadocIG/annotations.html b/java/java-tests/testData/codeInsight/javadocIG/annotations.html index 68eebeb32a3b..5b76ba200e33 100644 --- a/java/java-tests/testData/codeInsight/javadocIG/annotations.html +++ b/java/java-tests/testData/codeInsight/javadocIG/annotations.html @@ -1,3 +1,3 @@ -
@ 
+
@Nullable 
 @Deprecated 
 public String field = null

\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/javadocIG/methodFormatting.html b/java/java-tests/testData/codeInsight/javadocIG/methodFormatting.html
index f1fbff939128..c49aa2286a9e 100644
--- a/java/java-tests/testData/codeInsight/javadocIG/methodFormatting.html
+++ b/java/java-tests/testData/codeInsight/javadocIG/methodFormatting.html
@@ -1,3 +1,3 @@
-
<E extends Exception> @ String drainTo(
    Consumer<? super T, E> consumer,
+
<E extends Exception> @Anno String drainTo(
    Consumer<? super T, E> consumer,
     Object someParameter
)
 throws E
Throws:
E

\ No newline at end of file