SONARPY-2331 Implement setting metaclassFQN field for ClassType to Cl…

…assDescriptor conversion
SonarSource · Nov 14, 2024 · 0a6af73 · 0a6af73
1 parent fe57a36
commit 0a6af73
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/...n-checks/src/test/resources/checks/useOfAnyAsTypeHintCheck/useOfAnyAsTypeHintImporting.py b/...n-checks/src/test/resources/checks/useOfAnyAsTypeHintCheck/useOfAnyAsTypeHintImporting.py
@@ -12,5 +12,5 @@ class ImportedWithoutMetaClassInherited(ImportedParentWithoutMetaClass):
     def imported_inherited_foo(self) -> Any: # Noncompliant
         ...
 class ImportedWithMetaClassInherited(ImportedParentWithMetaClass):
-    def imported_inherited_foo(self) -> Any: # FN SONARPY-2331
+    def imported_inherited_foo(self) -> Any: # Noncompliant
         ...
diff --git a/...src/main/java/org/sonar/python/semantic/v2/converter/PythonTypeToDescriptorConverter.java b/...src/main/java/org/sonar/python/semantic/v2/converter/PythonTypeToDescriptorConverter.java
@@ -129,14 +129,20 @@ private static Descriptor convert(String moduleFqn, String parentFqn, String sym
       }
     }
 
+    var metaclassFQN = type.metaClasses()
+      .stream()
+      .map(metaClass -> typeFqn(moduleFqn, metaClass))
+      .findFirst()
+      .orElse(null);
+
     return new ClassDescriptor(symbolName, symbolFqn,
       superClasses,
       memberDescriptors,
       type.hasDecorators(),
       type.definitionLocation().orElse(null),
       hasSuperClassWithoutDescriptor,
       type.hasMetaClass(),
-      null,
+      metaclassFQN,
       false
     );
   }

diff --git a/python-frontend/src/test/java/org/sonar/python/semantic/ProjectLevelSymbolTableTest.java b/python-frontend/src/test/java/org/sonar/python/semantic/ProjectLevelSymbolTableTest.java
@@ -1125,6 +1125,18 @@ class Field(MetaField): ...
     assertThat(symbol.hasUnresolvedTypeHierarchy()).isTrue();
   }
 
+  @Test
+  void class_wth_metaclass() {
+    var code = """
+      from abc import ABCMeta
+      class WithMetaclass(metaclass=ABCMeta): ...
+      """;
+
+    var projectSymbolTable = new ProjectLevelSymbolTable();
+    projectSymbolTable.addModule(parseWithoutSymbols(code), "", pythonFile("mod.py"));
+    var symbol = (ClassSymbolImpl) projectSymbolTable.getSymbol("mod.WithMetaclass");
+    assertThat(symbol.metaclassFQN()).isEqualTo("abc.ABCMeta");
+  }
 
   @Test
   void projectPackages() {

diff --git a/...test/java/org/sonar/python/semantic/v2/converter/PythonTypeToDescriptorConverterTest.java b/...test/java/org/sonar/python/semantic/v2/converter/PythonTypeToDescriptorConverterTest.java
@@ -134,8 +134,7 @@ void testConvertClassType() {
 
     // SONARPY-2307 support for superClass is missing in ClassType
     assertThat(classDescriptor.hasSuperClassWithoutDescriptor()).isFalse();
-    // SONARPY-2307 support for metaclassFQN is missing in ClassType
-    assertThat(classDescriptor.metaclassFQN()).isNull();
+    assertThat(classDescriptor.metaclassFQN()).isEqualTo("int");
     // SONARPY-2307 support for generics is missing in ClassType
     assertThat(classDescriptor.supportsGenerics()).isFalse();
   }