simplify if: preserve comments (IDEA-197511)

plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/TrivialIfInspection.java

@@ -243,19 +243,23 @@ public class TrivialIfInspection extends BaseInspection implements CleanupLocalI
     if (condition == null) {
       return;
     }
-    final String conditionText = BoolUtils.getNegatedExpressionText(condition);
+    CommentTracker commentTracker = new CommentTracker();
+    final String conditionText = BoolUtils.getNegatedExpressionText(condition, commentTracker);
     final PsiReturnStatement nextStatement = ControlFlowUtils.getNextReturnStatement(statement);
     if (nextStatement == null) {
       return;
     }
-    final PsiElement nextSibling = statement.getNextSibling();
+    PsiElement nextSibling = statement.getNextSibling();
     if (nextSibling != nextStatement && nextStatement.getParent() == statement.getParent()) {
-      statement.getParent().deleteChildRange(nextSibling, nextStatement.getPrevSibling());
+      while (nextSibling != nextStatement && nextSibling != null) {
+        commentTracker.delete(nextSibling);
+        nextSibling = nextSibling.getNextSibling();
+      }
     }
     @NonNls final String newStatement = "return " + conditionText + ';';
-    PsiReplacementUtil.replaceStatement(statement, newStatement);
+    PsiReplacementUtil.replaceStatement(statement, newStatement, commentTracker);
     if (!ControlFlowUtils.isReachable(nextStatement)) {
-      nextStatement.delete();
+      new CommentTracker().deleteAndRestoreComments(nextStatement);
     }
   }
 

plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/trivialIf/NegatedConditional.after.java

@@ -8,6 +8,7 @@ class NegatedConditional {
 
     final NegatedConditional that = (NegatedConditional)object;
 
+      //comment
       return text != null ? text.equals(that.text) : that.text == null;
   }
 

plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/trivialIf/NegatedConditional.java

@@ -8,7 +8,7 @@ class NegatedConditional {
 
     final NegatedConditional that = (NegatedConditional)object;
 
-    <caret>if (text != null ? !text.equals(that.text) : that.text != null) return false;
+    <caret>if (text != null ? !text.equals(that.text) : that.text != null) return false; //comment
 
     return true;
   }