diff options
| author | Andrzej Ratajczak <andrzej.ratajczak98@gmail.com> | 2020-08-18 13:18:22 +0200 |
|---|---|---|
| committer | Paweł Marks <Kordyjan@users.noreply.github.com> | 2020-08-20 15:36:07 +0200 |
| commit | 54df62709a37fc8f55bded26fd5db15f9eb0fd25 (patch) | |
| tree | 347eb9eff50fdcc2a260f00c42989e0c7e4d1aff /plugins/base/src/main/kotlin/translators | |
| parent | a9be511b052755258bc92225c4f5a8977f174b89 (diff) | |
| download | dokka-54df62709a37fc8f55bded26fd5db15f9eb0fd25.tar.gz dokka-54df62709a37fc8f55bded26fd5db15f9eb0fd25.tar.bz2 dokka-54df62709a37fc8f55bded26fd5db15f9eb0fd25.zip | |
Hide unused generic type variables in constructor
Diffstat (limited to 'plugins/base/src/main/kotlin/translators')
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt index 9584d35a..b172cebc 100644 --- a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt +++ b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt @@ -603,11 +603,11 @@ private class DokkaDescriptorVisitor( is DynamicType -> Dynamic else -> when (val ctor = constructor.declarationDescriptor) { is TypeParameterDescriptor -> TypeParameter( - declarationDRI = DRI.from(ctor.containingDeclaration).withPackageFallbackTo(fallbackPackageName()), + dri = DRI.from(ctor).withPackageFallbackTo(fallbackPackageName()), name = ctor.name.asString() ) else -> TypeConstructor( - DRI.from(constructor.declarationDescriptor!!), // TODO: remove '!!' + DRI.from(ctor!!), // TODO: remove '!!' arguments.map { it.toProjection() }, if (isExtensionFunctionType) FunctionModifiers.EXTENSION else if (isFunctionType) FunctionModifiers.FUNCTION diff --git a/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt index 8dee2478..c9118920 100644 --- a/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt +++ b/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt @@ -360,9 +360,9 @@ class DefaultPsiToDocumentableTranslator( ?: return UnresolvedBound(type.presentableText) when { resolved.qualifiedName == "java.lang.Object" -> JavaObject - resolved is PsiTypeParameter && resolved.owner != null -> + resolved is PsiTypeParameter -> TypeParameter( - declarationDRI = DRI.from(resolved.owner!!), + dri = DRI.from(resolved), name = resolved.name.orEmpty() ) else -> |