SONARPY-3679 Merge isSubtypeOf with isOrExtendsType (#790)

GitOrigin-RevId: 8e1c7a72509a2b559e99b29a082e3ace840be0c3

Author: Seppli11

.claude/skills/type-matchers.md

@@ -130,22 +130,13 @@ TypeMatchers.isObjectOfType("builtins.str")
 // TypeMatchers.isObjectSatisfying(TypeMatchers.isType("builtins.str"))
 ```
 
-### Subtype Matching
-
-#### `isSubtypeOf(String fqn)`
-Checks if the type is a subtype of the type resolved from the FQN.
-
-```java
-TypeMatchers.isSubtypeOf("typing.Mapping")
-```
-
-#### `isObjectOfSubType(String fqn)`
-Convenience method for object instances of subtypes.
+#### `isObjectInstanceOf(String fqn)`
+Checks if the type is an object type and if its nested type or supertypes match the given type by equality. Useful for checking if an instance is of a type or extends it.
 
 ```java
-TypeMatchers.isObjectOfSubType("typing.Mapping")
+TypeMatchers.isObjectInstanceOf("builtins.Exception")
 // Equivalent to:
-// TypeMatchers.isObjectSatisfying(TypeMatchers.isSubtypeOf("typing.Mapping"))
+// TypeMatchers.isObjectSatisfying(TypeMatchers.isOrExtendsType("builtins.Exception"))
 ```
 
 ### Type Hierarchy Matching
@@ -225,9 +216,7 @@ TypeMatchers.any(
 ### Checking for Dict-like Types
 
 ```java
-TypeMatchers.isObjectSatisfying(
-  TypeMatchers.isSubtypeOf("typing.Mapping")
-)
+TypeMatchers.isObjectInstanceOf("typing.Mapping")
 ```
 
 ### Checking Method Owner

python-frontend/src/main/java/org/sonar/plugins/python/api/types/v2/matchers/TypeMatchers.java

@@ -28,7 +28,6 @@
 import org.sonar.python.types.v2.matchers.HasMemberSatisfyingPredicate;
 import org.sonar.python.types.v2.matchers.IsFunctionOwnerSatisfyingPredicate;
 import org.sonar.python.types.v2.matchers.IsObjectSatisfyingPredicate;
-import org.sonar.python.types.v2.matchers.IsSubtypeOfPredicate;
 import org.sonar.python.types.v2.matchers.IsTypeOrSuperTypeSatisfyingPredicate;
 import org.sonar.python.types.v2.matchers.IsTypePredicate;
 import org.sonar.python.types.v2.matchers.TypePredicate;
@@ -95,12 +94,13 @@ public static TypeMatcher isObjectOfType(String fqn) {
     return isObjectSatisfying(isType(fqn));
   }
 
-  public static TypeMatcher isSubtypeOf(String fqn) {
-    return new TypeMatcherImpl(new IsSubtypeOfPredicate(fqn));
-  }
-
-  public static TypeMatcher isObjectOfSubType(String fqn) {
-    return isObjectSatisfying(isSubtypeOf(fqn));
+  /**
+   * Checks if the type of the expression is an object type and if its nested type, or its supertypes, matches the given type by equality.
+   * @param fqn The FQN of the type to match by equality
+   * @return a type matcher
+   */
+  public static TypeMatcher isObjectInstanceOf(String fqn) {
+    return isObjectSatisfying(isOrExtendsType(fqn));
   }
 
   public static TypeMatcher isOrExtendsType(String fqn) {

python-frontend/src/main/java/org/sonar/python/semantic/v2/types/TypeInferenceMatchers.java

@@ -24,7 +24,7 @@
 import org.sonar.python.types.v2.matchers.HasMemberPredicate;
 import org.sonar.python.types.v2.matchers.IsObjectSatisfyingPredicate;
 import org.sonar.python.types.v2.matchers.IsSelfTypePredicate;
-import org.sonar.python.types.v2.matchers.IsSubtypeOfPredicate;
+import org.sonar.python.types.v2.matchers.IsTypeOrSuperTypeSatisfyingPredicate;
 import org.sonar.python.types.v2.matchers.IsTypePredicate;
 import org.sonar.python.types.v2.matchers.TypePredicate;
 
@@ -56,8 +56,8 @@ public static TypePredicate isObjectOfType(String fqn) {
     return isObjectSatisfying(isType(fqn));
   }
 
-  public static TypePredicate isSubtypeOf(String fqn) {
-    return new IsSubtypeOfPredicate(fqn);
+  public static TypePredicate isOrExtendsType(String fqn) {
+    return new IsTypeOrSuperTypeSatisfyingPredicate(isType(fqn));
   }
 
   public static TypePredicate hasMember(String memberName) {

python-frontend/src/main/java/org/sonar/python/semantic/v2/types/typecalculator/QualifiedExpressionCalculator.java

@@ -28,7 +28,7 @@
 
 public class QualifiedExpressionCalculator {
   private static final TypeInferenceMatcher IS_PROPERTY_TYPE = TypeInferenceMatcher.of(
-    TypeInferenceMatchers.isSubtypeOf("property"));
+    TypeInferenceMatchers.isOrExtendsType("property"));
 
   private final TypePredicateContext typePredicateContext;
 

python-frontend/src/main/java/org/sonar/python/types/v2/matchers/IsSubtypeOfPredicate.java

@@ -31,6 +31,50 @@
 
 class IsTypeOrSuperTypeSatisfyingPredicateTest {
 
+  @Test
+  void testObjectInstanceOf() {
+    var project = new TestProject();
+    project.addModule("my_file.py", """
+      class A:
+        pass
+      """);
+    Expression objectTypeExpression = project.lastExpression("""
+      from my_file import A
+      A()
+      """);
+
+    SubscriptionContext subscriptionContext = Mockito.mock(SubscriptionContext.class);
+    Mockito.when(subscriptionContext.typeTable()).thenReturn(project.projectLevelTypeTable());
+
+    assertThat(TypeMatchers.isObjectInstanceOf("my_file.A").evaluateFor(objectTypeExpression, subscriptionContext)).isEqualTo(TriBool.TRUE);
+    assertThat(TypeMatchers.isObjectInstanceOf("str").evaluateFor(objectTypeExpression, subscriptionContext)).isEqualTo(TriBool.FALSE);
+  }
+
+  @Test
+  void testObjectInstanceOfWithSubclasses() {
+    var project = new TestProject();
+    project.addModule("my_file.py", """
+      class A:
+        pass
+      class B(A):
+        pass
+      class C(A):
+        pass
+      """);
+    Expression objectTypeExpression = project.lastExpression("""
+      from my_file import B
+      B()
+      """);
+
+    SubscriptionContext subscriptionContext = Mockito.mock(SubscriptionContext.class);
+    Mockito.when(subscriptionContext.typeTable()).thenReturn(project.projectLevelTypeTable());
+
+    assertThat(TypeMatchers.isObjectInstanceOf("my_file.A").evaluateFor(objectTypeExpression, subscriptionContext)).isEqualTo(TriBool.TRUE);
+    assertThat(TypeMatchers.isObjectInstanceOf("my_file.B").evaluateFor(objectTypeExpression, subscriptionContext)).isEqualTo(TriBool.TRUE);
+    assertThat(TypeMatchers.isObjectInstanceOf("my_file.C").evaluateFor(objectTypeExpression, subscriptionContext)).isEqualTo(TriBool.FALSE);
+    assertThat(TypeMatchers.isObjectInstanceOf("str").evaluateFor(objectTypeExpression, subscriptionContext)).isEqualTo(TriBool.FALSE);
+  }
+
   @Test
   void testDirectTypeMatchWithIsTypePredicate() {
     var project = new TestProject();