From f7c67c2ade8b56c6556ec59d9c0adf8643a8e566 Mon Sep 17 00:00:00 2001
From: Andrzej Ratajczak <andrzej.ratajczak98@gmail.com>
Date: Mon, 3 Feb 2020 14:09:19 +0100
Subject: Resolves bugs with doubling references and fixes minor bugs

---
 core/src/main/kotlin/parsers/MarkdownParser.kt | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'core/src/main/kotlin/parsers')

diff --git a/core/src/main/kotlin/parsers/MarkdownParser.kt b/core/src/main/kotlin/parsers/MarkdownParser.kt
index 5e4b82e8..30a507df 100644
--- a/core/src/main/kotlin/parsers/MarkdownParser.kt
+++ b/core/src/main/kotlin/parsers/MarkdownParser.kt
@@ -1,5 +1,6 @@
 package org.jetbrains.dokka.parsers
 
+import com.intellij.psi.PsiElement
 import org.jetbrains.dokka.model.doc.*
 import org.intellij.markdown.MarkdownElementTypes
 import org.intellij.markdown.MarkdownTokenTypes
@@ -14,6 +15,9 @@ import org.jetbrains.dokka.utilities.DokkaConsoleLogger
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.idea.kdoc.resolveKDocLink
 import org.jetbrains.kotlin.kdoc.parser.KDocKnownTag
+import org.jetbrains.kotlin.kdoc.psi.api.KDoc
+import org.jetbrains.kotlin.kdoc.psi.impl.KDocImpl
+import org.jetbrains.kotlin.kdoc.psi.impl.KDocSection
 import org.jetbrains.kotlin.kdoc.psi.impl.KDocTag
 import org.intellij.markdown.parser.MarkdownParser as IntellijMarkdownParser
 
@@ -186,12 +190,18 @@ class MarkdownParser (
     override fun parseStringToDocNode(extractedString: String) = markdownToDocNode(extractedString)
     override fun preparse(text: String) = text
 
+    private fun findParent(kDoc: PsiElement): PsiElement =
+        if(kDoc is KDocSection) findParent(kDoc.parent) else kDoc
+
+    private fun getAllKDocTags(kDocImpl: PsiElement): List<KDocTag> =
+        kDocImpl.children.filterIsInstance<KDocTag>().filterNot { it is KDocSection } + kDocImpl.children.flatMap { getAllKDocTags(it) }
+
     fun parseFromKDocTag(kDocTag: KDocTag?): DocumentationNode {
         return if(kDocTag == null)
             DocumentationNode(emptyList())
         else
             DocumentationNode(
-                (listOf(kDocTag) + kDocTag.children).filterIsInstance<KDocTag>().map {
+                (listOf(kDocTag) + getAllKDocTags(findParent(kDocTag) as KDocImpl)).map {
                     when (it.knownTag) {
                         null -> if (it.name == null) Description(parseStringToDocNode(it.getContent())) else CustomWrapperTag(
                             parseStringToDocNode(it.getContent()),
@@ -213,6 +223,4 @@ class MarkdownParser (
                 }
             )
     }
-
-
 }
\ No newline at end of file
-- 
cgit