overload resolution: ignore static methods from super interface (IDEA-212406)

GitOrigin-RevId: b7d5a8433fc6c96aa3d0a0208976dc9bee7cad97

java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java

@@ -307,7 +307,7 @@ public class JavaMethodsConflictResolver implements PsiConflictResolver{
       }
       else if (expression == null && !ImportsUtil.hasStaticImportOn(parent, method, true)) {
         PsiClass qualifierClass = PsiTreeUtil.getParentOfType(parent, PsiClass.class);
-        if (qualifierClass != null && !PsiTreeUtil.isAncestor(method.getContainingClass(), qualifierClass, false)) {
+        if (qualifierClass != null && !PsiTreeUtil.isAncestor(method.getContainingClass(), qualifierClass, true)) {
           return qualifierClass;
         }
       }

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

@@ -12,4 +12,17 @@ interface Test {
 
   static void of(String... lists) { }
 
+}
+
+interface Entry<T> { }
+interface ClassA<T> {
+  static <T> void f(Iterable<T> values) {
+  }
+}
+interface ClassB<T> extends ClassA<Entry<T>> {
+  static <T> void f(Iterable<? extends Entry<? extends T>> values) {}
+  
+  static void m(Iterable<Entry<String>> x) {
+    f(x);
+  }
 }