diff options
| author | vmishenev <vad-mishenev@yandex.ru> | 2021-09-25 02:15:22 +0300 |
|---|---|---|
| committer | vmishenev <vad-mishenev@yandex.ru> | 2021-10-15 00:24:39 +0300 |
| commit | b2663070490d6ad31a0e7ba7ae80d16dbde43aef (patch) | |
| tree | cce72017295c1cffc97af090541131821550b681 /plugins/base/src/main/kotlin | |
| parent | 7e3f6b256585a8592e32ab9d8e01161f32e33aa6 (diff) | |
| download | dokka-b2663070490d6ad31a0e7ba7ae80d16dbde43aef.tar.gz dokka-b2663070490d6ad31a0e7ba7ae80d16dbde43aef.tar.bz2 dokka-b2663070490d6ad31a0e7ba7ae80d16dbde43aef.zip | |
Fix adding new custom stylesheets in submodules (#2168)
Diffstat (limited to 'plugins/base/src/main/kotlin')
3 files changed, 4 insertions, 2 deletions
diff --git a/plugins/base/src/main/kotlin/DokkaBase.kt b/plugins/base/src/main/kotlin/DokkaBase.kt index fc138461..03fbf64e 100644 --- a/plugins/base/src/main/kotlin/DokkaBase.kt +++ b/plugins/base/src/main/kotlin/DokkaBase.kt @@ -227,7 +227,7 @@ class DokkaBase : DokkaPlugin() { after(stylesInstaller) after(scriptsInstaller) after(assetsInstaller) - } applyIf { !delayTemplateSubstitution } + } } val packageListCreator by extending { diff --git a/plugins/base/src/main/kotlin/renderers/html/htmlPreprocessors.kt b/plugins/base/src/main/kotlin/renderers/html/htmlPreprocessors.kt index 665ae730..43526dc3 100644 --- a/plugins/base/src/main/kotlin/renderers/html/htmlPreprocessors.kt +++ b/plugins/base/src/main/kotlin/renderers/html/htmlPreprocessors.kt @@ -76,6 +76,8 @@ class CustomResourceInstaller(val dokkaContext: DokkaContext) : PageTransformer val customResourcesPaths = (customAssets + customStylesheets).map { it.name }.toSet() val withEmbeddedResources = input.transformContentPagesTree { it.modified(embeddedResources = it.embeddedResources + customResourcesPaths) } + if(dokkaContext.configuration.delayTemplateSubstitution) + return withEmbeddedResources val (currentResources, otherPages) = withEmbeddedResources.children.partition { it is RendererSpecificResourcePage } return input.modified(children = otherPages + currentResources.filterNot { it.name in customResourcesPaths } + customAssets + customStylesheets) } diff --git a/plugins/base/src/main/kotlin/resolvers/local/DokkaLocationProvider.kt b/plugins/base/src/main/kotlin/resolvers/local/DokkaLocationProvider.kt index 69a851ed..c4c46331 100644 --- a/plugins/base/src/main/kotlin/resolvers/local/DokkaLocationProvider.kt +++ b/plugins/base/src/main/kotlin/resolvers/local/DokkaLocationProvider.kt @@ -140,7 +140,7 @@ open class DokkaLocationProvider( private fun PageNode.parent() = pageGraphRoot.parentMap[this] private val PageNode.pathName: String - get() = if (this is PackagePageNode) name else identifierToFilename(name) + get() = if (this is PackagePageNode || this is RendererSpecificResourcePage) name else identifierToFilename(name) protected data class DRIWithSourceSets(val dri: DRI, val sourceSet: Set<DisplaySourceSet>) |