3 files changed, 130 insertions, 11 deletions

diff --git a/src/Generation/ConsoleGenerator.kt b/src/Generation/ConsoleGenerator.kt
index 3ba42099..af22a622 100644
--- a/src/Generation/ConsoleGenerator.kt
+++ b/src/Generation/ConsoleGenerator.kt
@@ -1,34 +1,33 @@
 package org.jetbrains.dokka
 
 public class ConsoleGenerator() {
-    val IndentStep = "  |"
+    val signatureGenerator = KotlinSignatureGenerator()
+
+    val IndentStep = "  "
 
     public fun generate(node: DocumentationNode, indent: String = "") {
         generateHeader(node, indent)
-        generateDetails(node, indent)
+        //generateDetails(node, indent)
         generateMembers(node, indent)
         generateLinks(node, indent)
     }
 
     public fun generateHeader(node: DocumentationNode, indent: String = "") {
-        println("$indent${node.kind}: ${node.name}")
-        println("$indent\"${node.doc.summary.replace("\n", "\n$indent")}\"")
+        println(indent + signatureGenerator.render(node))
+        val docString = node.doc.toString()
+        if (!docString.isEmpty())
+            println("$indent\"${docString.replace("\n", "\n$indent")}\"")
         println()
     }
 
     public fun generateMembers(node: DocumentationNode, indent: String = "") {
         val items = node.members
-        if (items.isEmpty())
-            return
-        println("$indent Members")
         for (child in items)
             generate(child, indent + IndentStep)
     }
 
     public fun generateDetails(node: DocumentationNode, indent: String = "") {
         val items = node.details
-        if (items.isEmpty())
-            return
         for (child in items)
             generate(child, indent + "  ")
     }
diff --git a/src/Generation/KotlinSignatureGenerator.kt b/src/Generation/KotlinSignatureGenerator.kt
index fad655b0..ee66d37a 100644
--- a/src/Generation/KotlinSignatureGenerator.kt
+++ b/src/Generation/KotlinSignatureGenerator.kt
@@ -1,7 +1,119 @@
 package org.jetbrains.dokka
 
+import org.jetbrains.dokka.DocumentationNode.*
+
 class KotlinSignatureGenerator : SignatureGenerator {
-    override fun getFunctionSignature(node: DocumentationNode): String {
+    override fun render(node: DocumentationNode): String {
+        return when (node.kind) {
+            Kind.Package -> renderPackage(node)
+            Kind.Class,
+            Kind.Trait,
+            Kind.Object -> renderClass(node)
+
+            Kind.TypeParameter -> renderTypeParameter(node)
+            Kind.Type,
+            Kind.UpperBound -> renderType(node)
+
+            Kind.Constructor,
+            Kind.Function -> renderFunction(node)
+            Kind.Property -> renderProperty(node)
+            else -> "${node.kind}: ${node.name}"
+        }
+    }
+
+    override fun renderPackage(node: DocumentationNode): String {
+        return "package ${node.name}"
+    }
+
+    override fun renderType(node: DocumentationNode): String {
         return node.name
     }
+
+    override fun renderTypeParameter(node: DocumentationNode): String {
+        val constraints = node.details(Kind.UpperBound)
+        return if (constraints.none())
+            node.name
+        else {
+            node.name + " : " + constraints.map { renderType(node) }.join()
+        }
+    }
+
+    override fun renderParameter(node: DocumentationNode): String {
+        return node.name + ": " + renderType(node.detail(Kind.Type))
+    }
+
+    override fun renderTypeParametersForNode(node: DocumentationNode): String {
+        return StringBuilder {
+            val typeParameters = node.details(Kind.TypeParameter)
+            if (typeParameters.any()) {
+                append("<")
+                append(typeParameters.map { renderTypeParameter(it) }.join())
+                append("> ")
+            }
+        }.toString()
+    }
+
+    override fun renderClass(node: DocumentationNode): String {
+        return StringBuilder {
+            when (node.kind) {
+                Kind.Class -> append("class ")
+                Kind.Trait -> append("trait ")
+                Kind.Object -> append("object ")
+                else -> throw IllegalArgumentException("Node $node is not a class-like object")
+            }
+
+            append(node.name)
+            append(renderTypeParametersForNode(node))
+
+            append("(")
+            append(node.details(Kind.Parameter).map { renderParameter(it) }.join())
+            append(")")
+        }.toString()
+    }
+
+    override fun renderFunction(node: DocumentationNode): String {
+        return StringBuilder {
+            when (node.kind) {
+                Kind.Constructor -> append("init")
+                Kind.Function -> append("fun ")
+                else -> throw IllegalArgumentException("Node $node is not a function-like object")
+            }
+            append(renderTypeParametersForNode(node))
+            val receiver = node.details(Kind.Receiver).firstOrNull() // TODO: replace with singleOrNull when fixed
+            if (receiver != null) {
+                append(renderType(receiver.detail(Kind.Type)))
+                append(".")
+            }
+
+            if (node.kind != Kind.Constructor)
+                append(node.name)
+
+            append("(")
+            append(node.details(Kind.Parameter).map { renderParameter(it) }.join())
+            append(")")
+            if (node.kind != Kind.Constructor) {
+                append(": ")
+                append(renderType(node.detail(Kind.Type)))
+            }
+        }.toString()
+    }
+
+    override fun renderProperty(node: DocumentationNode): String {
+        return StringBuilder {
+            when (node.kind) {
+                Kind.Property -> append("val ")
+                else -> throw IllegalArgumentException("Node $node is not a property")
+            }
+            append(renderTypeParametersForNode(node))
+            val receiver = node.details(Kind.Receiver).firstOrNull() // TODO: replace with singleOrNull when fixed
+            if (receiver != null) {
+                append(renderType(receiver.detail(Kind.Type)))
+                append(".")
+            }
+
+            append(node.name)
+            append(": ")
+            append(renderType(node.detail(Kind.Type)))
+        }.toString()
+    }
 }
\ No newline at end of file
diff --git a/src/Generation/SignatureGenerator.kt b/src/Generation/SignatureGenerator.kt
index 2f603327..8ddeddc8 100644
--- a/src/Generation/SignatureGenerator.kt
+++ b/src/Generation/SignatureGenerator.kt
@@ -1,6 +1,14 @@
 package org.jetbrains.dokka
 
 trait SignatureGenerator {
-    fun getFunctionSignature(node: DocumentationNode): String
+    fun render(node: DocumentationNode): String
+    fun renderFunction(node: DocumentationNode): String
+    fun renderClass(node: DocumentationNode): String
+    fun renderTypeParametersForNode(node: DocumentationNode): String
+    fun renderTypeParameter(node: DocumentationNode): String
+    fun renderParameter(node: DocumentationNode): String
+    fun renderType(node: DocumentationNode): String
+    fun renderPackage(node: DocumentationNode): String
+    fun renderProperty(node: DocumentationNode): String
 }