From 4901e1fc8558260bdf01384abe06a15c5c4bc6b2 Mon Sep 17 00:00:00 2001
From: Dmitry Batkovich <dmitry.batkovich@jetbrains.com>
Date: Thu, 27 Oct 2016 10:29:36 +0300
Subject: [PATCH] use ContainerUtil.process

---
 .../impl/search/JavaDirectInheritorsSearcher.java    | 12 ++++--------
 .../search/JavaFunctionalExpressionSearcher.java     |  8 +-------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaDirectInheritorsSearcher.java b/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaDirectInheritorsSearcher.java
index cf7ef670c80a..61b34571990b 100644
--- a/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaDirectInheritorsSearcher.java
+++ b/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaDirectInheritorsSearcher.java
@@ -297,14 +297,10 @@ public class JavaDirectInheritorsSearcher implements QueryExecutor<PsiClass, Dir
     if (!acceptAnonymous) {
       classStream = classStream.filter(c -> !(c instanceof PsiAnonymousClass));
     }
-
-    Iterator<PsiClass> it = classStream.iterator();
-    while (it.hasNext()) {
+    return ContainerUtil.process(classStream.iterator(), c -> {
       ProgressManager.checkCanceled();
-      PsiClass next = it.next();
-      if (checkInheritance && ReadAction.compute(() -> !next.isInheritor(baseClass, false))) continue;
-      if (!consumer.process(next)) return false;
-    }
-    return true;
+      if (checkInheritance && ReadAction.compute(() -> !c.isInheritor(baseClass, false))) return true;
+      return consumer.process(c);
+    });
   }
 }
diff --git a/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaFunctionalExpressionSearcher.java b/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaFunctionalExpressionSearcher.java
index 4fce43955743..df7513eceefe 100644
--- a/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaFunctionalExpressionSearcher.java
+++ b/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaFunctionalExpressionSearcher.java
@@ -362,13 +362,7 @@ public class JavaFunctionalExpressionSearcher extends QueryExecutorBase<PsiFunct
                                                       @NotNull SamDescriptor descriptor,
                                                       @NotNull Processor<PsiFunctionalExpression> consumer) {
     if (funExprInfo != null) {
-      Iterator<PsiFunctionalExpression> it = funExprInfo.getHierarchyChildren().iterator();
-      while (it.hasNext()) {
-        PsiFunctionalExpression next = it.next();
-        if (!consumer.process(next)) {
-          return false;
-        }
-      }
+      if (!ContainerUtil.process(funExprInfo.getHierarchyChildren().iterator(), consumer)) return false;
       GlobalSearchScope dirtyScope = funExprInfo.getDirtyScope();
       descriptor.effectiveUseScope = descriptor.effectiveUseScope.intersectWith(dirtyScope);
     }