add explicit type arguments: preserve nested wildcards (IDEA-134967)

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

@@ -73,7 +73,7 @@ public class AddTypeArgumentsFix extends MethodArgumentFix {
               PsiTypeParameter typeParameter = typeParameters[i];
               final PsiType substitution = helper.getSubstitutionForTypeParameter(typeParameter, returnType, toType, false, level);
               if (substitution == null || PsiType.NULL.equals(substitution)) return null;
-              mappings[i] = GenericsUtil.eliminateWildcards(substitution);
+              mappings[i] = GenericsUtil.eliminateWildcards(substitution, false);
             }
 
             final PsiElementFactory factory = JavaPsiFacade.getInstance(expression.getProject()).getElementFactory();

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

@@ -0,0 +1,15 @@
+// "Add explicit type arguments" "true"
+import java.util.Collections;
+import java.util.List;
+
+class Bar {
+
+  public static void main(String[] args) {
+    new Bar().complexTypeParams(Collections.<Class<?>>emptyList());
+  }
+
+  void complexTypeParams(List<Class<?>> list) {}
+}
+
+
+

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

@@ -0,0 +1,15 @@
+// "Add explicit type arguments" "true"
+import java.util.Collections;
+import java.util.List;
+
+class Bar {
+
+  public static void main(String[] args) {
+    new Bar().complexTypeParams(Collections.e<caret>mptyList());
+  }
+
+  void complexTypeParams(List<Class<?>> list) {}
+}
+
+
+