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

KT-22815: Fix documentation for primary constructor params/props

Browse Source
This commit is contained in:
Simon Ogorodnik
2018-07-16 18:53:31 +03:00
parent c608395c7c
commit 1bd02472a2
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/ide-common/src/org/jetbrains/kotlin/idea/kdoc/findKDoc.kt
+17 -9
View File
@@ -66,16 +66,24 @@ fun KtElement.findKDoc(descriptorToPsi: (DeclarationDescriptorWithSource) -> Psi
if (this is KtParameter || this is KtTypeParameter) { if (this is KtParameter || this is KtTypeParameter) {
val containingDeclaration = val containingDeclaration =
PsiTreeUtil.getParentOfType(this, KtDeclarationWithBody::class.java, KtClassOrObject::class.java, KtScript::class.java) PsiTreeUtil.findFirstParent(this, true) {
val classKDoc = containingDeclaration?.getChildOfType<KDoc>() it is KtDeclarationWithBody && it !is KtPrimaryConstructor
val subjectName = name || it is KtClassOrObject
if (classKDoc != null && subjectName != null) {
val propertySection =
classKDoc.findSectionByTag(KDocKnownTag.PROPERTY, subjectName)?.takeIf { this is KtParameter && this.isPropertyParameter() }
?: classKDoc.findDescendantOfType<KDocTag> { it.knownTag == KDocKnownTag.PARAM && it.getSubjectName() == subjectName }
if (propertySection != null) {
return propertySection
} }
val containerKDoc = containingDeclaration?.getChildOfType<KDoc>()
val subjectName = name
if (containerKDoc != null && subjectName != null) {
val propertyDoc =
containerKDoc.findSectionByTag(KDocKnownTag.PROPERTY, subjectName)
?.takeIf { this is KtParameter && this.isPropertyParameter() }
if (propertyDoc != null) return propertyDoc
val paramDoc =
containerKDoc.findDescendantOfType<KDocTag> { it.knownTag == KDocKnownTag.PARAM && it.getSubjectName() == subjectName }
if (paramDoc != null) return paramDoc
} }
} }