From ca0abe3b248d0139a91d3e82b185d377e2fc64da Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Thu, 20 Aug 2015 20:12:42 +0200
Subject: [PATCH] pass search parameters to ScopedQueryExecutor.getScope()
 (IDEA-CR-4486)

---
 .../com/intellij/psi/search/searches/ScopedQueryExecutor.java   | 2 +-
 .../psi/impl/search/ClassesWithAnnotatedMembersSearcher.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/java-indexing-api/src/com/intellij/psi/search/searches/ScopedQueryExecutor.java b/java/java-indexing-api/src/com/intellij/psi/search/searches/ScopedQueryExecutor.java
index 1aa3cf4496a6..35445c50cbe6 100644
--- a/java/java-indexing-api/src/com/intellij/psi/search/searches/ScopedQueryExecutor.java
+++ b/java/java-indexing-api/src/com/intellij/psi/search/searches/ScopedQueryExecutor.java
@@ -30,5 +30,5 @@ public interface ScopedQueryExecutor<Result, Param> extends QueryExecutor<Result
    * Returns the scope handled by this executor.
    */
   @NotNull
-  GlobalSearchScope getScope();
+  GlobalSearchScope getScope(Param param);
 }
diff --git a/java/java-indexing-impl/src/com/intellij/psi/impl/search/ClassesWithAnnotatedMembersSearcher.java b/java/java-indexing-impl/src/com/intellij/psi/impl/search/ClassesWithAnnotatedMembersSearcher.java
index 99f82c227789..2ca209dc043f 100644
--- a/java/java-indexing-impl/src/com/intellij/psi/impl/search/ClassesWithAnnotatedMembersSearcher.java
+++ b/java/java-indexing-impl/src/com/intellij/psi/impl/search/ClassesWithAnnotatedMembersSearcher.java
@@ -41,7 +41,7 @@ public class ClassesWithAnnotatedMembersSearcher extends QueryExecutorBase<PsiCl
     SearchScope scope = queryParameters.getScope();
     for (QueryExecutor executor : Extensions.getExtensions(ClassesWithAnnotatedMembersSearch.EP_NAME)) {
       if (executor instanceof ScopedQueryExecutor) {
-        scope = scope.intersectWith(GlobalSearchScope.notScope(((ScopedQueryExecutor) executor).getScope()));
+        scope = scope.intersectWith(GlobalSearchScope.notScope(((ScopedQueryExecutor) executor).getScope(queryParameters)));
       }
     }