From 86c773e12a944eb08377b3e1f093168f0c05a26b Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Mon, 24 Jun 2019 09:31:14 +0200
Subject: [PATCH] fix git auto-merge

GitOrigin-RevId: d48086b39e785148580ed2639cdb077fa2213d89
---
 .../intellij/codeInsight/ExpectedTypesProvider.java    | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java b/java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java
index b478e51242da..cbd9e0ca752f 100644
--- a/java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java
+++ b/java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java
@@ -370,15 +370,7 @@ public class ExpectedTypesProvider {
         Collections.addAll(myResult, getExpectedTypes(expression, myForCompletion));
       }
     }
-
-    @Override
-    public void visitYieldStatement(PsiYieldStatement statement) {
-      PsiSwitchExpression exitedElement = statement.findEnclosingExpression();
-      if (exitedElement != null) {
-        Collections.addAll(myResult, getExpectedTypes(exitedElement, myForCompletion));
-      }
-    }
-
+    
     @Override
     public void visitMethodCallExpression(@NotNull PsiMethodCallExpression expression) {
       myExpr = (PsiExpression)myExpr.getParent();