MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

can complete normally: break inside switch (IDEA-178304)

Browse Source 
break inside switch when switch is selected should not lead to abnormal completion
This commit is contained in:
Anna Kozlova
2017-09-04 11:59:25 +03:00
parent 0fb58a95a1
commit b23c6b026b
4 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowAnalyzer.java
View File

@@ -885,7 +885,7 @@ class ControlFlowAnalyzer extends JavaElementVisitor {
if (((PsiSwitchLabelStatement)aStatement).isDefaultCase()) {
defaultLabel = (PsiSwitchLabelStatement)aStatement;
}
Instruction instruction = new ConditionalGoToInstruction(0, statement.getExpression());
Instruction instruction = new ConditionalGoToInstruction(0, expr);
myCurrentFlow.addInstruction(instruction);
addElementOffsetLater(aStatement, true);
}

13
java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowUtil.java
View File

@@ -1044,8 +1044,17 @@ public class ControlFlowUtil {
boolean isNormal = nextOffset <= endOffset && !isReturn && (nextOffset == endOffset || canCompleteNormally[nextOffset]);
if (isNormal && nextOffset == endOffset) {
PsiElement element = flow.getElement(offset);
if (element instanceof PsiBreakStatement || element instanceof PsiContinueStatement) {
isNormal = false;
if (element instanceof PsiBreakStatement) {
PsiStatement exitedStatement = ((PsiBreakStatement)element).findExitedStatement();
if (exitedStatement == null || flow.getStartOffset(exitedStatement) < startOffset) {
isNormal = false;
}
}
else if (element instanceof PsiContinueStatement) {
PsiStatement continuedStatement = ((PsiContinueStatement)element).findContinuedStatement();
if (continuedStatement == null || flow.getStartOffset(continuedStatement) < startOffset) {
isNormal = false;
}
}
}
canCompleteNormally[offset] |= isNormal;

13
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/VoidValueCompatibilityWithBreakInSwitch.java Normal file
View File

@@ -0,0 +1,13 @@
import java.util.concurrent.ExecutorService;
class Test {
private void m(ExecutorService service, int i) {
service.submit(() -> {
switch (i) {
default:
break;
}
});
}
}

1
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/lambda/NewLambdaHighlightingTest.java
View File

@@ -161,6 +161,7 @@ public class NewLambdaHighlightingTest extends LightDaemonAnalyzerTestCase {
public void testConditionalExpressionInLambdaReturns() { doTest(); }
public void testLambdaWithFormalTypeParameters() { doTest(); }
public void testIDEA174924() { doTest(); }
public void testVoidValueCompatibilityWithBreakInSwitch() { doTest(); }
private void doTest() {
IdeaTestUtil.setTestVersion(JavaSdkVersion.JDK_1_8, getModule(), getTestRootDisposable());