add explicit type arguments: qualify method expression if needed (IDEA-64458)

java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeArgumentsFix.java

@@ -20,6 +20,7 @@ import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.pom.java.LanguageLevel;
 import com.intellij.psi.*;
 import com.intellij.psi.util.PsiUtil;
+import com.intellij.refactoring.util.RefactoringUtil;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 
@@ -72,11 +73,23 @@ public class AddTypeArgumentsFix extends MethodArgumentFix {
 
             final PsiElementFactory factory = JavaPsiFacade.getInstance(expression.getProject()).getElementFactory();
             PsiMethodCallExpression copy = (PsiMethodCallExpression)expression.copy();
-            final PsiReferenceParameterList parameterList = copy.getMethodExpression().getParameterList();
+            final PsiReferenceExpression methodExpression = copy.getMethodExpression();
+            final PsiReferenceParameterList parameterList = methodExpression.getParameterList();
             LOG.assertTrue(parameterList != null);
             for (PsiType mapping : mappings) {
               parameterList.add(factory.createTypeElement(mapping));
             }
+            if (methodExpression.getQualifierExpression() == null) {
+              final PsiExpression qualifierExpression;
+              final PsiClass containingClass = method.getContainingClass();
+              LOG.assertTrue(containingClass != null);
+              if (method.hasModifierProperty(PsiModifier.STATIC)) {
+                qualifierExpression = factory.createReferenceExpression(containingClass);
+              } else {
+                qualifierExpression = RefactoringUtil.createThisExpression(method.getManager(), null);
+              }
+              methodExpression.setQualifierExpression(qualifierExpression);
+            }
 
             return copy;
           }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeArguments/afterUnqualified.java

@@ -0,0 +1,7 @@
+// "Add explicit type arguments" "true"
+import java.util.*;
+class Test {
+    <T> List<T> f() { return new ArrayList<T>(); }
+    void g(List<Integer> a) {}
+    void someMethod() { g(this.<Integer>f()); }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeArguments/afterUnqualifiedStatic.java

@@ -0,0 +1,7 @@
+// "Add explicit type arguments" "true"
+import java.util.*;
+class Test {
+    static <T> List<T> f() { return new ArrayList<T>(); }
+    void g(List<Integer> a) {}
+    void someMethod() { g(Test.<Integer>f()); }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeArguments/beforeUnqualified.java

@@ -0,0 +1,7 @@
+// "Add explicit type arguments" "true"
+import java.util.*;
+class Test {
+    <T> List<T> f() { return new ArrayList<T>(); }
+    void g(List<Integer> a) {}
+    void someMethod() { g(f<caret>()); }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeArguments/beforeUnqualifiedStatic.java

@@ -0,0 +1,7 @@
+// "Add explicit type arguments" "true"
+import java.util.*;
+class Test {
+    static <T> List<T> f() { return new ArrayList<T>(); }
+    void g(List<Integer> a) {}
+    void someMethod() { g(<caret>f()); }
+}