From 71e717e81a1e4993eebe29b210b205c5fdc7fac2 Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Tue, 4 Oct 2016 19:31:18 +0300 Subject: [PATCH] CompilerReferenceService rename getScopeWithoutReferences -> getScopeWithoutCodeReferences --- .../src/com/intellij/compiler/CompilerReferenceServiceImpl.java | 2 +- .../src/com/intellij/compiler/CompilerReferenceService.java | 2 +- .../compiler/JavaCompilerReferencesCodeUsageScopeOptimizer.java | 2 +- .../psi/impl/search/JavaFunctionalExpressionSearcher.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java/compiler/impl/src/com/intellij/compiler/CompilerReferenceServiceImpl.java b/java/compiler/impl/src/com/intellij/compiler/CompilerReferenceServiceImpl.java index e8de37f8b142..fcb121d18861 100644 --- a/java/compiler/impl/src/com/intellij/compiler/CompilerReferenceServiceImpl.java +++ b/java/compiler/impl/src/com/intellij/compiler/CompilerReferenceServiceImpl.java @@ -140,7 +140,7 @@ public class CompilerReferenceServiceImpl extends CompilerReferenceService { @Nullable @Override - public GlobalSearchScope getScopeWithoutReferences(@NotNull PsiElement element, @NotNull CompilerSearchAdapter adapter) { + public GlobalSearchScope getScopeWithoutCodeReferences(@NotNull PsiElement element, @NotNull CompilerSearchAdapter adapter) { if (!isServiceEnabled()) return null; final ParameterizedCachedValueProvider cachedValueProvider = diff --git a/java/java-indexing-impl/src/com/intellij/compiler/CompilerReferenceService.java b/java/java-indexing-impl/src/com/intellij/compiler/CompilerReferenceService.java index 8b2880760af4..c8e6c0612fbd 100644 --- a/java/java-indexing-impl/src/com/intellij/compiler/CompilerReferenceService.java +++ b/java/java-indexing-impl/src/com/intellij/compiler/CompilerReferenceService.java @@ -36,7 +36,7 @@ public abstract class CompilerReferenceService extends AbstractProjectComponent } @Nullable - public abstract GlobalSearchScope getScopeWithoutReferences(@NotNull PsiElement element, @NotNull CompilerSearchAdapter adapter); + public abstract GlobalSearchScope getScopeWithoutCodeReferences(@NotNull PsiElement element, @NotNull CompilerSearchAdapter adapter); public static boolean isEnabled() { return IS_ENABLED_KEY.asBoolean(); diff --git a/java/java-indexing-impl/src/com/intellij/compiler/JavaCompilerReferencesCodeUsageScopeOptimizer.java b/java/java-indexing-impl/src/com/intellij/compiler/JavaCompilerReferencesCodeUsageScopeOptimizer.java index fced3ef74f47..bae091e37c19 100644 --- a/java/java-indexing-impl/src/com/intellij/compiler/JavaCompilerReferencesCodeUsageScopeOptimizer.java +++ b/java/java-indexing-impl/src/com/intellij/compiler/JavaCompilerReferencesCodeUsageScopeOptimizer.java @@ -25,6 +25,6 @@ public class JavaCompilerReferencesCodeUsageScopeOptimizer implements ScopeOptim @Nullable @Override public GlobalSearchScope getScopeToExclude(@NotNull PsiElement element) { - return CompilerReferenceService.getInstance(element.getProject()).getScopeWithoutReferences(element, JavaBaseCompilerSearchAdapter.INSTANCE); + return CompilerReferenceService.getInstance(element.getProject()).getScopeWithoutCodeReferences(element, JavaBaseCompilerSearchAdapter.INSTANCE); } } diff --git a/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaFunctionalExpressionSearcher.java b/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaFunctionalExpressionSearcher.java index 997b2e14ddfe..bd85cff86b92 100644 --- a/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaFunctionalExpressionSearcher.java +++ b/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaFunctionalExpressionSearcher.java @@ -114,7 +114,7 @@ public class JavaFunctionalExpressionSearcher extends QueryExecutorBase