diff options
| -rw-r--r-- | core/src/main/kotlin/plugability/DefaultExtensions.kt | 1 | ||||
| -rw-r--r-- | core/src/main/kotlin/transformers/pages/SameMethodNamePageMergerStrategy.kt (renamed from core/src/main/kotlin/transformers/pages/SameNamePageMergerStrategy.kt) | 2 | ||||
| -rw-r--r-- | core/src/test/kotlin/pageMerger/PageNodeMergerTest.kt | 5 |
3 files changed, 3 insertions, 5 deletions
diff --git a/core/src/main/kotlin/plugability/DefaultExtensions.kt b/core/src/main/kotlin/plugability/DefaultExtensions.kt index 28753cc6..1320c282 100644 --- a/core/src/main/kotlin/plugability/DefaultExtensions.kt +++ b/core/src/main/kotlin/plugability/DefaultExtensions.kt @@ -10,7 +10,6 @@ import org.jetbrains.dokka.transformers.descriptors.DefaultDescriptorToDocumenta import org.jetbrains.dokka.transformers.documentation.DefaultDocumentationNodeMerger import org.jetbrains.dokka.transformers.documentation.DefaultDocumentationToPageTranslator import org.jetbrains.dokka.transformers.pages.DefaultPageMergerStrategy -import org.jetbrains.dokka.transformers.pages.SameNamePageMergerStrategy import org.jetbrains.dokka.transformers.psi.DefaultPsiToDocumentationTranslator import org.jetbrains.dokka.transformers.pages.DefaultPageNodeMerger diff --git a/core/src/main/kotlin/transformers/pages/SameNamePageMergerStrategy.kt b/core/src/main/kotlin/transformers/pages/SameMethodNamePageMergerStrategy.kt index 47d5a2f5..3835506b 100644 --- a/core/src/main/kotlin/transformers/pages/SameNamePageMergerStrategy.kt +++ b/core/src/main/kotlin/transformers/pages/SameMethodNamePageMergerStrategy.kt @@ -2,7 +2,7 @@ package org.jetbrains.dokka.transformers.pages import org.jetbrains.dokka.pages.* -object SameNamePageMergerStrategy : PageMergerStrategy { +object SameMethodNamePageMergerStrategy : PageMergerStrategy { override fun tryMerge(pages: List<PageNode>): List<PageNode> { val name = pages.first().name val members = pages.filterIsInstance<MemberPageNode>() diff --git a/core/src/test/kotlin/pageMerger/PageNodeMergerTest.kt b/core/src/test/kotlin/pageMerger/PageNodeMergerTest.kt index e43e2348..88e57ddb 100644 --- a/core/src/test/kotlin/pageMerger/PageNodeMergerTest.kt +++ b/core/src/test/kotlin/pageMerger/PageNodeMergerTest.kt @@ -5,8 +5,7 @@ import org.jetbrains.dokka.pages.ContentPage import org.jetbrains.dokka.pages.PageNode import org.jetbrains.dokka.plugability.DokkaPlugin import org.jetbrains.dokka.transformers.pages.DefaultPageMergerStrategy -import org.jetbrains.dokka.transformers.pages.PageMergerStrategy -import org.jetbrains.dokka.transformers.pages.SameNamePageMergerStrategy +import org.jetbrains.dokka.transformers.pages.SameMethodNamePageMergerStrategy import org.jetbrains.dokka.utilities.DokkaLogger import org.junit.Test import testApi.testRunner.AbstractCoreTest @@ -14,7 +13,7 @@ import testApi.testRunner.AbstractCoreTest class PageNodeMergerTest : AbstractCoreTest() { object SameNameStrategy : DokkaPlugin() { - val strategy by extending { CoreExtensions.pageMergerStrategy with SameNamePageMergerStrategy } + val strategy by extending { CoreExtensions.pageMergerStrategy with SameMethodNamePageMergerStrategy } } class DefaultStrategy(val strList: MutableList<String> = mutableListOf()) : DokkaPlugin(), DokkaLogger { |