ReplaceNullCheckInspection: fix comment handling

java/java-impl/src/com/intellij/codeInspection/ReplaceNullCheckInspection.java

@@ -147,7 +147,7 @@ public class ReplaceNullCheckInspection extends AbstractBaseJavaLocalInspectionT
         CommentTracker tracker = new CommentTracker();
         PsiExpression requireCall =
           createRequireExpression(tracker, context.myNullExpr, project, context.myReferenceExpression, context.myNullExpr);
-        result = tracker.replace(context.myTernary, requireCall);
+        result = tracker.replaceAndRestoreComments(context.myTernary, requireCall);
       } else return;
       LambdaCanBeMethodReferenceInspection.replaceAllLambdasWithMethodReferences(result);
       CodeStyleManager.getInstance(project).reformat(JavaCodeStyleManager.getInstance(project).shortenClassReferences(result));

java/java-tests/testData/inspection/requireNonNull/afterTernaryOnly.java

@@ -8,6 +8,12 @@ class Test {
   }
 
   public void test(Object o) {
-    work(Objects.requireNonNullElse(o, ""));
+      /*2*/
+      /*3*/
+      /*4*/
+      /*5*/
+      /*6*/
+      /*7*/
+      work(/*1*/Objects.requireNonNullElse(o, "")/*8*/);
   }
 }

java/java-tests/testData/inspection/requireNonNull/beforeTernaryOnly.java

@@ -8,6 +8,6 @@ class Test {
   }
 
   public void test(Object o) {
-    work(o <caret>== null? "" : o);
+    work(/*1*/o/*2*/ <caret>== /*3*/null/*4*/?/*5*/ ""/*6*/ :/*7*/ o/*8*/);
   }
 }