SONARPY-2167 Function return type in V2 model should always be an ObjectType

Author: ghislainpiot

python-checks/src/test/resources/checks/nonCallableCalled.py

@@ -257,7 +257,7 @@ def my_rec(x):
 
 def call_non_callable_property():
     e = OSError()
-    e.errno()  # FN
+    e.errno()  # Noncompliant
 
 class MyClass:
     x = 42

python-frontend/src/main/java/org/sonar/python/semantic/v2/converter/FunctionDescriptorToPythonTypeConverter.java

@@ -27,6 +27,7 @@
 import org.sonar.python.types.v2.ParameterV2;
 import org.sonar.python.types.v2.PythonType;
 import org.sonar.python.types.v2.TypeOrigin;
+import org.sonar.python.types.v2.TypeUtils;
 
 public class FunctionDescriptorToPythonTypeConverter implements DescriptorToPythonTypeConverter {
 
@@ -44,6 +45,7 @@ public PythonType convert(ConversionContext ctx, FunctionDescriptor from) {
 
     var returnType = Optional.ofNullable(from.annotatedReturnTypeName())
       .map(fqn -> (PythonType) ctx.lazyTypesContext().getOrCreateLazyType(fqn))
+      .map(TypeUtils::ensureWrappedObjectType)
       .orElse(PythonType.UNKNOWN);
 
     var typeOrigin = TypeOrigin.STUB;

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

@@ -41,7 +41,7 @@ public ObjectType(TypeWrapper typeWrapper, List<PythonType> attributes, List<Mem
   }
 
   public ObjectType(PythonType type, List<PythonType> attributes, List<Member> members, TypeSource typeSource) {
-    this(new SimpleTypeWrapper(type), attributes, members, typeSource);
+    this(TypeWrapper.of(type), attributes, members, typeSource);
   }
 
   public ObjectType(PythonType type) {

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

@@ -31,4 +31,11 @@ static PythonType resolved(PythonType pythonType) {
     }
     return pythonType;
   }
+
+  public static PythonType ensureWrappedObjectType(PythonType pythonType) {
+    if (!(pythonType instanceof ObjectType)) {
+      return new ObjectType(pythonType);
+    }
+    return pythonType;
+  }
 }

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

@@ -24,4 +24,8 @@ public interface TypeWrapper {
   PythonType type();
 
   TypeWrapper UNKNOWN_TYPE_WRAPPER = new SimpleTypeWrapper(PythonType.UNKNOWN);
+
+  static TypeWrapper of(PythonType type) {
+    return type instanceof LazyType ? new LazyTypeWrapper(type) : new SimpleTypeWrapper(type);
+  }
 }

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

@@ -380,7 +380,6 @@ def foo(param: int):
   }
 
   @Test
-  @Disabled
   void typeSourceOfCallExpressionResultDependsOnTypeSourceOfQualifier() {
     FileInput root = inferTypes("""
       def foo(x: int):
@@ -404,7 +403,6 @@ def foo(x: int):
   }
 
   @Test
-  @Disabled
   void typeSourceOfCallExpressionResultDependsOnTypeSourceOfName() {
     FileInput fileInput = inferTypes("""
       from pyasn1.debug import Printer
@@ -2278,7 +2276,6 @@ void resolvedTypingLazyType() {
   }
 
   @Test
-  @Disabled
   void resolveCustomTypeLazyType() {
     FileInput fileInput = inferTypes("""
       import ldap

python-frontend/src/test/java/org/sonar/python/types/v2/LazyTypeTest.java

@@ -24,7 +24,6 @@
 import org.sonar.python.semantic.ProjectLevelSymbolTable;
 import org.sonar.python.semantic.v2.LazyTypesContext;
 import org.sonar.python.semantic.v2.ProjectLevelTypeTable;
-import org.sonar.python.semantic.v2.TypeShed;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -42,8 +41,6 @@ void lazyTypeThrowExceptionsWhenInteractedWith() {
     assertThat(lazyType.resolve()).isEqualTo(INT_TYPE);
     assertThatThrownBy(lazyType::unwrappedType).isInstanceOf(IllegalStateException.class).hasMessage("Lazy types should not be interacted with.");
     assertThatThrownBy(() -> lazyType.hasMember("__bool__")).isInstanceOf(IllegalStateException.class).hasMessage("Lazy types should not be interacted with.");
-    ObjectType objectContainingLazyType = new ObjectType(lazyType, TypeSource.EXACT);
-    assertThatThrownBy(() -> objectContainingLazyType.hasMember("__bool__")).isInstanceOf(IllegalStateException.class).hasMessage("Lazy types should not be interacted with.");
     assertThatThrownBy(lazyType::name).isInstanceOf(IllegalStateException.class).hasMessage("Lazy types should not be interacted with.");
     assertThatThrownBy(lazyType::instanceDisplayName).isInstanceOf(IllegalStateException.class).hasMessage("Lazy types should not be interacted with.");
     assertThatThrownBy(() -> lazyType.resolveMember("__bool__")).isInstanceOf(IllegalStateException.class).hasMessage("Lazy types should not be interacted with.");