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

ControlFlowAnalyzer: do not generate jump out of switch rule if body cannot complete normally

Browse Source
This commit is contained in:
Tagir Valeev
2018-12-06 15:09:32 +07:00
parent a7e71d05b6
commit a8202ddcf0
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java
+7 -6
View File
@@ -849,12 +849,13 @@ public class ControlFlowAnalyzer extends JavaElementVisitor {
boolean expressionSwitch = myExpressionBlockContext != null && myExpressionBlockContext.myCodeBlock == switchBody;
if (expressionSwitch && body instanceof PsiExpressionStatement) {
myExpressionBlockContext.generateReturn(((PsiExpressionStatement)body).getExpression(), this);
}
if (body != null) {
body.accept(this);
}
if (!(body instanceof PsiThrowStatement)) {
jumpOut(expressionSwitch ? switchBody : switchBlock);
} else {
if (body != null) {
body.accept(this);
}
if (ControlFlowUtils.statementMayCompleteNormally(body)) {
jumpOut(expressionSwitch ? switchBody : switchBlock);
}
}
finishElement(statement);
}