From 066c551fc6fcb2c60e3ed2014d0ef5e11409f9eb Mon Sep 17 00:00:00 2001
From: Ember Rose <emberrose@google.com>
Date: Thu, 27 Jan 2022 05:27:02 -0500
Subject: Collect annotations from package-info.java (#2331)

Fix: #2330
---
 .../translators/psi/DefaultPsiToDocumentableTranslator.kt     | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'plugins/base/src/main/kotlin')

diff --git a/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
index 79b4798c..d912d65f 100644
--- a/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
@@ -150,9 +150,11 @@ class DefaultPsiToDocumentableTranslator(
 
         suspend fun parsePackage(packageName: String, psiFiles: List<PsiJavaFile>): DPackage = coroutineScope {
             val dri = DRI(packageName = packageName)
-            val documentation = psiFiles.firstOrNull { it.name == "package-info.java" }?.let {
+            val packageInfo = psiFiles.singleOrNull { it.name == "package-info.java" }
+            val documentation = packageInfo?.let {
                 javadocParser.parseDocumentation(it).toSourceSetDependent()
-            } ?: emptyMap()
+            }.orEmpty()
+            val annotations = packageInfo?.packageStatement?.annotationList?.annotations
 
             DPackage(
                 dri,
@@ -166,7 +168,10 @@ class DefaultPsiToDocumentableTranslator(
                 emptyList(),
                 documentation,
                 null,
-                setOf(sourceSetData)
+                setOf(sourceSetData),
+                PropertyContainer.withAll(
+                    annotations?.toList().orEmpty().toListOfAnnotations().toSourceSetDependent().toAnnotations()
+                )
             )
         }
 
-- 
cgit