diff options
| author | Paweł Marks <pmarks@virtuslab.com> | 2020-03-25 13:18:59 +0100 |
|---|---|---|
| committer | Paweł Marks <Kordyjan@users.noreply.github.com> | 2020-03-25 13:19:31 +0100 |
| commit | 00a75f986e9b1a507b551f990ea8a12a1a470880 (patch) | |
| tree | 1eda823115b5a9ee44ed5a8c7ac68d2dacf90032 | |
| parent | ba16f209faaf02e3300f2c04fec6c9e5b9ebc152 (diff) | |
| download | dokka-00a75f986e9b1a507b551f990ea8a12a1a470880.tar.gz dokka-00a75f986e9b1a507b551f990ea8a12a1a470880.tar.bz2 dokka-00a75f986e9b1a507b551f990ea8a12a1a470880.zip | |
Simplify access for PrimaryConstructorExtra
3 files changed, 4 insertions, 6 deletions
diff --git a/core/src/main/kotlin/model/aditionalExtras.kt b/core/src/main/kotlin/model/aditionalExtras.kt index 853edd64..af399745 100644 --- a/core/src/main/kotlin/model/aditionalExtras.kt +++ b/core/src/main/kotlin/model/aditionalExtras.kt @@ -37,8 +37,6 @@ class Annotations(val content: List<Annotation>) : ExtraProperty<Documentable> { } } -object PrimaryConstructorExtra: ExtraProperty<DFunction> { - object PrimaryConstructorExtraKey: ExtraProperty.Key<DFunction, PrimaryConstructorExtra> - - override val key: ExtraProperty.Key<DFunction, *> = PrimaryConstructorExtraKey +object PrimaryConstructorExtra: ExtraProperty<DFunction>, ExtraProperty.Key<DFunction, PrimaryConstructorExtra> { + override val key: ExtraProperty.Key<DFunction, *> = this }
\ No newline at end of file diff --git a/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt index 8d925376..b93be352 100644 --- a/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt +++ b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt @@ -48,7 +48,7 @@ class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLog } link(c.name!!, c.dri) if(c is DClass){ - val pConstructor = c.constructors.singleOrNull() { it.extra[PrimaryConstructorExtra.PrimaryConstructorExtraKey] != null } + val pConstructor = c.constructors.singleOrNull() { it.extra[PrimaryConstructorExtra] != null } list(pConstructor?.parameters.orEmpty(), "(", ")", ",", pConstructor?.platformData.orEmpty().toSet()){ breakLine() text(it.name ?: "", styles = mainStyles.plus(TextStyle.Bold).plus(TextStyle.Indented)) diff --git a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt index 464c7bf4..6988afee 100644 --- a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt +++ b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt @@ -109,7 +109,7 @@ open class DefaultPageCreator( "Constructors", 2, ContentKind.Constructors, - c.constructors.filter { it.extra[PrimaryConstructorExtra.PrimaryConstructorExtraKey] == null }, + c.constructors.filter { it.extra[PrimaryConstructorExtra] == null }, c.platformData.toSet() ) { link(it.name, it.dri) |