split into declarations: preserve comments in normalizeDeclaration

java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLocalVariableImpl.java

@@ -181,7 +181,9 @@ public class PsiLocalVariableImpl extends CompositePsiElement implements PsiLoca
 
         ASTNode comma = PsiImplUtil.skipWhitespaceAndCommentsBack(variable.getTreePrev());
         if (comma != null && comma.getElementType() == JavaTokenType.COMMA) {
-          CodeEditUtil.removeChildren(statement, comma, variable.getTreePrev());
+          PsiElement commaPsi = comma.getPsi();
+          PsiElement lastWhitespaceAfterComma = commaPsi != null && commaPsi.getNextSibling() instanceof PsiWhiteSpace ? PsiTreeUtil.skipWhitespacesForward(commaPsi) : null;
+          CodeEditUtil.removeChildren(statement, comma, lastWhitespaceAfterComma != null ? lastWhitespaceAfterComma.getNode() : comma);
         }
 
         CodeEditUtil.removeChild(statement, variable);

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

@@ -0,0 +1,8 @@
+// "Split into separate declarations" "true"
+class Test {
+  {
+    String foo = "foo";//c1
+            //c2
+      String bar        = "bar";
+  }
+}

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

@@ -0,0 +1,7 @@
+// "Split into separate declarations" "true"
+class Test {
+  {
+    String foo <caret>= "foo",//c1
+           bar        = "bar";//c2
+  }
+}