From 3f52ca10acd4aebadda73ec3e206eb46be98ce8c Mon Sep 17 00:00:00 2001
From: Mikhail Sokolov <mikhail.sokolov@jetbrains.com>
Date: Tue, 4 Dec 2018 16:20:26 +0300
Subject: [PATCH] IDEA-203054 Thread leaks in tests

---
 .../actions/searcheverywhere/MultiThreadSearcher.java  |  4 ++--
 .../ide/actions/searcheverywhere/SESearcher.java       |  4 ++--
 .../actions/searcheverywhere/SingleThreadSearcher.java | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/MultiThreadSearcher.java b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/MultiThreadSearcher.java
index 2baef93940a8..3b1273e3c91f 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/MultiThreadSearcher.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/MultiThreadSearcher.java
@@ -60,7 +60,7 @@ class MultiThreadSearcher implements SESearcher {
   public ProgressIndicator search(@NotNull Map<SearchEverywhereContributor<?>, Integer> contributorsAndLimits,
                                   @NotNull String pattern,
                                   boolean useNonProjectItems,
-                                  @NotNull Function<SearchEverywhereContributor<?>, SearchEverywhereContributorFilter<?>> filterSupplier) {
+                                  @NotNull Function<? super SearchEverywhereContributor<?>, ? extends SearchEverywhereContributorFilter<?>> filterSupplier) {
     LOG.debug("Search started for pattern [", pattern, "]");
     FullSearchResultsAccumulator accumulator = new FullSearchResultsAccumulator(contributorsAndLimits, myEqualityProvider, myListener, myNotificationExecutor);
 
@@ -117,7 +117,7 @@ class MultiThreadSearcher implements SESearcher {
                                          boolean useNonProjectItems,
                                          @NotNull SearchEverywhereContributor<?> contributorToExpand,
                                          int newLimit,
-                                         @NotNull Function<SearchEverywhereContributor<?>, SearchEverywhereContributorFilter<?>> filterSupplier) {
+                                         @NotNull Function<? super SearchEverywhereContributor<?>, ? extends SearchEverywhereContributorFilter<?>> filterSupplier) {
     ResultsAccumulator accumulator = new ShowMoreResultsAccumulator(alreadyFound, myEqualityProvider, contributorToExpand, newLimit, myListener, myNotificationExecutor);
     SearchEverywhereContributorFilter<?> filter = filterSupplier.apply(contributorToExpand);
     ProgressIndicator indicator = new ProgressIndicatorBase();
diff --git a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SESearcher.java b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SESearcher.java
index 3c73eacf4f39..17d5392838f7 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SESearcher.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SESearcher.java
@@ -13,14 +13,14 @@ interface SESearcher {
   ProgressIndicator search(@NotNull Map<SearchEverywhereContributor<?>, Integer> contributorsAndLimits,
                            @NotNull String pattern,
                            boolean useNonProjectItems,
-                           @NotNull Function<SearchEverywhereContributor<?>, SearchEverywhereContributorFilter<?>> filterSupplier);
+                           @NotNull Function<? super SearchEverywhereContributor<?>, ? extends SearchEverywhereContributorFilter<?>> filterSupplier);
 
   ProgressIndicator findMoreItems(@NotNull Map<SearchEverywhereContributor<?>, Collection<ElementInfo>> alreadyFound,
                                   @NotNull String pattern,
                                   boolean useNonProjectItems,
                                   @NotNull SearchEverywhereContributor<?> contributorToExpand,
                                   int newLimit,
-                                  @NotNull Function<SearchEverywhereContributor<?>, SearchEverywhereContributorFilter<?>> filterSupplier);
+                                  @NotNull Function<? super SearchEverywhereContributor<?>, ? extends SearchEverywhereContributorFilter<?>> filterSupplier);
 
   /**
    * Search process listener interface
diff --git a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SingleThreadSearcher.java b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SingleThreadSearcher.java
index db044ad0bc2e..1144b0e0d235 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SingleThreadSearcher.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SingleThreadSearcher.java
@@ -35,7 +35,7 @@ class SingleThreadSearcher implements SESearcher {
   public ProgressIndicator search(@NotNull Map<SearchEverywhereContributor<?>, Integer> contributorsAndLimits,
                                   @NotNull String pattern,
                                   boolean useNonProjectItems,
-                                  @NotNull Function<SearchEverywhereContributor<?>, SearchEverywhereContributorFilter<?>> filterSupplier) {
+                                  @NotNull Function<? super SearchEverywhereContributor<?>, ? extends SearchEverywhereContributorFilter<?>> filterSupplier) {
     ProgressIndicator indicator = new ProgressIndicatorBase();
     Runnable task = new SearchTask(contributorsAndLimits, pattern, useNonProjectItems, filterSupplier, indicator, myNotificationExecutor,
                                    myNotificationListener, myEqualityProvider);
@@ -50,7 +50,7 @@ class SingleThreadSearcher implements SESearcher {
                                          boolean useNonProjectItems,
                                          @NotNull SearchEverywhereContributor<?> contributorToExpand,
                                          int newLimit,
-                                         @NotNull Function<SearchEverywhereContributor<?>, SearchEverywhereContributorFilter<?>> filterSupplier) {
+                                         @NotNull Function<? super SearchEverywhereContributor<?>, ? extends SearchEverywhereContributorFilter<?>> filterSupplier) {
     ProgressIndicator indicator = new ProgressIndicatorBase();
     Runnable task = createShowMoreTask(contributorToExpand, newLimit, pattern, useNonProjectItems, alreadyFound, filterSupplier, indicator);
     ApplicationManager.getApplication().executeOnPooledThread(ConcurrencyUtil.underThreadNameRunnable("SE-SingleThread-SearchTask", task));
@@ -64,7 +64,7 @@ class SingleThreadSearcher implements SESearcher {
                                                  String pattern,
                                                  boolean useNonProjectItems,
                                                  Map<SearchEverywhereContributor<?>, Collection<ElementInfo>> alreadyFound,
-                                                 Function<SearchEverywhereContributor<?>, SearchEverywhereContributorFilter<?>> filterSupplier,
+                                                 Function<? super SearchEverywhereContributor<?>, ? extends SearchEverywhereContributorFilter<?>> filterSupplier,
                                                  ProgressIndicator indicator) {
     List<ElementInfo> alreadyFoundList = alreadyFound.values()
       .stream()
@@ -144,7 +144,7 @@ class SingleThreadSearcher implements SESearcher {
     private final Map<SearchEverywhereContributor<?>, Integer> myContributorsAndLimits;
     private final String myPattern;
     private final boolean myUseNonProjectItems;
-    private final Function<SearchEverywhereContributor<?>, SearchEverywhereContributorFilter<?>> myFilterSupplier;
+    private final Function<? super SearchEverywhereContributor<?>, ? extends SearchEverywhereContributorFilter<?>> myFilterSupplier;
     private final SEResultsEqualityProvider myEqualityProvider;
 
     private final ProgressIndicator myProgressIndicator;
@@ -154,7 +154,7 @@ class SingleThreadSearcher implements SESearcher {
     SearchTask(Map<SearchEverywhereContributor<?>, Integer> contributorsAndLimits,
                String pattern,
                boolean useNonProjectItems,
-               Function<SearchEverywhereContributor<?>, SearchEverywhereContributorFilter<?>> filterSupplier,
+               Function<? super SearchEverywhereContributor<?>, ? extends SearchEverywhereContributorFilter<?>> filterSupplier,
                ProgressIndicator progressIndicator,
                Executor notificationExecutor,
                Listener notificationListener,