SONARPY-2846 Share the same ProjectLevelTypeTable instance across files analysis (#360)

GitOrigin-RevId: 673c28b6ac4ed5db19430d57872a5a02fec1b594

Author: maksim-grebeniuk-sonarsource

python-commons/src/main/java/org/sonar/plugins/python/PythonScanner.java

@@ -155,6 +155,7 @@ private PythonVisitorContext createVisitorContext(PythonInputFile inputFile, Pyt
         .workingDirectory(getWorkingDirectory(context))
         .packageName(indexer.packageName(inputFile))
         .projectLevelSymbolTable(indexer.projectLevelSymbolTable())
+        .typeTable(indexer.projectLevelTypeTable())
         .cacheContext(indexer.cacheContext())
         .sonarProduct(context.runtime().getProduct())
         .build();

python-commons/src/main/java/org/sonar/plugins/python/indexer/PythonIndexer.java

@@ -41,6 +41,8 @@
 import org.sonar.python.project.config.SignatureBasedAwsLambdaHandlersCollector;
 import org.sonar.python.parser.PythonParser;
 import org.sonar.python.semantic.ProjectLevelSymbolTable;
+import org.sonar.python.semantic.v2.ProjectLevelTypeTable;
+import org.sonar.python.semantic.v2.TypeTable;
 import org.sonar.python.tree.PythonTreeMaker;
 
 import static org.sonar.python.semantic.SymbolUtils.pythonPackageName;
@@ -53,7 +55,10 @@ public abstract class PythonIndexer {
 
   private final Map<URI, String> packageNames = new ConcurrentHashMap<>();
   private final Supplier<PythonParser> parserSupplier = PythonParser::create;
+
   private final ProjectLevelSymbolTable projectLevelSymbolTable = ProjectLevelSymbolTable.empty();
+  private final ProjectLevelTypeTable projectLevelTypeTable = new ProjectLevelTypeTable(projectLevelSymbolTable);
+
   private final SignatureBasedAwsLambdaHandlersCollector signatureBasedAwsLambdaHandlersCollector = new SignatureBasedAwsLambdaHandlersCollector();
   private final ProjectConfigurationBuilder projectConfigurationBuilder;
 
@@ -69,6 +74,10 @@ public ProjectConfiguration projectConfig() {
     return projectConfigurationBuilder.build();
   }
 
+  public TypeTable projectLevelTypeTable() {
+    return projectLevelTypeTable;
+  }
+
   public String packageName(PythonInputFile inputFile) {
     if (!packageNames.containsKey(inputFile.wrappedFile().uri())) {
       String name = pythonPackageName(inputFile.wrappedFile().file(), projectBaseDirAbsolutePath);

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

@@ -37,6 +37,7 @@
 import org.sonar.python.semantic.v2.SymbolTableBuilderV2;
 import org.sonar.python.semantic.v2.TypeInferenceV2;
 import org.sonar.python.semantic.v2.callgraph.CallGraph;
+import org.sonar.python.semantic.v2.TypeTable;
 import org.sonar.python.types.v2.TypeChecker;
 
 public class PythonVisitorContext extends PythonInputFileContext {
@@ -71,7 +72,6 @@ private PythonVisitorContext(FileInput rootTree,
   }
 
 
-
   public PythonVisitorContext(PythonFile pythonFile, RecognitionException parsingException, SonarProduct sonarProduct) {
     super(pythonFile, null, CacheContextImpl.dummyCache(), sonarProduct, ProjectLevelSymbolTable.empty());
     this.rootTree = null;
@@ -122,13 +122,13 @@ public static class Builder {
     private final FileInput rootTree;
 
     private Optional<ProjectLevelSymbolTable> projectLevelSymbolTable = Optional.empty();
+    private Optional<TypeTable> typeTable = Optional.empty();
     private Optional<CacheContext> cacheContext = Optional.empty();
     private Optional<SonarProduct> sonarProduct = Optional.empty();
     private Optional<File> workingDirectory = Optional.empty();
     private Optional<ProjectConfiguration> projectConfiguration = Optional.empty();
     private Optional<CallGraph> callGraph = Optional.empty();
     private Optional<String> packageName = Optional.empty();
-    private Optional<ProjectLevelTypeTable> projectLevelTypeTable = Optional.empty();
     private Optional<ModuleType> moduleType = Optional.empty();
 
     public Builder(FileInput rootTree, PythonFile pythonFile) {
@@ -150,6 +150,11 @@ public Builder projectLevelSymbolTable(ProjectLevelSymbolTable projectLevelSymbo
       this.projectLevelSymbolTable = Optional.of(projectLevelSymbolTable);
       return this;
     }
+    
+    public Builder typeTable(TypeTable typeTable) {
+      this.typeTable = Optional.ofNullable(typeTable);
+      return this;
+    }
 
     public Builder cacheContext(CacheContext cacheContext) {
       this.cacheContext = Optional.of(cacheContext);
@@ -166,11 +171,6 @@ public Builder projectConfiguration(ProjectConfiguration projectConfiguration) {
       return this;
     }
 
-    public Builder projectLevelTypeTable(ProjectLevelTypeTable projectLevelTypeTable) {
-      this.projectLevelTypeTable = Optional.of(projectLevelTypeTable);
-      return this;
-    }
-
     public Builder moduleType(ModuleType moduleType) {
       this.moduleType = Optional.of(moduleType);
       return this;
@@ -185,11 +185,11 @@ public PythonVisitorContext build() {
       var symbolTable = projectLevelSymbolTable.orElseGet(ProjectLevelSymbolTable::empty);
       var pkgName = packageName.orElse("");
       buildSymbols(rootTree, pythonFile, pkgName, symbolTable);
-      var typeTable = this.projectLevelTypeTable.orElseGet(() -> new ProjectLevelTypeTable(symbolTable));
+      var finalTypeTable = this.typeTable.orElseGet(() -> new ProjectLevelTypeTable(symbolTable));
       var mt = moduleType.orElseGet(() -> {
         var symbolTableBuilderV2 = new SymbolTableBuilderV2(rootTree);
         var symbolTableV2 = symbolTableBuilderV2.build();
-        return new TypeInferenceV2(typeTable, pythonFile, symbolTableV2, pkgName).inferModuleType(rootTree);
+        return new TypeInferenceV2(finalTypeTable, pythonFile, symbolTableV2, pkgName).inferModuleType(rootTree);
       });
 
       return new PythonVisitorContext(
@@ -201,7 +201,7 @@ public PythonVisitorContext build() {
         sonarProduct.orElse(SonarProduct.SONARQUBE),
         projectConfiguration.orElse(new ProjectConfiguration()),
         mt,
-        new TypeChecker(typeTable),
+        new TypeChecker(finalTypeTable),
         callGraph.orElse(CallGraph.EMPTY)
       );
     }

python-frontend/src/main/java/org/sonar/python/TestPythonVisitorRunner.java

@@ -103,7 +103,7 @@ public static PythonVisitorContext createContext(File file, @Nullable File worki
       .projectLevelSymbolTable(projectLevelSymbolTable)
       .cacheContext(cacheContext)
       .projectConfiguration(projectConfiguration)
-      .projectLevelTypeTable(typeTable)
+      .typeTable(typeTable)
       .moduleType(moduleType)
       .build();
   }

python-frontend/src/test/java/org/sonar/plugins/python/api/PythonVisitorContextTest.java

@@ -33,6 +33,7 @@
 import org.sonar.python.index.VariableDescriptor;
 import org.sonar.python.parser.PythonParser;
 import org.sonar.python.semantic.ProjectLevelSymbolTable;
+import org.sonar.python.semantic.v2.ProjectLevelTypeTable;
 import org.sonar.python.tree.FileInputImpl;
 import org.sonar.python.tree.PythonTreeMaker;
 
@@ -101,13 +102,15 @@ void globalSymbols() {
   void sonar_product() {
     CacheContextImpl cacheContext = CacheContextImpl.dummyCache();
     ProjectLevelSymbolTable projectLevelSymbolTable = ProjectLevelSymbolTable.empty();
+    var projectLevelTypeTable = new ProjectLevelTypeTable(projectLevelSymbolTable);
     String myPackage = "my_package";
     PythonFile pythonFile = pythonFile("my_module.py");
     FileInput fileInput = mock(FileInputImpl.class);
 
     PythonVisitorContext pythonVisitorContext = new PythonVisitorContext.Builder(fileInput, pythonFile)
       .packageName(myPackage)
       .projectLevelSymbolTable(projectLevelSymbolTable)
+      .typeTable(projectLevelTypeTable)
       .cacheContext(cacheContext)
       .sonarProduct(SonarProduct.SONARLINT)
       .build();
@@ -116,6 +119,7 @@ void sonar_product() {
     pythonVisitorContext = new PythonVisitorContext.Builder(fileInput, pythonFile)
       .packageName(myPackage)
       .projectLevelSymbolTable(projectLevelSymbolTable)
+      .typeTable(projectLevelTypeTable)
       .cacheContext(cacheContext)
       .sonarProduct(SonarProduct.SONARQUBE)
       .build();
@@ -124,6 +128,7 @@ void sonar_product() {
     pythonVisitorContext = new PythonVisitorContext.Builder(fileInput, pythonFile)
       .packageName(myPackage)
       .projectLevelSymbolTable(projectLevelSymbolTable)
+      .typeTable(projectLevelTypeTable)
       .cacheContext(cacheContext)
       .build();
     assertThat(pythonVisitorContext.sonarProduct()).isEqualTo(SonarProduct.SONARQUBE);
@@ -134,5 +139,13 @@ void sonar_product() {
 
     pythonVisitorContext = new PythonVisitorContext(pythonFile, parsingException, SonarProduct.SONARLINT);
     assertThat(pythonVisitorContext.sonarProduct()).isEqualTo(SonarProduct.SONARLINT);
+
+    pythonVisitorContext = new PythonVisitorContext.Builder(fileInput, pythonFile)
+      .packageName(myPackage)
+      .projectLevelSymbolTable(projectLevelSymbolTable)
+      .cacheContext(cacheContext)
+      .sonarProduct(SonarProduct.SONARLINT)
+      .build();
+    assertThat(pythonVisitorContext.sonarProduct()).isEqualTo(SonarProduct.SONARLINT);
   }
 }