normalize declaration: don't include tree next after space

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

@@ -181,9 +181,17 @@ public class PsiLocalVariableImpl extends CompositePsiElement implements PsiLoca
 
         ASTNode comma = PsiImplUtil.skipWhitespaceAndCommentsBack(variable.getTreePrev());
         if (comma != null && comma.getElementType() == JavaTokenType.COMMA) {
-          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);
+          PsiElement lastWhitespaceAfterComma = comma.getPsi();
+          while (true) {
+            PsiElement nextSibling = lastWhitespaceAfterComma.getNextSibling();
+            if (nextSibling instanceof PsiWhiteSpace) {
+              lastWhitespaceAfterComma = nextSibling;
+            }
+            else {
+              break;
+            }
+          }
+          CodeEditUtil.removeChildren(statement, comma, lastWhitespaceAfterComma.getNode());
         }
 
         CodeEditUtil.removeChild(statement, variable);

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

@@ -3,6 +3,8 @@ class Test {
   {
     String foo = "foo";//c1
             //c2
+            //c3
       String bar        = "bar";
+      String baz        = "baz";
   }
 }

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

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