Improve matching/reporting method references

Author: mickaelistria

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/core/search/DOMJavaSearchDelegate.java

@@ -54,6 +54,7 @@
 import org.eclipse.jdt.core.dom.ConstructorInvocation;
 import org.eclipse.jdt.core.dom.CreationReference;
 import org.eclipse.jdt.core.dom.EnumConstantDeclaration;
+import org.eclipse.jdt.core.dom.ExpressionMethodReference;
 import org.eclipse.jdt.core.dom.FieldDeclaration;
 import org.eclipse.jdt.core.dom.IBinding;
 import org.eclipse.jdt.core.dom.IMethodBinding;
@@ -70,7 +71,9 @@
 import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
 import org.eclipse.jdt.core.dom.SuperConstructorInvocation;
 import org.eclipse.jdt.core.dom.SuperMethodInvocation;
+import org.eclipse.jdt.core.dom.SuperMethodReference;
 import org.eclipse.jdt.core.dom.Type;
+import org.eclipse.jdt.core.dom.TypeMethodReference;
 import org.eclipse.jdt.core.dom.VariableDeclaration;
 import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
 import org.eclipse.jdt.core.dom.VariableDeclarationStatement;
@@ -372,6 +375,39 @@ private SearchMatch toCoreMatch(MatchLocator locator, org.eclipse.jdt.core.dom.A
 			res.setLocalElement(DOMASTNodeUtils.getLocalJavaElement(node));
 			return res;
 		}
