preserve comments in invert if (IDEA-182500)

java/java-impl/src/com/intellij/codeInsight/intention/impl/InvertIfConditionAction.java

@@ -29,6 +29,7 @@ import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtil;
 import com.intellij.util.ArrayUtilRt;
 import com.intellij.util.IncorrectOperationException;
+import com.siyeh.ig.psiutils.CommentTracker;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
@@ -312,7 +313,7 @@ public class InvertIfConditionAction extends PsiElementBaseIntentionAction {
       else if (thenBranch instanceof PsiBlockStatement) {
         PsiStatement[] statements = ((PsiBlockStatement) thenBranch).getCodeBlock().getStatements();
         if (statements.length > 0 && statements[statements.length - 1] instanceof PsiContinueStatement) {
-          statements[statements.length - 1].delete();
+          new CommentTracker().deleteAndRestoreComments(statements[statements.length - 1]);
         }
       }
     }

java/java-tests/testData/codeInsight/invertIfCondition/afterContinueWithComment.java

@@ -0,0 +1,13 @@
+// "Invert 'if' condition" "true"
+class A {
+    void f(){
+        while (true) {
+            if (false) {
+                System.out.println();
+            }
+            else {
+                //comment
+            }
+        }
+    }
+}

java/java-tests/testData/codeInsight/invertIfCondition/beforeContinueWithComment.java

@@ -0,0 +1,11 @@
+// "Invert 'if' condition" "true"
+class A {
+    void f(){
+        while (true) {
+            i<caret>f (true) {
+                continue;//comment
+            }
+            System.out.println();
+        }
+    }
+}