From 024f917277c1afeb102f881ac8fe9c0ff0dbebf1 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Mon, 6 Jul 2015 17:31:39 +0300
Subject: [PATCH] method refs: return type check fix for raw constructor
 (IDEA-142302)

---
 .../src/com/intellij/psi/PsiMethodReferenceUtil.java            | 2 +-
 .../lambda/newMethodRef/NewParameterizedReferenceOnRawType.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/java-psi-api/src/com/intellij/psi/PsiMethodReferenceUtil.java b/java/java-psi-api/src/com/intellij/psi/PsiMethodReferenceUtil.java
index bc0f21638e8b..6736b8581a22 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiMethodReferenceUtil.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiMethodReferenceUtil.java
@@ -325,7 +325,7 @@ public class PsiMethodReferenceUtil {
         if (methodReturnType == null) {
           methodReturnType = JavaPsiFacade.getElementFactory(expression.getProject()).createType(containingClass, subst);
         }
-        if (!TypeConversionUtil.isAssignable(interfaceReturnType, methodReturnType, false)) {
+        if (!TypeConversionUtil.isAssignable(interfaceReturnType, methodReturnType)) {
           return "Bad return type in method reference: cannot convert " + methodReturnType.getCanonicalText() + " to " + interfaceReturnType.getCanonicalText();
         }
       }
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newMethodRef/NewParameterizedReferenceOnRawType.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newMethodRef/NewParameterizedReferenceOnRawType.java
index f0d4fcbc7179..8d85594829fe 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newMethodRef/NewParameterizedReferenceOnRawType.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newMethodRef/NewParameterizedReferenceOnRawType.java
@@ -5,7 +5,7 @@ class Test<T> {
   }
 
   {
-    Callable<Test<String>> c  = <error descr="Bad return type in method reference: cannot convert Test to Test<java.lang.String>">Test::<String>new</error>;
+    Callable<Test<String>> c  = <error descr="Raw constructor reference with explicit type parameters for constructor">Test::<String>new</error>;
     Callable<Test<String>> c1 = Test<String>::<String>new;
   }
 }