From f80bf32d98b861f47d65a9064e09f8a5e25f0604 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Tue, 8 Apr 2014 16:40:31 +0200
Subject: [PATCH] functional expressions: include in find results when
 implementing classes/implementing methods options are on

---
 .../findUsages/JavaFindUsagesHandler.java     | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/java/java-impl/src/com/intellij/find/findUsages/JavaFindUsagesHandler.java b/java/java-impl/src/com/intellij/find/findUsages/JavaFindUsagesHandler.java
index 3078019b8fea..3fd1161bb0ed 100644
--- a/java/java-impl/src/com/intellij/find/findUsages/JavaFindUsagesHandler.java
+++ b/java/java-impl/src/com/intellij/find/findUsages/JavaFindUsagesHandler.java
@@ -346,15 +346,14 @@ public class JavaFindUsagesHandler extends FindUsagesHandler{
         }
         else if (classOptions.isImplementingClasses){
           if (!addImplementingClasses(psiClass, processor, classOptions)) return false;
+          FunctionalExpressionSearch.search(psiClass, classOptions.searchScope).forEach(new PsiElementProcessorAdapter<PsiFunctionalExpression>(
+            new PsiElementProcessor<PsiFunctionalExpression>() {
+              @Override
+              public boolean execute(@NotNull PsiFunctionalExpression expression) {
+                return addResult(processor, expression, options);
+              }
+            }));
         }
-
-        FunctionalExpressionSearch.search(psiClass, classOptions.searchScope).forEach(new PsiElementProcessorAdapter<PsiFunctionalExpression>(
-          new PsiElementProcessor<PsiFunctionalExpression>() {
-            @Override
-            public boolean execute(@NotNull PsiFunctionalExpression expression) {
-              return addResult(processor, expression, options);
-            }
-          }));
       }
       else if (classOptions.isDerivedClasses) {
         if (!addInheritors(psiClass, processor, classOptions)) return false;
@@ -372,6 +371,13 @@ public class JavaFindUsagesHandler extends FindUsagesHandler{
       final JavaMethodFindUsagesOptions methodOptions = (JavaMethodFindUsagesOptions)options;
       if (isAbstract && methodOptions.isImplementingMethods || methodOptions.isOverridingMethods) {
         if (!processOverridingMethods(psiMethod, processor, methodOptions)) return false;
+        FunctionalExpressionSearch.search(psiMethod, methodOptions.searchScope).forEach(new PsiElementProcessorAdapter<PsiFunctionalExpression>(
+          new PsiElementProcessor<PsiFunctionalExpression>() {
+            @Override
+            public boolean execute(@NotNull PsiFunctionalExpression expression) {
+              return addResult(processor, expression, options);
+            }
+          }));
       }
     }