SONARPY-2180 Move TypeShedDescriptorsProvider into ProjectLevelSymbolTable (#2040)

Author: ghislainpiot

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

@@ -41,6 +41,7 @@
 import org.sonar.python.index.Descriptor;
 import org.sonar.python.index.DescriptorUtils;
 import org.sonar.python.index.VariableDescriptor;
+import org.sonar.python.semantic.v2.typeshed.TypeShedDescriptorsProvider;
 
 import static org.sonar.python.tree.TreeUtils.getSymbolFromTree;
 import static org.sonar.python.tree.TreeUtils.nthArgumentOrKeyword;
@@ -52,6 +53,7 @@ public class ProjectLevelSymbolTable {
   private final Set<String> djangoViewsFQN = new HashSet<>();
   private final Map<String, Set<String>> importsByModule = new HashMap<>();
   private final Set<String> projectBasePackages = new HashSet<>();
+  private TypeShedDescriptorsProvider typeShedDescriptorsProvider = null;
 
   public static ProjectLevelSymbolTable empty() {
     return new ProjectLevelSymbolTable(Collections.emptyMap());
@@ -187,6 +189,13 @@ public Set<String> projectBasePackages() {
     return projectBasePackages;
   }
 
+  public TypeShedDescriptorsProvider typeShedDescriptorsProvider() {
+    if (typeShedDescriptorsProvider == null) {
+      typeShedDescriptorsProvider = new TypeShedDescriptorsProvider(projectBasePackages);
+    }
+    return typeShedDescriptorsProvider;
+  }
+
   private class DjangoViewsVisitor extends BaseTreeVisitor {
     @Override
     public void visitCallExpression(CallExpression callExpression) {

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

@@ -38,7 +38,6 @@
 import org.sonar.python.semantic.FunctionSymbolImpl;
 import org.sonar.python.semantic.ProjectLevelSymbolTable;
 import org.sonar.python.semantic.v2.converter.AnyDescriptorToPythonTypeConverter;
-import org.sonar.python.semantic.v2.typeshed.TypeShedDescriptorsProvider;
 import org.sonar.python.types.InferredTypes;
 import org.sonar.python.types.protobuf.SymbolsProtos;
 import org.sonar.python.types.v2.ClassType;
@@ -59,16 +58,14 @@ public class SymbolsModuleTypeProvider {
   private final ProjectLevelSymbolTable projectLevelSymbolTable;
   private final ModuleType rootModule;
   private final LazyTypesContext lazyTypesContext;
-  private final TypeShedDescriptorsProvider typeShedDescriptorsProvider;
   private final AnyDescriptorToPythonTypeConverter anyDescriptorToPythonTypeConverter;
 
   public SymbolsModuleTypeProvider(ProjectLevelSymbolTable projectLevelSymbolTable, LazyTypesContext lazyTypeContext) {
     this.projectLevelSymbolTable = projectLevelSymbolTable;
     this.lazyTypesContext = lazyTypeContext;
-    this.typeShedDescriptorsProvider = new TypeShedDescriptorsProvider(projectLevelSymbolTable.projectBasePackages());
     this.anyDescriptorToPythonTypeConverter = new AnyDescriptorToPythonTypeConverter(lazyTypesContext);
 
-    var rootModuleMembers = typeShedDescriptorsProvider.builtinDescriptors()
+    var rootModuleMembers = projectLevelSymbolTable.typeShedDescriptorsProvider().builtinDescriptors()
       .entrySet()
       .stream()
       .collect(Collectors.toMap(Map.Entry::getKey, e -> anyDescriptorToPythonTypeConverter.convert(e.getValue())));
@@ -100,7 +97,7 @@ private Optional<ModuleType> createModuleTypeFromProjectLevelSymbolTable(String
   }
 
   private Optional<ModuleType> createModuleTypeFromTypeShed(String moduleName, String moduleFqn, ModuleType parent) {
-    var moduleMembers = typeShedDescriptorsProvider.descriptorsForModule(moduleFqn)
+    var moduleMembers = projectLevelSymbolTable.typeShedDescriptorsProvider().descriptorsForModule(moduleFqn)
       .entrySet().stream()
       .collect(Collectors.toMap(Map.Entry::getKey, e -> anyDescriptorToPythonTypeConverter.convert(e.getValue())));
     return Optional.of(moduleMembers).filter(m -> !m.isEmpty())