From 725c447627ea375f42bb85ff71088c57f1397ba4 Mon Sep 17 00:00:00 2001
From: Bas Leijdekkers <basleijdekkers@gmail.com>
Date: Sun, 15 Jul 2012 21:02:53 +0200
Subject: [PATCH] allow error element

---
 .../com/siyeh/ipp/concatenation/CallSequencePredicate.java  | 2 +-
 .../concatenation/SimpleStringConcatenationPredicate.java   | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/CallSequencePredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/CallSequencePredicate.java
index b5a17409ae32..0edd8b949d1a 100644
--- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/CallSequencePredicate.java
+++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/CallSequencePredicate.java
@@ -23,7 +23,7 @@ import org.jetbrains.annotations.Nullable;
 /**
  * @author Bas Leijdekkers
  */
-public class CallSequencePredicate implements PsiElementPredicate {
+class CallSequencePredicate implements PsiElementPredicate {
 
   @Override
   public boolean satisfiedBy(PsiElement element) {
diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/SimpleStringConcatenationPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/SimpleStringConcatenationPredicate.java
index 1f932f5f2db7..3cd76a68d940 100644
--- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/SimpleStringConcatenationPredicate.java
+++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/SimpleStringConcatenationPredicate.java
@@ -21,7 +21,6 @@ import com.intellij.psi.PsiNameValuePair;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.siyeh.ipp.base.PsiElementPredicate;
 import com.siyeh.ipp.psiutils.ConcatenationUtils;
-import com.siyeh.ipp.psiutils.ErrorUtil;
 
 class SimpleStringConcatenationPredicate implements PsiElementPredicate {
 
@@ -36,10 +35,7 @@ class SimpleStringConcatenationPredicate implements PsiElementPredicate {
     if (!ConcatenationUtils.isConcatenation(element)) {
       return false;
     }
-    if (excludeConcatenationsInsideAnnotations && isInsideAnnotation(element)) {
-      return false;
-    }
-    return !ErrorUtil.containsError(element);
+    return !(excludeConcatenationsInsideAnnotations && isInsideAnnotation(element));
   }
 
   private static boolean isInsideAnnotation(PsiElement element) {