Skip to content

Fixed wildcard matching for elements with type information. #5833

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sambsnyd merged 5 commits into from
Aug 4, 2025
Merged

Fixed wildcard matching for elements with type information. #5833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
24459b9
Fixed wildcard matching for elements with type information.
Jenson3210 Jul 30, 2025
d675b76
Added correct + more assertions resulting in another fixed bug
Jenson3210 Jul 30, 2025
e717136
Added some more assertions
Jenson3210 Jul 30, 2025
13f0077
Run rewrite recipe
Jenson3210 Jul 30, 2025
07d31e5
Show change in behavior when `Foo.bar()` type information present
timtebeek Aug 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 74 additions & 4 deletions rewrite-java-test/src/test/java/org/openrewrite/java/MethodMatcherTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/
package org.openrewrite.java;

import org.intellij.lang.annotations.Language;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
Expand Down Expand Up @@ -140,19 +141,63 @@ void matchesUnqualifiedJavaLangArguments() {
void matchesArgumentsWithWildcards() {
assertTrue(argRegex("A foo(java.util.*)").matcher("java.util.Map").matches());
assertTrue(argRegex("A foo(java..*)").matcher("java.util.Map").matches());
assertTrue(argRegex("A foo(*.util.*)").matcher("java.util.Map").matches());
assertTrue(argRegex("A foo(*..*)").matcher("java.util.Map").matches());
}

@Test
void matchesExactlyOneWithWildcard() {
Comment thread
Jenson3210 marked this conversation as resolved.
assertTrue(argRegex("A foo(*)").matcher("int").matches());
assertTrue(argRegex("A foo(*)").matcher("java.lang.String").matches());
assertTrue(argRegex("A foo(*, int)").matcher("int,int").matches());
assertTrue(argRegex("A foo(*,int)").matcher("int,int").matches());
assertTrue(argRegex("A foo(*, int)").matcher("double,int").matches());
assertTrue(argRegex("A foo(*, int)").matcher("java.lang.String,int").matches());
assertTrue(argRegex("A foo(*, String)").matcher("java.lang.String,java.lang.String").matches());
assertTrue(argRegex("A foo(int, *)").matcher("int,int").matches());
assertTrue(argRegex("A foo(int, *)").matcher("int,double").matches());
assertTrue(argRegex("A foo(int,*)").matcher("int,double").matches());
assertTrue(argRegex("A foo(*, *)").matcher("int,int").matches());
assertTrue(argRegex("A foo(*,*)").matcher("int,int").matches());
assertTrue(argRegex("A foo(int, *, double)").matcher("int,int,double").matches());
assertTrue(argRegex("A foo(int, *, double)").matcher("int,double,double").matches());
assertTrue(argRegex("A foo(int,*,double)").matcher("int,double,double").matches());

assertFalse(argRegex("A foo(*)").matcher("").matches());
assertFalse(argRegex("A foo(*)").matcher("int,int").matches());
assertFalse(argRegex("A foo(*, int)").matcher("int").matches());
assertFalse(argRegex("A foo(*, int)").matcher("int,double").matches());
assertFalse(argRegex("A foo(int, *)").matcher("int").matches());
assertFalse(argRegex("A foo(int, *)").matcher("double,int").matches());
assertFalse(argRegex("A foo(*, *)").matcher("").matches());
assertFalse(argRegex("A foo(*, *)").matcher("int").matches());
assertFalse(argRegex("A foo(int, *, double)").matcher("int,double").matches());
assertFalse(argRegex("A foo(int, *, double)").matcher("double,int,double").matches());
}

@Test
void matchesArgumentsWithDotDot() {
assertTrue(argRegex("A foo(.., int)").matcher("int").matches());
assertTrue(argRegex("A foo(.., int)").matcher("int,int").matches());
assertTrue(argRegex("A foo(.., int)").matcher("double,int").matches());
assertFalse(argRegex("A foo(.., int)").matcher("int,double").matches());
Comment thread
Jenson3210 marked this conversation as resolved.

assertTrue(argRegex("A foo(int, ..)").matcher("int").matches());
assertTrue(argRegex("A foo(int, ..)").matcher("int,int").matches());
assertTrue(argRegex("A foo(int, ..)").matcher("int,double").matches());
assertFalse(argRegex("A foo(int, ..)").matcher("double,int").matches());

assertTrue(argRegex("A foo(int, .., double)").matcher("int,double").matches());
assertTrue(argRegex("A foo(int, .., double)").matcher("int,int,double").matches());
assertTrue(argRegex("A foo(int, .., double)").matcher("int,double,double").matches());
assertFalse(argRegex("A foo(int, .., double)").matcher("double,int,double").matches());

assertTrue(argRegex("A foo(..)").matcher("").matches());
assertTrue(argRegex("A foo(..)").matcher("int").matches());
assertTrue(argRegex("A foo(..)").matcher("int,int").matches());

assertTrue(argRegex("A foo(.., int)").matcher("double,double,int").matches());
assertTrue(argRegex("A foo(int, .., double)").matcher("int,double,java.lang.String,int,double").matches());
}

@Test
Expand Down Expand Up @@ -404,17 +449,42 @@ void matchUnknownTypesWildcardArguments() {
void matchUnknownTypesSingleWildcardArgument() {
var mi = asMethodInvocation("Assert.assertTrue(Foo.bar(), \"message\");");
assertTrue(new MethodMatcher("org.junit.Assert assertTrue(*, String)").matches(mi, true));
assertTrue(new MethodMatcher("org.junit.Assert assertTrue(*, java.lang.String)").matches(mi, true));
assertTrue(new MethodMatcher("org.junit.Assert assertTrue(String, *)").matches(mi, true));
assertTrue(new MethodMatcher("org.junit.Assert assertTrue(double, *)").matches(mi, true));
assertTrue(new MethodMatcher("org.junit.Assert assertTrue(java.lang.String, *)").matches(mi, true));
Comment on lines +453 to +455

@knutwannheden knutwannheden Sep 26, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These three assertions surprise me. In this test the type of Foo.bar() is unknown. So why would we match against String, double, or java.lang.String?

@knutwannheden knutwannheden Sep 26, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess that is how matchUnknownTypes is supposed to work: Just match whatever, as long as the "structure" is the same.

assertTrue(new MethodMatcher("org.junit.Assert assertTrue(*, *)").matches(mi, true));
}

@Issue("https://github.com/openrewrite/rewrite/pull/5833")
@Test
void matchKnownTypesSingleWildcardArgument() {
var mi = asMethodInvocation("Assert.assertTrue(Foo.bar(), \"message\");", """
class Foo {
static String bar() {
return "bar";
}
}
""");
assertTrue(new MethodMatcher("org.junit.Assert assertTrue(*, String)").matches(mi, true));
assertTrue(new MethodMatcher("org.junit.Assert assertTrue(*, java.lang.String)").matches(mi, true));
assertTrue(new MethodMatcher("org.junit.Assert assertTrue(String, *)").matches(mi, true));
assertFalse(new MethodMatcher("org.junit.Assert assertTrue(double, *)").matches(mi, true));
assertTrue(new MethodMatcher("org.junit.Assert assertTrue(java.lang.String, *)").matches(mi, true));
assertTrue(new MethodMatcher("org.junit.Assert assertTrue(*, *)").matches(mi, true));
}

static J.MethodInvocation asMethodInvocation(String code) {
var cu = JavaParser.fromJavaVersion().build().parse(
String.format("""
static J.MethodInvocation asMethodInvocation(String code, @Language("java") String... dependsOn) {
var cu = JavaParser.fromJavaVersion().dependsOn(dependsOn).build()
.parse(
"""
import org.junit.Assert;
class MyTest {
void test() {
%s
}
}
""", code)
""".formatted(code)
)
.findFirst()
.map(J.CompilationUnit.class::cast)
Expand Down
7 changes: 6 additions & 1 deletion rewrite-java/src/main/antlr/MethodSignatureParser.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,15 @@ formalParametersPattern

formalsPattern
: dotDot (COMMA SPACE* formalsPatternAfterDotDot)*
| optionalParensTypePattern (COMMA SPACE* formalsPattern)*
| wildcard (COMMA SPACE* formalsPattern)*
| optionalParensTypePattern (COMMA SPACE* formalsPattern)*
| formalTypePattern ELLIPSIS
;

wildcard
: WILDCARD
;

dotDot
: DOTDOT
;
Expand Down
22 changes: 19 additions & 3 deletions rewrite-java/src/main/java/org/openrewrite/java/MethodMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,8 +399,8 @@ private boolean matchesAllowingUnknownTypes(J.MethodInvocation method) {

final String argumentSignature = argumentsFromExpressionTypes(method);
final Pattern relaxedArgumentPattern = Pattern.compile(
argumentPattern.pattern().replaceAll("((?:[a-zA-Z0-9]+\\.?)+)",
"($1|" + JavaType.Unknown.getInstance().getFullyQualifiedName() + ")"));
argumentPattern.pattern().replaceAll("((?:(?:[a-zA-Z0-9]+(?:\\[\\.\\$])?)+(,)?)+)",
"($1|" + JavaType.Unknown.getInstance().getFullyQualifiedName() + "$2)"));
return relaxedArgumentPattern.matcher(argumentSignature).matches();
}

Expand Down Expand Up @@ -553,6 +553,12 @@ public String visitDotDot(MethodSignatureParser.DotDotContext ctx) {
return super.visitDotDot(ctx);
}

@Override
public String visitWildcard(MethodSignatureParser.WildcardContext ctx) {
arguments.add(Argument.WILDCARD);
return super.visitWildcard(ctx);
}

@Override
public String visitFormalTypePattern(MethodSignatureParser.FormalTypePatternContext ctx) {
arguments.add(new Argument.FormalType(ctx));
Expand All @@ -577,7 +583,10 @@ public String visitFormalParametersPattern(MethodSignatureParser.FormalParameter
argumentPatterns.add("(" + argument.getRegex() + ",)?");
}
} else { // FormalType
if (i > 0 && arguments.get(i - 1) != Argument.DOT_DOT) {
// We cannot start with a comma
if (i == 1 && arguments.get(0) == Argument.DOT_DOT) {
argumentPatterns.add(argument.getRegex());
} else if (i > 0) {
argumentPatterns.add("," + argument.getRegex());
} else {
argumentPatterns.add(argument.getRegex());
Expand All @@ -598,6 +607,13 @@ String getRegex() {
}
};

private static final Argument WILDCARD = new Argument() {
@Override
String getRegex() {
return "([^,]+)";
}
};

private static class FormalType extends Argument {
private final MethodSignatureParser.FormalTypePatternContext ctx;

Expand Down
Loading