From fdd55c5a144a802e406a82544cfb72a5be67397f Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Wed, 30 Oct 2013 11:05:32 +0100
Subject: [PATCH] lambda: skip wildcards in return types for now

---
 .../source/tree/java/PsiMethodReferenceExpressionImpl.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodReferenceExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodReferenceExpressionImpl.java
index 7fa95f377d7f..aba54dcf10b5 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodReferenceExpressionImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodReferenceExpressionImpl.java
@@ -325,7 +325,7 @@ public class PsiMethodReferenceExpressionImpl extends PsiReferenceExpressionBase
             final PsiClassType returnType = JavaPsiFacade.getElementFactory(project).createType(containingClass,
                                                                                                      isRawSubst ? PsiSubstitutor.EMPTY : substitutor);
 
-            substitutor = LambdaUtil.inferFromReturnType(typeParameters, returnType, interfaceMethodReturnType, substitutor, languageLevel,
+            substitutor = LambdaUtil.inferFromReturnType(typeParameters, returnType, GenericsUtil.eliminateWildcards(interfaceMethodReturnType), substitutor, languageLevel,
                                                          project);
 
             if (containingClass.getConstructors().length == 0) {
@@ -422,7 +422,7 @@ public class PsiMethodReferenceExpressionImpl extends PsiReferenceExpressionBase
       }
       return LambdaUtil.inferFromReturnType(method.getTypeParameters(),
                                             method.getReturnType(),
-                                            interfaceMethodReturnType,
+                                            GenericsUtil.eliminateWildcards(interfaceMethodReturnType),
                                             psiSubstitutor,
                                             languageLevel, getProject());
     }