ambiguous method calls: conflict resolver, tests (IDEA-78027)

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

@@ -337,7 +337,8 @@ public class JavaMethodsConflictResolver implements PsiConflictResolver{
     boolean noBoxing = boxingHappening || type1 instanceof PsiPrimitiveType == type2 instanceof PsiPrimitiveType;
     final boolean allowUncheckedConversion =
       !method1.hasModifierProperty(PsiModifier.STATIC) && !method2.hasModifierProperty(PsiModifier.STATIC) ||
-      method1.getContainingClass() == method2.getContainingClass();
+      InheritanceUtil.isInheritorOrSelf(method1.getContainingClass(), method2.getContainingClass(), true) ||
+      InheritanceUtil.isInheritorOrSelf( method2.getContainingClass(), method1.getContainingClass(),true);
     final boolean assignable2From1 = noBoxing && TypeConversionUtil.isAssignable(type2, type1, allowUncheckedConversion);
     final boolean assignable1From2 = noBoxing && TypeConversionUtil.isAssignable(type1, type2, allowUncheckedConversion);
     if (assignable1From2 || assignable2From1) {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/ambiguousIDEA78027/pck/AmbiguousMethodCall.java

@@ -0,0 +1,17 @@
+package pck;
+class Test {
+   void test() {
+       B.method(new ArgumentB());
+   }
+}
+
+class A {
+   static void method(ArgumentA a) { }
+}
+
+class B extends A {
+   static void method(ArgumentB b) { }
+}
+
+class ArgumentA<T> {}
+class ArgumentB extends ArgumentA<Object> {}

java/java-tests/testSrc/com/intellij/codeInsight/daemon/AdvHighlightingJdk7Test.java

@@ -164,4 +164,8 @@ public class AdvHighlightingJdk7Test extends DaemonAnalyzerTestCase {
   public void testAmbiguousIDEA67837() throws Exception {
     doTestAmbiguous();
   }
+
+  public void testAmbiguousIDEA78027() throws Exception {
+    doTestAmbiguous();
+  }
 }