From f474aa503d9b3d2d6a726feada10af4313a5b8d4 Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Tue, 5 Sep 2017 11:19:49 +0300 Subject: [PATCH] ScopeOptimizer: rename `getScopeToRestrict` to `getRestrictedUseScope` --- .../src/com/intellij/psi/search/ScopeOptimizer.java | 8 ++++---- .../com/intellij/psi/search/SearchRequestCollector.java | 2 +- .../com/intellij/psi/impl/search/PsiSearchHelperImpl.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/platform/indexing-api/src/com/intellij/psi/search/ScopeOptimizer.java b/platform/indexing-api/src/com/intellij/psi/search/ScopeOptimizer.java index 44e77dc4b714..60608ebe7482 100644 --- a/platform/indexing-api/src/com/intellij/psi/search/ScopeOptimizer.java +++ b/platform/indexing-api/src/com/intellij/psi/search/ScopeOptimizer.java @@ -40,7 +40,7 @@ import java.util.stream.Stream; public interface ScopeOptimizer { /** - * Please use {@link ScopeOptimizer#getScopeToRestrict(PsiElement)} instead + * Please use {@link ScopeOptimizer#getRestrictedUseScope(PsiElement)} instead */ @Deprecated @Nullable("is null when given optimizer can't provide a scope to exclude") @@ -49,18 +49,18 @@ public interface ScopeOptimizer { } @Nullable("is null when given optimizer can't provide a scope to restrict") - default SearchScope getScopeToRestrict(@NotNull PsiElement element) { + default SearchScope getRestrictedUseScope(@NotNull PsiElement element) { GlobalSearchScope scopeToExclude = getScopeToExclude(element); return scopeToExclude == null ? null : GlobalSearchScope.notScope(scopeToExclude); } @Nullable - static SearchScope calculateScopeToRestrict(@NotNull ScopeOptimizer[] optimizers, @NotNull PsiElement element) { + static SearchScope calculateOverallRestrictedUseScope(@NotNull ScopeOptimizer[] optimizers, @NotNull PsiElement element) { return Stream .of(optimizers) .peek(optimizer -> ProgressManager.checkCanceled()) - .map(optimizer -> optimizer.getScopeToRestrict(element)) + .map(optimizer -> optimizer.getRestrictedUseScope(element)) .filter(Objects::nonNull) .reduce((s1, s2) -> s1.intersectWith(s2)) .orElse(null); diff --git a/platform/indexing-api/src/com/intellij/psi/search/SearchRequestCollector.java b/platform/indexing-api/src/com/intellij/psi/search/SearchRequestCollector.java index 87cb6ee499ec..a0461ec4fca6 100644 --- a/platform/indexing-api/src/com/intellij/psi/search/SearchRequestCollector.java +++ b/platform/indexing-api/src/com/intellij/psi/search/SearchRequestCollector.java @@ -81,7 +81,7 @@ public class SearchRequestCollector { searchScope instanceof GlobalSearchScope && ((searchContext & UsageSearchContext.IN_CODE) != 0 || searchContext == UsageSearchContext.ANY)) { - final SearchScope restrictedCodeUsageSearchScope = ScopeOptimizer.calculateScopeToRestrict(CODE_USAGE_SCOPE_OPTIMIZER_EP_NAME.getExtensions(), searchTarget); + final SearchScope restrictedCodeUsageSearchScope = ScopeOptimizer.calculateOverallRestrictedUseScope(CODE_USAGE_SCOPE_OPTIMIZER_EP_NAME.getExtensions(), searchTarget); if (restrictedCodeUsageSearchScope != null) { short exceptCodeSearchContext = searchContext == UsageSearchContext.ANY ? UsageSearchContext.IN_COMMENTS | diff --git a/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java b/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java index 7b62f9021ba7..86d0cdb7ca10 100644 --- a/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java +++ b/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java @@ -88,7 +88,7 @@ public class PsiSearchHelperImpl implements PsiSearchHelper { } } - SearchScope scopeToRestrict = ScopeOptimizer.calculateScopeToRestrict(USE_SCOPE_OPTIMIZER_EP_NAME.getExtensions(), element); + SearchScope scopeToRestrict = ScopeOptimizer.calculateOverallRestrictedUseScope(USE_SCOPE_OPTIMIZER_EP_NAME.getExtensions(), element); if (scopeToRestrict != null) { scope = scope.intersectWith(scopeToRestrict); }