Partial Fix for testMethodReferencesElementPatternMultipleTypeParameter04 in equivalent tests

Signed-off-by: Rob Stryker <[email protected]>

Author: robstryker

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

@@ -1323,7 +1323,8 @@ public void reportSearchMatch(MatchLocator locator, ASTNode node, SearchMatch ma
 		IMethodBinding methodBinding = nodeBinding instanceof IMethodBinding mb2 ? mb2 : null;
 		boolean isMethodBinding = methodBinding != null;
 		boolean mbIsRaw = isMethodBinding && methodBinding.isRawMethod();
-		boolean mbDeclaringIsRaw = isMethodBinding && methodBinding.getDeclaringClass().isRawType();
+		ITypeBinding declaring = methodBinding.getDeclaringClass();
+		boolean mbDeclaringIsRaw = isMethodBinding && declaring.isRawType();
 		boolean mbIsGeneric = isMethodBinding && methodBinding.isGenericMethod();
 		boolean mbIsParameterized = isMethodBinding && methodBinding.isParameterizedMethod();
 		boolean patternHasMethodArgs = pattern.hasMethodArguments();
@@ -1365,10 +1366,14 @@ public void reportSearchMatch(MatchLocator locator, ASTNode node, SearchMatch ma
 		if (isMethodBinding
 			&& (mbIsRaw || mbDeclaringIsRaw)
 			&& (patternHasMethodArgs || patternHasTypeArgs)) {
-			int rule = match.getRule();
-			rule &= ~SearchPattern.R_FULL_MATCH;
-			rule |= SearchPattern.R_EQUIVALENT_MATCH | SearchPattern.R_ERASURE_MATCH;
-			match.setRule(rule);
+			if( mbDeclaringIsRaw ) {
+				updateMatch(declaring, this.pattern.getTypeArguments(), this.pattern.hasTypeParameters(), 0);
+			} else {
+				int rule = match.getRule();
+				rule &= ~SearchPattern.R_FULL_MATCH;
+				rule |= SearchPattern.R_EQUIVALENT_MATCH | SearchPattern.R_ERASURE_MATCH;
+				match.setRule(rule);
+			}
 		}
 		if( preferParamaterizedNode() ) {
 			if( node instanceof MethodInvocation iv) {