SONARPY-3219 Global Variables should propagate to functions (#665)

GitOrigin-RevId: dd84f0f3cbcf4577ad7da7ca4bb0d6f08b78d90d

Author: Seppli11

python-checks/src/main/java/org/sonar/python/checks/ConfusingTypeCheckingCheck.java

@@ -34,10 +34,10 @@
 import org.sonar.plugins.python.api.tree.Token;
 import org.sonar.plugins.python.api.tree.Tree;
 import org.sonar.plugins.python.api.types.InferredType;
+import org.sonar.plugins.python.api.types.v2.PythonType;
 import org.sonar.python.tree.TreeUtils;
 import org.sonar.python.types.InferredTypes;
 import org.sonar.python.types.TypeShed;
-import org.sonar.plugins.python.api.types.v2.PythonType;
 
 import static org.sonar.python.tree.TreeUtils.nameFromExpression;
 import static org.sonar.python.types.InferredTypes.containsDeclaredType;
@@ -211,7 +211,8 @@ protected boolean isExpectedTypeSource(SubscriptionContext ctx, PythonType calle
     @Override
     protected boolean isException(SubscriptionContext ctx, PythonType calleeType) {
       var isCoroutine = ctx.typeChecker().typeCheckBuilder().isInstanceOf("typing.Coroutine").check(calleeType) == TriBool.TRUE;
-      return super.isException(ctx, calleeType) || isCoroutine;
+      var isTypeVar = ctx.typeChecker().typeCheckBuilder().isInstanceOf("typing.TypeVar").check(calleeType) == TriBool.TRUE;
+      return super.isException(ctx, calleeType) || isCoroutine || isTypeVar;
     }
   }
 

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

@@ -1,4 +1,4 @@
-from typing import Set, FrozenSet, Union, Coroutine, Callable
+from typing import Set, FrozenSet, Union, Coroutine, Callable, TypeVar
 import asyncio
 
 def empty_union(x: Union['A', 'B']):
@@ -59,3 +59,11 @@ def local_function() -> int:
 def calling_local_function():
     x = local_function()
     x() # Noncompliant
+
+T = TypeVar("T", bound=Callable)
+def calling_type_var(function: T):
+  function()
+
+T2 = TypeVar("T2", bound=int)
+def calling_type_var(function: T2):
+  function() # FN: We don't preserve the bound type of the TypeVar

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

@@ -89,3 +89,14 @@ def no_fp_aws_elasticloadbalancing():
 
     print(app_listener)
     print(net_listener)
+
+
+def locally_defined_function():
+    def foo() -> None:
+        ...
+
+    def bar() -> int:
+        return 42
+
+    a = foo() # Noncompliant
+    b = bar() # OK

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

@@ -16,13 +16,13 @@
  */
 package org.sonar.plugins.python.api.types.v2;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import org.sonar.api.Beta;
 import org.sonar.plugins.python.api.LocationInFile;
 import org.sonar.plugins.python.api.TriBool;
+import org.sonar.python.semantic.v2.TypeBuilder;
 
 @Beta
 public final class ObjectType implements PythonType {
@@ -31,32 +31,13 @@ public final class ObjectType implements PythonType {
   private final List<Member> members;
   private final TypeSource typeSource;
 
-  public ObjectType(TypeWrapper typeWrapper, List<PythonType> attributes, List<Member> members, TypeSource typeSource) {
+  private ObjectType(TypeWrapper typeWrapper, List<PythonType> attributes, List<Member> members, TypeSource typeSource) {
     this.typeWrapper = typeWrapper;
     this.attributes = attributes;
     this.members = members;
     this.typeSource = typeSource;
   }
 
-  public ObjectType(PythonType type, List<PythonType> attributes, List<Member> members, TypeSource typeSource) {
-    this(TypeWrapper.of(type), attributes, members, typeSource);
-  }
-
-  public ObjectType(PythonType type) {
-    this(type, TypeSource.EXACT);
-  }
-
-  public ObjectType(TypeWrapper typeWrapper) {
-    this(typeWrapper, new ArrayList<>(), new ArrayList<>(), TypeSource.EXACT);
-  }
-
-  public ObjectType(PythonType type, TypeSource typeSource) {
-    this(type, new ArrayList<>(), new ArrayList<>(), typeSource);
-  }
-
-  public ObjectType(PythonType type, List<PythonType> attributes, List<Member> members) {
-    this(type, attributes, members, TypeSource.EXACT);
-  }
 
   @Override
   public Optional<String> displayName() {
@@ -147,4 +128,62 @@ public String toString() {
       "typeSource=" + typeSource + ']';
   }
 
+  public static class Builder implements TypeBuilder<ObjectType> {
+    private TypeWrapper typeWrapper;
+    private List<PythonType> attributes = List.of();
+    private List<Member> members = List.of();
+    private TypeSource typeSource = TypeSource.EXACT;
+
+    private Builder(TypeWrapper typeWrapper) {
+      this.typeWrapper = typeWrapper;
+    }
+
+    public static Builder fromTypeWrapper(TypeWrapper typeWrapper) {
+      return new Builder(typeWrapper);
+    }
+
+    public static Builder fromType(PythonType type) {
+      if (type instanceof ObjectType objectType) {
+        return new Builder(objectType.typeWrapper())
+          .withAttributes(objectType.attributes())
+          .withMembers(objectType.members())
+          .withTypeSource(objectType.typeSource());
+      }
+      return new Builder(TypeWrapper.of(type));
+    }
+
+    @Override
+    public ObjectType build() {
+      return new ObjectType(typeWrapper, attributes, members, typeSource);
+    }
+
+    @Override
+    public TypeBuilder<ObjectType> withDefinitionLocation(LocationInFile definitionLocation) {
+      throw new IllegalStateException("Object type does not have definition location");
+    }
+
+    public Builder withType(PythonType type) {
+      this.typeWrapper = TypeWrapper.of(type);
+      return this;
+    }
+
+    public Builder withAttributes(List<PythonType> attributes) {
+      this.attributes = attributes;
+      return this;
+    }
+
+    public Builder withMembers(List<Member> members) {
+      this.members = members;
+      return this;
+    }
+
+    public Builder withTypeSource(TypeSource typeSource) {
+      this.typeSource = typeSource;
+      return this;
+    }
+  }
+
+  public static ObjectType fromType(PythonType type) {
+    return Builder.fromType(type).build();
+  }
 }

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

@@ -83,7 +83,9 @@ public static PythonType of(@Nullable PythonType type) {
     if (type instanceof ObjectType objectType) {
       PythonType innerType = objectType.unwrappedType();
       SelfType selfType = new SelfType(innerType);
-      return new ObjectType(selfType, objectType.attributes(), objectType.members(), objectType.typeSource());
+      return ObjectType.Builder.fromType(objectType)
+        .withType(selfType)
+        .build();
     }
 
     if (type instanceof UnionType unionType) {

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

@@ -17,13 +17,13 @@
 package org.sonar.python.semantic.v2.converter;
 
 import java.util.Optional;
-import org.sonar.python.index.FunctionDescriptor;
-import org.sonar.python.types.v2.LazyTypeWrapper;
 import org.sonar.plugins.python.api.types.v2.ObjectType;
 import org.sonar.plugins.python.api.types.v2.ParameterV2;
 import org.sonar.plugins.python.api.types.v2.PythonType;
-import org.sonar.python.types.v2.SimpleTypeWrapper;
 import org.sonar.plugins.python.api.types.v2.TypeWrapper;
+import org.sonar.python.index.FunctionDescriptor;
+import org.sonar.python.types.v2.LazyTypeWrapper;
+import org.sonar.python.types.v2.SimpleTypeWrapper;
 
 public class ParameterConverter {
 
@@ -33,7 +33,7 @@ public ParameterV2 convert(ConversionContext ctx, FunctionDescriptor.Parameter p
       .map(lt -> (TypeWrapper) new LazyTypeWrapper(lt))
       .orElseGet(() -> new SimpleTypeWrapper(PythonType.UNKNOWN));
 
-    var type = new ObjectType(typeWrapper);
+    var type = ObjectType.Builder.fromTypeWrapper(typeWrapper).build();
 
     return new ParameterV2(parameter.name(),
       new SimpleTypeWrapper(type),

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

@@ -16,12 +16,12 @@
  */
 package org.sonar.python.semantic.v2.converter;
 
-import org.sonar.python.index.Descriptor;
-import org.sonar.python.index.VariableDescriptor;
 import org.sonar.plugins.python.api.types.v2.ObjectType;
 import org.sonar.plugins.python.api.types.v2.PythonType;
-import org.sonar.python.types.v2.SpecialFormType;
 import org.sonar.plugins.python.api.types.v2.TypeWrapper;
+import org.sonar.python.index.Descriptor;
+import org.sonar.python.index.VariableDescriptor;
+import org.sonar.python.types.v2.SpecialFormType;
 
 public class VariableDescriptorToPythonTypeConverter implements DescriptorToPythonTypeConverter {
 
@@ -37,7 +37,7 @@ public PythonType convert(ConversionContext ctx, VariableDescriptor from) {
         return new SpecialFormType(fullyQualifiedName);
       }
       TypeWrapper typeWrapper = ctx.lazyTypesContext().getOrCreateLazyTypeWrapper(annotatedType);
-      return new ObjectType(typeWrapper);
+      return ObjectType.Builder.fromTypeWrapper(typeWrapper).build();
     }
     return PythonType.UNKNOWN;
   }