From bbb8a682e5e79a9d73d3aeaab159bb88523d1de0 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Thu, 19 Mar 2015 10:41:07 +0100
Subject: hide internal members from the documentation; understand @suppress
 tags in javadoc comments; don't show "Extension functions for external class"
 block if all extension functions for that class are hidden

---
 src/Java/JavaDocumentationBuilder.kt | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'src/Java')

diff --git a/src/Java/JavaDocumentationBuilder.kt b/src/Java/JavaDocumentationBuilder.kt
index 6c83fd61..6624037c 100644
--- a/src/Java/JavaDocumentationBuilder.kt
+++ b/src/Java/JavaDocumentationBuilder.kt
@@ -11,6 +11,9 @@ import org.jsoup.nodes.TextNode
 public class JavaDocumentationBuilder(private val options: DocumentationOptions,
                                       private val refGraph: NodeReferenceGraph) {
     fun appendFile(file: PsiJavaFile, module: DocumentationModule) {
+        if (file.getClasses().all { skipElement(it) }) {
+            return
+        }
         val packageNode = module.findOrCreatePackageNode(file.getPackageName())
         packageNode.appendChildren(file.getClasses()) { build() }
     }
@@ -236,8 +239,14 @@ public class JavaDocumentationBuilder(private val options: DocumentationOptions,
         }
     }
 
-    private fun skipElement(element: Any): Boolean =
-        !options.includeNonPublic && element is PsiModifierListOwner && element.hasModifierProperty(PsiModifier.PRIVATE)
+    private fun skipElement(element: Any) = skipElementByVisibility(element) || hasSuppressTag(element)
+
+    private fun skipElementByVisibility(element: Any): Boolean =
+        !options.includeNonPublic && element is PsiModifierListOwner &&
+                (element.hasModifierProperty(PsiModifier.PRIVATE) || element.hasModifierProperty(PsiModifier.PACKAGE_LOCAL))
+
+    private fun hasSuppressTag(element: Any) =
+        element is PsiDocCommentOwner && element.getDocComment()?.let { it.findTagByName("suppress") != null } ?: false
 
     fun DocumentationNode.appendMembers<T>(elements: Array<T>, buildFn: T.() -> DocumentationNode) =
             appendChildren(elements, DocumentationReference.Kind.Member, buildFn)
-- 
cgit