+		if (node instanceof ExpressionMethodReference method) {
+			IJavaElement enclosing = DOMASTNodeUtils.getEnclosingJavaElement(node.getParent());
+			IMethodBinding mb = method.resolveMethodBinding();
+			boolean isSynthetic = mb != null && mb.isSynthetic();
+			var res = new MethodReferenceMatch(enclosing, accuracy, method.getName().getStartPosition(),
+					method.getStartPosition() + method.getLength() - method.getName().getStartPosition(), false,
+					isSynthetic, (accuracy & PatternLocator.SUPER_INVOCATION_FLAVOR) != 0, insideDocComment(node), getParticipant(locator), resource);
+			res.setRaw(mb != null && mb.isRawMethod());
+			res.setLocalElement(DOMASTNodeUtils.getLocalJavaElement(node));
+			return res;
+		}
+		if (node instanceof TypeMethodReference method) {
+			IJavaElement enclosing = DOMASTNodeUtils.getEnclosingJavaElement(node.getParent());
+			IMethodBinding mb = method.resolveMethodBinding();
+			boolean isSynthetic = mb != null && mb.isSynthetic();
+			var res = new MethodReferenceMatch(enclosing, accuracy, method.getName().getStartPosition(),
+					method.getStartPosition() + method.getLength() - method.getName().getStartPosition(), false,
+					isSynthetic, (accuracy & PatternLocator.SUPER_INVOCATION_FLAVOR) != 0, insideDocComment(node), getParticipant(locator), resource);
+			res.setRaw(mb != null && mb.isRawMethod());
+			res.setLocalElement(DOMASTNodeUtils.getLocalJavaElement(node));
+			return res;
+		}
+		if (node instanceof SuperMethodReference method) {
+			IJavaElement enclosing = DOMASTNodeUtils.getEnclosingJavaElement(node.getParent());
+			IMethodBinding mb = method.resolveMethodBinding();
+			boolean isSynthetic = mb != null && mb.isSynthetic();
+			var res = new MethodReferenceMatch(enclosing, accuracy, method.getName().getStartPosition(),
+					method.getStartPosition() + method.getLength() - method.getName().getStartPosition(), false,
+					isSynthetic, (accuracy & PatternLocator.SUPER_INVOCATION_FLAVOR) != 0, insideDocComment(node), getParticipant(locator), resource);
+			res.setRaw(mb != null && mb.isRawMethod());
+			res.setLocalElement(DOMASTNodeUtils.getLocalJavaElement(node));
+			return res;
+		}
 		if (node.getLocationInParent() == SingleMemberAnnotation.VALUE_PROPERTY && locator.pattern instanceof MethodPattern) {
 			var res = new MethodReferenceMatch(DOMASTNodeUtils.getEnclosingJavaElement(node), accuracy,
 					node.getStartPosition(), node.getLength(), true,

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

@@ -192,7 +192,9 @@ public LocatorResponse match(MethodRef node, NodeSetWrapper nodeSet, MatchLocato
 	}
 	@Override
 	public LocatorResponse match(MethodReference node, NodeSetWrapper nodeSet, MatchLocator locator) {
-		if (this.locator.pattern.fineGrain != 0 && (this.locator.pattern.fineGrain & IJavaSearchConstants.METHOD_REFERENCE_EXPRESSION) == 0) {
+		if (this.locator.pattern.fineGrain != 0 &&
+			(this.locator.pattern.fineGrain & IJavaSearchConstants.METHOD_REFERENCE_EXPRESSION) == 0 &&
+			(!(node instanceof SuperMethodReference) || (this.locator.pattern.fineGrain & IJavaSearchConstants.SUPER_REFERENCE) == 0)) {
 			return toResponse(IMPOSSIBLE_MATCH);
 		}
 		SimpleName name = node instanceof TypeMethodReference typeMethodRef ? typeMethodRef.getName() :
@@ -232,10 +234,12 @@ public LocatorResponse match(org.eclipse.jdt.core.dom.Expression expression, Nod
 
 	@Override
 	public LocatorResponse match(Name node, NodeSetWrapper nodeSet, MatchLocator locator) {
-		if( node.getParent() instanceof MethodInvocation mi && mi.getName() == node) {
-//			if( nodeSet.getTrustedMatch(mi) > IMPOSSIBLE_MATCH ) {
-				return toResponse(IMPOSSIBLE_MATCH);
-//			}
+		if (// already matched
+			MethodInvocation.NAME_PROPERTY == node.getLocationInParent() ||
+			TypeMethodReference.NAME_PROPERTY == node.getLocationInParent() ||
+			ExpressionMethodReference.NAME_PROPERTY == node.getLocationInParent() ||
+			SuperMethodReference.NAME_PROPERTY == node.getLocationInParent()) {
+			return toResponse(IMPOSSIBLE_MATCH);
 		}
 
 		if (node.getLocationInParent() == MemberValuePair.NAME_PROPERTY
@@ -691,12 +695,12 @@ protected int resolveLevelForNodeWithMethodBinding(ASTNode messageSend,
 //		String q2 = declBindingClass == null ? null : declBindingClass.getQualifiedName();
 //		String b1 = invocationDeclClass == null ? null : invocationDeclClass.getBinaryName();
 //		String b2 = declBindingClass == null ? null : declBindingClass.getBinaryName();
-		int declaringLevel;
-		ITypeBinding receiverType = initialReceiverType != null ? initialReceiverType : invocationOrDeclarationBinding.getDeclaringClass();
-		if (shouldResolveSubSuperLevel(messageSend, receiverType, invocationOrDeclarationBinding, invocOrDeclLevel)) {
-			declaringLevel = resolveSubSuperLevel(messageSend, receiverType, invocationOrDeclarationBinding, invocOrDeclLevel, nullParamsForSubTypeCheck);
-		} else {
-			declaringLevel = resolveLevelForType(this.pattern.declaringSimpleName, this.pattern.declaringQualification, invocationOrDeclarationBinding.getDeclaringClass());
+		int declaringLevel = resolveLevelForType(this.pattern.declaringSimpleName, this.pattern.declaringQualification, invocationOrDeclarationBinding.getDeclaringClass());
+		if (declaringLevel == IMPOSSIBLE_MATCH) {
+			ITypeBinding receiverType = initialReceiverType != null ? initialReceiverType : invocationOrDeclarationBinding.getDeclaringClass();
+			if (shouldResolveSubSuperLevel(messageSend, receiverType, invocationOrDeclarationBinding, invocOrDeclLevel)) {
+				declaringLevel = resolveSubSuperLevel(messageSend, receiverType, invocationOrDeclarationBinding, invocOrDeclLevel, nullParamsForSubTypeCheck);
+			}
 		}
 
 		int declaringFlavors = declaringLevel & FLAVORS_MASK;