overload resolution: apply site substitution before potential compatibility check (IDEA-150807)

java/java-psi-api/src/com/intellij/psi/infos/MethodCandidateInfo.java

@@ -196,7 +196,7 @@ public class MethodCandidateInfo extends CandidateInfo{
           formalParameterType = ((PsiEllipsisType)formalParameterType).getComponentType();
         }
 
-        if (!isPotentialCompatible(expression, formalParameterType, method)) {
+        if (!isPotentialCompatible(expression, getSiteSubstitutor().substitute(formalParameterType), method)) {
           return false;
         }
       }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/overloadResolution/PotentiallyCompatibleShouldCheckAgainstSubstitutedWithSiteSubstitutor.java

@@ -0,0 +1,33 @@
+import java.util.function.Function;
+
+class Test {
+  static class MyMap<V>
+  {
+    V put( char[] key, V value )
+    {
+      return null;
+    }
+
+    V put( String key, V value )
+    {
+      return null;
+    }
+  }
+
+  static final MyMap<Test.F> s_funcMap = new MyMap<>();
+
+  interface F extends Function<Thread,Number> { }
+
+  static
+  {
+    // without casts
+    s_funcMap.put( "ID", Thread::getId );
+    s_funcMap.put( "ID", thread -> thread.getId() + 1 );
+    s_funcMap.put( "ID", thread -> { return thread.getId() + 1; } );
+
+    // with casts
+    s_funcMap.put( "ID", (Test.F) Thread::getId );
+    s_funcMap.put( "ID", (Test.F) thread -> thread.getId() + 1 );
+    s_funcMap.put( "ID", (Test.F) thread -> { return thread.getId() + 1; } );
+  }
+}

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

@@ -188,6 +188,10 @@ public class OverloadResolutionTest extends LightDaemonAnalyzerTestCase {
     doTest();
   }
 
+  public void testPotentiallyCompatibleShouldCheckAgainstSubstitutedWithSiteSubstitutor() throws Exception {
+    doTest(false);
+  }
+
   private void doTest() {
     doTest(true);
   }