[DOM Search] Various issues trying to match unresolved patterns

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

Author: Rob Stryker

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

@@ -328,7 +328,15 @@ private int validateTypeParameters(Type node) {
 				for( int j = 0; j < thisLevelTypeParams.length; j++ ) {
 					String patternSig = new String(thisLevelTypeParams[j]);
 					IBinding patternTypeBinding = JdtCoreDomPackagePrivateUtility.findBindingForType(node, patternSig);
-					IBinding domBinding = DOMASTNodeUtils.getBinding((ASTNode)typeArgs.get(j));
+					if( patternTypeBinding == null ) {
+						boolean plusOrMinus = patternSig.startsWith("+") || patternSig.startsWith("-");
+						String safePatternString = plusOrMinus ? patternSig.substring(1) : patternSig;
+						if( safePatternString.startsWith("Q")) {
+							patternTypeBinding = JdtCoreDomPackagePrivateUtility.findUnresolvedBindingForType(node, safePatternString);
+						}
+					}
+					ASTNode argj = (ASTNode)typeArgs.get(j);
+					IBinding domBinding = DOMASTNodeUtils.getBinding(argj);
 					String domSig = domBinding == null ? null : domBinding instanceof JavacTypeBinding jctb ? jctb.getGenericTypeSignature(false) : domBinding.getKey();
 					if( patternSig.equals(("*")))
 							continue;
@@ -359,9 +367,18 @@ private int validateTypeParameters(Type node) {
 						String patternSigWithoutPrefix = patternSig.startsWith("+") || patternSig.startsWith("-") ? patternSig.substring(1) : patternSig;
 						String domSigWithoutPrefix = domSig.startsWith("+") || domSig.startsWith("-") ? domSig.substring(1) : domSig;
 						String patternSig2 = patternSigWithoutPrefix.substring(1);
-						if( !patternSig2.equals(domSigWithoutPrefix.substring(1)) && !domSig.endsWith("." + patternSig2)) {
-							return TYPE_PARAMS_COUNT_MATCH;
+						if( patternSig2.equals(domSigWithoutPrefix.substring(1))) 
+							continue;
+						if( domSig.endsWith("." + patternSig2) ) 
+							continue;
+						if( argj instanceof SimpleType stt && stt.getName() instanceof SimpleName snn) {
+							String identifier = snn.getIdentifier();
+							String patternSig3 = patternSig2.endsWith(";") ? patternSig2.substring(0, patternSig2.length() - 1) : patternSig2;
+							if( matchesName(patternSig3.toCharArray(),	identifier.toCharArray()) ) {
+								continue;
+							}
 						}
+						return TYPE_PARAMS_COUNT_MATCH;
 					} else if( !patternSig.equals(domSig)) {
 						return TYPE_PARAMS_COUNT_MATCH;
 					}
@@ -409,7 +426,7 @@ private boolean validateOneTypeParameterExtends(String criteriaSignature, ITypeB
 			if( evaluateSigIsUnresolved && boundSig.endsWith("." + evaluateSigTrimmed)) {
 				return true;
 			}
-			if( !evaluateSigIsUnresolved && evaluateBinding instanceof ITypeBinding itb) {
+			if( evaluateBinding instanceof ITypeBinding itb) {
 				ITypeBinding working = itb;
 				while(working != null) {
 					ITypeBinding superClaz = working.getSuperclass();