From 6d0ab542c0c82b47ba2db07981f862de683a3839 Mon Sep 17 00:00:00 2001
From: Tagir Valeev <Tagir.Valeev@jetbrains.com>
Date: Tue, 17 Jan 2017 10:01:45 +0700
Subject: [PATCH] MethodCallUtils#isVarArgCall: resolveMethodGenerics() used
 instead of resolveMethod() (IDEA-CR-17240)

---
 .../src/com/siyeh/ig/psiutils/MethodCallUtils.java        | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/MethodCallUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/MethodCallUtils.java
index 90f23ebf8eca..67dfffd8e77b 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/MethodCallUtils.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/MethodCallUtils.java
@@ -21,6 +21,7 @@ import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.util.MethodSignatureUtil;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtil;
+import com.intellij.util.ObjectUtils;
 import com.siyeh.HardcodedMethodConstants;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -105,7 +106,7 @@ public class MethodCallUtils {
   public static boolean isSimpleCallToMethod(@NotNull PsiMethodCallExpression expression, @NonNls @Nullable String calledOnClassName,
     @Nullable PsiType returnType, @NonNls @Nullable String methodName, @NonNls @Nullable String... parameterTypeStrings) {
     if (parameterTypeStrings == null) {
-      return isCallToMethod(expression, calledOnClassName, returnType, methodName, null);
+      return isCallToMethod(expression, calledOnClassName, returnType, methodName, (PsiType[])null);
     }
     final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(expression.getProject());
     final PsiElementFactory factory = psiFacade.getElementFactory();
@@ -302,9 +303,10 @@ public class MethodCallUtils {
    * @return true if call is resolved to the var-arg method and var-arg form is actually used
    */
   public static boolean isVarArgCall(PsiMethodCallExpression call) {
-    PsiMethod method = call.resolveMethod();
+    JavaResolveResult result = call.resolveMethodGenerics();
+    PsiMethod method = ObjectUtils.tryCast(result.getElement(), PsiMethod.class);
     if(method == null || !method.isVarArgs()) return false;
-    PsiSubstitutor substitutor = call.resolveMethodGenerics().getSubstitutor();
+    PsiSubstitutor substitutor = result.getSubstitutor();
     return MethodCallInstruction
       .isVarArgCall(method, substitutor, call.getArgumentList().getExpressions(), method.getParameterList().getParameters());
   }