CompilerReferenceService rename getScopeWithoutReferences -> getScopeWithoutCodeReferences

This commit is contained in:
Dmitry Batkovich
2016-10-04 19:34:57 +03:00
parent ab970287e2
commit 71e717e81a
4 changed files with 4 additions and 4 deletions
@@ -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<GlobalSearchScope, CompilerSearchAdapter> cachedValueProvider =
@@ -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();
@@ -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);
}
}
@@ -114,7 +114,7 @@ public class JavaFunctionalExpressionSearcher extends QueryExecutorBase<PsiFunct
SearchScope scope = samClass.getUseScope().intersectWith(queryParameters.getEffectiveSearchScope());
final GlobalSearchScope excludedScope =
CompilerReferenceService.getInstance(project).getScopeWithoutReferences(samClass, JavaFunctionalExpressionCompilerSearchAdapter.INSTANCE);
CompilerReferenceService.getInstance(project).getScopeWithoutCodeReferences(samClass, JavaFunctionalExpressionCompilerSearchAdapter.INSTANCE);
if (excludedScope != null) {
scope = scope.intersectWith(GlobalSearchScope.notScope(excludedScope));
}