From 97257371e1594b25395c7c4baaaa92fb98a0ce97 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Mon, 7 Sep 2015 20:57:17 +0200 Subject: work in progress on updating Dokka to latest Kotlin (compiles but does not run yet) --- src/Formats/FormatService.kt | 2 +- src/Formats/OutlineService.kt | 2 +- src/Formats/StructuredFormatService.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Formats') diff --git a/src/Formats/FormatService.kt b/src/Formats/FormatService.kt index 93470a4c..642fad04 100644 --- a/src/Formats/FormatService.kt +++ b/src/Formats/FormatService.kt @@ -17,4 +17,4 @@ public interface FormatService { } /** Format content to [String] using specified [location] */ -fun FormatService.format(location: Location, nodes: Iterable): String = StringBuilder { appendNodes(location, this, nodes) }.toString() +fun FormatService.format(location: Location, nodes: Iterable): String = kotlin.StringBuilder { appendNodes(location, this, nodes) }.toString() diff --git a/src/Formats/OutlineService.kt b/src/Formats/OutlineService.kt index 6c7e882e..31128d6d 100644 --- a/src/Formats/OutlineService.kt +++ b/src/Formats/OutlineService.kt @@ -16,7 +16,7 @@ public interface OutlineFormatService { for (node in nodes) { appendOutlineHeader(location, node, to) if (node.members.any()) { - val sortedMembers = node.members.sortBy { it.name } + val sortedMembers = node.members.sortedBy { it.name } appendOutlineLevel(to) { appendOutline(location, to, sortedMembers) } diff --git a/src/Formats/StructuredFormatService.kt b/src/Formats/StructuredFormatService.kt index a90c60b1..41db84a3 100644 --- a/src/Formats/StructuredFormatService.kt +++ b/src/Formats/StructuredFormatService.kt @@ -225,7 +225,7 @@ public abstract class StructuredFormatService(locationService: LocationService, if (nodes.any()) { appendHeader(to, caption, 3) - val children = nodes.sortBy { it.name } + val children = nodes.sortedBy { it.name } val membersMap = children.groupBy { link(node, it) } appendTable(to) { -- cgit