Improve matching LambdaExpression

Author: mickaelistria

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

@@ -108,6 +108,7 @@ public static IJavaElement getLocalJavaElement(ASTNode node) {
 			|| node instanceof CompilationUnit
 			|| node instanceof AnnotationTypeMemberDeclaration
 			|| node instanceof Initializer
+			|| node instanceof LambdaExpression
 			|| node.getLocationInParent() == FieldDeclaration.FRAGMENTS_PROPERTY) {
 			return getEnclosingJavaElement(node);
 		}

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

@@ -34,7 +34,9 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.ILog;
 import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jdt.core.IBuffer;
 import org.eclipse.jdt.core.IClassFile;
+import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.IJavaModelStatusConstants;
 import org.eclipse.jdt.core.IJavaProject;
@@ -61,6 +63,7 @@
 import org.eclipse.jdt.core.dom.IPackageBinding;
 import org.eclipse.jdt.core.dom.ITypeBinding;
 import org.eclipse.jdt.core.dom.IVariableBinding;
+import org.eclipse.jdt.core.dom.LambdaExpression;
 import org.eclipse.jdt.core.dom.MethodDeclaration;
 import org.eclipse.jdt.core.dom.MethodInvocation;
 import org.eclipse.jdt.core.dom.MethodRef;
@@ -469,6 +472,29 @@ private SearchMatch toCoreMatch(MatchLocator locator, org.eclipse.jdt.core.dom.A
 			return new TypeParameterReferenceMatch(element, accuracy, nodeTP.getName().getStartPosition(),
 					nodeTP.getName().getLength(), DOMASTNodeUtils.insideDocComment(node), getParticipant(locator), resource);
 		}
+		if (node instanceof LambdaExpression lambda) {
+			IJavaElement enclosing = DOMASTNodeUtils.getLocalJavaElement(node);
+			IMethodBinding mb = lambda.resolveMethodBinding();
+			boolean isSynthetic = mb != null && mb.isSynthetic();
+			int arrowEnd = lambda.getBody().getStartPosition() - 1;
+			try {
+				if (enclosing != null && enclosing.getAncestor(IJavaElement.COMPILATION_UNIT) instanceof ICompilationUnit unit) {
+					IBuffer buffer = unit.getBuffer();
+					while (arrowEnd > 0 && buffer.getChar(arrowEnd) != '>') {
+						arrowEnd--;
+					}
+					arrowEnd++;
+				}
+			} catch (JavaModelException ex) {
+				ILog.get().error(ex.getMessage(), ex);
+			}
+			var res = new MethodReferenceMatch(enclosing, accuracy, lambda.getStartPosition(),
+					arrowEnd - lambda.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 Name name) {
 			IBinding b = name.resolveBinding();
 			IJavaElement enclosing = DOMASTNodeUtils.getEnclosingJavaElement(node);

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

@@ -35,6 +35,7 @@
 import org.eclipse.jdt.core.dom.IBinding;
 import org.eclipse.jdt.core.dom.ImportDeclaration;
 import org.eclipse.jdt.core.dom.IntersectionType;
+import org.eclipse.jdt.core.dom.LambdaExpression;
 import org.eclipse.jdt.core.dom.MemberValuePair;
 import org.eclipse.jdt.core.dom.MethodDeclaration;
 import org.eclipse.jdt.core.dom.MethodInvocation;
@@ -186,6 +187,10 @@ public boolean visit(RecordDeclaration node) {
 	public boolean visit(AnonymousClassDeclaration node) {
 		return defaultVisitImplementation(node, (x,y) -> y.match(node, this.nodeSet, this.locator));
 	}
+	@Override
+	public boolean visit(LambdaExpression node) {
+		return defaultVisitImplementation(node, (x,y) -> y.match(node, this.nodeSet, this.locator));
+	}
 
 	private boolean visitType(Type node) {
 		LocatorResponse resp = defaultVisitImplementationWithFunc(node, (x,y) -> y.match(node, this.nodeSet, this.locator), DOMASTNodeUtils::getBinding);

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

@@ -38,6 +38,7 @@
 import org.eclipse.jdt.core.dom.ITypeBinding;
 import org.eclipse.jdt.core.dom.IVariableBinding;
 import org.eclipse.jdt.core.dom.JdtCoreDomPackagePrivateUtility;
+import org.eclipse.jdt.core.dom.LambdaExpression;
 import org.eclipse.jdt.core.dom.MemberValuePair;
 import org.eclipse.jdt.core.dom.MethodDeclaration;
 import org.eclipse.jdt.core.dom.MethodInvocation;
@@ -1158,7 +1159,6 @@ public void reportSearchMatch(MatchLocator locator, ASTNode node, SearchMatch ma
 		SearchMatchingUtility.reportSearchMatch(locator, match);
 	}
 
-
 	private boolean preferParamaterizedNode() {
 		int patternRule = this.locator.pattern.getMatchRule();
 		boolean patternIsErasureMatch = isPatternErasureMatch();
@@ -1176,4 +1176,9 @@ private boolean preferParamaterizedNode() {
 		}
 		return true;
 	}
+
+	@Override
+	public LocatorResponse match(LambdaExpression node, NodeSetWrapper nodeSet, MatchLocator locator) {
+		return toResponse(this.locator.pattern.parameterCount == node.parameters().size() ? POSSIBLE_MATCH : IMPOSSIBLE_MATCH);
+	}
 }