From 9f9112e85696e128a35d7b0329834407c62d47c9 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Tue, 10 Mar 2015 16:29:37 +0100
Subject: [PATCH] search for method usages in smart mode (EA-65599)

---
 .../psi/impl/search/MethodUsagesSearcher.java        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/java/java-indexing-impl/src/com/intellij/psi/impl/search/MethodUsagesSearcher.java b/java/java-indexing-impl/src/com/intellij/psi/impl/search/MethodUsagesSearcher.java
index 125327195927..3c38ab375b6b 100644
--- a/java/java-indexing-impl/src/com/intellij/psi/impl/search/MethodUsagesSearcher.java
+++ b/java/java-indexing-impl/src/com/intellij/psi/impl/search/MethodUsagesSearcher.java
@@ -15,8 +15,8 @@
  */
 package com.intellij.psi.impl.search;
 
-import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.QueryExecutorBase;
+import com.intellij.openapi.project.DumbService;
 import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.*;
@@ -43,7 +43,7 @@ public class MethodUsagesSearcher extends QueryExecutorBase<PsiReference, Method
     final boolean[] needStrictSignatureSearch = new boolean[1];
     final boolean strictSignatureSearch = p.isStrictSignatureSearch();
 
-    final PsiClass aClass = ApplicationManager.getApplication().runReadAction(new Computable<PsiClass>() {
+    final PsiClass aClass = DumbService.getInstance(method.getProject()).runReadActionInSmartMode(new Computable<PsiClass>() {
       public PsiClass compute() {
         PsiClass aClass = method.getContainingClass();
         if (aClass == null) return null;
@@ -51,8 +51,8 @@ public class MethodUsagesSearcher extends QueryExecutorBase<PsiReference, Method
         psiManager[0] = aClass.getManager();
         methodName[0] = method.getName();
         isValueAnnotation[0] = PsiUtil.isAnnotationMethod(method) &&
-                    PsiAnnotation.DEFAULT_REFERENCED_METHOD_NAME.equals(methodName[0]) &&
-                    method.getParameterList().getParametersCount() == 0;
+                               PsiAnnotation.DEFAULT_REFERENCED_METHOD_NAME.equals(methodName[0]) &&
+                               method.getParameterList().getParametersCount() == 0;
         needStrictSignatureSearch[0] = strictSignatureSearch && (aClass instanceof PsiAnonymousClass
                                                                  || aClass.hasModifierProperty(PsiModifier.FINAL)
                                                                  || method.hasModifierProperty(PsiModifier.STATIC)
@@ -65,7 +65,7 @@ public class MethodUsagesSearcher extends QueryExecutorBase<PsiReference, Method
 
     final SearchRequestCollector collector = p.getOptimizer();
 
-    final SearchScope searchScope = ApplicationManager.getApplication().runReadAction(new Computable<SearchScope>() {
+    final SearchScope searchScope = DumbService.getInstance(method.getProject()).runReadActionInSmartMode(new Computable<SearchScope>() {
       @Override
       public SearchScope compute() {
         return p.getEffectiveSearchScope();
@@ -91,7 +91,7 @@ public class MethodUsagesSearcher extends QueryExecutorBase<PsiReference, Method
       return;
     }
 
-    ApplicationManager.getApplication().runReadAction(new Runnable() {
+    DumbService.getInstance(method.getProject()).runReadActionInSmartMode(new Runnable() {
       public void run() {
         final PsiMethod[] methods = strictSignatureSearch ? new PsiMethod[]{method} : aClass.findMethodsByName(methodName[0], false);
         SearchScope accessScope = methods[0].getUseScope();