MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-20 13:31:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

SplitConditionUtil: disable action for incomplete statement

Browse Source
This commit is contained in:
Tagir Valeev
2018-12-01 17:57:56 +07:00
parent 61569c5e12
commit 1318c26754
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitConditionUtil.java
View File

@@ -22,6 +22,7 @@ import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.siyeh.ig.psiutils.CommentTracker;
import com.siyeh.ig.psiutils.ControlFlowUtils;
import com.siyeh.ipp.psiutils.ErrorUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -46,6 +47,10 @@ public class SplitConditionUtil {
boolean isAndExpression = acceptAnd && expression.getOperationTokenType() == JavaTokenType.ANDAND;
boolean isOrExpression = acceptOr && expression.getOperationTokenType() == JavaTokenType.OROR;
if (!isAndExpression && !isOrExpression) return null;
if (ErrorUtil.containsError(expression)) {
// Incomplete expression like "something &&"
return null;
}
while (expression.getParent() instanceof PsiPolyadicExpression) {
expression = (PsiPolyadicExpression)expression.getParent();

5
java/java-tests/testData/codeInsight/splitIfAction/beforeIncomplete.java Normal file
View File

@@ -0,0 +1,5 @@
public class SplitCondition {
void test(boolean foo) {
if(foo && foo &<caret>& ) {}
}
}

6
java/java-tests/testSrc/com/intellij/java/codeInsight/intention/SplitIfActionTest.java
View File

@@ -76,6 +76,12 @@ public class SplitIfActionTest extends LightCodeInsightTestCase {
public void testWithoutSpaces() {
doTest();
}
public void testIncomplete() {
configureByFile("/codeInsight/splitIfAction/before" + getTestName(false) + ".java");
SplitIfAction action = new SplitIfAction();
assertFalse(action.isAvailable(getProject(), getEditor(), getFile()));
}
private void doTest() {
configureByFile("/codeInsight/splitIfAction/before" + getTestName(false)+ ".java");