MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-203054 Thread leaks in tests

Browse Source
This commit is contained in:
Mikhail Sokolov
2018-12-04 16:51:51 +03:00
parent 3aaa88f249
commit 3f52ca10ac
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/MultiThreadSearcher.java
+2 -2
View File
@@ -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();
platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SESearcher.java
+2 -2
View File
@@ -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
platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SingleThreadSearcher.java
+5 -5
View File
@@ -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,