diff options
| author | Sean McQuillan <seanmcq@google.com> | 2018-04-26 18:03:04 -0700 |
|---|---|---|
| committer | Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com> | 2018-07-14 23:57:11 +0300 |
| commit | a16ae6c02e1ec7270fb161c63908b5b3831bce8e (patch) | |
| tree | 3e053fc88e28721cc6693faebaa89687f63ef4e7 /core/src | |
| parent | 432868e8732085a0b160466ddbe8262b793b4f95 (diff) | |
| download | dokka-a16ae6c02e1ec7270fb161c63908b5b3831bce8e.tar.gz dokka-a16ae6c02e1ec7270fb161c63908b5b3831bce8e.tar.bz2 dokka-a16ae6c02e1ec7270fb161c63908b5b3831bce8e.zip | |
[backport] Support for {@inheritDoc} including grand inheritance and skip levels.
Original: 0eda743
Diffstat (limited to 'core/src')
| -rw-r--r-- | core/src/main/kotlin/Java/JavadocParser.kt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/src/main/kotlin/Java/JavadocParser.kt b/core/src/main/kotlin/Java/JavadocParser.kt index f88f557d..554cd2d3 100644 --- a/core/src/main/kotlin/Java/JavadocParser.kt +++ b/core/src/main/kotlin/Java/JavadocParser.kt @@ -1,6 +1,8 @@ package org.jetbrains.dokka import com.intellij.psi.* +import com.intellij.psi.impl.source.javadoc.CorePsiDocTagValueImpl +import com.intellij.psi.javadoc.* import com.intellij.psi.impl.source.tree.JavaDocElementType import com.intellij.psi.javadoc.* import com.intellij.psi.util.PsiTreeUtil @@ -41,14 +43,13 @@ class JavadocParser( paragraphs.forEach { result.append(it) } - val attrs = mutableListOf<DocumentationNode>() - var since: DocumentationNode? = null docComment.tags.forEach { tag -> when (tag.name) { "see" -> result.convertSeeTag(tag) "deprecated" -> { - deprecatedContent = Content() - deprecatedContent!!.convertJavadocElements(tag.contentElements(), element) + deprecatedContent = Content().apply { + convertJavadocElements(tag.contentElements(), element) + } } else -> { val subjectName = tag.getSubjectName() |