Verify method parameter types to return accuracy

Author: mickaelistria

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/core/search/matching/DOMMethodLocator.java

@@ -31,6 +31,7 @@
 import org.eclipse.jdt.core.dom.ASTNode;
 import org.eclipse.jdt.core.dom.Annotation;
 import org.eclipse.jdt.core.dom.AnnotationTypeMemberDeclaration;
+import org.eclipse.jdt.core.dom.ConstructorInvocation;
 import org.eclipse.jdt.core.dom.Expression;
 import org.eclipse.jdt.core.dom.ExpressionMethodReference;
 import org.eclipse.jdt.core.dom.IBinding;
@@ -639,10 +640,11 @@ private int computeResolveLevel(org.eclipse.jdt.core.dom.ASTNode node, IBinding
 		return IMPOSSIBLE_MATCH;
 	}
 
-	protected int resolveLevel(MethodInvocation messageSend) {
-		IMethodBinding invocationBinding = messageSend.resolveMethodBinding();
-		ITypeBinding initialReceiverType = messageSend.getExpression() != null ? messageSend.getExpression().resolveTypeBinding() : null;
-		return resolveLevelForNodeWithMethodBinding(messageSend, invocationBinding, initialReceiverType, false, false);
+	private List<Expression> arguments(ASTNode node) {
+		return (List<Expression>)
+				(node instanceof MethodInvocation method ? method.arguments() :
+				node instanceof ConstructorInvocation constr ? constr.arguments() :
+				List.of());
 	}
 
 	protected int resolveLevelForNodeWithMethodBinding(ASTNode messageSend,
@@ -669,6 +671,16 @@ protected int resolveLevelForNodeWithMethodBinding(ASTNode messageSend,
 			invocationOrDeclarationBinding = declarationBinding;
 		}
 
+		if (invocationBinding.getParameterTypes().length == arguments(messageSend).size()) {
+			for (int i = 0; i < invocationBinding.getParameterTypes().length; i++) {
+				var source = arguments(messageSend).get(i).resolveTypeBinding();
+				var resolved = invocationBinding.getParameterTypes()[i];
+				if (source != null && !source.isAssignmentCompatible(resolved)) {
+					return INACCURATE_MATCH;
+				}
+			}
+		}
+
 		int invocOrDeclLevel = invocationLevel == IMPOSSIBLE_MATCH ? declarationLevel : invocationLevel;
 		// receiver type
 		if (this.pattern.declaringSimpleName == null && this.pattern.declaringQualification == null) {
@@ -709,6 +721,8 @@ protected int resolveLevelForNodeWithMethodBinding(ASTNode messageSend,
 				// this is an overridden method => add flavor to returned level
 				declaringLevel = invocOrDeclLevel | SUPER_INVOCATION_FLAVOR;
 			}
+			// Consider whether the next lines should be part of DOMJavaSearchDelegate as they
+			// don't seem so specific to Method locator (same code could serve TypeRefLocator too)
 			if ((declaringLevel & FLAVORS_MASK) != 0) {
 				// level got some flavors => return it
 				retval = declaringLevel;
@@ -783,7 +797,9 @@ protected boolean isVirtualInvoke(IMethodBinding method) {
 	@Override
 	public LocatorResponse resolveLevel(org.eclipse.jdt.core.dom.ASTNode node, IBinding binding, MatchLocator locator) {
 		if (node instanceof MethodInvocation invocation) {
-			return toResponse(resolveLevel(invocation));
+			IMethodBinding invocationBinding = invocation.resolveMethodBinding();
+			ITypeBinding initialReceiverType = invocation.getExpression() != null ? invocation.getExpression().resolveTypeBinding() : null;
+			return toResponse(resolveLevelForNodeWithMethodBinding(invocation, invocationBinding, initialReceiverType, false, false));
 		}
 		int level = computeResolveLevel(node, binding, locator);
 		if (node instanceof MethodDeclaration declaration && binding != null) {

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/core/search/matching/DOMTypeReferenceLocator.java

@@ -963,7 +963,25 @@ private void updateMatchRule(ASTNode node, SearchMatch match) {
 		int matchRule = match.getRule();
 		char[][][] fromPattern = this.locator.pattern.getTypeArguments();
 		int patternTypeArgsLength = (fromPattern == null || fromPattern.length == 0 || fromPattern[0] == null ? 0 : fromPattern.length <= 0 ? 0 : fromPattern[0].length);
-		int typeArgumentsLength = node instanceof ParameterizedType ptt ? ptt.typeArguments().size() : 0;
+		Type typeNode = null;
+		{
+			ASTNode current = node;
+			while (current != null) {
+				if (current.getLocationInParent() == SimpleType.NAME_PROPERTY) {
+					current = current.getParent();
+					typeNode = (SimpleType) current;
+				} else if (current.getLocationInParent() == ParameterizedType.TYPE_PROPERTY) {
+					current = current.getParent();
+					typeNode = (ParameterizedType) current;
+				} else if (current instanceof Type t) {
+					current = current.getParent();
+					typeNode = t;
+				} else {
+					current = null;
+				}
+			}
+		}
+		int typeArgumentsLength = typeNode instanceof ParameterizedType ptt ? ptt.typeArguments().size() : 0;
 		boolean hasTypeParameters = this.locator.pattern.hasTypeParameters();
 
 		if (match.isRaw()) {

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/core/search/matching/TypeArgumentMatchingUtility.java

@@ -46,10 +46,10 @@ public static boolean validateSingleTypeArgMatches(boolean requiresExactMatch, S
 			domSig = domBinding instanceof JavacTypeBinding jctb ? jctb.getGenericTypeSignature(false) : domBinding.getKey();
 		}
 
+		if( Objects.equals(patternSig, domSig)) {
+			return true;
+		}
 		if( requiresExactMatch ) {
-			if( Objects.equals(patternSig, domSig)) {
-				return true;
-			}
 			if( patternSig.equals("*") && isQuestionMark(domSig)) {
 				return true;
 			}