Fix DefaultRenderer and HtmlRenderer

1 files changed, 45 insertions, 23 deletions

diff --git a/core/src/main/kotlin/renderers/DefaultRenderer.kt b/core/src/main/kotlin/renderers/DefaultRenderer.kt
index e7c8d074..1acaaf4f 100644
--- a/core/src/main/kotlin/renderers/DefaultRenderer.kt
+++ b/core/src/main/kotlin/renderers/DefaultRenderer.kt
@@ -3,39 +3,61 @@ package org.jetbrains.dokka.renderers
 import org.jetbrains.dokka.pages.*
 import org.jetbrains.dokka.resolvers.LocationProvider
 
-abstract class DefaultRenderer(val fileWriter: FileWriter, val locationProvider: LocationProvider): Renderer {
+abstract class DefaultRenderer(val fileWriter: FileWriter, val locationProvider: LocationProvider) : Renderer {
 
     protected abstract fun buildHeader(level: Int, text: String): String
-    protected abstract fun buildNewLine(): String
     protected abstract fun buildLink(text: String, address: String): String
-    protected abstract fun buildCode(code: String): String
-    protected abstract fun buildNavigation(page: PageNode): String
-    protected open fun buildText(text: String): String = text
-    protected open fun buildHeader(level: Int, content: List<ContentNode>, pageContext: PageNode): String = buildHeader(level, content.joinToString { it.build(pageContext) })
-    protected open fun buildGroup(children: List<ContentNode>, pageContext: PageNode): String = children.joinToString { it.build(pageContext) }
-    protected open fun buildComment(parts: List<ContentNode>, pageContext: PageNode): String = parts.joinToString { it.build(pageContext) }
-    protected open fun buildSymbol(parts: List<ContentNode>, pageContext: PageNode): String = parts.joinToString(separator = "") { it.build(pageContext) }
-    protected open fun buildBlock(name: String, content: List<ContentNode>, pageContext: PageNode) = buildHeader(3, name) + content.joinToString("\n") { it.build(pageContext) }
+    protected abstract fun buildList(node: ContentList, pageContext: PageNode): String
+    protected abstract fun buildNewLine(): String
+    protected abstract fun buildResource(node: ContentEmbeddedResource, pageContext: PageNode): String
+    protected abstract fun buildTable(node: ContentTable, pageContext: PageNode): String
+
+    protected open fun buildText(textNode: ContentText): String = textNode.text
+
+    protected open fun buildGroup(node: ContentGroup, pageContext: PageNode): String = node.children.joinToString("") { it.build(pageContext) }
+
+    protected open fun buildLinkText(nodes: List<ContentNode>, pageContext: PageNode): String =
+        nodes.joinToString(" ") { it.build(pageContext) }
+
+    protected open fun buildCode(code: List<ContentNode>, language: String, pageContext: PageNode): String =
+        code.joinToString { it.build(pageContext) }
+
+    protected open fun buildHeader(node: ContentHeader, pageContext: PageNode): String =
+        buildHeader(node.level, node.children.joinToString { it.build(pageContext) })
+
+    protected open fun buildNavigation(page: PageNode): String {
+        fun buildNavigationWithContext(page: PageNode, context: PageNode): String =
+            page.parent?.let { buildNavigationWithContext(it, context) }.orEmpty() + "/" + buildLink(
+                page.name,
+                locationProvider.resolve(page, context)
+            )
+        return buildNavigationWithContext(page, page)
+    }
 
     protected open fun ContentNode.build(pageContext: PageNode): String = buildContentNode(this, pageContext)
 
     protected open fun buildContentNode(node: ContentNode, pageContext: PageNode): String =
-        when(node) {
-            is ContentText -> buildText(node.text)
-            is ContentComment -> buildComment(node.parts, pageContext)
-            is ContentSymbol -> buildSymbol(node.parts, pageContext)
-            is ContentCode -> buildCode(node.code)
-            is ContentBlock -> buildBlock(node.name, node.children, pageContext)
-            is ContentLink -> buildLink(node.text, locationProvider.resolve(node.address, node.dci.platformDataList, pageContext))
-            is ContentGroup -> buildGroup(node.children, pageContext)
-            is ContentHeader -> buildHeader(node.level, node.items, pageContext)
-            is ContentStyle -> node.items.joinToString(separator = "\n") { buildContentNode(it, pageContext) }
-            else -> ""
+        when (node) {
+            is ContentText -> buildText(node)
+            is ContentHeader -> buildHeader(node, pageContext)
+            is ContentCode -> buildCode(node.children, node.language, pageContext)
+            is ContentDRILink -> buildLink(
+                buildLinkText(node.children, pageContext),
+                locationProvider.resolve(node.address, node.platforms.toList(), pageContext)
+            )
+            is ContentResolvedLink -> buildLink(buildLinkText(node.children, pageContext), node.address)
+            is ContentEmbeddedResource -> buildResource(node, pageContext)
+            is ContentList -> buildList(node, pageContext)
+            is ContentTable -> buildTable(node, pageContext)
+            is ContentGroup -> buildGroup(node, pageContext)
+            else -> "".also { println("Unrecognized ContentNode: $node") }
         }
 
-    protected open fun buildPageContent(page: PageNode): String = buildNavigation(page) + page.content.joinToString("\n") { it.build(page) }
+    protected open fun buildPageContent(page: PageNode): String =
+        buildNavigation(page) + page.content.joinToString("\n") { it.build(page) }
 
-    protected open fun renderPage(page: PageNode) = fileWriter.write(locationProvider.resolve(page), buildPageContent(page), "")
+    protected open fun renderPage(page: PageNode) =
+        fileWriter.write(locationProvider.resolve(page), buildPageContent(page), "")
 
     protected open fun renderPages(root: PageNode) {
         renderPage(root)