azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KT-18501: Fix to find KDoc even if KDoc is in ModifierList

Browse Source
This commit is contained in:
takahirom
2017-06-25 22:54:59 +09:00
committed by Simon Ogorodnik
parent 4b92349031
commit fe9d3f16d3
3 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/psi/FindDocComment.kt
+9 -4
View File
@@ -16,14 +16,19 @@
package org.jetbrains.kotlin.psi.findDocComment
import com.intellij.psi.PsiComment
import com.intellij.psi.PsiWhiteSpace
import org.jetbrains.kotlin.kdoc.psi.api.KDoc
import org.jetbrains.kotlin.psi.KtDeclaration
import org.jetbrains.kotlin.psi.KtDeclarationModifierList
import org.jetbrains.kotlin.psi.psiUtil.allChildren
fun findDocComment(declaration: KtDeclaration): KDoc? {
return declaration.allChildren
.dropWhile { it !is KDoc && (it is PsiWhiteSpace || it is PsiComment) }
.first() as? KDoc
.flatMap {
if (it is KtDeclarationModifierList) {
return@flatMap it.children.asSequence()
}
sequenceOf(it)
}
.dropWhile { it !is KDoc }
.firstOrNull() as? KDoc
}