diff options
| author | Andrzej Ratajczak <andrzej.ratajczak98@gmail.com> | 2020-08-19 12:57:38 +0200 |
|---|---|---|
| committer | Paweł Marks <Kordyjan@users.noreply.github.com> | 2020-08-20 15:36:07 +0200 |
| commit | 45bec5b68c2da35860877c6298bff04a4cb3d1d6 (patch) | |
| tree | d99b27e6c6100ef93c2989caac66b55ef3ba3e21 /plugins/base/src/main | |
| parent | e4fc2c274fd982b2742eac46581b504b56b2b48f (diff) | |
| download | dokka-45bec5b68c2da35860877c6298bff04a4cb3d1d6.tar.gz dokka-45bec5b68c2da35860877c6298bff04a4cb3d1d6.tar.bz2 dokka-45bec5b68c2da35860877c6298bff04a4cb3d1d6.zip | |
Fix LinkProvider to link properly all nested generic parameters
Diffstat (limited to 'plugins/base/src/main')
| -rw-r--r-- | plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt | 2 | ||||
| -rw-r--r-- | plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt index 823e1e8f..82eeb296 100644 --- a/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt +++ b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt @@ -239,7 +239,7 @@ class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLog ) text(f.modifiers()[it]?.toSignatureString() ?: "") text("fun ") - val usedGenerics = f.generics.filter { f uses it } + val usedGenerics = if (f.isConstructor) f.generics.filter { f uses it } else f.generics list(usedGenerics, prefix = "<", suffix = "> ") { +buildSignature(it) } diff --git a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt index b172cebc..05c99af1 100644 --- a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt +++ b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt @@ -590,7 +590,7 @@ private class DokkaDescriptorVisitor( private fun TypeParameterDescriptor.toTypeParameter() = DTypeParameter( - DRI.from(this), + DRI.from(this).withPackageFallbackTo(fallbackPackageName()), name.identifier, resolveDescriptorData(), null, |