diff options
| author | sebastian.sellmair <sebastian.sellmair@jetbrains.com> | 2020-06-17 14:38:02 +0200 |
|---|---|---|
| committer | Paweł Marks <Kordyjan@users.noreply.github.com> | 2020-06-18 09:29:02 +0200 |
| commit | 295c8f1ad4d51e124efe4bbeb4351fa4db6b40d1 (patch) | |
| tree | 0410dc70a7b3a04a73a933a91065145276a3ac98 /plugins/base/src/main/kotlin/translators | |
| parent | 4ac93c20f3936d5824b77a04806a2cdcfbb5e25f (diff) | |
| download | dokka-295c8f1ad4d51e124efe4bbeb4351fa4db6b40d1.tar.gz dokka-295c8f1ad4d51e124efe4bbeb4351fa4db6b40d1.tar.bz2 dokka-295c8f1ad4d51e124efe4bbeb4351fa4db6b40d1.zip | |
KotlinSignatureProvider: Render 'fun interface' into signature
Diffstat (limited to 'plugins/base/src/main/kotlin/translators')
| -rw-r--r-- | plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt | 4 | ||||
| -rw-r--r-- | plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt index 90e37308..dfa7b480 100644 --- a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt +++ b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt @@ -131,7 +131,6 @@ private class DokkaDescriptorVisitor( val isExpect = descriptor.isExpect val info = descriptor.resolveClassDescriptionData() - return DInterface( dri = driWithPlatform.dri, name = descriptor.name.asString(), @@ -635,7 +634,8 @@ private class DokkaDescriptorVisitor( ExtraModifiers.KotlinOnlyModifiers.Inline.takeIf { isInline }, ExtraModifiers.KotlinOnlyModifiers.External.takeIf { isExternal }, ExtraModifiers.KotlinOnlyModifiers.Inner.takeIf { isInner }, - ExtraModifiers.KotlinOnlyModifiers.Data.takeIf { isData } + ExtraModifiers.KotlinOnlyModifiers.Data.takeIf { isData }, + ExtraModifiers.KotlinOnlyModifiers.Fun.takeIf { isFun } ).toSet() private fun ValueParameterDescriptor.additionalExtras() = listOfNotNull( diff --git a/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt b/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt index c499be6f..cbae588f 100644 --- a/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt +++ b/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt @@ -353,11 +353,11 @@ open class PageContentBuilder( ) = ContentText(text, DCI(mainDRI, kind), sourceSets, styles, extra) - fun <T> platformText( + fun <T> sourceSetDependentText( value: SourceSetDependent<T>, - platforms: Set<SourceSetData> = value.keys, + sourceSets: Set<SourceSetData> = value.keys, transform: (T) -> String - ) = value.entries.filter { it.key in platforms }.mapNotNull { (p, v) -> + ) = value.entries.filter { it.key in sourceSets }.mapNotNull { (p, v) -> transform(v).takeIf { it.isNotBlank() }?.let { it to p } }.groupBy({ it.first }) { it.second }.forEach { text(it.key, sourceSets = it.value.toSet()) |