From 6edb04da9ce3729ff50c618c926284f48623ce84 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Fri, 19 Apr 2013 11:06:58 +0400
Subject: [PATCH] review cleanup

---
 .../codeInsight/daemon/impl/HighlightInfo.java    | 15 +++++++++------
 .../daemon/impl/LocalInspectionsPass.java         | 10 ++++++----
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java
index 550698b8c485..b3c5f5700cc8 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java
@@ -110,7 +110,7 @@ public class HighlightInfo implements Segment {
     String toolTip = this.toolTip;
     String description = this.description;
     if (toolTip == null || description == null || !toolTip.contains(DESCRIPTION_PLACEHOLDER)) return toolTip;
-    String decoded = toolTip.replace(DESCRIPTION_PLACEHOLDER, XmlStringUtil.escapeString(description));
+    String decoded = StringUtil.replace(toolTip, DESCRIPTION_PLACEHOLDER, XmlStringUtil.escapeString(description));
     String niceTooltip = XmlStringUtil.wrapInHtml(decoded);
     return niceTooltip;
   }
@@ -119,12 +119,13 @@ public class HighlightInfo implements Segment {
     if (toolTip == null || description == null) return toolTip;
     String unescaped = StringUtil.unescapeXml(XmlStringUtil.stripHtml(toolTip));
 
-    if (unescaped.contains(description)) {
-      String encoded = unescaped.replace(description, DESCRIPTION_PLACEHOLDER);
-      if (encoded.equals(DESCRIPTION_PLACEHOLDER)) encoded = DESCRIPTION_PLACEHOLDER;
-      return encoded;
+    String encoded = StringUtil.replace(unescaped, description, DESCRIPTION_PLACEHOLDER);
+    //noinspection StringEquality
+    if (encoded == unescaped) {
+      return toolTip;
     }
-    return toolTip;
+    if (encoded.equals(DESCRIPTION_PLACEHOLDER)) encoded = DESCRIPTION_PLACEHOLDER;
+    return encoded;
   }
 
   public String getDescription() {
@@ -135,11 +136,13 @@ public class HighlightInfo implements Segment {
   @interface FlagConstant {}
 
   private boolean isFlagSet(@FlagConstant int flag) {
+    assert flag < 8;
     int state = myFlags >> flag;
     return (state & 1) != 0;
   }
 
   private void setFlag(@FlagConstant int flag, boolean value) {
+    assert flag < 8;
     int state = value ? 1 : 0;
     myFlags = (byte)(myFlags & ~(1 << flag) | state << flag);
   }
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java
index 1e8b5771921d..98aa94e0f073 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java
@@ -625,11 +625,13 @@ public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass
       int start = hostRange.getStartOffset();
       int end = hostRange.getEndOffset();
       HighlightInfo.Builder builder = HighlightInfo.newHighlightInfo(info.type).range(element, start, end);
-      if (info.getDescription() != null) {
-        builder.description(info.getDescription());
+      String description = info.getDescription();
+      if (description != null) {
+        builder.description(description);
       }
-      if (info.getToolTip() != null) {
-        builder.escapedToolTip(info.getToolTip());
+      String toolTip = info.getToolTip();
+      if (toolTip != null) {
+        builder.escapedToolTip(toolTip);
       }
       HighlightInfo patched = builder.createUnconditionally();
       if (patched.startOffset != patched.endOffset || info.startOffset == info.endOffset) {