keep comments on split declaration inside for loop

java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitDeclarationAction.java

@@ -31,6 +31,7 @@ import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtil;
 import com.intellij.refactoring.util.RefactoringUtil;
 import com.intellij.util.IncorrectOperationException;
+import com.siyeh.ig.psiutils.CommentTracker;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -171,7 +172,7 @@ public class SplitDeclarationAction extends PsiElementBaseIntentionAction {
         }
 
         final PsiElement parent = block.getParent();
-        PsiExpressionStatement replaced = (PsiExpressionStatement)decl.replace(statement);
+        PsiExpressionStatement replaced = (PsiExpressionStatement)new CommentTracker().replaceAndRestoreComments(decl, statement);
         if (!(parent instanceof PsiCodeBlock)) {
           final PsiBlockStatement blockStatement =
             (PsiBlockStatement)JavaPsiFacade.getElementFactory(project).createStatementFromText("{}", block);

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/splitDeclaration/afterForLoop.java

@@ -1,6 +1,7 @@
 // "Split into declaration and assignment" "true"
 class Test {
   {
+      //c1
       int i;
       for (i = 0; i<10; i++) {
           System.out.println();

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/splitDeclaration/beforeForLoop.java

@@ -1,7 +1,8 @@
 // "Split into declaration and assignment" "true"
 class Test {
   {
-      for (int i<caret>=0; i<10; i++) {
+      for (int i<caret>//c1
+    =0; i<10; i++) {
           System.out.println();
       }
   }