Cleanup support for NodeRenderContent

3 files changed, 12 insertions, 8 deletions

diff --git a/core/src/main/kotlin/Formats/StructuredFormatService.kt b/core/src/main/kotlin/Formats/StructuredFormatService.kt
index ebc9cde6..410de281 100644
--- a/core/src/main/kotlin/Formats/StructuredFormatService.kt
+++ b/core/src/main/kotlin/Formats/StructuredFormatService.kt
@@ -152,6 +152,10 @@ abstract class StructuredOutputBuilder(val to: StringBuilder,
                 }
             }
 
+            is NodeRenderContent -> {
+                val node = content.node
+                appendContent(languageService.render(node, content.mode))
+            }
             is ContentNodeLink -> {
                 val node = content.node
                 val linkTo = if (node != null) locationHref(location, node) else "#"
diff --git a/core/src/main/kotlin/Java/JavadocParser.kt b/core/src/main/kotlin/Java/JavadocParser.kt
index 9f9ea017..1144763b 100644
--- a/core/src/main/kotlin/Java/JavadocParser.kt
+++ b/core/src/main/kotlin/Java/JavadocParser.kt
@@ -33,12 +33,12 @@ class JavadocParser(
 
     private fun ContentSection.appendTypeElement(signature: String, selector: (DocumentationNode) -> DocumentationNode?) {
         append(LazyContentBlock {
-            val node = refGraph.lookupOrWarn(signature, logger)?.let(selector)
-            if (node != null) {
-                it.append(NodeRenderContent(node, LanguageService.RenderMode.SUMMARY))
-                it.symbol(":")
-                it.text(" ")
-            }
+            val node = refGraph.lookupOrWarn(signature, logger)?.let(selector) ?: return@LazyContentBlock emptyList()
+            listOf(ContentBlock().apply {
+                append(NodeRenderContent(node, LanguageService.RenderMode.SUMMARY))
+                symbol(":")
+                text(" ")
+            })
         })
     }
 
diff --git a/core/src/main/kotlin/Model/Content.kt b/core/src/main/kotlin/Model/Content.kt
index 7c776bdb..87a8023a 100644
--- a/core/src/main/kotlin/Model/Content.kt
+++ b/core/src/main/kotlin/Model/Content.kt
@@ -35,13 +35,13 @@ class NodeRenderContent(
         get() = 0 //TODO: Clarify?
 }
 
-class LazyContentBlock(private val fillChildren: (ContentBlock) -> Unit) : ContentBlock() {
+class LazyContentBlock(private val fillChildren: () -> List<ContentNode>) : ContentBlock() {
     private var computed = false
     override val children: ArrayList<ContentNode>
         get() {
             if (!computed) {
                 computed = true
-                fillChildren(this)
+                children.addAll(fillChildren())
             }
             return super.children
         }