diff options
| author | Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com> | 2017-03-23 22:59:08 +0300 |
|---|---|---|
| committer | Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com> | 2017-03-29 18:37:38 +0300 |
| commit | 57e38932b414e7496678b3cc1f171cbf7c4d8fbb (patch) | |
| tree | 4658b36056734ceda19be3ce78c62791712aef32 /core/src/main/kotlin/Java | |
| parent | 921192e64c7f1df02692c1ec7f24f4a8bc9b7231 (diff) | |
| download | dokka-57e38932b414e7496678b3cc1f171cbf7c4d8fbb.tar.gz dokka-57e38932b414e7496678b3cc1f171cbf7c4d8fbb.tar.bz2 dokka-57e38932b414e7496678b3cc1f171cbf7c4d8fbb.zip | |
Per package options
Diffstat (limited to 'core/src/main/kotlin/Java')
| -rw-r--r-- | core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt | 10 |
1 files changed, 5 insertions, 5 deletions
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 |