Merge 20e9861 into f1114c4

sevntu-checkstyle · Aug 28, 2015 · 65beb54 · 65beb54
2 parents f1114c4 + 20e9861
commit 65beb54
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/.../java/com/github/sevntu/checkstyle/checks/coding/LogicConditionNeedOptimizationCheck.java b/.../java/com/github/sevntu/checkstyle/checks/coding/LogicConditionNeedOptimizationCheck.java
@@ -63,10 +63,9 @@ public void visitToken(DetailAST detailAST)
      */
     private static boolean needOptimization(DetailAST logicNode)
     {
-        final DetailAST firstOperand = logicNode.getFirstChild();
         final DetailAST secondOperand = getSecondOperand(logicNode);
         return !secondOperand.branchContains(TokenTypes.METHOD_CALL)
-                && firstOperand.branchContains(TokenTypes.METHOD_CALL);
+                && logicNode.branchContains(TokenTypes.METHOD_CALL);
     }
     /**
      * <p>

diff --git a/...a/com/github/sevntu/checkstyle/checks/coding/LogicConditionNeedOptimizationCheckTest.java b/...a/com/github/sevntu/checkstyle/checks/coding/LogicConditionNeedOptimizationCheckTest.java
@@ -49,6 +49,7 @@ public void test() throws Exception
         	"67: " + getCheckMessage(MSG_KEY, "&&", 67, 38),
         	"69: " + getCheckMessage(MSG_KEY, "&&", 69, 35),
         	"72: " + getCheckMessage(MSG_KEY, "&&", 72, 19),
+        	"93: " + getCheckMessage(MSG_KEY, "||", 93, 33),
         };
         verify(checkConfig, getPath("InputLogicConditionsNeedOptimizationCheck.java"), expected);
     }

diff --git a/...com/github/sevntu/checkstyle/checks/coding/InputLogicConditionsNeedOptimizationCheck.java b/...com/github/sevntu/checkstyle/checks/coding/InputLogicConditionsNeedOptimizationCheck.java
@@ -86,4 +86,11 @@ private static void test()
         String x = "test";
         boolean y = x.length() == 3 ? true : false;
     }
+    private void methodInParentheses(){
+      Object elem = null;
+      java.util.ArrayList lst = new java.util.ArrayList();
+      boolean found = lst.remove(elem);
+      found = (lst.remove(elem)) || found;
+      found = found || (lst.remove(elem));
+    }
 }