SONARPY-1829 tmp commit

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

@@ -21,21 +21,47 @@
 
 import javax.annotation.Nullable;
 import org.sonar.check.Rule;
-import org.sonar.plugins.python.api.types.InferredType;
+import org.sonar.plugins.python.api.PythonSubscriptionCheck;
+import org.sonar.plugins.python.api.tree.CallExpression;
+import org.sonar.plugins.python.api.tree.Expression;
+import org.sonar.plugins.python.api.tree.Tree;
+import org.sonar.python.types.v2.PythonType;
+import org.sonar.python.types.v2.TriBool;
+
+import static org.sonar.python.tree.TreeUtils.nameFromExpression;
 
 @Rule(key = "S5756")
-public class NonCallableCalledCheck extends NonCallableCalled {
+public class NonCallableCalledCheck extends PythonSubscriptionCheck {
 
   @Override
-  public boolean isNonCallableType(InferredType type) {
-    return !type.canHaveMember("__call__");
+  public void initialize(Context context) {
+    context.registerSyntaxNodeConsumer(Tree.Kind.CALL_EXPR, ctx -> {
+      CallExpression callExpression = (CallExpression) ctx.syntaxNode();
+      Expression callee = callExpression.callee();
+      PythonType type = callee.typeV2();
+      if (isNonCallableType(type)) {
+        String name = nameFromExpression(callee);
+        PreciseIssue preciseIssue = ctx.addIssue(callee, message(type, name));
+        type.definitionLocation()
+          .ifPresent(location -> preciseIssue.secondary(location, "Definition."));
+      }
+    });
   }
 
-  @Override
-  public String message(InferredType calleeType, @Nullable String name) {
+  protected static String addTypeName(PythonType type) {
+    return type.displayName()
+      .map(d -> " has type " + d + " and it")
+      .orElse("");
+  }
+
+  public boolean isNonCallableType(PythonType type) {
+    return type.hasMember("__call__") == TriBool.FALSE;
+  }
+
+  public String message(PythonType typeV2, @Nullable String name) {
     if (name != null) {
-      return String.format("Fix this call; \"%s\"%s is not callable.", name, addTypeName(calleeType));
+      return "Fix this call; \"%s\"%s is not callable.".formatted(name, addTypeName(typeV2));
     }
-    return String.format("Fix this call; this expression%s is not callable.", addTypeName(calleeType));
+    return "Fix this call; this expression%s is not callable.".formatted(addTypeName(typeV2));
   }
 }

python-checks/src/main/java/org/sonar/python/checks/utils/DeadStoreUtils.java

@@ -26,6 +26,7 @@
 import java.util.Set;
 import org.sonar.check.Rule;
 import org.sonar.plugins.python.api.cfg.CfgBlock;
+import org.sonar.plugins.python.api.tree.ClassDef;
 import org.sonar.plugins.python.api.tree.FunctionDef;
 import org.sonar.plugins.python.api.tree.Tree;
 import org.sonar.python.cfg.fixpoint.LiveVariablesAnalysis.LiveVariables;
@@ -51,7 +52,11 @@ public static List<UnnecessaryAssignment> findUnnecessaryAssignments(CfgBlock bl
       blockLiveVariables.getSymbolReadWrites(element).forEach((symbol, symbolReadWrite) -> {
         if (symbolReadWrite.isWrite() && !symbolReadWrite.isRead()) {
           if (!element.is(Tree.Kind.IMPORT_NAME) && !willBeRead.contains(symbol) && functionDef.localVariables().contains(symbol)) {
-            unnecessaryAssignments.add(new UnnecessaryAssignment(symbol, element));
+            Tree elementToReport = element;
+            if (elementToReport instanceof ClassDef classDefElement) {
+              elementToReport = classDefElement.name();
+            }
+            unnecessaryAssignments.add(new UnnecessaryAssignment(symbol, elementToReport));
           }
           willBeRead.remove(symbol);
         } else if (symbolReadWrite.isRead()) {

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

@@ -390,6 +390,11 @@ class a: # Noncompliant {{Remove this assignment to local variable 'a'; the valu
 #   ^^^^^^< 1 {{'a' is reassigned here.}}
     print(a)
 
+def function_dead_store():
+    def my_func(): ...
+    my_func = 42  # FN
+    print(my_func)
+
 def multiple_issues(a):
     b = 2 # Noncompliant
     if a:

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

@@ -27,6 +27,9 @@ def call_noncallable(p):
     dict_var = {}
     dict_var()  # Noncompliant
 
+    set_literal = {1, 2}
+    set_literal()  # Noncompliant
+
     set_var = set()
     set_var()  # Noncompliant
 
@@ -37,7 +40,11 @@ def call_noncallable(p):
       x = 42
     else:
       x = 'str'
-    x() # Noncompliant {{Fix this call; "x" is not callable.}}
+    x() # Noncompliant
+
+
+def call_no_name():
+    42() # Noncompliant {{Fix this call; this expression has type int and it is not callable.}}
 
 def flow_sensitivity():
   my_var = "hello"
@@ -69,16 +76,16 @@ def member_access():
 def types_from_typeshed(foo):
   from math import acos
   from functools import wraps
-  acos(42)() # Noncompliant {{Fix this call; this expression has type float and it is not callable.}}
-# ^^^^^^^^
+  acos(42)() # FN: declared return type of Typeshed
   wraps(func)(foo) # OK, wraps returns a Callable
 
 def with_metaclass():
   class Factory: ...
   class Base(metaclass=Factory): ...
   class A(Base): ...
   a = A()
-  a() # OK
+  # TODO: resolve type hierarchy and metaclasses
+  a() # Noncompliant
 
 
 def decorators():
@@ -181,3 +188,53 @@ def typing_named_tuple_no_fp():
     from typing import NamedTuple
     Employee = NamedTuple('Employee', [('name', str), ('id', int)])
     employee = Employee("Sam", 42)
+
+
+class Parent:
+    def __call__(self):
+        ...
+
+class Child(Parent):
+    ...
+
+
+def inherited_call_method():
+    child = Child()
+    child()  # OK
+
+
+some_global_func = None
+
+def assigning_global(my_func):
+    global some_global_func
+    some_global_func = my_func
+
+def calling_global_func():
+    some_global_func()  # OK
+
+
+some_nonlocal_var = 42
+
+def using_nonlocal_var():
+    nonlocal some_nonlocal_var
+    some_nonlocal_var()  # Noncompliant
+
+
+def reassigned_function():
+    if cond:
+        def my_callable(): ...
+        my_callable()  # OK
+    else:
+        def my_callable(): ...
+        my_callable = 42
+        my_callable()  # Noncompliant
+
+
+def reassigned_class():
+    if cond:
+        class MyClass(): ...
+        MyClass()  # OK
+    else:
+        def MyClass(): ...
+        MyClass = 42
+        MyClass()  # Noncompliant

python-frontend/src/main/java/org/sonar/plugins/python/api/LocationInFile.java

@@ -19,38 +19,5 @@
  */
 package org.sonar.plugins.python.api;
 
-public class LocationInFile {
-  private final String fileId;
-  private final int startLine;
-  private final int startLineOffset;
-  private final int endLine;
-  private final int endLineOffset;
-
-  public LocationInFile(String fileId, int startLine, int startLineOffset, int endLine, int endLineOffset) {
-    this.fileId = fileId;
-    this.startLine = startLine;
-    this.startLineOffset = startLineOffset;
-    this.endLine = endLine;
-    this.endLineOffset = endLineOffset;
-  }
-
-  public String fileId() {
-    return fileId;
-  }
-
-  public int startLine() {
-    return startLine;
-  }
-
-  public int startLineOffset() {
-    return startLineOffset;
-  }
-
-  public int endLine() {
-    return endLine;
-  }
-
-  public int endLineOffset() {
-    return endLineOffset;
-  }
+public record LocationInFile(String fileId, int startLine, int startLineOffset, int endLine, int endLineOffset) {
 }

python-frontend/src/main/java/org/sonar/plugins/python/api/PythonVisitorContext.java

@@ -31,6 +31,9 @@
 import org.sonar.python.caching.CacheContextImpl;
 import org.sonar.python.semantic.ProjectLevelSymbolTable;
 import org.sonar.python.semantic.SymbolTableBuilder;
+import org.sonar.python.semantic.v2.ProjectLevelTypeTable;
+import org.sonar.python.semantic.v2.SymbolTableBuilderV2;
+import org.sonar.python.semantic.v2.TypeInferenceV2;
 
 public class PythonVisitorContext extends PythonInputFileContext {
 
@@ -44,6 +47,8 @@ public PythonVisitorContext(FileInput rootTree, PythonFile pythonFile, @Nullable
     this.parsingException = null;
     SymbolTableBuilder symbolTableBuilder = packageName != null ? new SymbolTableBuilder(packageName, pythonFile) : new SymbolTableBuilder(pythonFile);
     symbolTableBuilder.visitFileInput(rootTree);
+    var symbolTable = new SymbolTableBuilderV2(rootTree).build();
+    new TypeInferenceV2(new ProjectLevelTypeTable(ProjectLevelSymbolTable.empty()), pythonFile, symbolTable).inferTypes(rootTree);
   }
 
   public PythonVisitorContext(FileInput rootTree, PythonFile pythonFile, @Nullable File workingDirectory, String packageName,
@@ -52,6 +57,10 @@ public PythonVisitorContext(FileInput rootTree, PythonFile pythonFile, @Nullable
     this.rootTree = rootTree;
     this.parsingException = null;
     new SymbolTableBuilder(packageName, pythonFile, projectLevelSymbolTable).visitFileInput(rootTree);
+
+    var symbolTable = new SymbolTableBuilderV2(rootTree)
+      .build();
+    new TypeInferenceV2(new ProjectLevelTypeTable(projectLevelSymbolTable), pythonFile, symbolTable).inferTypes(rootTree);
   }
 
   public PythonVisitorContext(FileInput rootTree, PythonFile pythonFile, @Nullable File workingDirectory, String packageName,
@@ -60,6 +69,9 @@ public PythonVisitorContext(FileInput rootTree, PythonFile pythonFile, @Nullable
     this.rootTree = rootTree;
     this.parsingException = null;
     new SymbolTableBuilder(packageName, pythonFile, projectLevelSymbolTable).visitFileInput(rootTree);
+    var symbolTable = new SymbolTableBuilderV2(rootTree)
+      .build();
+    new TypeInferenceV2(new ProjectLevelTypeTable(projectLevelSymbolTable), pythonFile, symbolTable).inferTypes(rootTree);
   }
 
   public PythonVisitorContext(PythonFile pythonFile, RecognitionException parsingException) {

python-frontend/src/main/java/org/sonar/plugins/python/api/tree/Expression.java

@@ -22,12 +22,18 @@
 import com.google.common.annotations.Beta;
 import org.sonar.plugins.python.api.types.InferredType;
 import org.sonar.python.types.InferredTypes;
+import org.sonar.python.types.v2.PythonType;
 
 public interface Expression extends Tree {
 
   @Beta
   default InferredType type() {
     return InferredTypes.anyType();
   }
+
+  @Beta
+  default PythonType typeV2() {
+    return PythonType.UNKNOWN;
+  }
 
 }

python-frontend/src/main/java/org/sonar/plugins/python/api/tree/Name.java

@@ -19,6 +19,8 @@
  */
 package org.sonar.plugins.python.api.tree;
 
+import org.sonar.python.semantic.v2.SymbolV2;
+
 /**
  * See https://docs.python.org/3/reference/expressions.html#atom-identifiers
  */
@@ -28,4 +30,6 @@ public interface Name extends Expression, HasSymbol {
 
   // FIXME: we should create a separate tree for Variables
   boolean isVariable();
+
+  SymbolV2 symbolV2();
 }

python-frontend/src/main/java/org/sonar/plugins/python/api/tree/QualifiedExpression.java

@@ -22,6 +22,7 @@
 import javax.annotation.CheckForNull;
 import org.sonar.plugins.python.api.symbols.Symbol;
 import org.sonar.plugins.python.api.symbols.Usage;
+import org.sonar.python.types.v2.PythonType;
 
 /**
  * Qualified expression like "foo.bar"
@@ -56,4 +57,9 @@ default Symbol symbol() {
   default Usage usage() {
     return name().usage();
   }
+
+  @Override
+  default PythonType typeV2() {
+    return name().typeV2();
+  }
 }

python-frontend/src/main/java/org/sonar/python/cfg/ControlFlowGraphBuilder.java

@@ -194,7 +194,7 @@ private PythonCfgBlock build(Statement statement, PythonCfgBlock currentBlock) {
 
   private PythonCfgBlock buildClassDefStatement(ClassDef classDef, PythonCfgBlock currentBlock) {
     PythonCfgBlock block = build(classDef.body().statements(), currentBlock);
-    block.addElement(classDef.name()); // represents binding to class name
+    block.addElement(classDef); // represents binding to class name
     classDef.decorators().stream().forEach(currentBlock::addElement);
     return block;
   }

python-frontend/src/main/java/org/sonar/python/semantic/SymbolUtils.java

@@ -148,7 +148,7 @@ public static List<Expression> assignmentsLhs(AssignmentStatement assignmentStat
       .toList();
   }
 
-  static List<Name> boundNamesFromExpression(@CheckForNull Tree tree) {
+  public static List<Name> boundNamesFromExpression(@CheckForNull Tree tree) {
     List<Name> names = new ArrayList<>();
     if (tree == null) {
       return names;