Make samples runnable

4 files changed, 38 insertions, 42 deletions

diff --git a/plugins/base/src/main/kotlin/renderers/DefaultRenderer.kt b/plugins/base/src/main/kotlin/renderers/DefaultRenderer.kt
index a946aa6f..09d6cad1 100644
--- a/plugins/base/src/main/kotlin/renderers/DefaultRenderer.kt
+++ b/plugins/base/src/main/kotlin/renderers/DefaultRenderer.kt
@@ -74,8 +74,8 @@ abstract class DefaultRenderer<T>(
         nodes.forEach { it.build(this, pageContext, sourceSetRestriction) }
     }
 
-    open fun T.buildCode(code: List<ContentNode>, language: String, pageContext: ContentPage) {
-        code.forEach { it.build(this, pageContext) }
+    open fun T.buildCode(code: ContentCode, pageContext: ContentPage) {
+        code.children.forEach { it.build(this, pageContext) }
     }
 
     open fun T.buildHeader(
@@ -102,7 +102,7 @@ abstract class DefaultRenderer<T>(
             when (node) {
                 is ContentText -> buildText(node)
                 is ContentHeader -> buildHeader(node, pageContext, sourceSetRestriction)
-                is ContentCode -> buildCode(node.children, node.language, pageContext)
+                is ContentCode -> buildCode(node, pageContext)
                 is ContentDRILink ->
                     buildLink(locationProvider.resolve(node.address, node.sourceSets.toList(), pageContext)) {
                         buildLinkText(node.children, pageContext, sourceSetRestriction)
@@ -172,4 +172,4 @@ abstract class DefaultRenderer<T>(
     }
 }
 
-fun ContentPage.platforms() = this.content.sourceSets.toList()
\ No newline at end of file
+fun ContentPage.sourceSets() = this.content.sourceSets
\ No newline at end of file
diff --git a/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt b/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt
index ee6f1e1f..d56ab50c 100644
--- a/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt
+++ b/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt
@@ -540,23 +540,11 @@ open class HtmlRenderer(
         a(href = address, block = content)
 
     override fun FlowContent.buildCode(
-        code: List<ContentNode>,
-        language: String,
+        code: ContentCode,
         pageContext: ContentPage
     ) {
-        span(classes = "code") {
-            val iterator = code.iterator()
-            while (iterator.hasNext()) {
-                val element = iterator.next()
-                +(when (element) {
-                    is ContentText -> element.text
-                    is ContentBreakLine -> "\n"
-                    else -> run { context.logger.error("Cannot cast $element as ContentText!"); "" }
-                })
-                if (iterator.hasNext()) {
-                    buildNewLine()
-                }
-            }
+        code(code.style.joinToString(" ") { it.toString().toLowerCase() }) {
+            code.children.forEach { buildContentNode(it, pageContext) }
         }
     }
 
@@ -658,15 +646,20 @@ open class HtmlRenderer(
             head {
                 meta(name = "viewport", content = "width=device-width, initial-scale=1", charset = "UTF-8")
                 title(page.name)
-                with(resources) {
-                    filter { it.substringBefore('?').substringAfterLast('.') == "css" }
-                        .forEach { link(rel = LinkRel.stylesheet, href = resolveLink(it, page)) }
-                    filter { it.substringBefore('?').substringAfterLast('.') == "js" }
-                        .forEach {
-                            script(type = ScriptType.textJavaScript, src = resolveLink(it, page)) {
-                                async = true
-                            }
+                resources.forEach {
+                    when {
+                        it.substringBefore('?').substringAfterLast('.') == "css" -> link(
+                            rel = LinkRel.stylesheet,
+                            href = resolveLink(it, page)
+                        )
+                        it.substringBefore('?').substringAfterLast('.') == "js" -> script(
+                            type = ScriptType.textJavaScript,
+                            src = resolveLink(it, page)
+                        ) {
+                            async = true
                         }
+                        else -> unsafe { +it }
+                    }
                 }
                 script { unsafe { +"""var pathToRoot = "${locationProvider.resolveRoot(page)}";""" } }
             }
diff --git a/plugins/base/src/main/kotlin/renderers/html/NavigationPage.kt b/plugins/base/src/main/kotlin/renderers/html/NavigationPage.kt
index eb563dbd..8fe2a6c8 100644
--- a/plugins/base/src/main/kotlin/renderers/html/NavigationPage.kt
+++ b/plugins/base/src/main/kotlin/renderers/html/NavigationPage.kt
@@ -25,7 +25,7 @@ class NavigationPage(val root: NavigationNode) : RendererSpecificPage {
                 id = navId
                 attributes["pageId"] = node.dri.toString()
                 div("overview") {
-                    buildLink(node.dri, node.sourceSets) { +node.name }
+                    buildLink(node.dri, node.sourceSets.toList()) { +node.name }
                     if (node.children.isNotEmpty()) {
                         span("navButton") {
                             onClick = """document.getElementById("$navId").classList.toggle("hidden");"""
@@ -41,7 +41,7 @@ class NavigationPage(val root: NavigationNode) : RendererSpecificPage {
 class NavigationNode(
     val name: String,
     val dri: DRI,
-    val sourceSets: List<DokkaSourceSet>,
+    val sourceSets: Set<DokkaSourceSet>,
     val children: List<NavigationNode>
 )
 
diff --git a/plugins/base/src/main/kotlin/renderers/html/htmlPreprocessors.kt b/plugins/base/src/main/kotlin/renderers/html/htmlPreprocessors.kt
index af0525d7..2f7c8ee1 100644
--- a/plugins/base/src/main/kotlin/renderers/html/htmlPreprocessors.kt
+++ b/plugins/base/src/main/kotlin/renderers/html/htmlPreprocessors.kt
@@ -4,7 +4,7 @@ import kotlinx.html.h1
 import kotlinx.html.id
 import kotlinx.html.table
 import kotlinx.html.tbody
-import org.jetbrains.dokka.base.renderers.platforms
+import org.jetbrains.dokka.base.renderers.sourceSets
 import org.jetbrains.dokka.model.DEnum
 import org.jetbrains.dokka.model.DEnumEntry
 import org.jetbrains.dokka.pages.*
@@ -45,16 +45,17 @@ object NavigationPageInstaller : PageTransformer {
         NavigationNode(
             page.name,
             page.dri.first(),
-            page.platforms(),
+            page.sourceSets(),
             page.navigableChildren()
         )
 
     private fun ContentPage.navigableChildren(): List<NavigationNode> {
-        if(this !is ClasslikePageNode){
+        if (this !is ClasslikePageNode) {
             return children.filterIsInstance<ContentPage>()
                 .map { visit(it) }
-        } else if(documentable is DEnum) {
-            return children.filter { it is ContentPage && it.documentable is DEnumEntry }.map { visit(it as ContentPage) }
+        } else if (documentable is DEnum) {
+            return children.filter { it is ContentPage && it.documentable is DEnumEntry }
+                .map { visit(it as ContentPage) }
         }
 
         return emptyList()
@@ -84,18 +85,20 @@ object StyleAndScriptsAppender : PageTransformer {
     }
 }
 
-class SourcesetDependencyAppender(val context: DokkaContext) : PageTransformer{
+class SourcesetDependencyAppender(val context: DokkaContext) : PageTransformer {
     override fun invoke(input: RootPageNode): RootPageNode {
         val dependenciesMap = context.configuration.sourceSets.map {
             it.sourceSetID to it.dependentSourceSets
         }.toMap()
-        fun createDependenciesJson() : String = "sourceset_dependencies = '{${
-            dependenciesMap.entries.joinToString(", ") {
-                "\"${it.key}\": [${it.value.joinToString(","){
-                    "\"$it\""
-                }}]" 
-            }
+
+        fun createDependenciesJson(): String = "sourceset_dependencies = '{${
+        dependenciesMap.entries.joinToString(", ") {
+            "\"${it.key}\": [${it.value.joinToString(",") {
+                "\"$it\""
+            }}]"
+        }
         }}'"
+
         val deps = RendererSpecificResourcePage(
             name = "scripts/sourceset_dependencies.js",
             children = emptyList(),
@@ -106,4 +109,4 @@ class SourcesetDependencyAppender(val context: DokkaContext) : PageTransformer{
             children = input.children + deps
         )
     }
-}
\ No newline at end of file
+}