diff options
| -rw-r--r-- | core/src/main/kotlin/Kotlin/DocumentationBuilder.kt | 8 | ||||
| -rw-r--r-- | core/src/main/kotlin/javadoc/docbase.kt | 2 | ||||
| -rw-r--r-- | lib/kotlin-for-upsource.jar | bin | 15747810 -> 15983474 bytes | |||
| -rw-r--r-- | lib/markdown.jar | bin | 391722 -> 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 Binary files differindex 3472c32c..c31b7cdc 100644 --- a/lib/kotlin-for-upsource.jar +++ b/lib/kotlin-for-upsource.jar diff --git a/lib/markdown.jar b/lib/markdown.jar Binary files differindex fcd3a30e..ec4302b4 100644 --- a/lib/markdown.jar +++ b/lib/markdown.jar |