aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Ryzhenkov <orangy@jetbrains.com>2015-10-22 19:18:07 +0300
committerIlya Ryzhenkov <orangy@jetbrains.com>2015-10-22 19:18:07 +0300
commita76e5a6f50302382fa53608ff79de3dd1926d84c (patch)
tree2f21c587bf6938c72db92d019c984602f1ba795e
parent1e2e2b6a4223c7e09bf447f645b0843128fed7b5 (diff)
downloaddokka-a76e5a6f50302382fa53608ff79de3dd1926d84c.tar.gz
dokka-a76e5a6f50302382fa53608ff79de3dd1926d84c.tar.bz2
dokka-a76e5a6f50302382fa53608ff79de3dd1926d84c.zip
Update to changes in Kotlin Beta.
-rw-r--r--ant/src/dokka.kt2
-rw-r--r--src/Model/DocumentationNode.kt1
-rw-r--r--test/src/TestAPI.kt2
3 files changed, 3 insertions, 2 deletions
diff --git a/ant/src/dokka.kt b/ant/src/dokka.kt
index 6538f083..d78980f8 100644
--- a/ant/src/dokka.kt
+++ b/ant/src/dokka.kt
@@ -67,7 +67,7 @@ class DokkaAntTask(): Task() {
}
override fun execute() {
- if (sourcePath.list().size() == 0) {
+ if (sourcePath.list().size == 0) {
throw BuildException("At least one source path needs to be specified")
}
if (moduleName == null) {
diff --git a/src/Model/DocumentationNode.kt b/src/Model/DocumentationNode.kt
index 2f0638bc..04285594 100644
--- a/src/Model/DocumentationNode.kt
+++ b/src/Model/DocumentationNode.kt
@@ -138,6 +138,7 @@ fun DocumentationNode.append(child: DocumentationNode, kind: DocumentationRefere
DocumentationReference.Kind.Detail -> child.addReferenceTo(this, DocumentationReference.Kind.Owner)
DocumentationReference.Kind.Member -> child.addReferenceTo(this, DocumentationReference.Kind.Owner)
DocumentationReference.Kind.Owner -> child.addReferenceTo(this, DocumentationReference.Kind.Member)
+ else -> { /* Do not add any links back for other types */ }
}
}
diff --git a/test/src/TestAPI.kt b/test/src/TestAPI.kt
index 88d19036..ce200bfe 100644
--- a/test/src/TestAPI.kt
+++ b/test/src/TestAPI.kt
@@ -111,7 +111,7 @@ fun StringBuilder.appendNode(node: ContentNode): StringBuilder {
fun ContentNode.toTestString(): String {
val node = this
- return StringBuilder {
+ return StringBuilder().apply {
appendNode(node)
}.toString()
}