Fix testMethodReferencesElementPatternMultipleTypeParameter01 in JavaSearchGenericMethodEquivalentTests

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

Fix regressions

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

Fix regressions

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

Author: robstryker

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

@@ -189,7 +189,11 @@ public static IJavaElement[] getLocalOrOtherJavaElements(ASTNode node, boolean l
 			}
 		}
 
-        if (!local && node.getLocationInParent() == FieldDeclaration.TYPE_PROPERTY && node.getParent() instanceof FieldDeclaration stmt && stmt.fragments().size() > 1) {
+        if (!local
+        		&& (node.getLocationInParent() == FieldDeclaration.TYPE_PROPERTY
+        			|| node.getLocationInParent() == FieldDeclaration.MODIFIERS_PROPERTY
+        			|| node.getLocationInParent() == FieldDeclaration.MODIFIERS2_PROPERTY)
+        		&& node.getParent() instanceof FieldDeclaration stmt && stmt.fragments().size() > 1) {
             return ((List<VariableDeclarationFragment>)stmt.fragments())
                             .stream()
                             .map(VariableDeclarationFragment::resolveBinding)

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

@@ -828,15 +828,19 @@ protected int resolveLevelForNodeWithMethodBinding(ASTNode messageSend,
 		}
 		int invocationLevel = matchMethod(messageSend, invocationBinding, skipVerif, isDecl);
 		int declarationLevel = IMPOSSIBLE_MATCH;
+		int invocOrDeclLevel = invocationLevel;
 		if (invocationLevel == IMPOSSIBLE_MATCH && !isDecl) {
 			declarationBinding = invocationBinding.getMethodDeclaration();
 			declarationLevel = matchMethod(messageSend, declarationBinding, skipVerif, true);
 			if (declarationLevel == IMPOSSIBLE_MATCH)
 				return IMPOSSIBLE_MATCH;
 			invocationOrDeclarationBinding = declarationBinding;
+			invocOrDeclLevel = invocationLevel == IMPOSSIBLE_MATCH ? declarationLevel : invocationLevel;
+			if( !invocationBinding.isRawMethod() && this.locator.pattern.hasTypeParameters()) {
+				invocOrDeclLevel = findWeakerLevel(invocOrDeclLevel, ERASURE_MATCH);
+			}
 		}
 
-		int invocOrDeclLevel = invocationLevel == IMPOSSIBLE_MATCH ? declarationLevel : invocationLevel;
 		if (invocationBinding.isRawMethod() && (this.locator.pattern.hasTypeArguments() || this.locator.pattern.hasTypeParameters())) {
 			invocOrDeclLevel = findWeakerLevel(invocOrDeclLevel, ERASURE_MATCH);
 		}