SONARPY-2306 Support annotated return type information conversion fro…

…m PythonType to FunctionDescriptor
SonarSource · Nov 6, 2024 · 1b9e88a · 1b9e88a
1 parent 7baa415
commit 1b9e88a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
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
@@ -96,6 +96,8 @@ private static Descriptor convert(String moduleFqn, FunctionType type) {
       .filter(Objects::nonNull)
       .toList();
 
+    var annotatedReturnTypeName = typeFqn(moduleFqn, type.returnType());
+
     // Using FunctionType#name and FunctionType#fullyQualifiedName instead of symbol is only accurate if the function has not been reassigned
     // This logic should be revisited when tackling SONARPY-2285
     return new FunctionDescriptor(type.name(), type.fullyQualifiedName(),
@@ -105,7 +107,7 @@ private static Descriptor convert(String moduleFqn, FunctionType type) {
       decorators,
       type.hasDecorators(),
       type.definitionLocation().orElse(null),
-      null,
+      annotatedReturnTypeName,
       null
     );
   }

diff --git a/...test/java/org/sonar/python/semantic/v2/converter/PythonTypeToDescriptorConverterTest.java b/...test/java/org/sonar/python/semantic/v2/converter/PythonTypeToDescriptorConverterTest.java
@@ -85,10 +85,7 @@ void testConvertFunctionTypeWithoutDecorator() {
     assertThat(functionDescriptor.isAsynchronous()).isTrue();
     assertThat(functionDescriptor.isInstanceMethod()).isTrue();
 
-    // TODO SONARPY-2223 support for return type is missing in FunctionType
-    assertThat(functionDescriptor.annotatedReturnTypeName()).isNull();
-
-    // TODO SONARPY-2223 support for type annotation is missing in FunctionType
+    assertThat(functionDescriptor.annotatedReturnTypeName()).isEqualTo("float");
     assertThat(functionDescriptor.typeAnnotationDescriptor()).isNull();
 
     assertThat(functionDescriptor.hasDecorators()).isTrue();