From 45bec5b68c2da35860877c6298bff04a4cb3d1d6 Mon Sep 17 00:00:00 2001 From: Andrzej Ratajczak Date: Wed, 19 Aug 2020 12:57:38 +0200 Subject: Fix LinkProvider to link properly all nested generic parameters --- plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt | 2 +- .../descriptors/DefaultDescriptorToDocumentableTranslator.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/base/src/main/kotlin') 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, -- cgit