ensure tailing comments doesn't break statement in the middle (IDEA-188072)

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/mergeIfOr/afterIfBlock.java

@@ -2,10 +2,10 @@
 
 class Test {
   public static void main(String[] args) {
-      //c2
+      //c3
       if (args.length == 1 || args.length == 2) {
           return; // c1
-      }
+      }//c2
     System.out.println();
   }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/mergeIfOr/beforeIfBlock.java

@@ -4,9 +4,9 @@ class Test {
   public static void main(String[] args) {
     i<caret>f (args.length == 1) {
       return; // c1
-    }
+    }//c2
     else if (args.length == 2) {
-      return; //c2
+      return; //c3
     }
     System.out.println();
   }

plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/MergeIfOrIntention.java

@@ -74,7 +74,7 @@ public class MergeIfOrIntention extends Intention {
     statement.append(parentThenBranchText);
     final PsiStatement childElseBranch = childStatement.getElseBranch();
     if (childElseBranch != null) {
-      statement.append("else ");
+      statement.append("\nelse ");
       statement.append(tracker.text(childElseBranch));
     }
     PsiReplacementUtil.replaceStatement(parentStatement, statement.toString(), tracker);
@@ -109,7 +109,7 @@ public class MergeIfOrIntention extends Intention {
     newStatement.append(parentTracker.text(parentThenBranch));
     final PsiStatement childElseBranch = childStatement.getElseBranch();
     if (childElseBranch != null) {
-      newStatement.append("else ");
+      newStatement.append("\nelse ");
       newStatement.append(childTracker.text(childElseBranch));
     }
     PsiReplacementUtil.replaceStatement(parentStatement, newStatement.toString(), parentTracker);