From 4a0c98238e82d9e1995d4df301914fa4bfda1430 Mon Sep 17 00:00:00 2001 From: Vassiliy Kudryashov Date: Thu, 13 Feb 2014 21:00:01 +0400 Subject: [PATCH] Fix failed tests --- .../intellij/openapi/editor/impl/EditorMarkupModelImpl.java | 2 +- .../util/src/com/intellij/openapi/util/text/StringUtil.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 ca8ae59b5abf..74b770b401d7 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java @@ -1170,7 +1170,7 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark if (tooltip == null) continue; String s = String.valueOf(tooltip); if (s.isEmpty()) continue; - s = s.replaceAll("\\s+", " "); + s = s.replaceAll(" ", " ").replaceAll("\\s+", " "); LogicalPosition logicalPosition = myEditor.offsetToLogicalPosition(hEndOffset); int endOfLineOffset = myEditor.getDocument().getLineEndOffset(logicalPosition.line); diff --git a/platform/util/src/com/intellij/openapi/util/text/StringUtil.java b/platform/util/src/com/intellij/openapi/util/text/StringUtil.java index 86c7e9e1b496..93fb443f181d 100644 --- a/platform/util/src/com/intellij/openapi/util/text/StringUtil.java +++ b/platform/util/src/com/intellij/openapi/util/text/StringUtil.java @@ -1795,8 +1795,8 @@ public class StringUtil extends StringUtilRt { return '\"' + str + "\""; } - @NonNls private static final String[] REPLACES_REFS = {"<", ">", "&", "'", """, " "}; - @NonNls private static final String[] REPLACES_DISP = {"<", ">", "&", "'", "\"", " "}; + @NonNls private static final String[] REPLACES_REFS = {"<", ">", "&", "'", """}; + @NonNls private static final String[] REPLACES_DISP = {"<", ">", "&", "'", "\""}; public static String unescapeXml(@Nullable final String text) { if (text == null) return null;