more specific method should be chosen before static access is checked (IDEA-101480)

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/InstanceMemberNotAccessibleInStaticContext.java

@@ -0,0 +1,11 @@
+class Foo {
+    public void foo() {}
+
+    public static void foo(String... s){}
+}
+
+class A {
+    {
+        Foo.<error descr="Non-static method 'foo()' cannot be referenced from a static context">foo</error>();
+    }
+}

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

@@ -166,4 +166,5 @@ public class LightAdvHighlightingJdk7Test extends LightDaemonAnalyzerTestCase {
   public void testWrongArgsAndUnknownTypeParams() throws Exception { doTest(false, false); }
   public void testAmbiguousMethodCallIDEA97983() throws Exception { doTest(false, false); }
   public void testAmbiguousMethodCallIDEA100314() throws Exception { doTest(false, false); }
+  public void testInstanceMemberNotAccessibleInStaticContext() throws Exception { doTest(false, false); }
 }

java/java-tests/testSrc/com/intellij/psi/resolve/ResolveMethodTest.java

@@ -204,7 +204,7 @@ public class ResolveMethodTest extends ResolveTestCase {
     PsiElement target = resolve();
     assertTrue(target instanceof PsiMethod);
     PsiMethod method = (PsiMethod) target;
-    assertEquals(1, method.getParameterList().getParametersCount());
+    assertEquals(0, method.getParameterList().getParametersCount());
   }
 
   public void testClone() throws Exception{