Merge pull request #9 from orangy/annotations

Support annotation classes and annotations in model and rendered output

1 files changed, 26 insertions, 3 deletions

diff --git a/src/Formats/StructuredFormatService.kt b/src/Formats/StructuredFormatService.kt
index 2d326854..977d81d0 100644
--- a/src/Formats/StructuredFormatService.kt
+++ b/src/Formats/StructuredFormatService.kt
@@ -28,6 +28,7 @@ public abstract class StructuredFormatService(val locationService: LocationServi
     public abstract fun formatLink(text: String, href: String): String
     public open fun formatLink(link: FormatLink): String = formatLink(formatText(link.text), link.location)
     public abstract fun formatStrong(text: String): String
+    public abstract fun formatStrikethrough(text: String): String
     public abstract fun formatEmphasis(text: String): String
     public abstract fun formatCode(code: String): String
     public abstract fun formatList(text: String): String
@@ -46,6 +47,7 @@ public abstract class StructuredFormatService(val locationService: LocationServi
                 is ContentKeyword -> append(formatKeyword(content.text))
                 is ContentIdentifier -> append(formatIdentifier(content.text))
                 is ContentStrong -> append(formatStrong(formatText(location, content.children)))
+                is ContentStrikethrough -> append(formatStrikethrough(formatText(location, content.children)))
                 is ContentCode -> append(formatCode(formatText(location, content.children)))
                 is ContentEmphasis -> append(formatEmphasis(formatText(location, content.children)))
                 is ContentList -> append(formatList(formatText(location, content.children)))
@@ -116,6 +118,17 @@ public abstract class StructuredFormatService(val locationService: LocationServi
         for ((summary, items) in breakdownBySummary) {
             items.forEach {
                 appendBlockCode(to, formatText(location, languageService.render(it)))
+                val deprecation = it.deprecation
+                if (deprecation != null) {
+                    val deprecationParameter = deprecation.details(DocumentationNode.Kind.Parameter).firstOrNull()
+                    val deprecationValue = deprecationParameter?.details(DocumentationNode.Kind.Value)?.firstOrNull()
+                    if (deprecationValue != null) {
+                        to.append(formatStrong("Deprecated: "))
+                        appendLine(to, formatText(deprecationValue.name.trim("\"")))
+                    } else {
+                        appendLine(to, formatStrong("Deprecated"))
+                    }
+                }
             }
             appendLine(to, summary)
             appendLine(to)
@@ -178,18 +191,25 @@ public abstract class StructuredFormatService(val locationService: LocationServi
         for ((breadcrumbs, items) in breakdownByLocation) {
             appendLine(to, breadcrumbs)
             appendLine(to)
-            appendLocation(location, to, items)
+            appendLocation(location, to, items.filter { it.kind != DocumentationNode.Kind.ExternalClass })
         }
 
         for (node in nodes) {
+            if (node.kind == DocumentationNode.Kind.ExternalClass) {
+                appendSection(location, "Extensions for ${node.name}", node.members, node, to)
+                continue
+            }
+
             appendSection(location, "Packages", node.members(DocumentationNode.Kind.Package), node, to)
             appendSection(location, "Types", node.members.filter {
                 it.kind in setOf(
                         DocumentationNode.Kind.Class,
                         DocumentationNode.Kind.Interface,
                         DocumentationNode.Kind.Enum,
-                        DocumentationNode.Kind.Object)
+                        DocumentationNode.Kind.Object,
+                        DocumentationNode.Kind.AnnotationClass)
             }, node, to)
+            appendSection(location, "Extensions for External Classes", node.members(DocumentationNode.Kind.ExternalClass), node, to)
             appendSection(location, "Constructors", node.members(DocumentationNode.Kind.Constructor), node, to)
             appendSection(location, "Properties", node.members(DocumentationNode.Kind.Property), node, to)
             appendSection(location, "Functions", node.members(DocumentationNode.Kind.Function), node, to)
@@ -200,14 +220,17 @@ public abstract class StructuredFormatService(val locationService: LocationServi
                 it.kind !in setOf(
                         DocumentationNode.Kind.Class,
                         DocumentationNode.Kind.Interface,
+                        DocumentationNode.Kind.Enum,
                         DocumentationNode.Kind.Object,
+                        DocumentationNode.Kind.AnnotationClass,
                         DocumentationNode.Kind.Constructor,
                         DocumentationNode.Kind.Property,
                         DocumentationNode.Kind.Package,
                         DocumentationNode.Kind.Function,
                         DocumentationNode.Kind.PropertyAccessor,
                         DocumentationNode.Kind.ClassObjectProperty,
-                        DocumentationNode.Kind.ClassObjectFunction
+                        DocumentationNode.Kind.ClassObjectFunction,
+                        DocumentationNode.Kind.ExternalClass
                         )
             }, node, to)
             appendSection(location, "Extensions", node.extensions, node, to)