method references overload resolution: skip static methods of interfaces called on inheritor (IDEA-209920)

GitOrigin-RevId: 9e7889def32913679fa867f9dd2a80f8d187964e

java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/MethodReferenceResolver.java

@@ -289,6 +289,16 @@ public class MethodReferenceResolver implements ResolveCache.PolyVariantContextR
 
       if ((varargs || functionalInterfaceParamTypes.length == parameterTypes.length) &&
           isCorrectAssignment(parameterTypes, functionalInterfaceParamTypes, interfaceMethod, varargs, referenceExpression, conflict, 0)) {
+        //reject static interface methods called on something else but interface class
+        if (psiMethod.hasModifierProperty(PsiModifier.STATIC)) {
+          PsiClass containingClass = psiMethod.getContainingClass();
+          if (containingClass != null && containingClass.isInterface()) {
+            final PsiClass qualifierClass = PsiMethodReferenceUtil.getQualifierResolveResult(referenceExpression).getContainingClass();
+            if (!containingClass.getManager().areElementsEquivalent(qualifierClass, containingClass)) {
+              return null;
+            }
+          }
+        }
         return true;
       }
 

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

@@ -0,0 +1,33 @@
+
+import java.util.function.Function;
+
+class Main {
+
+	void m(B b) {
+		Function<A<String>, String> f1 = A<String>::getName;
+		Function<A<String>, String> f10 = A::getName;
+		Function<B, String> f2 = B::getName;
+		Function<B, String> f3 = b::<error descr="Cannot resolve method 'getName'">getName</error>;
+	}
+}
+
+interface I {
+	String getName();
+
+	static String getName(final I i) {
+		return null;
+	}
+}
+class A<T> implements I {
+	@Override
+	public String getName() {
+		return null;
+	}
+}
+
+class B implements I {
+	@Override
+	public String getName() {
+		return null;
+	}
+}

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

@@ -271,6 +271,7 @@ public class OverloadResolutionTest extends LightDaemonAnalyzerTestCase {
   public void testOverriddenMethodWithOtherRawSignature() { doTest(false);}
 
   public void testMoreSpecificForRawSignatureOnStaticProblem() { doTest(false);}
+  public void testSkipStaticInterfaceMethodCalledOnInheritorForMethodRefConflictResolving() { doTest(false);}
 
   public void testUnqualifiedStaticInterfaceMethodCallsOnInnerClasses() { doTest(false);}