CompilerReferenceService rename getScopeWithoutReferences -> getScopeWithoutCodeRefer...
authorDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Tue, 4 Oct 2016 16:31:18 +0000 (19:31 +0300)
committerDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Tue, 4 Oct 2016 16:34:57 +0000 (19:34 +0300)
java/compiler/impl/src/com/intellij/compiler/CompilerReferenceServiceImpl.java
java/java-indexing-impl/src/com/intellij/compiler/CompilerReferenceService.java
java/java-indexing-impl/src/com/intellij/compiler/JavaCompilerReferencesCodeUsageScopeOptimizer.java
java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaFunctionalExpressionSearcher.java

index e8de37f8b142ce3eaaa3e97ee1ff6c6c6eaf38aa..fcb121d18861feedc07707bd8aa0d42fe1713f05 100644 (file)
@@ -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 =
index 8b2880760af43a35e346ad4dbfb9a4f4e2168545..c8e6c0612fbd3a768c7927ce631b560b336e5897 100644 (file)
@@ -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();
index fced3ef74f479da92ac6d9a8802d4b659f1d8560..bae091e37c1902d1968a3a08590d3a642c69d5eb 100644 (file)
@@ -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);
   }
 }
index 997b2e14ddfef62d8df87e9bd15eb5e646a2dc0d..bd85cff86b929f860d572b3e589a431e8335456e 100644 (file)
@@ -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));
           }