diff --git a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowAnalyzer.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowAnalyzer.java index 75db20c1ba77..40194f91adb9 100644 --- a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowAnalyzer.java +++ b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowAnalyzer.java @@ -931,10 +931,10 @@ final class ControlFlowAnalyzer extends JavaElementVisitor { } PsiCodeBlock body = statement.getBody(); - PsiType exprType = expr == null ? null : expr.getType(); if (body != null) { PsiStatement[] statements = body.getStatements(); boolean needToCreateDefault = false; + PsiType exprType = expr == null ? null : expr.getType(); for (PsiStatement aStatement : statements) { ProgressManager.checkCanceled(); if (!(aStatement instanceof PsiSwitchLabelStatementBase)) continue; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlightingPatternsInSwitch/Reachability.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlightingPatternsInSwitch/Reachability.java index b3ca9eb7941d..078fccf09756 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlightingPatternsInSwitch/Reachability.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlightingPatternsInSwitch/Reachability.java @@ -49,8 +49,8 @@ class Test { void testSealedClassUnreachable1(I i) { switch (i) { - Object o: - throw new IllegalArgumentException(); + case Object o: + throw new IllegalArgumentException(); } System.out.println(); }