[Search] Improve filters when matching super-type

Author: mickaelistria

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

@@ -12,6 +12,7 @@
 
 import java.util.Set;
 
+import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
 import org.eclipse.jdt.core.dom.ClassInstanceCreation;
 import org.eclipse.jdt.core.dom.IBinding;
 import org.eclipse.jdt.core.dom.ITypeBinding;
@@ -43,12 +44,15 @@ public LocatorResponse match(org.eclipse.jdt.core.dom.LambdaExpression node, Nod
 
 	@Override
 	public LocatorResponse match(Type node, NodeSetWrapper nodeSet, MatchLocator locator) {
-		if (Set.of(TypeDeclaration.SUPERCLASS_TYPE_PROPERTY, TypeDeclaration.SUPER_INTERFACE_TYPES_PROPERTY, ClassInstanceCreation.TYPE_PROPERTY).contains(node)) {
+		if (!Set.of(TypeDeclaration.SUPERCLASS_TYPE_PROPERTY, TypeDeclaration.SUPER_INTERFACE_TYPES_PROPERTY, ClassInstanceCreation.TYPE_PROPERTY).contains(node.getLocationInParent())) {
 			return toResponse(IMPOSSIBLE_MATCH);
 		}
 		if (node.getLocationInParent() == ClassInstanceCreation.TYPE_PROPERTY && node.getParent() instanceof ClassInstanceCreation newInst && newInst.getAnonymousClassDeclaration() == null) {
 			return toResponse(IMPOSSIBLE_MATCH);
 		}
+		if (node.getParent() instanceof AbstractTypeDeclaration decl && !DOMTypeDeclarationLocator.matchSearchForTypeSuffix(decl, this.locator.pattern.typeSuffix)) {
+			return toResponse(IMPOSSIBLE_MATCH);
+		}
 		if (this.locator.pattern.superSimpleName == null) {
 			int level = nodeSet.addMatch(node, this.locator.pattern.mustResolve ? POSSIBLE_MATCH : ACCURATE_MATCH);
 			return toResponse(level, true);
@@ -82,23 +86,18 @@ public LocatorResponse resolveLevel(org.eclipse.jdt.core.dom.ASTNode node, IBind
 
 		var type = (ITypeBinding) binding;
 		int level = IMPOSSIBLE_MATCH;
-		if (this.locator.pattern.superRefKind != SuperTypeReferencePattern.ONLY_SUPER_INTERFACES) {
+		if (this.locator.pattern.superRefKind != SuperTypeReferencePattern.ONLY_SUPER_INTERFACES || node.getLocationInParent() == TypeDeclaration.SUPER_INTERFACE_TYPES_PROPERTY) {
 			level = this.resolveLevelForType(this.locator.pattern.superSimpleName, this.locator.pattern.superQualification,
-					type.getSuperclass());
+					type);
 			if (level == ACCURATE_MATCH)
 				return toResponse(ACCURATE_MATCH);
 		}
 
-		if (this.locator.pattern.superRefKind != SuperTypeReferencePattern.ONLY_SUPER_CLASSES) {
-			for (ITypeBinding superInterface : type.getInterfaces()) {
-				int newLevel = this.resolveLevelForType(this.locator.pattern.superSimpleName, this.locator.pattern.superQualification,
-						superInterface);
-				if (newLevel > level) {
-					if (newLevel == ACCURATE_MATCH)
-						return toResponse(ACCURATE_MATCH);
-					level = newLevel;
-				}
-			}
+		if (this.locator.pattern.superRefKind != SuperTypeReferencePattern.ONLY_SUPER_CLASSES || node.getLocationInParent() == TypeDeclaration.SUPERCLASS_TYPE_PROPERTY) {
+			level = this.resolveLevelForType(this.locator.pattern.superSimpleName, this.locator.pattern.superQualification,
+					type);
+			if (level == ACCURATE_MATCH)
+				return toResponse(ACCURATE_MATCH);
 		}
 		return toResponse(level);
 	}

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

@@ -45,7 +45,7 @@ public LocatorResponse match(AbstractTypeDeclaration node, NodeSetWrapper nodeSe
 		return toResponse(IMPOSSIBLE_MATCH);
 	}
 
-	private boolean matchSearchForTypeSuffix(AbstractTypeDeclaration type, char typeSuffix) {
+	static boolean matchSearchForTypeSuffix(AbstractTypeDeclaration type, char typeSuffix) {
 		return switch (typeSuffix) {
 			case IIndexConstants.CLASS_SUFFIX -> type instanceof TypeDeclaration decl && !decl.isInterface();
 			case IIndexConstants.CLASS_AND_INTERFACE_SUFFIX -> type instanceof TypeDeclaration;