preserve comments when remove redundant type arguments

java/java-analysis-impl/src/com/intellij/codeInspection/miscGenerics/RedundantTypeArgsInspection.java

@@ -22,6 +22,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
 import com.intellij.psi.impl.PsiDiamondTypeUtil;
 import com.intellij.util.IncorrectOperationException;
+import com.siyeh.ig.psiutils.CommentTracker;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
@@ -192,7 +193,7 @@ public class RedundantTypeArgsInspection extends GenericsInspectionToolBase {
       try {
         final PsiMethodCallExpression expr =
           (PsiMethodCallExpression)JavaPsiFacade.getElementFactory(project).createExpressionFromText("foo()", null);
-        typeArgumentList.replace(expr.getTypeArgumentList());
+        new CommentTracker().replaceAndRestoreComments(typeArgumentList, expr.getTypeArgumentList());
       }
       catch (IncorrectOperationException e) {
         LOG.error(e);

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/redundantTypeArgs/afterInsideNestedCall.java

@@ -4,7 +4,8 @@ import java.util.List;
 class Collectors {
   public static void foo(List<String> list) {}
   {
-    foo(Collectors.of());
+      //c1
+      foo(Collectors.of());
   }
 
   public static <E> List<E> of() {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/redundantTypeArgs/beforeInsideNestedCall.java

@@ -4,7 +4,8 @@ import java.util.List;
 class Collectors {
   public static void foo(List<String> list) {}
   {
-    foo(Collectors.<Str<caret>ing>of());
+    foo(Collectors.<Str<caret>ing//c1
+        >of());
   }
 
   public static <E> List<E> of() {