add explicit arguments: eliminate wildcards (IDEA-106741)

java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeArgumentsConditionalFix.java

@@ -75,7 +75,7 @@ public class AddTypeArgumentsConditionalFix implements IntentionAction {
       public String fun(PsiTypeParameter parameter) {
         final PsiType substituteTypeParam = mySubstitutor.substitute(parameter);
         LOG.assertTrue(substituteTypeParam != null);
-        return substituteTypeParam.getCanonicalText();
+        return GenericsUtil.eliminateWildcards(substituteTypeParam).getCanonicalText();
       }
     }, ", ") + ">";
     final PsiExpression expression = myExpression.getMethodExpression().getQualifierExpression();

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeArgumentsConditional/afterEliminateWildcards.java

@@ -0,0 +1,12 @@
+// "Add explicit type arguments" "true"
+import java.util.*;
+
+class Test {
+     static class A {}
+     static class B extends A {}
+ 
+ 
+     public Collection<? extends A> run(boolean flag) {
+         return flag ? Collections.singletonList(new B()) : Collections.<A>emptyList();
+     }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeArgumentsConditional/beforeEliminateWildcards.java

@@ -0,0 +1,12 @@
+// "Add explicit type arguments" "true"
+import java.util.*;
+
+class Test {
+     static class A {}
+     static class B extends A {}
+ 
+ 
+     public Collection<? extends A> run(boolean flag) {
+         return flag ? Collections.singletonList(new B()) : Collections.<caret>emptyList();
+     }
+}