SONARJAVA-1584 Prefer method without var arity first

Author: benzonico

java-frontend/src/main/java/org/sonar/java/resolve/Resolve.java

@@ -559,14 +559,19 @@ private boolean isSignatureMoreSpecific(JavaSymbol m1, JavaSymbol m2, TypeSubsti
     List<JavaType> m1ArgTypes = ((JavaType.MethodJavaType) m1.type).argTypes;
     List<JavaType> m2ArgTypes = ((JavaType.MethodJavaType) m2.type).argTypes;
     JavaSymbol.MethodJavaSymbol methodJavaSymbol = (JavaSymbol.MethodJavaSymbol) m1;
-    if (methodJavaSymbol.isVarArgs()) {
+    boolean m1VarArity = methodJavaSymbol.isVarArgs();
+    boolean m2VarArity = ((JavaSymbol.MethodJavaSymbol) m2).isVarArgs();
+    if (m1VarArity != m2VarArity) {
+      return m2VarArity;
+    }
+    if (m1VarArity) {
       m1ArgTypes = expandVarArgsToFitSize(m1ArgTypes, m2ArgTypes.size());
     }
-    if(!hasCompatibleArity(m1ArgTypes.size(), m2ArgTypes.size(), ((JavaSymbol.MethodJavaSymbol) m2).isVarArgs())) {
+    if(!hasCompatibleArity(m1ArgTypes.size(), m2ArgTypes.size(), m2VarArity)) {
       return false;
     }
     m1ArgTypes = typeSubstitutionSolver.applySubstitutionToFormalParameters(m1ArgTypes, substitution);
-    return isArgumentsAcceptable(m1ArgTypes, m2ArgTypes, ((JavaSymbol.MethodJavaSymbol) m2).isVarArgs(), false);
+    return isArgumentsAcceptable(m1ArgTypes, m2ArgTypes, m2VarArity, false);
   }
 
   private static List<JavaType> expandVarArgsToFitSize(List<JavaType> m1ArgTypes, int size) {

java-frontend/src/test/files/sym/references/MethodCall.java

@@ -221,4 +221,21 @@ void test() {
     varargs3("");
     varargs4();
   }
+}
+
+class MyVarArgs {
+  void varargs5(Object o) {}
+  void varargs6(String s, Object... o) {}
+}
+
+class MyVarArgsTest extends MyVarArgs {
+  void varargs5(String s, Object... o) {}
+  void varargs6(Object o) {}
+
+  void test() {
+    varargs5(null);
+    varargs5("");
+    varargs6(null);
+    varargs6("");
+  }
 }

java-frontend/src/test/java/org/sonar/java/resolve/Result.java

@@ -114,7 +114,7 @@ private Object referenceTree(int line, int column, boolean searchSymbol, @Nullab
         }
       }
     }
-    throw new IllegalArgumentException("Reference Tree not found");
+    throw new IllegalArgumentException("Reference Tree not found "+line);
   }
 
 

java-frontend/src/test/java/org/sonar/java/resolve/SymbolTableTest.java

@@ -635,6 +635,12 @@ public void MethodCall() {
     assertThat(result.reference(221, 5)).isSameAs(result.symbol("varargs3", 216));
     assertThat(result.reference(222, 5)).isSameAs(result.symbol("varargs4", 218));
 
+    assertThat(result.reference(236, 5)).isSameAs(result.symbol("varargs5", 227));
+    assertThat(result.reference(237, 5)).isSameAs(result.symbol("varargs5", 227));
+
+    assertThat(result.reference(238, 5)).isSameAs(result.symbol("varargs6", 233));
+    assertThat(result.reference(239, 5)).isSameAs(result.symbol("varargs6", 233));
+
 
   }