From bee52be815bebd7012193728521636b5fbed2829 Mon Sep 17 00:00:00 2001
From: Kamil Doległo <kamilok1965@interia.pl>
Date: Tue, 18 Feb 2020 17:47:14 +0100
Subject: Rename extensions to make them more uniform

---
 .../kotlin/transformers/pages/merger/PageMerger.kt | 29 ++++++++++++++++++++++
 .../transformers/pages/merger/PageNodeMerger.kt    | 29 ----------------------
 2 files changed, 29 insertions(+), 29 deletions(-)
 create mode 100644 plugins/base/src/main/kotlin/transformers/pages/merger/PageMerger.kt
 delete mode 100644 plugins/base/src/main/kotlin/transformers/pages/merger/PageNodeMerger.kt

(limited to 'plugins/base/src/main/kotlin/transformers/pages')

diff --git a/plugins/base/src/main/kotlin/transformers/pages/merger/PageMerger.kt b/plugins/base/src/main/kotlin/transformers/pages/merger/PageMerger.kt
new file mode 100644
index 00000000..93d42e7e
--- /dev/null
+++ b/plugins/base/src/main/kotlin/transformers/pages/merger/PageMerger.kt
@@ -0,0 +1,29 @@
+package org.jetbrains.dokka.base.transformers.pages.merger
+
+import org.jetbrains.dokka.pages.PageNode
+import org.jetbrains.dokka.pages.RootPageNode
+import org.jetbrains.dokka.transformers.pages.PageTransformer
+
+class PageMerger(private val strategies: Iterable<PageMergerStrategy>) : PageTransformer {
+    override fun invoke(input: RootPageNode): RootPageNode =
+        input.modified(children = input.children.map { it.mergeChildren(emptyList()) })
+
+    private fun PageNode.mergeChildren(path: List<String>): PageNode = children.groupBy { it.name }
+        .map { (n, v) -> mergePageNodes(v, path + n) }
+        .let { pages ->
+            modified(children = pages.map { it.assertSingle(path) }.map { it.mergeChildren(path + it.name) })
+        }
+
+    private fun mergePageNodes(pages: List<PageNode>, path: List<String>): List<PageNode> =
+        strategies.fold(pages) { acc, strategy -> tryMerge(strategy, acc, path) }
+
+    private fun tryMerge(strategy: PageMergerStrategy, pages: List<PageNode>, path: List<String>) =
+        if (pages.size > 1) strategy.tryMerge(pages, path) else pages
+}
+
+private fun <T> Iterable<T>.assertSingle(path: List<String>): T = try {
+        single()
+    } catch (e: Exception) {
+        val renderedPath = path.joinToString(separator = "/")
+        throw IllegalStateException("Page merger is misconfigured. Error for $renderedPath: ${e.message}")
+    }
\ No newline at end of file
diff --git a/plugins/base/src/main/kotlin/transformers/pages/merger/PageNodeMerger.kt b/plugins/base/src/main/kotlin/transformers/pages/merger/PageNodeMerger.kt
deleted file mode 100644
index 96cd126c..00000000
--- a/plugins/base/src/main/kotlin/transformers/pages/merger/PageNodeMerger.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.jetbrains.dokka.base.transformers.pages.merger
-
-import org.jetbrains.dokka.pages.PageNode
-import org.jetbrains.dokka.pages.RootPageNode
-import org.jetbrains.dokka.transformers.pages.PageNodeTransformer
-
-class PageNodeMerger(private val strategies: Iterable<PageMergerStrategy>) : PageNodeTransformer {
-    override fun invoke(input: RootPageNode): RootPageNode =
-        input.modified(children = input.children.map { it.mergeChildren(emptyList()) })
-
-    private fun PageNode.mergeChildren(path: List<String>): PageNode = children.groupBy { it.name }
-        .map { (n, v) -> mergePageNodes(v, path + n) }
-        .let { pages ->
-            modified(children = pages.map { it.assertSingle(path) }.map { it.mergeChildren(path + it.name) })
-        }
-
-    private fun mergePageNodes(pages: List<PageNode>, path: List<String>): List<PageNode> =
-        strategies.fold(pages) { acc, strategy -> tryMerge(strategy, acc, path) }
-
-    private fun tryMerge(strategy: PageMergerStrategy, pages: List<PageNode>, path: List<String>) =
-        if (pages.size > 1) strategy.tryMerge(pages, path) else pages
-}
-
-private fun <T> Iterable<T>.assertSingle(path: List<String>): T = try {
-        single()
-    } catch (e: Exception) {
-        val renderedPath = path.joinToString(separator = "/")
-        throw IllegalStateException("Page merger is misconfigured. Error for $renderedPath: ${e.message}")
-    }
\ No newline at end of file
-- 
cgit