From 57e38932b414e7496678b3cc1f171cbf7c4d8fbb Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Thu, 23 Mar 2017 22:59:08 +0300 Subject: Per package options --- core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'core/src/main/kotlin/Java') diff --git a/core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt b/core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt index b2f4aeaf..a950e432 100644 --- a/core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt +++ b/core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt @@ -133,11 +133,11 @@ class JavaPsiDocumentationBuilder : JavaDocumentationBuilder { private fun skipElement(element: Any) = skipElementByVisibility(element) || hasSuppressDocTag(element) - private fun skipElementByVisibility(element: Any): Boolean = - !options.includeNonPublic && element is PsiModifierListOwner && - (element.hasModifierProperty(PsiModifier.PRIVATE) || - element.hasModifierProperty(PsiModifier.PACKAGE_LOCAL) || - element.isInternal()) + private fun skipElementByVisibility(element: Any): Boolean = element is PsiModifierListOwner && + !(options.effectivePackageOptions((element.containingFile as? PsiJavaFile)?.packageName ?: "").includeNonPublic) && + (element.hasModifierProperty(PsiModifier.PRIVATE) || + element.hasModifierProperty(PsiModifier.PACKAGE_LOCAL) || + element.isInternal()) private fun PsiElement.isInternal(): Boolean { val ktElement = (this as? KtLightElement<*, *>)?.kotlinOrigin ?: return false -- cgit