IDEA-209300 Split into 2 if's doesn't work when I'm staying on the last symbol of &&

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

@@ -16,7 +16,7 @@
 package com.intellij.codeInsight.intention.impl;
 
 import com.intellij.codeInsight.CodeInsightBundle;
-import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction;
+import com.intellij.codeInsight.intention.BaseElementAtCaretIntentionAction;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.ScrollType;
@@ -35,7 +35,7 @@ import static com.intellij.codeInsight.intention.impl.SplitConditionUtil.getROpe
 /**
  * @author mike
  */
-public class SplitIfAction extends PsiElementBaseIntentionAction {
+public class SplitIfAction extends BaseElementAtCaretIntentionAction {
   private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.intention.impl.SplitIfAction");
 
   @Override

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

@@ -1,6 +1,6 @@
 class C {
     void foo() {
-        if (a || b &<caret>& c) {
+        if (a || b &&<caret> c) {
             call();
         }
     }

platform/platform-resources-en/src/messages/CodeInsightBundle.properties

@@ -168,7 +168,7 @@ i18nize.dialog.error.property.already.defined.title=Property Already Exists
 intention.split.declaration.family=Split Declaration
 intention.split.declaration.text=Split into separate declarations
 intention.split.declaration.assignment.text=Split into declaration and assignment
-intention.split.if.family=Split If
+intention.split.if.family=Split 'if'
 intention.split.if.text=Split into 2 if's
 intention.split.filter.text=Split into filter chain
 intention.split.filter.family=Split filter