1 files changed, 10 insertions, 5 deletions
diff --git a/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/AnnotationParameterInfoHandler.java b/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/AnnotationParameterInfoHandler.java
index b3434ac20c10..9646ef9983ad 100644
--- a/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/AnnotationParameterInfoHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/AnnotationParameterInfoHandler.java
@@ -21,6 +21,7 @@ import com.intellij.openapi.project.DumbAware;
 import com.intellij.psi.*;
 import com.intellij.psi.util.PsiUtil;
 import com.intellij.util.text.CharArrayUtil;
+import com.intellij.xml.util.XmlStringUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -110,14 +111,18 @@ public class AnnotationParameterInfoHandler implements ParameterInfoHandler<PsiA
 
   @Override
   public void updateUI(final PsiAnnotationMethod p, final ParameterInfoUIContext context) {
-    @NonNls StringBuffer buffer = new StringBuffer();
+    updateUIText(p, context);
+  }
+
+  public static String updateUIText(PsiAnnotationMethod p, ParameterInfoUIContext context) {
+    @NonNls StringBuilder buffer = new StringBuilder();
     int highlightStartOffset;
     int highlightEndOffset;
     buffer.append(p.getReturnType().getPresentableText());
     buffer.append(" ");
-    highlightStartOffset = buffer.length();
+    highlightStartOffset = XmlStringUtil.escapeString(buffer.toString()).length();
     buffer.append(p.getName());
-    highlightEndOffset = buffer.length();
+    highlightEndOffset = XmlStringUtil.escapeString(buffer.toString()).length();
     buffer.append("()");
 
     if (p.getDefaultValue() != null) {
@@ -125,8 +130,8 @@ public class AnnotationParameterInfoHandler implements ParameterInfoHandler<PsiA
       buffer.append(p.getDefaultValue().getText());
     }
 
-    context.setupUIComponentPresentation(buffer.toString(), highlightStartOffset, highlightEndOffset, false, p.isDeprecated(),
-                                         false, context.getDefaultParameterColor());
+    return context.setupUIComponentPresentation(buffer.toString(), highlightStartOffset, highlightEndOffset, false, p.isDeprecated(),
+                                                false, context.getDefaultParameterColor());
   }
 
   private static PsiAnnotationMethod findAnnotationMethod(PsiFile file, int offset) {