Fixed requested changes

2 files changed, 12 insertions, 13 deletions

diff --git a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
index ad872e2a..49d8ae0f 100644
--- a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
@@ -696,16 +696,15 @@ private class DokkaDescriptorVisitor(
         else -> StringValue(toString())
     }
 
-    private fun AnnotationDescriptor.toAnnotation(): Annotations.Annotation? =
-        DRI.from(annotationClass as DeclarationDescriptor).let {
-            Annotations.Annotation(
-                it,
-                allValueArguments.map { it.key.asString() to it.value.toValue() }.filter {
-                    it.second != null
-                }.toMap() as Map<String, AnnotationParameterValue>,
-                annotationClass!!.annotations.hasAnnotation(FqName("kotlin.annotation.MustBeDocumented"))
-            )
-        }
+    private fun AnnotationDescriptor.toAnnotation(): Annotations.Annotation {
+        return Annotations.Annotation(
+            DRI.from(annotationClass as DeclarationDescriptor),
+            allValueArguments.map { it.key.asString() to it.value.toValue() }.filter {
+                it.second != null
+            }.toMap() as Map<String, AnnotationParameterValue>,
+            annotationClass!!.annotations.hasAnnotation(FqName("kotlin.annotation.MustBeDocumented"))
+        )
+    }
 
     private fun PropertyDescriptor.getAnnotationsWithBackingField(): List<Annotations.Annotation> =
         getAnnotations() + (backingField?.getAnnotations() ?: emptyList())
diff --git a/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
index f3102b2d..a5117b09 100644
--- a/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
@@ -429,12 +429,12 @@ object DefaultPsiToDocumentableTranslator : SourceToDocumentableTranslator {
             else -> StringValue(text ?: "")
         }
 
-        private fun PsiAnnotation.toAnnotation() = psiReference?.let {
+        private fun PsiAnnotation.toAnnotation() = psiReference?.let { psiElement ->
             Annotations.Annotation(
-                DRI.from(it),
+                DRI.from(psiElement),
                 attributes.filter { it !is KtLightAbstractAnnotation }.mapNotNull { it.attributeName to it.toValue() }
                     .toMap(),
-                (it as PsiClass).annotations.any {
+                (psiElement as PsiClass).annotations.any {
                     hasQualifiedName("java.lang.annotation.Documented")
                 }
             )