SONARPY-3575 Use QualifiedExpression for function return type (#712)

GitOrigin-RevId: 8c4f92335925cf1d2ab2be94698dde37995b78c5

Author: Seppli11

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

@@ -36,9 +36,9 @@
 import org.sonar.plugins.python.api.tree.AliasedName;
 import org.sonar.plugins.python.api.tree.AnnotatedAssignment;
 import org.sonar.plugins.python.api.tree.ArgList;
-import org.sonar.plugins.python.api.tree.AwaitExpression;
 import org.sonar.plugins.python.api.tree.AssignmentExpression;
 import org.sonar.plugins.python.api.tree.AssignmentStatement;
+import org.sonar.plugins.python.api.tree.AwaitExpression;
 import org.sonar.plugins.python.api.tree.BaseTreeVisitor;
 import org.sonar.plugins.python.api.tree.BinaryExpression;
 import org.sonar.plugins.python.api.tree.CallExpression;
@@ -730,8 +730,8 @@ private ClassType computeDirectClassOwner() {
   }
 
   private PythonType resolveTypeAnnotationExpressionType(Expression expression, @Nullable ClassType enclosingClassType) {
-    if (expression instanceof Name name && name.typeV2() != PythonType.UNKNOWN) {
-      PythonType resolvedType = resolveSelfType(name.typeV2(), enclosingClassType);
+    if ((expression instanceof Name || expression instanceof QualifiedExpression) && expression.typeV2() != PythonType.UNKNOWN) {
+      PythonType resolvedType = resolveSelfType(expression.typeV2(), enclosingClassType);
       return ObjectType.Builder.fromType(resolvedType).withTypeSource(TypeSource.TYPE_HINT).build();
     } else if (expression instanceof SubscriptionExpression subscriptionExpression && subscriptionExpression.object().typeV2() != PythonType.UNKNOWN) {
       var candidateTypes = subscriptionExpression.subscripts()

python-frontend/src/test/java/org/sonar/python/semantic/v2/TypeInferenceV2Test.java

@@ -4316,6 +4316,27 @@ class B(datetime.datetime): pass
       .isEqualTo(bType);
   }
 
+  @Test
+  void self_type_as_return_type_on_inherited_methods_with_qualified_expression() {
+    FileInput fileInput = inferTypes("""
+      import typing
+      class A:
+        def foo() -> typing.Self: ...
+
+      class B(A):
+        ...
+      resultB = B().foo()
+      """);
+
+    PythonType resultB = PythonTestUtils.<Name>getFirstChild(fileInput, t -> t instanceof Name name && "resultB".equals(name.name())).typeV2();
+    PythonType classTypeB = PythonTestUtils.<ClassDef>getFirstChild(fileInput, t -> t instanceof ClassDef cd && "B".equals(cd.name().name())).name().typeV2();
+
+    assertThat(resultB)
+      .isInstanceOf(ObjectType.class)
+      .extracting(PythonType::unwrappedType)
+      .isEqualTo(classTypeB);
+  }
+
   @Test
   void self_type_as_return_type_on_inherited_methods() {
     FileInput fileInput = inferTypes("""