Fixes testBug431357_015

robstryker · robstryker · commit e8c9b551ab61 · 2025-11-24T15:02:11.000-05:00
Signed-off-by: Rob Stryker &lt;rob@oxbeef.net&gt;
diff --git a/org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/core/search/matching/DOMMethodLocator.java b/org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/core/search/matching/DOMMethodLocator.java
@@ -770,7 +770,12 @@ private IMethodBinding findMethodBindingFromFocus(MethodPattern methodPattern, A
 							boolean eq = sigJ.equals(parameterTypeSignatures[j]);
 							boolean eq2 = parameterTypeSignatures[j].startsWith("Q") && sigJ.endsWith(parameterTypeSignatures[j].substring(1));
 							if( !eq && !eq2) {
-								failed = true;
+								// Let's do a more intensive search
+								String noDollarsFromBinding = sigJ.replaceAll("\\$", ".");
+								String noDollarsFromFocus = parameterTypeSignatures[j].replaceAll("\\$", ".");
+								boolean eq3 = parameterTypeSignatures[j].startsWith("Q") && noDollarsFromBinding.endsWith(noDollarsFromFocus.substring(1));
+								if( !eq3 )
+									failed = true;
 							}
 						}
 						if( !failed ) {

Original file line number	Diff line number	Diff line change
`@@ -770,7 +770,12 @@ private IMethodBinding findMethodBindingFromFocus(MethodPattern methodPattern, A`
`770`	`770`	`boolean eq = sigJ.equals(parameterTypeSignatures[j]);`
`771`	`771`	`boolean eq2 = parameterTypeSignatures[j].startsWith("Q") && sigJ.endsWith(parameterTypeSignatures[j].substring(1));`
`772`	`772`	`if( !eq && !eq2) {`
`773`		`- failed = true;`
	`773`	`+ // Let's do a more intensive search`
	`774`	`+ String noDollarsFromBinding = sigJ.replaceAll("\\$", ".");`
	`775`	`+ String noDollarsFromFocus = parameterTypeSignatures[j].replaceAll("\\$", ".");`
	`776`	`+ boolean eq3 = parameterTypeSignatures[j].startsWith("Q") && noDollarsFromBinding.endsWith(noDollarsFromFocus.substring(1));`
	`777`	`+ if( !eq3 )`
	`778`	`+ failed = true;`
`774`	`779`	`}`
`775`	`780`	`}`
`776`	`781`	`if( !failed ) {`