From c4f40a03404641a9a42e6518cb066f2e0ae609e0 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Mon, 12 Jan 2015 16:32:30 +0100 Subject: better display for enum members --- src/Formats/StructuredFormatService.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/Formats') diff --git a/src/Formats/StructuredFormatService.kt b/src/Formats/StructuredFormatService.kt index 977d81d0..49a7c96b 100644 --- a/src/Formats/StructuredFormatService.kt +++ b/src/Formats/StructuredFormatService.kt @@ -216,6 +216,7 @@ public abstract class StructuredFormatService(val locationService: LocationServi appendSection(location, "Class Object Properties", node.members(DocumentationNode.Kind.ClassObjectProperty), node, to) appendSection(location, "Class Object Functions", node.members(DocumentationNode.Kind.ClassObjectFunction), node, to) appendSection(location, "Accessors", node.members(DocumentationNode.Kind.PropertyAccessor), node, to) + appendSection(location, "Enum Values", node.members(DocumentationNode.Kind.EnumItem), node, to) appendSection(location, "Other members", node.members.filter { it.kind !in setOf( DocumentationNode.Kind.Class, @@ -230,11 +231,13 @@ public abstract class StructuredFormatService(val locationService: LocationServi DocumentationNode.Kind.PropertyAccessor, DocumentationNode.Kind.ClassObjectProperty, DocumentationNode.Kind.ClassObjectFunction, - DocumentationNode.Kind.ExternalClass + DocumentationNode.Kind.ExternalClass, + DocumentationNode.Kind.EnumItem ) }, node, to) appendSection(location, "Extensions", node.extensions, node, to) - appendSection(location, "Inheritors", node.inheritors, node, to) + appendSection(location, "Inheritors", + node.inheritors.filter { it.kind != DocumentationNode.Kind.EnumItem }, node, to) appendSection(location, "Links", node.links, node, to) } -- cgit From 0c584d0e12f07946fdfc8cc0e9f132558ff794fc Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Mon, 12 Jan 2015 17:23:07 +0100 Subject: enum values continued --- src/Formats/StructuredFormatService.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/Formats') diff --git a/src/Formats/StructuredFormatService.kt b/src/Formats/StructuredFormatService.kt index 49a7c96b..3f505e37 100644 --- a/src/Formats/StructuredFormatService.kt +++ b/src/Formats/StructuredFormatService.kt @@ -1,6 +1,7 @@ package org.jetbrains.dokka import java.util.LinkedHashMap +import org.jetbrains.dokka.LanguageService.RenderMode public data class FormatLink(val text: String, val location: Location) @@ -162,7 +163,7 @@ public abstract class StructuredFormatService(val locationService: LocationServi val breakdownBySummary = members.groupBy { formatText(location, it.summary) } for ((summary, items) in breakdownBySummary) { val signatureTexts = items map { signature -> - val signature = languageService.render(signature) + val signature = languageService.render(signature, RenderMode.SUMMARY) val signatureAsCode = ContentCode() signatureAsCode.append(signature) formatText(location, signatureAsCode) -- cgit