From 4edd453e90604d78b866ddfd73dbe1558c7fdbb4 Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 11 Sep 2014 17:56:08 +0200 Subject: [PATCH] [maxim] fix showing attributes on external annotations gutter --- .../codeInsight/javadoc/JavaDocInfoGenerator.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/java/java-psi-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java b/java/java-psi-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java index f83f6be6e699..67b1ef813de8 100644 --- a/java/java-psi-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java +++ b/java/java-psi-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java @@ -795,8 +795,7 @@ public class JavaDocInfoGenerator { private static void appendLinkOrText(StringBuilder buffer, PsiAnnotationMemberValue memberValue, boolean generateLink) { - boolean linkGenerated = !generateLink; - if (!linkGenerated && memberValue instanceof PsiQualifiedReferenceElement) { + if (generateLink && memberValue instanceof PsiQualifiedReferenceElement) { String text = ((PsiQualifiedReferenceElement)memberValue).getCanonicalText(); PsiElement resolve = ((PsiQualifiedReferenceElement)memberValue).resolve(); @@ -812,13 +811,11 @@ public class JavaDocInfoGenerator { if (aClass != null) text = aClass.getQualifiedName() + '#' + field.getName(); } generateLink(buffer, text, aClass != null? aClass.getName() + '.' + field.getName():null, memberValue, false); - linkGenerated = true; + return; } } - if (!linkGenerated) { - buffer.append(XmlStringUtil.escapeString(memberValue.getText())); - } + buffer.append(XmlStringUtil.escapeString(memberValue.getText())); } public static boolean isDocumentedAnnotationType(@Nullable PsiElement annotationType) {