[DOM Search] Parameterized types are not having source range replaced when unnecessarily qualified

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

@@ -896,23 +896,27 @@ public void reportSearchMatch(MatchLocator locator, ASTNode node, SearchMatch ma
 		if (!report) 
 			return;
 
-		ASTNode replacementNode = null;
-		if( node instanceof QualifiedType qtt) {
-			replacementNode = findNodeMatchingPatternQualifier(qtt.getQualifier());
-		} else if( node instanceof SimpleType st) {
-			replacementNode = findNodeMatchingPatternQualifier(st);
+		ASTNode replacementNodeForStartPosition = null;
+		ASTNode toCheck = node;
+		if( node instanceof ParameterizedType ptt) {
+			toCheck = ptt.getType();
+		}
+		if( toCheck instanceof QualifiedType qtt) {
+			replacementNodeForStartPosition = findNodeMatchingPatternQualifier(qtt.getQualifier());
+		} else if( toCheck instanceof SimpleType st) {
+			replacementNodeForStartPosition = findNodeMatchingPatternQualifier(st);
 		}
 
-		if( replacementNode != null ) {
+		if( replacementNodeForStartPosition != null ) {
 			int matchStart = match.getOffset();
 			int matchEnd = matchStart + match.getLength();
-			int newStart = replacementNode.getStartPosition();
+			int newStart = replacementNodeForStartPosition.getStartPosition();
 			int newLength = matchEnd - newStart;
 			match.setOffset(newStart);
 			match.setLength(newLength);
 		}
 
-		ASTNode working = (replacementNode != null ? replacementNode : node);
+		ASTNode working = (replacementNodeForStartPosition != null ? replacementNodeForStartPosition : node);
 		int trimQualifierStart = findTrimQualifierStart(working);
 		if( trimQualifierStart != -1 ) {
 			int matchStart = match.getOffset();