IDEA-101944 ("Pointless boolean expression" inspection with multiple '&&' fails)

plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/PointlessBooleanExpressionInspection.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2012 Dave Griffith, Bas Leijdekkers
+ * Copyright 2003-2013 Dave Griffith, Bas Leijdekkers
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -183,17 +183,19 @@ public class PointlessBooleanExpressionInspection extends BaseInspection {
       }
       buildSimplifiedExpression(expressions, "==", negate, out);
     }
+    else {
+      out.append(expression.getText());
+    }
   }
 
   private void buildSimplifiedExpression(List<PsiExpression> expressions, String token, boolean negate, StringBuilder out) {
     if (expressions.size() == 1) {
       final PsiExpression expression = expressions.get(0);
-      final String expressionText = expression.getText();
       if (isBoxedTypeComparison(token, expression)) {
-        out.append(expressionText).append(" != null && ");
+        out.append(expression.getText()).append(" != null && ");
       }
       if (!negate) {
-        out.append(expressionText);
+        out.append(expression.getText());
         return;
       }
       if (ComparisonUtils.isComparison(expression)) {
@@ -206,10 +208,10 @@ public class PointlessBooleanExpressionInspection extends BaseInspection {
       }
       else {
         if (ParenthesesUtils.getPrecedence(expression) > ParenthesesUtils.PREFIX_PRECEDENCE) {
-          out.append("!(").append(expressionText).append(')');
+          out.append("!(").append(expression.getText()).append(')');
         }
         else {
-          out.append('!').append(expressionText);
+          out.append('!').append(expression.getText());
         }
       }
     }
@@ -221,11 +223,19 @@ public class PointlessBooleanExpressionInspection extends BaseInspection {
       for (PsiExpression expression : expressions) {
         if (useToken) {
           out.append(token);
+          final PsiElement previousSibling = expression.getPrevSibling();
+          if (previousSibling instanceof PsiWhiteSpace) {
+            out.append(previousSibling.getText());
+          }
         }
         else {
           useToken = true;
         }
         buildSimplifiedExpression(expression, out);
+        final PsiElement nextSibling = expression.getNextSibling();
+        if (nextSibling instanceof PsiWhiteSpace) {
+          out.append(nextSibling.getText());
+        }
       }
       if (negate) {
         out.append(')');

plugins/InspectionGadgets/test/com/siyeh/igtest/controlflow/pointless_boolean_expression/PointlessBooleanExpression.java

@@ -28,4 +28,11 @@ class PointlessBooleanExpression {
     boolean y = false || c;
     boolean z = b != true;
   }
+}
+class Presley {
+  void elvis(Object king) {
+    if (true && king != null && king.hashCode() > 1) {
+      // blah
+    }
+  }
 }

plugins/InspectionGadgets/test/com/siyeh/igtest/controlflow/pointless_boolean_expression/expected.xml

@@ -42,4 +42,11 @@
     <description>&lt;code&gt;b != true&lt;/code&gt; can be simplified to '!b' #loc</description>
   </problem>
 
+  <problem>
+    <file>PointlessBooleanExpression.java</file>
+    <line>34</line>
+    <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Pointless boolean expression</problem_class>
+    <description>&lt;code&gt;true &amp;&amp; king != null &amp;&amp; king.hashCode() &gt; 1&lt;/code&gt; can be simplified to 'king != null &amp;&amp; king.hashCode() &gt; 1' #loc</description>
+  </problem>
+
 </problems>

plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/PointlessBooleanExpressionInspectionTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,6 @@ public class PointlessBooleanExpressionInspectionTest extends IGInspectionTestCa
   public void test() throws Exception {
     final PointlessBooleanExpressionInspection inspection = new PointlessBooleanExpressionInspection();
     inspection.m_ignoreExpressionsContainingConstants = true;
-    doTest("com/siyeh/igtest/controlflow/pointless_boolean_expression_ignore_cont_const", inspection);
+    doTest("com/siyeh/igtest/controlflow/pointless_boolean_expression", inspection);
   }
 }