IDEA-130997 Editor gutter tooltips must properly de-escape content

diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java
index 92b3fd2346ae81dc082d31d1db3100b5e11f248c..fdc2c399c3217740e96fb818e636a4b1962a406a 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java
@@ -48,6 +48,7 @@ import com.intellij.openapi.ui.popup.Balloon;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.ProperTextRange;
 import com.intellij.openapi.util.registry.Registry;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.wm.ToolWindowAnchor;
 import com.intellij.openapi.wm.ex.ToolWindowManagerEx;
 import com.intellij.ui.*;
@@ -1252,6 +1253,7 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
                 String s = String.valueOf(tooltip);
                 if (s.isEmpty()) continue;
                 s = s.replaceAll(" ", " ").replaceAll("\\s+", " ");
+                s = StringUtil.unescapeXml(s);
 
                 LogicalPosition logicalPosition = myEditor.offsetToLogicalPosition(hEndOffset);
                 int endOfLineOffset = myEditor.getDocument().getLineEndOffset(logicalPosition.line);