diff options
author | Andrzej Ratajczak <andrzej.ratajczak98@gmail.com> | 2020-01-16 10:51:55 +0100 |
---|---|---|
committer | Paweł Marks <Kordyjan@users.noreply.github.com> | 2020-01-16 11:55:53 +0100 |
commit | 69d2663ff7de9fb4e4b1d0bc0b82f7653f70dad1 (patch) | |
tree | 304f1fd2fc3a93a13df3f2fc7b49347568138216 /core/src/main/kotlin/resolvers | |
parent | 0917459a2eafabc563e79579a0322bb7832cae1f (diff) | |
download | dokka-69d2663ff7de9fb4e4b1d0bc0b82f7653f70dad1.tar.gz dokka-69d2663ff7de9fb4e4b1d0bc0b82f7653f70dad1.tar.bz2 dokka-69d2663ff7de9fb4e4b1d0bc0b82f7653f70dad1.zip |
Applies requested changes
Diffstat (limited to 'core/src/main/kotlin/resolvers')
-rw-r--r-- | core/src/main/kotlin/resolvers/DefaultLocationProvider.kt | 6 | ||||
-rw-r--r-- | core/src/main/kotlin/resolvers/LocationProviderFactory.kt | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/core/src/main/kotlin/resolvers/DefaultLocationProvider.kt b/core/src/main/kotlin/resolvers/DefaultLocationProvider.kt index 7eae26ca..d7089f96 100644 --- a/core/src/main/kotlin/resolvers/DefaultLocationProvider.kt +++ b/core/src/main/kotlin/resolvers/DefaultLocationProvider.kt @@ -10,9 +10,9 @@ import org.jetbrains.dokka.plugability.single open class DefaultLocationProvider( private val pageGraphRoot: ModulePageNode, - private val context: DokkaContext + private val dokkaContext: DokkaContext ) : LocationProvider { // TODO: cache - private val extension = context.single(CoreExtensions.fileExtension) + private val extension = dokkaContext.single(CoreExtensions.fileExtension) override fun resolve(node: PageNode, context: PageNode?): String = pathTo(node, context) + extension @@ -20,7 +20,7 @@ open class DefaultLocationProvider( findInPageGraph(dri, platforms)?.let { resolve(it, context) } ?: // Not found in PageGraph, that means it's an external link ExternalLocationProvider.getLocation(dri, - this@DefaultLocationProvider.context.configuration.passesConfigurations + this.dokkaContext.configuration.passesConfigurations .filter { passConfig -> platforms.toSet().contains(PlatformData(passConfig.moduleName, passConfig.analysisPlatform, passConfig.targets)) } // TODO: change targets to something better? diff --git a/core/src/main/kotlin/resolvers/LocationProviderFactory.kt b/core/src/main/kotlin/resolvers/LocationProviderFactory.kt index 1622045b..c657846a 100644 --- a/core/src/main/kotlin/resolvers/LocationProviderFactory.kt +++ b/core/src/main/kotlin/resolvers/LocationProviderFactory.kt @@ -1,13 +1,13 @@ package org.jetbrains.dokka.resolvers import org.jetbrains.dokka.pages.ModulePageNode -import org.jetbrains.dokka.pages.PageNode import org.jetbrains.dokka.plugability.DokkaContext interface LocationProviderFactory { - fun getLocationProvider(pageNode: PageNode, context: DokkaContext): LocationProvider + fun getLocationProvider(pageNode: ModulePageNode): LocationProvider } -object DefaultLocationProviderFactory : LocationProviderFactory { - override fun getLocationProvider(pageNode: PageNode, context: DokkaContext) = DefaultLocationProvider(pageNode as ModulePageNode, context) +class DefaultLocationProviderFactory(val context: DokkaContext) : LocationProviderFactory { + + override fun getLocationProvider(pageNode: ModulePageNode) = DefaultLocationProvider(pageNode, context) }
\ No newline at end of file |