From 2ed09b7cec8b94cdd8709d1e01b7e8835f2a11fa Mon Sep 17 00:00:00 2001
From: Dmitry Batkovich <dmitry.batkovich@jetbrains.com>
Date: Tue, 6 Feb 2018 16:36:03 +0300
Subject: [PATCH] implicit to string search: check method before search

---
 .../find/findUsages/JavaFindUsagesHelper.java  |  2 +-
 .../impl/search/ImplicitToStringSearcher.java  | 15 ---------------
 .../searches/ImplicitToStringSearch.java       | 18 ++++++++++++++++--
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/java/java-analysis-impl/src/com/intellij/find/findUsages/JavaFindUsagesHelper.java b/java/java-analysis-impl/src/com/intellij/find/findUsages/JavaFindUsagesHelper.java
index 784d7564699d..75fef6429a53 100644
--- a/java/java-analysis-impl/src/com/intellij/find/findUsages/JavaFindUsagesHelper.java
+++ b/java/java-analysis-impl/src/com/intellij/find/findUsages/JavaFindUsagesHelper.java
@@ -182,7 +182,7 @@ public class JavaFindUsagesHelper {
         FunctionalExpressionSearch.search(psiMethod, methodOptions.searchScope).forEach(new PsiElementProcessorAdapter<>(
           expression -> addResult(expression, options, processor)));
       }
-      if (methodOptions.isImplicitToString) {
+      if (ImplicitToStringSearch.isToStringMethod(psiMethod) && methodOptions.isImplicitToString) {
         ImplicitToStringSearch.search(psiMethod, methodOptions.searchScope).forEach(new PsiElementProcessorAdapter<>(ref -> addResult(ref, options, processor)));
       }
     }
diff --git a/java/java-impl/src/com/intellij/psi/impl/search/ImplicitToStringSearcher.java b/java/java-impl/src/com/intellij/psi/impl/search/ImplicitToStringSearcher.java
index 68342994347f..bad1b3dd53f5 100644
--- a/java/java-impl/src/com/intellij/psi/impl/search/ImplicitToStringSearcher.java
+++ b/java/java-impl/src/com/intellij/psi/impl/search/ImplicitToStringSearcher.java
@@ -68,21 +68,6 @@ public class ImplicitToStringSearcher extends QueryExecutorBase<PsiExpression, I
     }
   }
 
-  public static boolean isToStringMethod(@NotNull PsiElement element) {
-    if (!(element instanceof PsiMethod)) {
-      return false;
-    }
-    PsiMethod method = (PsiMethod)element;
-    if (!"toString".equals(method.getName())) {
-      return false;
-    }
-    if (method.getParameters().length != 0) {
-      return false;
-    }
-    PsiType returnType = method.getReturnType();
-    return returnType != null && returnType.equalsToText(CommonClassNames.JAVA_LANG_STRING);
-  }
-
   private static boolean processFile(VirtualFile file,
                                      int[] offsets,
                                      PsiManager manager,
diff --git a/java/java-indexing-api/src/com/intellij/psi/search/searches/ImplicitToStringSearch.java b/java/java-indexing-api/src/com/intellij/psi/search/searches/ImplicitToStringSearch.java
index 51a52952fd8c..6ed39a50aa10 100644
--- a/java/java-indexing-api/src/com/intellij/psi/search/searches/ImplicitToStringSearch.java
+++ b/java/java-indexing-api/src/com/intellij/psi/search/searches/ImplicitToStringSearch.java
@@ -1,8 +1,7 @@
 // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.psi.search.searches;
 
-import com.intellij.psi.PsiExpression;
-import com.intellij.psi.PsiMethod;
+import com.intellij.psi.*;
 import com.intellij.psi.search.SearchScope;
 import com.intellij.util.Query;
 import org.jetbrains.annotations.NotNull;
@@ -34,4 +33,19 @@ public class ImplicitToStringSearch extends ExtensibleQueryFactory<PsiExpression
   public static Query<PsiExpression> search(@NotNull PsiMethod targetMethod, @NotNull SearchScope scope) {
     return INSTANCE.createUniqueResultsQuery(new SearchParameters(targetMethod, scope));
   }
+
+  public static boolean isToStringMethod(@NotNull PsiElement element) {
+    if (!(element instanceof PsiMethod)) {
+      return false;
+    }
+    PsiMethod method = (PsiMethod)element;
+    if (!"toString".equals(method.getName())) {
+      return false;
+    }
+    if (method.getParameters().length != 0) {
+      return false;
+    }
+    PsiType returnType = method.getReturnType();
+    return returnType != null && returnType.equalsToText(CommonClassNames.JAVA_LANG_STRING);
+  }
 }