aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Jemerov <yole@jetbrains.com>2016-02-02 17:35:59 +0100
committerDmitry Jemerov <yole@jetbrains.com>2016-02-02 17:35:59 +0100
commit91d24f36225b75084a67dbf25ff0340661c57c5c (patch)
treeda278c7fd4de7cdb5d5b7c1cb65f59e8dbfd3f9f
parenta7a7696ea41a7d54808f6af38322c7ab7ed4ad55 (diff)
downloaddokka-91d24f36225b75084a67dbf25ff0340661c57c5c.tar.gz
dokka-91d24f36225b75084a67dbf25ff0340661c57c5c.tar.bz2
dokka-91d24f36225b75084a67dbf25ff0340661c57c5c.zip
update for public RC
-rw-r--r--core/src/main/kotlin/Kotlin/DocumentationBuilder.kt8
-rw-r--r--core/src/main/kotlin/javadoc/docbase.kt2
-rw-r--r--lib/kotlin-for-upsource.jarbin15747810 -> 15983474 bytes
-rw-r--r--lib/markdown.jarbin391722 -> 397271 bytes
4 files changed, 2 insertions, 8 deletions
diff --git a/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt b/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt
index 937b8f17..e67f1aa1 100644
--- a/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt
+++ b/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt
@@ -569,12 +569,6 @@ class DocumentationBuilder
}
node.appendType(constraint, NodeKind.UpperBound)
}
-
- for (constraint in lowerBounds) {
- if (KotlinBuiltIns.isNothing(constraint))
- continue
- node.appendType(constraint, NodeKind.LowerBound)
- }
return node
}
@@ -742,7 +736,7 @@ fun PropertyDescriptor.receiverSignature(): String {
}
fun CallableMemberDescriptor.parameterSignature(): String {
- val params = valueParameters.map { it.type }.toArrayList()
+ val params = valueParameters.map { it.type }.toMutableList()
val extensionReceiver = extensionReceiverParameter
if (extensionReceiver != null) {
params.add(0, extensionReceiver.type)
diff --git a/core/src/main/kotlin/javadoc/docbase.kt b/core/src/main/kotlin/javadoc/docbase.kt
index 5ddaa37f..db5f201e 100644
--- a/core/src/main/kotlin/javadoc/docbase.kt
+++ b/core/src/main/kotlin/javadoc/docbase.kt
@@ -477,7 +477,7 @@ fun List<DocumentationNode>.collectAllTypesRecursively(): Map<String, Documentat
}
class ModuleNodeAdapter(val module: DocumentationModule, val reporter: DocErrorReporter, val outputPath: String) : DocumentationNodeBareAdapter(module), DocErrorReporter by reporter, RootDoc {
- val allPackages = module.members(NodeKind.Package).toMapBy { it.name }
+ val allPackages = module.members(NodeKind.Package).associateBy { it.name }
val allTypes = module.members(NodeKind.Package).collectAllTypesRecursively()
override fun packageNamed(name: String?): PackageDoc? = allPackages[name]?.let { PackageAdapter(this, it) }
diff --git a/lib/kotlin-for-upsource.jar b/lib/kotlin-for-upsource.jar
index 3472c32c..c31b7cdc 100644
--- a/lib/kotlin-for-upsource.jar
+++ b/lib/kotlin-for-upsource.jar
Binary files differ
diff --git a/lib/markdown.jar b/lib/markdown.jar
index fcd3a30e..ec4302b4 100644
--- a/lib/markdown.jar
+++ b/lib/markdown.jar
Binary files differ