diff options
Diffstat (limited to 'plugins/base/src')
| -rw-r--r-- | plugins/base/src/main/kotlin/DokkaBase.kt | 12 | ||||
| -rw-r--r-- | plugins/base/src/test/kotlin/basic/DokkaBasicTests.kt | 5 | ||||
| -rw-r--r-- | plugins/base/src/test/kotlin/enums/EnumsTest.kt | 2 | ||||
| -rw-r--r-- | plugins/base/src/test/kotlin/markdown/KDocTest.kt | 2 |
4 files changed, 11 insertions, 10 deletions
diff --git a/plugins/base/src/main/kotlin/DokkaBase.kt b/plugins/base/src/main/kotlin/DokkaBase.kt index af04d435..46c92c15 100644 --- a/plugins/base/src/main/kotlin/DokkaBase.kt +++ b/plugins/base/src/main/kotlin/DokkaBase.kt @@ -130,7 +130,7 @@ class DokkaBase : DokkaPlugin() { } val rootCreator by extending { - htmlPreprocessors with RootCreator + htmlPreprocessors with RootCreator applyIf { format == "html" } } val defaultSamplesTransformer by extending { @@ -153,19 +153,19 @@ class DokkaBase : DokkaPlugin() { } val navigationPageInstaller by extending { - htmlPreprocessors with NavigationPageInstaller order { after(rootCreator) } + htmlPreprocessors with NavigationPageInstaller order { after(rootCreator) } applyIf { format == "html" } } val searchPageInstaller by extending { - htmlPreprocessors with SearchPageInstaller order { after(rootCreator) } + htmlPreprocessors with SearchPageInstaller order { after(rootCreator) } applyIf { format == "html" } } val resourceInstaller by extending { - htmlPreprocessors with ResourceInstaller order { after(rootCreator) } + htmlPreprocessors with ResourceInstaller order { after(rootCreator) } applyIf { format == "html" } } val styleAndScriptsAppender by extending { - htmlPreprocessors with StyleAndScriptsAppender order { after(rootCreator) } + htmlPreprocessors with StyleAndScriptsAppender order { after(rootCreator) } applyIf { format == "html" } } val packageListCreator by extending { @@ -175,7 +175,7 @@ class DokkaBase : DokkaPlugin() { "html", "html" ) - } order { after(rootCreator) } + } order { after(rootCreator) } applyIf { format == "html" } } val sourcesetDependencyAppender by extending { diff --git a/plugins/base/src/test/kotlin/basic/DokkaBasicTests.kt b/plugins/base/src/test/kotlin/basic/DokkaBasicTests.kt index c1044e09..c9f4b156 100644 --- a/plugins/base/src/test/kotlin/basic/DokkaBasicTests.kt +++ b/plugins/base/src/test/kotlin/basic/DokkaBasicTests.kt @@ -31,8 +31,9 @@ class DokkaBasicTests : AbstractCoreTest() { configuration ) { pagesGenerationStage = { - println(it.dri) - assertTrue(it.getClasslikeToMemberMap().filterKeys { it.name == "Test" }.entries.firstOrNull()?.value?.size == 2) + val root = it as ModulePageNode + println(root.dri) + assertTrue(root.getClasslikeToMemberMap().filterKeys { root.name == "Test" }.entries.firstOrNull()?.value?.size == 2) } } } diff --git a/plugins/base/src/test/kotlin/enums/EnumsTest.kt b/plugins/base/src/test/kotlin/enums/EnumsTest.kt index a8b78baa..125e37e2 100644 --- a/plugins/base/src/test/kotlin/enums/EnumsTest.kt +++ b/plugins/base/src/test/kotlin/enums/EnumsTest.kt @@ -231,7 +231,7 @@ class EnumsTest : AbstractCoreTest() { } - fun ModulePageNode.getClasslikeToMemberMap() = + fun RootPageNode.getClasslikeToMemberMap() = this.parentMap.filterValues { it is ClasslikePageNode }.entries.groupBy({ it.value }) { it.key } private fun ContentGroup.constructorSignature(): String = diff --git a/plugins/base/src/test/kotlin/markdown/KDocTest.kt b/plugins/base/src/test/kotlin/markdown/KDocTest.kt index f9d717b0..218f7244 100644 --- a/plugins/base/src/test/kotlin/markdown/KDocTest.kt +++ b/plugins/base/src/test/kotlin/markdown/KDocTest.kt @@ -39,7 +39,7 @@ abstract class KDocTest : AbstractCoreTest() { pagesGenerationStage = { assertEquals( expectedDocumentationNode, - actualDocumentationNode(it) + actualDocumentationNode(it as ModulePageNode) ) } } |