/*
 * Copyright 2003-2005 Dave Griffith
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package com.siyeh.ipp.bool;

import com.intellij.psi.JavaTokenType;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiExpression;
import com.intellij.psi.PsiPolyadicExpression;
import com.intellij.psi.tree.IElementType;
import com.siyeh.ipp.base.PsiElementPredicate;
import com.siyeh.ipp.psiutils.ErrorUtil;

class ConjunctionPredicate implements PsiElementPredicate {

  public boolean satisfiedBy(PsiElement element) {
    if (!(element instanceof PsiPolyadicExpression)) {
      return false;
    }
    final PsiPolyadicExpression expression = (PsiPolyadicExpression)element;
    final IElementType tokenType = expression.getOperationTokenType();
    if (!tokenType.equals(JavaTokenType.ANDAND) && !tokenType.equals(JavaTokenType.OROR)) {
      return false;
    }
    if (ErrorUtil.containsError(expression)) {
      return false;
    }
    for (PsiExpression operand : expression.getOperands()) {
      if (ErrorUtil.containsError(operand)) {
        return false;
      }
    }
    return true;
  }
}

@@ -20,10 +20,10 @@
 3-20
-05
+17
  Dav
@@ -32,16 +32,33 @@
 Griffith
+, Bas Leijdekkers
 %0A *%0A * L
@@ -716,47 +716,8 @@
 nt;%0A
-import com.intellij.psi.PsiExpression;%0A
 impo
@@ -798,24 +798,66 @@
 lementType;%0A
+import com.intellij.psi.util.PsiUtilCore;%0A
 import com.s
@@ -895,47 +895,32 @@
 te;%0A
+%0A
 import 
-com.siyeh.ipp.psiutils.ErrorUtil
+java.util.Arrays
 ;%0A%0Ac
@@ -1385,35 +1385,48 @@
     
-if (ErrorUtil.containsError
+return !PsiUtilCore.hasErrorElementChild
 (exp
@@ -1437,196 +1437,107 @@
 ion)
-) %7B
+ &&
 %0A      
-return false;%0A    %7D%0A    for (PsiExpression operand : expression.getOperands()) %7B%0A      if (ErrorUtil.containsError(operand)) %7B%0A        return false;%0A      %7D%0A    %7D%0A    return true
+     Arrays.stream(expression.getOperands()).noneMatch(PsiUtilCore::hasErrorElementChild)
 ;%0A  

use streams