CR fixes

SonarSource · Nov 14, 2024 · 510214f · 510214f
1 parent 04c4e5d
commit 510214f
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/python-frontend/src/main/java/org/sonar/python/index/ClassDescriptor.java b/python-frontend/src/main/java/org/sonar/python/index/ClassDescriptor.java
@@ -22,6 +22,7 @@
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
+import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
 import org.sonar.plugins.python.api.LocationInFile;
 
@@ -94,6 +95,7 @@ public boolean hasMetaClass() {
     return hasMetaClass;
   }
 
+  @CheckForNull
   public String metaclassFQN() {
     return metaclassFQN;
   }

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
@@ -1126,7 +1126,7 @@ class Field(MetaField): ...
   }
 
   @Test
-  void class_wth_metaclass() {
+  void class_wth_imported_metaclass() {
     var code = """
       from abc import ABCMeta
       class WithMetaclass(metaclass=ABCMeta): ...
@@ -1138,6 +1138,32 @@ class WithMetaclass(metaclass=ABCMeta): ...
     assertThat(symbol.metaclassFQN()).isEqualTo("abc.ABCMeta");
   }
 
+  @Test
+  void class_wth_locally_defined_metaclass() {
+    var code = """
+      class LocalMetaClass: ...
+      class WithMetaclass(metaclass=LocalMetaClass): ...
+      """;
+
+    var projectSymbolTable = new ProjectLevelSymbolTable();
+    projectSymbolTable.addModule(parseWithoutSymbols(code), "", pythonFile("mod.py"));
+    var symbol = (ClassSymbolImpl) projectSymbolTable.getSymbol("mod.WithMetaclass");
+    assertThat(symbol.metaclassFQN()).isEqualTo("mod.LocalMetaClass");
+  }
+
+  @Test
+  void class_wth_unresolved_import_metaclass() {
+    var code = """
+      from unknown import UnresolvedMetaClass
+      class WithMetaclass(metaclass=UnresolvedMetaClass): ...
+      """;
+
+    var projectSymbolTable = new ProjectLevelSymbolTable();
+    projectSymbolTable.addModule(parseWithoutSymbols(code), "", pythonFile("mod.py"));
+    var symbol = (ClassSymbolImpl) projectSymbolTable.getSymbol("mod.WithMetaclass");
+    assertThat(symbol.metaclassFQN()).isEqualTo("unknown.UnresolvedMetaClass");
+  }
+
   @Test
   void projectPackages() {
     ProjectLevelSymbolTable projectLevelSymbolTable = new ProjectLevelSymbolTable();