[java] consistent PSI after removing one of multiple declarations (IDEA-175642)

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

@@ -77,6 +77,17 @@ public class PsiDeclarationStatementImpl extends CompositePsiElement implements
     }
 
     super.deleteChildInternal(child);
+
+    TreeElement first = getFirstChildNode();
+    if (first != null && !DECLARED_ELEMENT_BIT_SET.contains(first.getElementType())) {
+      TreeElement last = first;
+      while (true) {
+        TreeElement next = last.getTreeNext();
+        if (next == null || DECLARED_ELEMENT_BIT_SET.contains(next.getElementType())) break;
+        last = next;
+      }
+      getTreeParent().addInternal(first, last, this, Boolean.TRUE);
+    }
   }
 
   private void removeCommaBefore(ASTNode child) {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/removeUnusedVariable/after12.java

@@ -5,7 +5,8 @@ class a {
     int k;
 
     private int run() {
-        /*ddddd*/ Object oo = (Object) new Integer(0);
+        /*ddddd*/
+        Object oo = (Object) new Integer(0);
         return 0;
     }
 }