diff options
Diffstat (limited to 'src/Model')
| -rw-r--r-- | src/Model/Content.kt | 67 | ||||
| -rw-r--r-- | src/Model/DocumentationNode.kt | 10 |
2 files changed, 26 insertions, 51 deletions
diff --git a/src/Model/Content.kt b/src/Model/Content.kt index 8491fd88..e59037d2 100644 --- a/src/Model/Content.kt +++ b/src/Model/Content.kt @@ -34,7 +34,7 @@ public class ContentNodeLink(val node : DocumentationNode) : ContentBlock() public class ContentExternalLink(val href : String) : ContentBlock() public class ContentList() : ContentBlock() public class ContentListItem() : ContentBlock() -public class ContentSection(public val label: String) : ContentBlock() +public class ContentSection(public val tag: String, public val subjectName: String?) : ContentBlock() fun content(body: ContentNode.() -> Unit): ContentNode { val block = ContentBlock() @@ -54,53 +54,36 @@ fun ContentNode.link(to: DocumentationNode, body: ContentNode.() -> Unit) { } public class Content() : ContentNode() { - public val sections: Map<String, ContentSection> by Delegates.lazy { - val map = linkedMapOf<String, ContentSection>() - for (child in children) { - if (child is ContentSection) - map.put(child.label, child) - } - - if ("\$summary" !in map && "\$description" !in map) { - // no explicit summary and description, convert anonymous section - val anonymous = map[""] - if (anonymous != null) { - map.remove("") - val summary = ContentSection("\$summary") - val description = ContentSection("\$description") - - val summaryNodes = anonymous.children.take(1) - val descriptionNodes = anonymous.children.drop(1) - - if (summaryNodes.any()) { - summary.children.addAll(summaryNodes) - map.put("\$summary", summary) - } - - if (descriptionNodes.any()) { - description.children.addAll(descriptionNodes) - map.put("\$description", description) - } - } - } - map + private val sectionList = arrayListOf<ContentSection>() + public val sections: List<ContentSection> + get() = sectionList + + fun addSection(name: String?, subjectName: String?): ContentSection { + val section = ContentSection(name ?: "", subjectName) + sectionList.add(section) + return section } - public val summary: ContentNode get() { - return sections["\$summary"] ?: ContentNode.empty + fun findSectionByTag(tag: String): ContentSection? = + sections.firstOrNull { tag.equalsIgnoreCase(it.tag) } + + public val summary: ContentNode get() = children.firstOrNull() ?: ContentEmpty + + public val description: ContentNode by Delegates.lazy { + val descriptionNodes = children.drop(1) + if (descriptionNodes.isEmpty()) { + ContentEmpty + } else { + val result = ContentSection("Description", null) + result.children.addAll(descriptionNodes) + result + } } - public val description: ContentNode get() = sections["\$description"] ?: ContentNode.empty override fun equals(other: Any?): Boolean { if (other !is Content) return false - if (sections.size != other.sections.size) - return false - for (keys in sections.keySet()) - if (sections[keys] != other.sections[keys]) - return false - - return true + return sections == other.sections && children == other.children } override fun hashCode(): Int { @@ -110,7 +93,7 @@ public class Content() : ContentNode() { override fun toString(): String { if (sections.isEmpty()) return "<empty>" - return sections.values().joinToString() + return (listOf(summary, description) + sections).joinToString() } val isEmpty: Boolean diff --git a/src/Model/DocumentationNode.kt b/src/Model/DocumentationNode.kt index a666b486..c3700069 100644 --- a/src/Model/DocumentationNode.kt +++ b/src/Model/DocumentationNode.kt @@ -8,15 +8,7 @@ public open class DocumentationNode(val name: String, private val references = LinkedHashSet<DocumentationReference>() - public val summary: ContentNode get() { - val contentSection = content.sections["\$summary"] - if (contentSection != null) - return contentSection - val ownerSection = owner?.content?.sections?.get(name) - if (ownerSection != null) - return ownerSection - return ContentNode.empty - } + public val summary: ContentNode get() = content.summary public val owner: DocumentationNode? get() = references(DocumentationReference.Kind.Owner).singleOrNull()?.to |