diff options
| author | Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com> | 2016-11-02 16:05:47 +0300 |
|---|---|---|
| committer | Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com> | 2016-11-02 16:05:47 +0300 |
| commit | 40e81322426a925f3fe88e867a8a0e9858847835 (patch) | |
| tree | 49c7ce2f48eac28dddc226edee663bd9f081e516 /core/src/main/kotlin/Kotlin | |
| parent | 225a4993835b3c5c798e9cecd17cbb31da5d9ee8 (diff) | |
| download | dokka-40e81322426a925f3fe88e867a8a0e9858847835.tar.gz dokka-40e81322426a925f3fe88e867a8a0e9858847835.tar.bz2 dokka-40e81322426a925f3fe88e867a8a0e9858847835.zip | |
Fix for GH #98 : Added tests, altered fix code for corner cases
Diffstat (limited to 'core/src/main/kotlin/Kotlin')
| -rw-r--r-- | core/src/main/kotlin/Kotlin/KotlinAsJavaDocumentationBuilder.kt | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/core/src/main/kotlin/Kotlin/KotlinAsJavaDocumentationBuilder.kt b/core/src/main/kotlin/Kotlin/KotlinAsJavaDocumentationBuilder.kt index 1250f463..304b2bf2 100644 --- a/core/src/main/kotlin/Kotlin/KotlinAsJavaDocumentationBuilder.kt +++ b/core/src/main/kotlin/Kotlin/KotlinAsJavaDocumentationBuilder.kt @@ -4,12 +4,9 @@ import com.google.inject.Inject import com.intellij.psi.JavaPsiFacade import com.intellij.psi.PsiClass import com.intellij.psi.PsiNamedElement -import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.dokka.Kotlin.DescriptorDocumentationParser import org.jetbrains.kotlin.asJava.KtLightElement import org.jetbrains.kotlin.descriptors.DeclarationDescriptor -import org.jetbrains.kotlin.kdoc.parser.KDocKnownTag -import org.jetbrains.kotlin.kdoc.psi.impl.KDocTag import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.KtDeclaration @@ -40,15 +37,11 @@ class KotlinAsJavaDocumentationBuilder } } - fun KtDeclaration.isNotSuppressed() = - PsiTreeUtil.findChildrenOfType(this.docComment, KDocTag::class.java).none { it.knownTag == KDocKnownTag.SUPPRESS } - - fun PsiClass.isVisibleInDocumentation() : Boolean { + fun PsiClass.isVisibleInDocumentation(): Boolean { val origin: KtDeclaration = (this as KtLightElement<*, *>).kotlinOrigin as? KtDeclaration ?: return true - return origin.isNotSuppressed() && - origin.hasModifier(KtTokens.INTERNAL_KEYWORD) != true && - origin.hasModifier(KtTokens.PRIVATE_KEYWORD) != true + return origin.hasModifier(KtTokens.INTERNAL_KEYWORD) != true && + origin.hasModifier(KtTokens.PRIVATE_KEYWORD) != true } } |