diff options
| author | Paweł Marks <pmarks@virtuslab.com> | 2020-02-27 18:21:06 +0100 |
|---|---|---|
| committer | Paweł Marks <Kordyjan@users.noreply.github.com> | 2020-03-04 14:28:14 +0100 |
| commit | 33d67aae63986687f0eff9228cfc9f9d5da6d61e (patch) | |
| tree | 2a675cd95e764494ee31b4d729ac8b3e12700cdc | |
| parent | ded94108b225686bc77ec1626798ded06a6db0c1 (diff) | |
| download | dokka-33d67aae63986687f0eff9228cfc9f9d5da6d61e.tar.gz dokka-33d67aae63986687f0eff9228cfc9f9d5da6d61e.tar.bz2 dokka-33d67aae63986687f0eff9228cfc9f9d5da6d61e.zip | |
Signature provider moved to base
| -rw-r--r-- | core/src/main/kotlin/CoreExtensions.kt | 2 | ||||
| -rw-r--r-- | plugins/base/src/main/kotlin/DokkaBase.kt | 2 | ||||
| -rw-r--r-- | plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt (renamed from plugins/base/src/main/kotlin/providers/KotlinSignatureProvider.kt) | 2 | ||||
| -rw-r--r-- | plugins/base/src/main/kotlin/signatures/SignatureProvider.kt (renamed from core/src/main/kotlin/model/SignatureProvider.kt) | 3 |
4 files changed, 5 insertions, 4 deletions
diff --git a/core/src/main/kotlin/CoreExtensions.kt b/core/src/main/kotlin/CoreExtensions.kt index 6a1af187..be354bc4 100644 --- a/core/src/main/kotlin/CoreExtensions.kt +++ b/core/src/main/kotlin/CoreExtensions.kt @@ -1,6 +1,5 @@ package org.jetbrains.dokka -import org.jetbrains.dokka.model.SignatureProvider import org.jetbrains.dokka.plugability.ExtensionPoint import org.jetbrains.dokka.renderers.Renderer import org.jetbrains.dokka.transformers.descriptors.DescriptorToDocumentableTranslator @@ -19,7 +18,6 @@ object CoreExtensions { val documentableToPageTranslator by coreExtension<DocumentableToPageTranslator>() val pageTransformer by coreExtension<PageTransformer>() val renderer by coreExtension<Renderer>() - val signatureProvider by coreExtension<SignatureProvider>() private fun <T : Any> coreExtension() = object { operator fun provideDelegate(thisRef: CoreExtensions, property: KProperty<*>): Lazy<ExtensionPoint<T>> = diff --git a/plugins/base/src/main/kotlin/DokkaBase.kt b/plugins/base/src/main/kotlin/DokkaBase.kt index 03875320..78a51559 100644 --- a/plugins/base/src/main/kotlin/DokkaBase.kt +++ b/plugins/base/src/main/kotlin/DokkaBase.kt @@ -6,6 +6,7 @@ import org.jetbrains.dokka.base.renderers.OutputWriter import org.jetbrains.dokka.base.renderers.html.HtmlRenderer import org.jetbrains.dokka.base.resolvers.DefaultLocationProviderFactory import org.jetbrains.dokka.base.resolvers.LocationProviderFactory +import org.jetbrains.dokka.base.signatures.SignatureProvider import org.jetbrains.dokka.base.transformers.documentables.DefaultDocumentableMerger import org.jetbrains.dokka.base.transformers.pages.comments.CommentsToContentConverter import org.jetbrains.dokka.base.transformers.pages.comments.DocTagToContentConverter @@ -21,6 +22,7 @@ import org.jetbrains.dokka.plugability.DokkaPlugin class DokkaBase : DokkaPlugin() { val pageMergerStrategy by extensionPoint<PageMergerStrategy>() val commentsToContentConverter by extensionPoint<CommentsToContentConverter>() + val signatureProvider by extensionPoint<SignatureProvider>() val locationProviderFactory by extensionPoint<LocationProviderFactory>() val outputWriter by extensionPoint<OutputWriter>() diff --git a/plugins/base/src/main/kotlin/providers/KotlinSignatureProvider.kt b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt index efee39fd..6eddca0d 100644 --- a/plugins/base/src/main/kotlin/providers/KotlinSignatureProvider.kt +++ b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt @@ -1,4 +1,4 @@ -package org.jetbrains.dokka.base.providers +package org.jetbrains.dokka.base.signatures import org.jetbrains.dokka.base.transformers.pages.comments.CommentsToContentConverter import org.jetbrains.dokka.base.translators.documentables.PageContentBuilder diff --git a/core/src/main/kotlin/model/SignatureProvider.kt b/plugins/base/src/main/kotlin/signatures/SignatureProvider.kt index 2df0f4b6..738f405a 100644 --- a/core/src/main/kotlin/model/SignatureProvider.kt +++ b/plugins/base/src/main/kotlin/signatures/SignatureProvider.kt @@ -1,5 +1,6 @@ -package org.jetbrains.dokka.model +package org.jetbrains.dokka.base.signatures +import org.jetbrains.dokka.model.Documentable import org.jetbrains.dokka.pages.ContentNode interface SignatureProvider { |