From 9dc686d3cc3cde552ac7afc0b7f9ca9752bd9039 Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Mon, 20 Mar 2017 23:32:13 +0300 Subject: [PATCH] inspection view: strip description tags when offline node is invalid IDEA-169659 upd --- .../com/intellij/codeInspection/ProblemDescriptorUtil.java | 4 ++-- .../offlineViewer/OfflineProblemDescriptorNode.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/ProblemDescriptorUtil.java b/platform/analysis-impl/src/com/intellij/codeInspection/ProblemDescriptorUtil.java index 25df9669f1e6..4108c1bce9c9 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/ProblemDescriptorUtil.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/ProblemDescriptorUtil.java @@ -98,7 +98,7 @@ public class ProblemDescriptorUtil { message = StringUtil.replace(message, "#end", ""); message = StringUtil.replace(message, "#treeend", ""); - return message; + return message.trim(); } public static String unescapeTags(String message) { @@ -108,7 +108,7 @@ public class ProblemDescriptorUtil { message = unescapeXmlCode(message); } else { - message = StringUtil.unescapeXml(message).trim(); + message = StringUtil.unescapeXml(message); } return message; } diff --git a/platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineProblemDescriptorNode.java b/platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineProblemDescriptorNode.java index 40809a7f1477..b7444727f7ea 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineProblemDescriptorNode.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineProblemDescriptorNode.java @@ -66,7 +66,7 @@ public class OfflineProblemDescriptorNode extends ProblemDescriptionNode { protected String calculatePresentableName() { String presentableName = super.calculatePresentableName(); return presentableName.isEmpty() && getUserObject() instanceof OfflineProblemDescriptor - ? ProblemDescriptorUtil.unescapeTags(StringUtil.notNullize(((OfflineProblemDescriptor)getUserObject()).getDescription())) + ? ProblemDescriptorUtil.unescapeTags(StringUtil.notNullize(((OfflineProblemDescriptor)getUserObject()).getDescription())).trim() : presentableName; }