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: cosmetics (IDEA-CR-40127)

Browse Source
This commit is contained in:
Tagir Valeev
2018-11-20 18:34:31 +07:00
parent 18ee655bd0
commit b7d19f060c
1 changed files with 3 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
+3 -6
View File
@@ -800,10 +800,9 @@ public class ControlFlowAnalyzer extends JavaElementVisitor {
PsiExpression returnValue = statement.getReturnValue();
InlinedBlockContext context = myInlinedBlockContext;
if (context != null) {
if (myInlinedBlockContext != null) {
// We treat return inside switch expression (which is disallowed syntax) as break-with-value
context.generateReturn(returnValue, this);
myInlinedBlockContext.generateReturn(returnValue, this);
} else {
if (returnValue != null) {
@@ -2044,9 +2043,7 @@ public class ControlFlowAnalyzer extends JavaElementVisitor {
exitInlinedBlock();
}
private void enterInlinedBlock(@NotNull PsiCodeBlock block,
@NotNull Nullability resultNullability,
@NotNull DfaVariableValue target) {
private void enterInlinedBlock(@NotNull PsiCodeBlock block, @NotNull Nullability resultNullability, @NotNull DfaVariableValue target) {
// Transfer value is pushed to avoid emptying stack beyond this point
pushTrap(new Trap.InsideInlinedBlock(block));
addInstruction(new PushInstruction(myFactory.controlTransfer(ReturnTransfer.INSTANCE, FList.emptyList()), null));