More matches

Author: mickaelistria

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

@@ -134,6 +134,11 @@ && matchParametersCount(enumConstantDecl, enumConstantDecl.arguments())) {
 			int level = nodeSet.addMatch(node, this.locator.pattern.mustResolve ? POSSIBLE_MATCH : ACCURATE_MATCH);
 			return toResponse(level, true);
 		}
+		if (!this.locator.pattern.hasConstructorParameters()
+			&& node instanceof CreationReference ref
+			&& matchesTypeReference(this.locator.pattern.declaringSimpleName, ref.getType())) {
+			return toResponse(POSSIBLE_MATCH);
+		}
 		return toResponse(IMPOSSIBLE_MATCH);
 	}
 

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

@@ -1179,6 +1179,11 @@ private boolean preferParamaterizedNode() {
 
 	@Override
 	public LocatorResponse match(LambdaExpression node, NodeSetWrapper nodeSet, MatchLocator locator) {
-		return toResponse(this.locator.pattern.parameterCount == node.parameters().size() ? POSSIBLE_MATCH : IMPOSSIBLE_MATCH);
+		if (this.locator.pattern.parameterCount == -1
+			|| this.locator.pattern.parameterCount == node.parameters().size()) {
+			nodeSet.setMustResolve(true);
+			return toResponse(POSSIBLE_MATCH);
+		}
+		return toResponse(IMPOSSIBLE_MATCH);
 	}
 }

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

@@ -15,7 +15,9 @@
 import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
 import org.eclipse.jdt.core.dom.ClassInstanceCreation;
 import org.eclipse.jdt.core.dom.IBinding;
+import org.eclipse.jdt.core.dom.IMethodBinding;
 import org.eclipse.jdt.core.dom.ITypeBinding;
+import org.eclipse.jdt.core.dom.LambdaExpression;
 import org.eclipse.jdt.core.dom.QualifiedName;
 import org.eclipse.jdt.core.dom.QualifiedType;
 import org.eclipse.jdt.core.dom.SimpleName;
@@ -81,6 +83,9 @@ public LocatorResponse match(Type node, NodeSetWrapper nodeSet, MatchLocator loc
 	public LocatorResponse resolveLevel(org.eclipse.jdt.core.dom.ASTNode node, IBinding binding, MatchLocator locator) {
 		if (binding == null)
 			return toResponse(INACCURATE_MATCH);
+		if (node instanceof LambdaExpression && binding instanceof IMethodBinding method) {
+			binding = method.getDeclaringClass();
+		}
 		if (!(binding instanceof ITypeBinding type))
 			return toResponse(IMPOSSIBLE_MATCH);