preserve comments: invert if with comment after then branch

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

@@ -248,8 +248,8 @@ public class InvertIfConditionAction extends PsiElementBaseIntentionAction {
 
     if (element instanceof PsiReturnStatement) {
       PsiReturnStatement returnStatement = (PsiReturnStatement) element;
-      ifStatement = addAfterWithinCodeBlock(ifStatement, ct.markUnchanged(thenBranch));
-      ct.replaceAndRestoreComments(Objects.requireNonNull(ifStatement.getThenBranch()), returnStatement.copy());
+      ifStatement = addAfterWithinCodeBlock(ifStatement, thenBranch);
+      ct.replaceAndRestoreComments(Objects.requireNonNull(ifStatement.getThenBranch()), ct.markUnchanged(returnStatement).copy());
 
       ControlFlow flow2 = buildControlFlow(findCodeBlock(ifStatement));
       if (!ControlFlowUtil.isInstructionReachable(flow2, flow2.getStartOffset(returnStatement), 0)) returnStatement.delete();

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

@@ -0,0 +1,10 @@
+// "Invert 'if' condition" "true"
+public class C {
+   public boolean isAcceptable(Object element) {
+       if (element == null) {
+           return false;//c1
+       }
+       System.out.println();
+       return false;
+    }
+}

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

@@ -0,0 +1,9 @@
+// "Invert 'if' condition" "true"
+public class C {
+   public boolean isAcceptable(Object element) {
+        i<caret>f (element != null) {
+            System.out.println();
+        }//c1
+        return false;
+    }
+}