diff options
| author | Andrzej Ratajczak <andrzej.ratajczak98@gmail.com> | 2020-04-07 16:40:05 +0200 |
|---|---|---|
| committer | Paweł Marks <Kordyjan@users.noreply.github.com> | 2020-04-08 11:53:09 +0200 |
| commit | 49d69219c9e3cf6307c5be161dc56d04e217d668 (patch) | |
| tree | 8a7dd127271a8a84d546a65ae616ec9a8dcacb40 /core | |
| parent | dd645cb5cd77c2738424e445587407b4bf97250c (diff) | |
| download | dokka-49d69219c9e3cf6307c5be161dc56d04e217d668.tar.gz dokka-49d69219c9e3cf6307c5be161dc56d04e217d668.tar.bz2 dokka-49d69219c9e3cf6307c5be161dc56d04e217d668.zip | |
Resolves problems with multiple DRI resolve in Markdown Parser
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/kotlin/parsers/MarkdownParser.kt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/src/main/kotlin/parsers/MarkdownParser.kt b/core/src/main/kotlin/parsers/MarkdownParser.kt index b567bbe7..9354a6b6 100644 --- a/core/src/main/kotlin/parsers/MarkdownParser.kt +++ b/core/src/main/kotlin/parsers/MarkdownParser.kt @@ -12,6 +12,7 @@ import org.intellij.markdown.flavours.commonmark.CommonMarkFlavourDescriptor import org.jetbrains.dokka.analysis.DokkaResolutionFacade import org.jetbrains.dokka.links.DRI import org.jetbrains.dokka.parsers.factories.DocTagsFromIElementFactory +import org.jetbrains.dokka.utilities.DokkaLogger import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.idea.kdoc.resolveKDocLink import org.jetbrains.kotlin.kdoc.parser.KDocKnownTag @@ -22,7 +23,8 @@ import org.intellij.markdown.parser.MarkdownParser as IntellijMarkdownParser class MarkdownParser( private val resolutionFacade: DokkaResolutionFacade, - private val declarationDescriptor: DeclarationDescriptor + private val declarationDescriptor: DeclarationDescriptor, + private val logger: DokkaLogger ) : Parser() { inner class MarkdownVisitor(val text: String, val destinationLinksMap: Map<String, String>) { @@ -110,7 +112,7 @@ class MarkdownParser( declarationDescriptor, null, link.split('.') - ).also { if (it.size > 1) throw IllegalStateException("Markdown link resolved more than one element: $it") } + ).also { if (it.size > 1) logger.warn("Markdown link resolved more than one element: $it") } .firstOrNull()//.single() ?.let { DRI.from(it) } } |