diff options
| author | Kamil Doległo <kamilok1965@interia.pl> | 2020-08-11 21:47:26 +0200 |
|---|---|---|
| committer | Sebastian Sellmair <34319766+sellmair@users.noreply.github.com> | 2020-08-19 13:34:10 +0200 |
| commit | 852a6ce6c0f43c9b2044320dcceb4c6cc0a3b302 (patch) | |
| tree | fb95be79e816769ca5305cf3a601348549000c6d /plugins/gfm/src | |
| parent | 822653f017fa58352148e1c586690debb6773965 (diff) | |
| download | dokka-852a6ce6c0f43c9b2044320dcceb4c6cc0a3b302.tar.gz dokka-852a6ce6c0f43c9b2044320dcceb4c6cc0a3b302.tar.bz2 dokka-852a6ce6c0f43c9b2044320dcceb4c6cc0a3b302.zip | |
Refactor location providers
Diffstat (limited to 'plugins/gfm/src')
| -rw-r--r-- | plugins/gfm/src/main/kotlin/GfmPlugin.kt | 14 | ||||
| -rw-r--r-- | plugins/gfm/src/test/kotlin/renderers/gfm/GfmRenderingOnlyTestBase.kt | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/plugins/gfm/src/main/kotlin/GfmPlugin.kt b/plugins/gfm/src/main/kotlin/GfmPlugin.kt index 3cec8320..c758467a 100644 --- a/plugins/gfm/src/main/kotlin/GfmPlugin.kt +++ b/plugins/gfm/src/main/kotlin/GfmPlugin.kt @@ -5,9 +5,10 @@ import org.jetbrains.dokka.base.DokkaBase import org.jetbrains.dokka.base.renderers.DefaultRenderer import org.jetbrains.dokka.base.renderers.PackageListCreator import org.jetbrains.dokka.base.renderers.RootCreator -import org.jetbrains.dokka.base.resolvers.local.DefaultLocationProvider +import org.jetbrains.dokka.base.resolvers.local.DokkaLocationProvider import org.jetbrains.dokka.base.resolvers.local.LocationProviderFactory import org.jetbrains.dokka.model.DisplaySourceSet +import org.jetbrains.dokka.base.resolvers.shared.RecognizedLinkFormat import org.jetbrains.dokka.pages.* import org.jetbrains.dokka.plugability.DokkaContext import org.jetbrains.dokka.plugability.DokkaPlugin @@ -39,7 +40,7 @@ class GfmPlugin : DokkaPlugin() { val packageListCreator by extending { (gfmPreprocessors - providing { PackageListCreator(it, "gfm", "md") } + providing { PackageListCreator(it, RecognizedLinkFormat.DokkaGFM) } order { after(rootCreator) }) } } @@ -355,9 +356,8 @@ class MarkdownLocationProviderFactory(val context: DokkaContext) : LocationProvi class MarkdownLocationProvider( pageGraphRoot: RootPageNode, dokkaContext: DokkaContext -) : DefaultLocationProvider( +) : DokkaLocationProvider( pageGraphRoot, - dokkaContext -) { - override val extension = ".md" -} + dokkaContext, +".md" +)
\ No newline at end of file diff --git a/plugins/gfm/src/test/kotlin/renderers/gfm/GfmRenderingOnlyTestBase.kt b/plugins/gfm/src/test/kotlin/renderers/gfm/GfmRenderingOnlyTestBase.kt index 7c9590c6..35c2da3d 100644 --- a/plugins/gfm/src/test/kotlin/renderers/gfm/GfmRenderingOnlyTestBase.kt +++ b/plugins/gfm/src/test/kotlin/renderers/gfm/GfmRenderingOnlyTestBase.kt @@ -6,8 +6,8 @@ import org.jetbrains.dokka.gfm.MarkdownLocationProviderFactory import org.jetbrains.dokka.testApi.context.MockContext import org.jetbrains.dokka.base.DokkaBase import org.jetbrains.dokka.base.renderers.RootCreator -import org.jetbrains.dokka.base.resolvers.external.DokkaExternalLocationProviderFactory -import org.jetbrains.dokka.base.resolvers.external.JavadocExternalLocationProviderFactory +import org.jetbrains.dokka.base.resolvers.external.DefaultExternalLocationProviderFactory +import org.jetbrains.dokka.base.resolvers.external.javadoc.JavadocExternalLocationProviderFactory import renderers.RenderingOnlyTestBase import utils.TestOutputWriter @@ -18,7 +18,7 @@ abstract class GfmRenderingOnlyTestBase : RenderingOnlyTestBase<String>() { DokkaBase().outputWriter to { _ -> files }, DokkaBase().locationProviderFactory to ::MarkdownLocationProviderFactory, DokkaBase().externalLocationProviderFactory to { ::JavadocExternalLocationProviderFactory }, - DokkaBase().externalLocationProviderFactory to { ::DokkaExternalLocationProviderFactory }, + DokkaBase().externalLocationProviderFactory to { ::DefaultExternalLocationProviderFactory }, GfmPlugin().gfmPreprocessors to { _ -> RootCreator }, testConfiguration = DokkaConfigurationImpl() |