method refs: do not loose information about type arguments given by ReferenceType in receiver

java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/PsiMethodReferenceCompatibilityConstraint.java

@@ -196,6 +196,10 @@ public class PsiMethodReferenceCompatibilityConstraint implements ConstraintForm
     PsiType qualifierType;
     if (qualifierTypeElement != null) {
       qualifierType = qualifierTypeElement.getType();
+      final PsiClass qualifierClass = PsiUtil.resolveClassInType(qualifierType);
+      if (qualifierClass != null) {
+        qualifierType = JavaPsiFacade.getElementFactory(myExpression.getProject()).createType(qualifierClass, PsiSubstitutor.EMPTY);
+      }
     }
     else {
       LOG.assertTrue(qualifierExpression != null);

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newMethodRef/FromReferenceWithTypeArgs.java

@@ -0,0 +1,17 @@
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+class Box<T>
+{
+  public T getValue()
+  {
+    return null;
+  }
+
+  void f(Stream<Box<String>> stream) {
+    List<String> l3 = stream
+      .map(Box<String>::getValue)
+      .collect(Collectors.toList());
+  }
+}

java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/NewMethodRefHighlightingTest.java

@@ -233,6 +233,10 @@ public class NewMethodRefHighlightingTest extends LightDaemonAnalyzerTestCase {
     doTest();
   }
 
+  public void testFromReferenceWithTypeArgs() throws Exception {
+    doTest();
+  }
+
   private void doTest() {
     doTest(false);
   }