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-199693 Unreachable switch statements are not highlighted after always reachable branch

Browse Source
This commit is contained in:
Tagir Valeev
2018-10-01 16:08:54 +07:00
parent 841fcbc914
commit bbcc8ca24d
3 changed files with 56 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java
+12 -1
View File
@@ -43,7 +43,6 @@ import java.util.*;
import static com.intellij.util.ObjectUtils.tryCast;
@SuppressWarnings("ConditionalExpressionWithIdenticalBranches")
public class DataFlowInspectionBase extends AbstractBaseJavaLocalInspectionTool {
static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.dataFlow.DataFlowInspection");
@NonNls private static final String SHORT_NAME = "ConstantConditions";
@@ -692,6 +691,18 @@ public class DataFlowInspectionBase extends AbstractBaseJavaLocalInspectionTool
holder.registerProblem(psiAnchor,
InspectionsBundle.message("dataflow.message.unreachable.switch.label"),
new DeleteSwitchLabelFix((PsiSwitchLabelStatement)psiAnchor));
} else if (trueSet.contains(instruction)) {
// If switch branch is always reachable, then all the subsequent branches are unreachable (thus weren't analyzed)
PsiSwitchLabelStatement current = (PsiSwitchLabelStatement)psiAnchor;
while(true) {
current = PsiTreeUtil.getNextSiblingOfType(current, PsiSwitchLabelStatement.class);
if (current == null) break;
if (!current.isDefaultCase()) {
holder.registerProblem(current,
InspectionsBundle.message("dataflow.message.unreachable.switch.label"),
new DeleteSwitchLabelFix((PsiSwitchLabelStatement)psiAnchor));
}
}
}
}
else if (psiAnchor != null && !isFlagCheck(psiAnchor)) {
java/java-tests/testData/inspection/dataFlow/fixture/AlwaysTrueSwitchLabel.java
+43
View File
@@ -0,0 +1,43 @@
class Scratch {
public static void main(String[] args) {
switch("ping") {
case "ping":
System.out.println("ping");
break;
<warning descr="Switch label 'case \"pong\":' is unreachable">case "pong":</warning>
System.out.println("pong");
break;
<warning descr="Switch label 'case \"simple\":' is unreachable">case "simple":</warning>
System.out.println("simple");
break;
default:
break;
}
switch("ping") {
<warning descr="Switch label 'case \"pong\":' is unreachable">case "pong":</warning>
System.out.println("pong");
break;
case "ping":
System.out.println("ping");
break;
<warning descr="Switch label 'case \"simple\":' is unreachable">case "simple":</warning>
System.out.println("simple");
break;
default:
break;
}
switch("ping") {
<warning descr="Switch label 'case \"pong\":' is unreachable">case "pong":</warning>
System.out.println("pong");
break;
<warning descr="Switch label 'case \"simple\":' is unreachable">case "simple":</warning>
System.out.println("simple");
break;
case "ping":
System.out.println("ping");
break;
default:
break;
}
}
}
java/java-tests/testSrc/com/intellij/java/codeInspection/DataFlowInspectionTest.java
+1
View File
@@ -657,4 +657,5 @@ public class DataFlowInspectionTest extends DataFlowInspectionTestCase {
assertEquals(1, intentions.stream().filter(i -> i.getText().equals("Remove 'if' statement")).count());
assertEquals(0, intentions.stream().filter(i -> i.getText().equals("Simplify 'expirationDay != other.expirationDay' to false")).count());
}
public void testAlwaysTrueSwitchLabel() { doTest(); }
}