aboutsummaryrefslogtreecommitdiff
path: root/src/Formats
diff options
context:
space:
mode:
authorDmitry Jemerov <yole@jetbrains.com>2015-09-07 20:57:17 +0200
committerDmitry Jemerov <yole@jetbrains.com>2015-09-07 20:57:17 +0200
commit97257371e1594b25395c7c4baaaa92fb98a0ce97 (patch)
treec04101d93fa6b20edb924d0cfe0ea9d3fe403327 /src/Formats
parent3d4cda549bdde68935cb0053dceddb8e64e1e20c (diff)
downloaddokka-97257371e1594b25395c7c4baaaa92fb98a0ce97.tar.gz
dokka-97257371e1594b25395c7c4baaaa92fb98a0ce97.tar.bz2
dokka-97257371e1594b25395c7c4baaaa92fb98a0ce97.zip
work in progress on updating Dokka to latest Kotlin (compiles but does not run yet)
Diffstat (limited to 'src/Formats')
-rw-r--r--src/Formats/FormatService.kt2
-rw-r--r--src/Formats/OutlineService.kt2
-rw-r--r--src/Formats/StructuredFormatService.kt2
3 files changed, 3 insertions, 3 deletions
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<DocumentationNode>): String = StringBuilder { appendNodes(location, this, nodes) }.toString()
+fun FormatService.format(location: Location, nodes: Iterable<DocumentationNode>): 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) {