MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-203845 com.intellij.util.IncorrectOperationException: Incorrect statement 'else

Browse Source
This commit is contained in:
Tagir Valeev
2018-12-08 17:14:46 +07:00
parent fe21c53198
commit 7e9e5dd691
4 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertSwitchToIfIntention.java
+9 -12
View File
@@ -15,6 +15,7 @@ import com.intellij.psi.util.PsiUtil;
import com.intellij.psi.util.TypeConversionUtil;
import com.intellij.refactoring.util.RefactoringUtil;
import com.intellij.util.ObjectUtils;
import com.intellij.util.containers.ContainerUtil;
import com.siyeh.ig.psiutils.BreakConverter;
import com.siyeh.ig.psiutils.CommentTracker;
import com.siyeh.ig.psiutils.ControlFlowUtils;
@@ -212,15 +213,15 @@ public class ConvertSwitchToIfIntention implements IntentionAction {
final List<SwitchStatementBranch> allBranches = new ArrayList<>();
SwitchStatementBranch currentBranch = null;
final PsiElement[] children = body.getChildren();
boolean defaultAlwaysExecuted = true;
List<PsiSwitchLabelStatementBase> labels = PsiTreeUtil.getChildrenOfTypeAsList(body, PsiSwitchLabelStatementBase.class);
boolean defaultAlwaysExecuted = !labels.isEmpty() &&
Objects.requireNonNull(ContainerUtil.getLastItem(labels)).isDefaultCase() &&
fallThroughTargets.containsAll(labels.subList(1, labels.size()));
for (int i = 1; i < children.length - 1; i++) {
final PsiElement statement = children[i];
if (statement instanceof PsiSwitchLabelStatement) {
final PsiSwitchLabelStatement label = (PsiSwitchLabelStatement)statement;
if (currentBranch == null || !fallThroughTargets.contains(statement)) {
if (currentBranch != null) {
defaultAlwaysExecuted = false;
}
openBranches.clear();
currentBranch = new SwitchStatementBranch();
currentBranch.addPendingDeclarations(declaredElements);
@@ -232,17 +233,13 @@ public class ConvertSwitchToIfIntention implements IntentionAction {
allBranches.add(currentBranch);
openBranches.add(currentBranch);
}
if (label.isDefaultCase()) {
currentBranch.setAlwaysExecuted(defaultAlwaysExecuted);
if (defaultAlwaysExecuted) {
openBranches.retainAll(Collections.singleton(currentBranch));
}
if (label.isDefaultCase() && defaultAlwaysExecuted) {
openBranches.retainAll(Collections.singleton(currentBranch));
}
currentBranch.addCaseValues(label, commentTracker);
currentBranch.addCaseValues(label, defaultAlwaysExecuted, commentTracker);
}
else if (statement instanceof PsiSwitchLabeledRuleStatement) {
openBranches.clear();
defaultAlwaysExecuted = false;
PsiSwitchLabeledRuleStatement rule = (PsiSwitchLabeledRuleStatement)statement;
currentBranch = new SwitchStatementBranch();
@@ -250,7 +247,7 @@ public class ConvertSwitchToIfIntention implements IntentionAction {
if (ruleBody != null) {
currentBranch.addStatement(ruleBody);
}
currentBranch.addCaseValues(rule, commentTracker);
currentBranch.addCaseValues(rule, defaultAlwaysExecuted, commentTracker);
openBranches.add(currentBranch);
allBranches.add(currentBranch);
}
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SwitchStatementBranch.java
+2 -1
View File
@@ -93,9 +93,10 @@ class SwitchStatementBranch {
return Collections.unmodifiableSet(myPendingDeclarations);
}
void addCaseValues(PsiSwitchLabelStatementBase label, CommentTracker commentTracker) {
void addCaseValues(PsiSwitchLabelStatementBase label, boolean defaultAlwaysExecuted, CommentTracker commentTracker) {
if (label.isDefaultCase()) {
setDefault();
setAlwaysExecuted(defaultAlwaysExecuted);
}
else {
PsiExpressionList values = label.getCaseValues();
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/switchDefault/afterRuleDefault.java
+6
View File
@@ -0,0 +1,6 @@
// "Unwrap 'switch'" "true"
public class One {
void f1(String a) {
System.out.println("None");
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/switchDefault/beforeRuleDefault.java
+8
View File
@@ -0,0 +1,8 @@
// "Unwrap 'switch'" "true"
public class One {
void f1(String a) {
sw<caret>itch (a) {
default -> System.out.println("None");
}
}
}