From 8f4ca9390c8db8f5a3348e30315dff3f48c15189 Mon Sep 17 00:00:00 2001
From: Tagir Valeev <Tagir.Valeev@jetbrains.com>
Date: Mon, 11 Mar 2019 16:19:38 +0700
Subject: [PATCH] ExpectedTypesProvider: fix switch expression handling

---
 .../src/com/intellij/codeInsight/ExpectedTypesProvider.java  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java b/java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java
index e6752ffd6cd0..3fc6cfbbc241 100644
--- a/java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java
+++ b/java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java
@@ -351,10 +351,7 @@ public class ExpectedTypesProvider {
       if (statement.getParent() instanceof PsiSwitchLabeledRuleStatement) {
         PsiSwitchBlock block = ((PsiSwitchLabeledRuleStatement)statement.getParent()).getEnclosingSwitchBlock();
         if (block instanceof PsiSwitchExpression) {
-          if (myForCompletion) {
-            myExpr = (PsiSwitchExpression)block;
-          }
-          block.getParent().accept(this);
+          Collections.addAll(myResult, getExpectedTypes((PsiExpression)block, myForCompletion));
           return;
         }
       }