From dd017a44ed7baae83f4f09a92d9691231f424eaa Mon Sep 17 00:00:00 2001 From: BarkingBad <32793002+BarkingBad@users.noreply.github.com> Date: Fri, 13 Dec 2019 14:01:25 +0100 Subject: Add abstract structure for MD/HTML comments and MD parser --- plugins/mathjax/src/main/kotlin/MathjaxPlugin.kt | 2 +- plugins/xml/src/main/kotlin/XmlPlugin.kt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins') diff --git a/plugins/mathjax/src/main/kotlin/MathjaxPlugin.kt b/plugins/mathjax/src/main/kotlin/MathjaxPlugin.kt index 0c8bd654..ff3e83a3 100644 --- a/plugins/mathjax/src/main/kotlin/MathjaxPlugin.kt +++ b/plugins/mathjax/src/main/kotlin/MathjaxPlugin.kt @@ -28,7 +28,7 @@ object MathjaxTransformer : PageNodeTransformer { private val PageNode.isNeedingMathjax - get() = documentationNode?.platformInfo + get() = documentable?.platformInfo ?.flatMap { it.docTag?.children?.toList().orEmpty() } .orEmpty() .any { it.text == ANNOTATION } diff --git a/plugins/xml/src/main/kotlin/XmlPlugin.kt b/plugins/xml/src/main/kotlin/XmlPlugin.kt index 64d52b82..961a6387 100644 --- a/plugins/xml/src/main/kotlin/XmlPlugin.kt +++ b/plugins/xml/src/main/kotlin/XmlPlugin.kt @@ -1,7 +1,7 @@ package org.jetbrains.dokka.xml import org.jetbrains.dokka.CoreExtensions -import org.jetbrains.dokka.model.DocumentationNode +import org.jetbrains.dokka.model.Documentable import org.jetbrains.dokka.model.dfs import org.jetbrains.dokka.pages.* import org.jetbrains.dokka.plugability.DokkaContext @@ -26,12 +26,12 @@ object XmlTransformer : PageNodeTransformer { if (node !is ClassPageNode) node else { val refs = - node.documentationNode?.extra?.filterIsInstance()?.filter { it.key == "@attr ref" } + node.documentable?.extra?.filterIsInstance()?.filter { it.key == "@attr ref" } .orEmpty() - val elementsToAdd = mutableListOf() + val elementsToAdd = mutableListOf() refs.forEach { ref -> - input.documentationNode?.dfs { it.dri == ref.dri }?.let { elementsToAdd.add(it) } + input.documentable?.dfs { it.dri == ref.dri }?.let { elementsToAdd.add(it) } } val platformData = node.platforms().toSet() val refTable = DefaultPageContentBuilder.group( -- cgit