SONARPY-3600 Prevent Types from TrivialTypeInferenceVisistor leaking into the ProjectLevelTypeTable (#749)

GitOrigin-RevId: caf3181d7d653489069d875def0d67b77ce488e0

Author: Seppli11

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

@@ -42,14 +42,6 @@ public ModuleType(@Nullable String name,
     this.parent = parent;
     this.members = members;
     this.subModules = new ConcurrentHashMap<>();
-    registerAsSubmoduleOfParent(parent);
-  }
-
-  private void registerAsSubmoduleOfParent(@Nullable ModuleType parent) {
-    if (parent == null) {
-      return;
-    }
-    parent.subModules.putIfAbsent(this.name, TypeWrapper.of(this));
   }
 
   public ModuleType(@Nullable String name) {
@@ -66,6 +58,10 @@ public ModuleType(@Nullable String name,
     this(name, null, parent, members);
   }
 
+  public void registerSubmodule(ModuleType submodule) {
+    subModules.putIfAbsent(submodule.name(), TypeWrapper.of(submodule));
+  }
+
   @Override
   public Optional<PythonType> resolveMember(String memberName) {
     return Optional.ofNullable(members.get(memberName)).map(TypeWrapper::type).or(() -> resolveSubmodule(memberName));

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

@@ -66,10 +66,13 @@ public PythonType convertModuleType(List<String> moduleFqn, ModuleType parent) {
     var moduleFqnString = getModuleFqnString(moduleFqn);
     Optional<ModuleType> result =  createModuleTypeFromProjectLevelSymbolTable(moduleName, moduleFqnString, parent)
       .or(() -> createModuleTypeFromTypeShed(moduleName, moduleFqnString, parent));
+
     if (result.isEmpty()) {
       return PythonType.UNKNOWN;
     }
-    return result.get();
+    var moduleType = result.get();
+    parent.registerSubmodule(moduleType);
+    return moduleType;
   }
 
   private static String getModuleFqnString(List<String> moduleFqn) {

python-frontend/src/test/java/org/sonar/plugins/python/api/types/v2/ModuleTypeTest.java

@@ -29,7 +29,7 @@ void constructorTest() {
     var b = new ModuleType("b", "a.b", a, new HashMap<>());
 
     Assertions.assertThat(b.fullyQualifiedName()).isEqualTo("a.b");
-    Assertions.assertThat(a.resolveMember("b")).containsSame(b);
+    Assertions.assertThat(a.resolveMember("b")).isEmpty();
   }
 
   @Test
@@ -49,6 +49,7 @@ void replaceMemberIfUnknown() {
     a.members().put("b", TypeWrapper.UNKNOWN_TYPE_WRAPPER);
     Assertions.assertThat(a.resolveMember("b")).containsSame(PythonType.UNKNOWN);
     var b = new ModuleType("b", a);
+    a.registerSubmodule(b);
     Assertions.assertThat(a.resolveMember("b")).containsSame(PythonType.UNKNOWN);
     Assertions.assertThat(a.resolveSubmodule("b")).containsSame(b);
   }
@@ -69,6 +70,7 @@ void registerAsSubmoduleTest() {
     a.members().put("b", TypeWrapper.UNKNOWN_TYPE_WRAPPER);
     Assertions.assertThat(a.resolveSubmodule("b")).isEmpty();
     var b = new ModuleType("b", a, Map.of());
+    a.registerSubmodule(b);
     Assertions.assertThat(a.resolveMember("b")).containsSame(PythonType.UNKNOWN);
     Assertions.assertThat(a.resolveSubmodule("b")).containsSame(b);
     // no parent: no effect
@@ -79,8 +81,10 @@ void registerAsSubmoduleTest() {
   void doNotReplaceKnownSubmodule() {
     var a = new ModuleType("a");
     ModuleType existingSubmodule = new ModuleType("b", a, Map.of());
+    a.registerSubmodule(existingSubmodule);
     Assertions.assertThat(a.resolveSubmodule("b")).containsSame(existingSubmodule);
-    new ModuleType("b", a, Map.of());
+    var b = new ModuleType("b", a, Map.of());
+    a.registerSubmodule(b);
     Assertions.assertThat(a.resolveSubmodule("b")).containsSame(existingSubmodule);
   }
 

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

@@ -86,7 +86,7 @@
 import org.sonar.python.tree.TreeUtils;
 import org.sonar.python.tree.TupleImpl;
 import org.sonar.python.types.v2.LazyType;
-import org.sonar.python.types.v2.SimpleTypeWrapper;
+import org.sonar.python.types.v2.LazyTypeWrapper;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.sonar.python.PythonTestUtils.getFirstDescendant;
@@ -4891,6 +4891,7 @@ class SuperClass: ...
       class AClass(SuperClass):
         ...
       """;
+    project.addModule("package/finalModule.py", finalModuleCode);
     PythonFile finalModulePythonFile = pythonFile("finalModule.py");
     new PythonVisitorContext.Builder(project.inferTypes(finalModuleCode), finalModulePythonFile)
       .typeTable(project.projectLevelTypeTable())
@@ -4902,10 +4903,7 @@ class AClass(SuperClass):
     assertThat(bType).isInstanceOfSatisfying(ClassType.class, classType -> {
       assertThat(classType.superClasses())
         .satisfies(typeWrapper -> assertThat(typeWrapper)
-          // This should be a LazyTypeWrapper because the ClassDescriptorToPythonTypeConverter
-          // will create a LazyTypeWrapper for the super class.
-          // See SONARPY-3600
-          .isInstanceOf(SimpleTypeWrapper.class), Index.atIndex(0));
+          .isInstanceOf(LazyTypeWrapper.class), Index.atIndex(0));
     });
   }
 }