StreamApiMigrationInspection: preserve comments on cleanUp limit/bufferedReader

java/java-impl/src/com/intellij/codeInspection/streamMigration/StreamApiMigrationInspection.java

@@ -6,7 +6,10 @@ import com.intellij.codeInsight.PsiEquivalenceUtil;
 import com.intellij.codeInsight.daemon.GroupNames;
 import com.intellij.codeInsight.daemon.impl.analysis.HighlightControlFlowUtil;
 import com.intellij.codeInsight.intention.impl.StreamRefactoringUtil;
-import com.intellij.codeInspection.*;
+import com.intellij.codeInspection.AbstractBaseJavaLocalInspectionTool;
+import com.intellij.codeInspection.LambdaCanBeMethodReferenceInspection;
+import com.intellij.codeInspection.ProblemHighlightType;
+import com.intellij.codeInspection.ProblemsHolder;
 import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
@@ -851,7 +854,7 @@ public class StreamApiMigrationInspection extends AbstractBaseJavaLocalInspectio
     @Override
     void cleanUp() {
       if (myCounterVariable != null) {
-        myCounterVariable.delete();
+        new CommentTracker().deleteAndRestoreComments(myCounterVariable);
       }
     }
 
@@ -934,7 +937,7 @@ public class StreamApiMigrationInspection extends AbstractBaseJavaLocalInspectio
     @Override
     void cleanUp() {
       if (myDeleteVariable) {
-        myVariable.delete();
+        new CommentTracker().deleteAndRestoreComments(myVariable);
       }
     }
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/bufferedReader/afterBufferedReaderCollect.java

@@ -9,6 +9,7 @@ import java.util.stream.Collectors;
 public class Main {
   List<String> test(BufferedReader br) throws IOException {
     List<String> result;
+      /*comment*/
       result = br.lines().map(String::trim).collect(Collectors.toList());
     return result;
   }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/bufferedReader/beforeBufferedReaderCollect.java

@@ -8,7 +8,7 @@ import java.util.List;
 public class Main {
   List<String> test(BufferedReader br) throws IOException {
     List<String> result = new ArrayList<>();
-    String line = "";
+    String line = /*comment*/"";
     wh<caret>ile(null != (line = br.readLine())) {
       result.add(line.trim());
     }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/afterLimitIntermediate.java

@@ -5,6 +5,7 @@ import java.util.stream.Collectors;
 
 public class Main {
   public Set<String> test(String[] array) {
+      /*initial count*/
       Set<String> set = Arrays.stream(array).filter(Objects::nonNull).limit(10).collect(Collectors.toSet());
       return set;
   }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/limit/beforeLimitIntermediate.java

@@ -4,7 +4,7 @@ import java.util.*;
 
 public class Main {
   public Set<String> test(String[] array) {
-    int count = 0;
+    int count = /*initial count*/0;
     Set<String> set = new HashSet<>();
     for(String str : a<caret>rray) {
       if (str != null) {