split if: skip comments inside (IDEA-95297)

they should be restored though

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

@@ -125,8 +125,7 @@ public class SplitIfAction extends PsiElementBaseIntentionAction {
   }
 
   private static PsiExpression getROperands(PsiPolyadicExpression expression, PsiJavaToken separator) throws IncorrectOperationException {
-    PsiElement next = separator.getNextSibling();
-    if (next instanceof PsiWhiteSpace) next = next.getNextSibling();
+    PsiElement next = PsiTreeUtil.skipSiblingsForward(separator.getNextSibling(), PsiWhiteSpace.class, PsiComment.class);
     if (next == null) {
       throw new IncorrectOperationException("Unable to split '"+expression.getText()+"' at '"+separator+"' (offset "+separator.getStartOffsetInParent()+")");
     }

java/java-tests/testData/codeInsight/splitIfAction/afterComment.java

@@ -0,0 +1,9 @@
+class C {
+    void foo() {
+        if (a) {
+            call();
+        } else if (b) {
+            call();
+        }
+    }
+}

java/java-tests/testData/codeInsight/splitIfAction/beforeComment.java

@@ -0,0 +1,8 @@
+class C {
+    void foo() {
+        if (a |<caret>| //comment 
+            b) {
+            call();
+        }
+    }
+}

java/java-tests/testSrc/com/intellij/codeInsight/intention/SplitIfActionTest.java

@@ -51,6 +51,12 @@ public class SplitIfActionTest extends LightCodeInsightTestCase {
     checkResultByFile("/codeInsight/splitIfAction/afterOrParenthesis.java");
   }
 
+  public void testComment() throws Exception {
+    configureByFile("/codeInsight/splitIfAction/beforeComment.java");
+    perform();
+    checkResultByFile("/codeInsight/splitIfAction/afterComment.java");
+  }
+
    public void test8() throws Exception {
     configureByFile("/codeInsight/splitIfAction/beforeOrAndMixed.java");
     SplitIfAction action = new SplitIfAction();