From c09bde34ff729ef9b1f3bea602fb53cd4e6dca42 Mon Sep 17 00:00:00 2001
From: Andrzej Ratajczak <andrzej.ratajczak98@gmail.com>
Date: Fri, 13 Mar 2020 10:46:33 +0100
Subject: Gradle Task supporting multimodular projects

---
 plugins/jekyll/src/main/kotlin/JekyllPlugin.kt | 182 +++++++++++++++++++++++++
 1 file changed, 182 insertions(+)
 create mode 100644 plugins/jekyll/src/main/kotlin/JekyllPlugin.kt

(limited to 'plugins/jekyll/src/main/kotlin/JekyllPlugin.kt')

diff --git a/plugins/jekyll/src/main/kotlin/JekyllPlugin.kt b/plugins/jekyll/src/main/kotlin/JekyllPlugin.kt
new file mode 100644
index 00000000..0a0a2cc4
--- /dev/null
+++ b/plugins/jekyll/src/main/kotlin/JekyllPlugin.kt
@@ -0,0 +1,182 @@
+package org.jetbrains.dokka.jekyll
+
+import org.jetbrains.dokka.CoreExtensions
+import org.jetbrains.dokka.pages.*
+import org.jetbrains.dokka.plugability.DokkaContext
+import org.jetbrains.dokka.plugability.DokkaPlugin
+import org.jetbrains.dokka.plugability.single
+import org.jetbrains.dokka.renderers.DefaultRenderer
+import org.jetbrains.dokka.renderers.OutputWriter
+import org.jetbrains.dokka.resolvers.DefaultLocationProvider
+import org.jetbrains.dokka.resolvers.LocationProvider
+import org.jetbrains.dokka.resolvers.LocationProviderFactory
+import java.lang.StringBuilder
+
+
+class JekyllPlugin : DokkaPlugin() {
+
+    val renderer by extending {
+        CoreExtensions.renderer providing { JekyllRenderer(it.single(CoreExtensions.outputWriter), it) }
+    }
+}
+
+class JekyllRenderer(
+    outputWriter: OutputWriter,
+    context: DokkaContext
+) : DefaultRenderer<StringBuilder>(outputWriter, context) {
+    override fun StringBuilder.buildHeader(level: Int, content: StringBuilder.() -> Unit) {
+        buildParagraph()
+        append("${"#".repeat(level)} ")
+        content()
+        buildNewLine()
+    }
+
+    override fun StringBuilder.buildLink(address: String, content: StringBuilder.() -> Unit) {
+        append("[")
+        content()
+        append("]($address)")
+    }
+
+    override fun StringBuilder.buildList(node: ContentList, pageContext: ContentPage) {
+        buildListLevel(node, pageContext)
+        buildParagraph()
+    }
+
+    private val indent = " ".repeat(4)
+
+    private fun StringBuilder.buildListItem(items: List<ContentNode>, pageContext: ContentPage, bullet: String = "*") {
+        items.forEach {
+            if(it is ContentList) {
+                val builder = StringBuilder()
+                builder.append(indent)
+                builder.buildListLevel(it, pageContext)
+                append(builder.toString().replace(Regex("  \n(?!$)"), "  \n$indent"))
+            } else {
+                append("$bullet ")
+                it.build(this, pageContext)
+                buildNewLine()
+            }
+        }
+    }
+
+    private fun StringBuilder.buildListLevel(node: ContentList, pageContext: ContentPage) {
+        if(node.ordered) {
+            buildListItem(node.children, pageContext, "${node.start}.")
+        } else {
+            buildListItem(node.children, pageContext, "*")
+        }
+    }
+
+    override fun StringBuilder.buildNewLine() {
+        this.append("  \n")
+    }
+
+    fun StringBuilder.buildParagraph() {
+        this.append("\n\n")
+    }
+
+    override fun StringBuilder.buildResource(node: ContentEmbeddedResource, pageContext: ContentPage) {
+        this.append("Resource")
+    }
+
+    override fun StringBuilder.buildTable(node: ContentTable, pageContext: ContentPage) {
+
+        buildParagraph()
+
+        val size = node.children.firstOrNull()?.children?.size ?: 0
+
+        if(node.header.size > 0) {
+            node.header.forEach {
+                it.children.forEach {
+                    append("| ")
+                    it.build(this, pageContext)
+                }
+                append("|\n")
+            }
+        } else {
+            append("| ".repeat(size))
+            if(size > 0) append("|\n")
+        }
+
+        append("|---".repeat(size))
+        if(size > 0) append("|\n")
+
+
+        node.children.forEach {
+            it.children.forEach {
+                append("| ")
+                it.build(this,  pageContext)
+            }
+            append("|\n")
+        }
+
+        buildParagraph()
+    }
+
+    override fun StringBuilder.buildText(textNode: ContentText) {
+        val decorators = decorators(textNode.style)
+        this.append(decorators)
+        this.append(textNode.text.replace(Regex("[<>]"), ""))
+        this.append(decorators.reversed())
+    }
+
+    override fun StringBuilder.buildNavigation(page: PageNode) {
+        locationProvider.ancestors(page).asReversed().forEach { node ->
+            append("/")
+            if (node.isNavigable) buildLink(node, page)
+            else append(node.name)
+        }
+        buildParagraph()
+    }
+
+    override fun buildPage(page: ContentPage, content: (StringBuilder, ContentPage) -> Unit): String {
+        val builder = StringBuilder()
+        builder.append("---\n")
+        builder.append("title: ${page.name} -\n")
+        builder.append("---\n")
+        content(builder, page)
+        return builder.toString()
+    }
+
+    override fun buildError(node: ContentNode) {
+        println("Error")
+    }
+
+    private fun decorators(styles: Set<Style>): String {
+        val decorators = StringBuilder()
+        styles.forEach {
+            when(it) {
+                TextStyle.Bold          -> decorators.append("**")
+                TextStyle.Italic        -> decorators.append("*")
+                TextStyle.Strong        -> decorators.append("**")
+                TextStyle.Strikethrough -> decorators.append("~~")
+                else                    -> Unit
+            }
+        }
+        return decorators.toString()
+    }
+
+    private val PageNode.isNavigable: Boolean
+        get() = this !is RendererSpecificPage || strategy != RenderingStrategy.DoNothing
+
+    private fun StringBuilder.buildLink(to: PageNode, from: PageNode) =
+        buildLink(locationProvider.resolve(to, from)) {
+            append(to.name)
+        }
+
+    override fun renderPage(page: PageNode) {
+        val path by lazy { locationProvider.resolve(page, skipExtension = true) }
+        when (page) {
+            is ContentPage -> outputWriter.write(path, buildPage(page) { c, p -> buildPageContent(c, p) }, ".md")
+            is RendererSpecificPage -> when (val strategy = page.strategy) {
+                is RenderingStrategy.Copy -> outputWriter.writeResources(strategy.from, path)
+                is RenderingStrategy.Write -> outputWriter.write(path, strategy.text, "")
+                is RenderingStrategy.Callback -> outputWriter.write(path, strategy.instructions(this, page), ".md")
+                RenderingStrategy.DoNothing -> Unit
+            }
+            else -> throw AssertionError(
+                "Page ${page.name} cannot be rendered by renderer as it is not renderer specific nor contains content"
+            )
+        }
+    }
+}
\ No newline at end of file
-- 
cgit 


From 10e8dc85946aabf797d73552e0bc98330764ba3f Mon Sep 17 00:00:00 2001
From: Andrzej Ratajczak <andrzej.ratajczak98@gmail.com>
Date: Tue, 31 Mar 2020 13:33:31 +0200
Subject: Fixes problems with Markdown and Jekyll

---
 .../resolvers/local/DefaultLocationProvider.kt     |   2 +-
 plugins/gfm/build.gradle.kts                       |   8 +-
 plugins/gfm/src/main/kotlin/GfmPlugin.kt           |  42 ++++--
 plugins/jekyll/build.gradle.kts                    |   7 +-
 plugins/jekyll/src/main/kotlin/JekyllPlugin.kt     | 158 +--------------------
 settings.gradle.kts                                |   2 +
 6 files changed, 46 insertions(+), 173 deletions(-)

(limited to 'plugins/jekyll/src/main/kotlin/JekyllPlugin.kt')

diff --git a/plugins/base/src/main/kotlin/resolvers/local/DefaultLocationProvider.kt b/plugins/base/src/main/kotlin/resolvers/local/DefaultLocationProvider.kt
index 736367a9..29c4a425 100644
--- a/plugins/base/src/main/kotlin/resolvers/local/DefaultLocationProvider.kt
+++ b/plugins/base/src/main/kotlin/resolvers/local/DefaultLocationProvider.kt
@@ -21,7 +21,7 @@ open class DefaultLocationProvider(
     protected val pageGraphRoot: RootPageNode,
     protected val dokkaContext: DokkaContext
 ) : LocationProvider {
-    protected val extension = ".html"
+    protected open val extension = ".html"
 
     protected val externalLocationProviderFactories =
         dokkaContext.plugin<DokkaBase>().query { externalLocationProviderFactory }
diff --git a/plugins/gfm/build.gradle.kts b/plugins/gfm/build.gradle.kts
index c327b96c..c0226345 100644
--- a/plugins/gfm/build.gradle.kts
+++ b/plugins/gfm/build.gradle.kts
@@ -1,8 +1,12 @@
 publishing {
     publications {
-        register<MavenPublication>("gfm-plugin") {
+        register<MavenPublication>("gfmPlugin") {
             artifactId = "gfm-plugin"
             from(components["java"])
         }
     }
-}
\ No newline at end of file
+}
+
+dependencies {
+    implementation(project(":plugins:base"))
+}
diff --git a/plugins/gfm/src/main/kotlin/GfmPlugin.kt b/plugins/gfm/src/main/kotlin/GfmPlugin.kt
index 64a2cdfc..7c0ce509 100644
--- a/plugins/gfm/src/main/kotlin/GfmPlugin.kt
+++ b/plugins/gfm/src/main/kotlin/GfmPlugin.kt
@@ -1,32 +1,31 @@
-package org.jetbrains.dokka.commonmarkrenderer
+package org.jetbrains.dokka.gfm
 
 import org.jetbrains.dokka.CoreExtensions
+import org.jetbrains.dokka.base.DokkaBase
+import org.jetbrains.dokka.base.renderers.DefaultRenderer
+import org.jetbrains.dokka.base.renderers.OutputWriter
+import org.jetbrains.dokka.base.resolvers.local.DefaultLocationProvider
+import org.jetbrains.dokka.base.resolvers.local.LocationProviderFactory
 import org.jetbrains.dokka.pages.*
 import org.jetbrains.dokka.plugability.DokkaContext
 import org.jetbrains.dokka.plugability.DokkaPlugin
 import java.lang.StringBuilder
 
 
-class CommonmarkRendererPlugin : DokkaPlugin() {
-
-    val locationProviderFactory by extensionPoint<LocationProviderFactory>()
-    val outputWriter by extensionPoint<OutputWriter>()
+class GfmPlugin : DokkaPlugin() {
 
     val renderer by extending {
-        CoreExtensions.renderer providing { CommonmarkRenderer(it.single(outputWriter), it) }
+        CoreExtensions.renderer providing { CommonmarkRenderer(it) } applyIf { format == "gfm" }
     }
 
     val locationProvider by extending {
-        locationProviderFactory providing { MarkdownLocationProviderFactory(it) } order {
-            before(renderer)
-        }
+        plugin<DokkaBase>().locationProviderFactory providing { MarkdownLocationProviderFactory(it) } applyIf { format == "gfm" }
     }
 }
 
-class CommonmarkRenderer(
-    outputWriter: OutputWriter,
+open class CommonmarkRenderer(
     context: DokkaContext
-) : DefaultRenderer<StringBuilder>(outputWriter, context) {
+) : DefaultRenderer<StringBuilder>(context) {
     override fun StringBuilder.buildHeader(level: Int, content: StringBuilder.() -> Unit) {
         buildParagraph()
         append("#".repeat(level) + " ")
@@ -84,14 +83,27 @@ class CommonmarkRenderer(
         append("\n\n")
     }
 
+    override fun StringBuilder.buildPlatformDependent(content: PlatformHintedContent, pageContext: ContentPage) {
+        val distinct = content.platforms.map {
+            it to "${StringBuilder().apply {buildContentNode(content.inner, pageContext, it) }.toString()}"
+        }.groupBy(Pair<PlatformData, String>::second, Pair<PlatformData, String>::first)
+
+        if (distinct.size == 1)
+            append(distinct.keys.single())
+        else
+            distinct.forEach { text, platforms ->
+                append(platforms.joinToString(prefix = " [", postfix = "] $text") { it.name })
+            }
+    }
+
     override fun StringBuilder.buildResource(node: ContentEmbeddedResource, pageContext: ContentPage) {
         append("Resource")
     }
 
     override fun StringBuilder.buildTable(node: ContentTable, pageContext: ContentPage, platformRestriction: PlatformData?) {
 
-        val size = node.children.firstOrNull()?.children?.size ?: 0
         buildParagraph()
+        val size = node.children.firstOrNull()?.children?.size ?: 0
 
         if (node.header.size > 0) {
             node.header.forEach {
@@ -116,12 +128,14 @@ class CommonmarkRenderer(
             }
             append("|\n")
         }
+
+        buildParagraph()
     }
 
     override fun StringBuilder.buildText(textNode: ContentText) {
         val decorators = decorators(textNode.style)
         append(decorators)
-        append(textNode.text.escapeIllegalCharacters())
+        append(textNode.text.replace(Regex("[<>]"), ""))
         append(decorators.reversed())
     }
 
diff --git a/plugins/jekyll/build.gradle.kts b/plugins/jekyll/build.gradle.kts
index 535a0aef..03fcfc58 100644
--- a/plugins/jekyll/build.gradle.kts
+++ b/plugins/jekyll/build.gradle.kts
@@ -1,8 +1,13 @@
 publishing {
     publications {
-        register<MavenPublication>("jekyll-plugin") {
+        register<MavenPublication>("jekyllPlugin") {
             artifactId = "jekyll-plugin"
             from(components["java"])
         }
     }
+}
+
+dependencies {
+    implementation(project(":plugins:base"))
+    implementation(project(":plugins:gfm"))
 }
\ No newline at end of file
diff --git a/plugins/jekyll/src/main/kotlin/JekyllPlugin.kt b/plugins/jekyll/src/main/kotlin/JekyllPlugin.kt
index 0a0a2cc4..c4f7f2c7 100644
--- a/plugins/jekyll/src/main/kotlin/JekyllPlugin.kt
+++ b/plugins/jekyll/src/main/kotlin/JekyllPlugin.kt
@@ -1,133 +1,23 @@
 package org.jetbrains.dokka.jekyll
 
 import org.jetbrains.dokka.CoreExtensions
+import org.jetbrains.dokka.gfm.CommonmarkRenderer
 import org.jetbrains.dokka.pages.*
 import org.jetbrains.dokka.plugability.DokkaContext
 import org.jetbrains.dokka.plugability.DokkaPlugin
-import org.jetbrains.dokka.plugability.single
-import org.jetbrains.dokka.renderers.DefaultRenderer
-import org.jetbrains.dokka.renderers.OutputWriter
-import org.jetbrains.dokka.resolvers.DefaultLocationProvider
-import org.jetbrains.dokka.resolvers.LocationProvider
-import org.jetbrains.dokka.resolvers.LocationProviderFactory
 import java.lang.StringBuilder
 
 
 class JekyllPlugin : DokkaPlugin() {
 
     val renderer by extending {
-        CoreExtensions.renderer providing { JekyllRenderer(it.single(CoreExtensions.outputWriter), it) }
+        CoreExtensions.renderer providing { JekyllRenderer(it) } applyIf { format == "jekyll" }
     }
 }
 
 class JekyllRenderer(
-    outputWriter: OutputWriter,
     context: DokkaContext
-) : DefaultRenderer<StringBuilder>(outputWriter, context) {
-    override fun StringBuilder.buildHeader(level: Int, content: StringBuilder.() -> Unit) {
-        buildParagraph()
-        append("${"#".repeat(level)} ")
-        content()
-        buildNewLine()
-    }
-
-    override fun StringBuilder.buildLink(address: String, content: StringBuilder.() -> Unit) {
-        append("[")
-        content()
-        append("]($address)")
-    }
-
-    override fun StringBuilder.buildList(node: ContentList, pageContext: ContentPage) {
-        buildListLevel(node, pageContext)
-        buildParagraph()
-    }
-
-    private val indent = " ".repeat(4)
-
-    private fun StringBuilder.buildListItem(items: List<ContentNode>, pageContext: ContentPage, bullet: String = "*") {
-        items.forEach {
-            if(it is ContentList) {
-                val builder = StringBuilder()
-                builder.append(indent)
-                builder.buildListLevel(it, pageContext)
-                append(builder.toString().replace(Regex("  \n(?!$)"), "  \n$indent"))
-            } else {
-                append("$bullet ")
-                it.build(this, pageContext)
-                buildNewLine()
-            }
-        }
-    }
-
-    private fun StringBuilder.buildListLevel(node: ContentList, pageContext: ContentPage) {
-        if(node.ordered) {
-            buildListItem(node.children, pageContext, "${node.start}.")
-        } else {
-            buildListItem(node.children, pageContext, "*")
-        }
-    }
-
-    override fun StringBuilder.buildNewLine() {
-        this.append("  \n")
-    }
-
-    fun StringBuilder.buildParagraph() {
-        this.append("\n\n")
-    }
-
-    override fun StringBuilder.buildResource(node: ContentEmbeddedResource, pageContext: ContentPage) {
-        this.append("Resource")
-    }
-
-    override fun StringBuilder.buildTable(node: ContentTable, pageContext: ContentPage) {
-
-        buildParagraph()
-
-        val size = node.children.firstOrNull()?.children?.size ?: 0
-
-        if(node.header.size > 0) {
-            node.header.forEach {
-                it.children.forEach {
-                    append("| ")
-                    it.build(this, pageContext)
-                }
-                append("|\n")
-            }
-        } else {
-            append("| ".repeat(size))
-            if(size > 0) append("|\n")
-        }
-
-        append("|---".repeat(size))
-        if(size > 0) append("|\n")
-
-
-        node.children.forEach {
-            it.children.forEach {
-                append("| ")
-                it.build(this,  pageContext)
-            }
-            append("|\n")
-        }
-
-        buildParagraph()
-    }
-
-    override fun StringBuilder.buildText(textNode: ContentText) {
-        val decorators = decorators(textNode.style)
-        this.append(decorators)
-        this.append(textNode.text.replace(Regex("[<>]"), ""))
-        this.append(decorators.reversed())
-    }
-
-    override fun StringBuilder.buildNavigation(page: PageNode) {
-        locationProvider.ancestors(page).asReversed().forEach { node ->
-            append("/")
-            if (node.isNavigable) buildLink(node, page)
-            else append(node.name)
-        }
-        buildParagraph()
-    }
+) : CommonmarkRenderer(context) {
 
     override fun buildPage(page: ContentPage, content: (StringBuilder, ContentPage) -> Unit): String {
         val builder = StringBuilder()
@@ -137,46 +27,4 @@ class JekyllRenderer(
         content(builder, page)
         return builder.toString()
     }
-
-    override fun buildError(node: ContentNode) {
-        println("Error")
-    }
-
-    private fun decorators(styles: Set<Style>): String {
-        val decorators = StringBuilder()
-        styles.forEach {
-            when(it) {
-                TextStyle.Bold          -> decorators.append("**")
-                TextStyle.Italic        -> decorators.append("*")
-                TextStyle.Strong        -> decorators.append("**")
-                TextStyle.Strikethrough -> decorators.append("~~")
-                else                    -> Unit
-            }
-        }
-        return decorators.toString()
-    }
-
-    private val PageNode.isNavigable: Boolean
-        get() = this !is RendererSpecificPage || strategy != RenderingStrategy.DoNothing
-
-    private fun StringBuilder.buildLink(to: PageNode, from: PageNode) =
-        buildLink(locationProvider.resolve(to, from)) {
-            append(to.name)
-        }
-
-    override fun renderPage(page: PageNode) {
-        val path by lazy { locationProvider.resolve(page, skipExtension = true) }
-        when (page) {
-            is ContentPage -> outputWriter.write(path, buildPage(page) { c, p -> buildPageContent(c, p) }, ".md")
-            is RendererSpecificPage -> when (val strategy = page.strategy) {
-                is RenderingStrategy.Copy -> outputWriter.writeResources(strategy.from, path)
-                is RenderingStrategy.Write -> outputWriter.write(path, strategy.text, "")
-                is RenderingStrategy.Callback -> outputWriter.write(path, strategy.instructions(this, page), ".md")
-                RenderingStrategy.DoNothing -> Unit
-            }
-            else -> throw AssertionError(
-                "Page ${page.name} cannot be rendered by renderer as it is not renderer specific nor contains content"
-            )
-        }
-    }
 }
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8b4d4050..56c122f8 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -9,6 +9,8 @@ include("runners:cli")
 include("runners:maven-plugin")
 include("plugins:base")
 include("plugins:mathjax")
+include("plugins:gfm")
+include("plugins:jekyll")
 include("plugins:kotlin-as-java")
 include("integration-tests:gradle-integration-tests")
 
-- 
cgit 


From fee86d79a3aa7357c68c2f8f519d187f43447e8c Mon Sep 17 00:00:00 2001
From: Andrzej Ratajczak <andrzej.ratajczak98@gmail.com>
Date: Fri, 3 Apr 2020 13:57:33 +0200
Subject: Refactor package list to be a preprocessor

---
 core/src/main/kotlin/links/DRI.kt                  |  2 +-
 plugins/base/src/main/kotlin/DokkaBase.kt          | 14 ++++--
 .../src/main/kotlin/renderers/DefaultRenderer.kt   | 19 --------
 .../main/kotlin/renderers/PackageListService.kt    | 51 ++++++++++++++++++++++
 .../kotlin/renderers/html/htmlPreprocessors.kt     | 29 ++++++------
 .../src/main/kotlin/renderers/preprocessors.kt     | 27 ++++++++++++
 .../test/kotlin/renderers/RenderingOnlyTestBase.kt |  2 +-
 .../annotatedFunction/out/html/root/package-list   |  5 +++
 .../out/html/root/package-list                     |  8 ++++
 .../expect/function/out/html/root/package-list     |  5 +++
 .../out/html/root/package-list                     |  8 ++++
 .../out/html/root/package-list                     |  5 +++
 .../out/html/root/package-list                     |  5 +++
 .../out/html/root/package-list                     |  5 +++
 .../functionWithParams/out/html/root/package-list  |  5 +++
 .../out/html/root/package-list                     |  6 +++
 .../genericFunction/out/html/root/package-list     |  5 +++
 .../out/html/root/package-list                     |  5 +++
 .../inlineFunction/out/html/root/package-list      |  5 +++
 .../out/html/root/package-list                     |  5 +++
 .../signatureTest/out/html/root/package-list       |  5 +++
 .../expect/sinceKotlin/out/html/root/package-list  |  5 +++
 .../suspendFunction/out/html/root/package-list     |  5 +++
 .../out/html/root/package-list                     |  5 +++
 plugins/gfm/src/main/kotlin/GfmPlugin.kt           | 25 ++++++++++-
 plugins/jekyll/src/main/kotlin/JekyllPlugin.kt     | 23 ++++++++++
 26 files changed, 244 insertions(+), 40 deletions(-)
 create mode 100644 plugins/base/src/main/kotlin/renderers/PackageListService.kt
 create mode 100644 plugins/base/src/main/kotlin/renderers/preprocessors.kt
 create mode 100644 plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/package-list
 create mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/package-list
 create mode 100644 plugins/base/src/test/resources/expect/function/out/html/root/package-list
 create mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/package-list
 create mode 100644 plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/package-list
 create mode 100644 plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/package-list
 create mode 100644 plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/package-list
 create mode 100644 plugins/base/src/test/resources/expect/functionWithParams/out/html/root/package-list
 create mode 100644 plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/package-list
 create mode 100644 plugins/base/src/test/resources/expect/genericFunction/out/html/root/package-list
 create mode 100644 plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/package-list
 create mode 100644 plugins/base/src/test/resources/expect/inlineFunction/out/html/root/package-list
 create mode 100644 plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/package-list
 create mode 100644 plugins/base/src/test/resources/expect/signatureTest/out/html/root/package-list
 create mode 100644 plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/package-list
 create mode 100644 plugins/base/src/test/resources/expect/suspendFunction/out/html/root/package-list
 create mode 100644 plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/package-list

(limited to 'plugins/jekyll/src/main/kotlin/JekyllPlugin.kt')

diff --git a/core/src/main/kotlin/links/DRI.kt b/core/src/main/kotlin/links/DRI.kt
index f961c982..3d9012ec 100644
--- a/core/src/main/kotlin/links/DRI.kt
+++ b/core/src/main/kotlin/links/DRI.kt
@@ -69,7 +69,7 @@ val DRI.parent: DRI
         genericTarget != null -> copy(genericTarget = null)
         target != null -> copy(target = null)
         callable != null -> copy(callable = null)
-        classNames != null -> copy(classNames = classNames.substringBeforeLast('.').takeIf { it.isNotBlank() })
+        classNames != null -> copy(classNames = classNames.substringBeforeLast(".", "").takeIf { it.isNotBlank() })
         else -> DRI.topLevel
     }
 
diff --git a/plugins/base/src/main/kotlin/DokkaBase.kt b/plugins/base/src/main/kotlin/DokkaBase.kt
index e8614507..5a86780b 100644
--- a/plugins/base/src/main/kotlin/DokkaBase.kt
+++ b/plugins/base/src/main/kotlin/DokkaBase.kt
@@ -1,10 +1,8 @@
 package org.jetbrains.dokka.base
 
 import org.jetbrains.dokka.CoreExtensions
-import org.jetbrains.dokka.base.renderers.FileWriter
-import org.jetbrains.dokka.base.renderers.OutputWriter
+import org.jetbrains.dokka.base.renderers.*
 import org.jetbrains.dokka.base.renderers.html.*
-import org.jetbrains.dokka.base.renderers.html.HtmlRenderer
 import org.jetbrains.dokka.base.signatures.KotlinSignatureProvider
 import org.jetbrains.dokka.base.signatures.SignatureProvider
 import org.jetbrains.dokka.base.resolvers.external.*
@@ -154,4 +152,14 @@ class DokkaBase : DokkaPlugin() {
     val styleAndScriptsAppender by extending {
         htmlPreprocessors with StyleAndScriptsAppender order { after(rootCreator) }
     }
+
+    val packageListCreator by extending {
+        htmlPreprocessors providing {
+            PackageListCreator(
+                it,
+                "html",
+                "html"
+            )
+        } order { after(rootCreator) }
+    }
 }
\ No newline at end of file
diff --git a/plugins/base/src/main/kotlin/renderers/DefaultRenderer.kt b/plugins/base/src/main/kotlin/renderers/DefaultRenderer.kt
index 0ff0511a..26c75dbf 100644
--- a/plugins/base/src/main/kotlin/renderers/DefaultRenderer.kt
+++ b/plugins/base/src/main/kotlin/renderers/DefaultRenderer.kt
@@ -114,31 +114,12 @@ abstract class DefaultRenderer<T>(
         root.children.forEach { renderPages(it) }
     }
 
-    // reimplement this as preprocessor
-    open fun renderPackageList(root: ContentPage) =
-        getPackageNamesAndPlatforms(root)
-            .keys
-            .joinToString("\n")
-            .also { outputWriter.write("${root.name}/package-list", it, "") }
-
-    open fun getPackageNamesAndPlatforms(root: PageNode): Map<String, List<PlatformData>> =
-        root.children
-            .map(::getPackageNamesAndPlatforms)
-            .fold(emptyMap<String, List<PlatformData>>()) { e, acc -> acc + e } +
-                if (root is PackagePageNode) {
-                    mapOf(root.name to root.platforms())
-                } else {
-                    emptyMap()
-                }
-
     override fun render(root: RootPageNode) {
         val newRoot = preprocessors.fold(root) { acc, t -> t(acc) }
 
         locationProvider =
             context.plugin<DokkaBase>().querySingle { locationProviderFactory }.getLocationProvider(newRoot)
 
-        root.children<ModulePageNode>().forEach { renderPackageList(it) }
-
         renderPages(newRoot)
     }
 }
diff --git a/plugins/base/src/main/kotlin/renderers/PackageListService.kt b/plugins/base/src/main/kotlin/renderers/PackageListService.kt
new file mode 100644
index 00000000..d4333200
--- /dev/null
+++ b/plugins/base/src/main/kotlin/renderers/PackageListService.kt
@@ -0,0 +1,51 @@
+package org.jetbrains.dokka.base.renderers
+
+import org.jetbrains.dokka.base.DokkaBase
+import org.jetbrains.dokka.links.DRI
+import org.jetbrains.dokka.links.parent
+import org.jetbrains.dokka.pages.*
+import org.jetbrains.dokka.plugability.DokkaContext
+import org.jetbrains.dokka.plugability.plugin
+import org.jetbrains.dokka.plugability.querySingle
+import org.jetbrains.kotlin.utils.addToStdlib.safeAs
+
+class PackageListService(val context: DokkaContext) {
+
+    fun formatPackageList(module: RootPageNode, format: String, linkExtension: String): String {
+
+        val packages = mutableSetOf<String>()
+        val nonStandardLocations = mutableMapOf<String, String>()
+
+        val locationProvider =
+            context.plugin<DokkaBase>().querySingle { locationProviderFactory }.getLocationProvider(module)
+
+        fun visit(node: PageNode, parentDris: Set<DRI>) {
+
+            if (node is PackagePageNode) {
+                packages.add(node.name)
+            }
+
+            val contentPage = node.safeAs<ContentPage>()
+            contentPage?.dri?.forEach {
+                if (parentDris.isNotEmpty() && it.parent !in parentDris) {
+                    nonStandardLocations[it.toString()] = locationProvider.resolve(node)
+                }
+            }
+
+            node.children.forEach { visit(it, contentPage?.dri ?: setOf()) }
+        }
+
+        visit(module, setOf())
+
+        return buildString {
+            appendln("\$dokka.format:${format}")
+            appendln("\$dokka.linkExtension:${linkExtension}")
+            nonStandardLocations.map { (signature, location) -> "\$dokka.location:$signature\u001f$location" }
+                .sorted().joinTo(this, separator = "\n", postfix = "\n")
+
+            packages.sorted().joinTo(this, separator = "\n", postfix = "\n")
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/plugins/base/src/main/kotlin/renderers/html/htmlPreprocessors.kt b/plugins/base/src/main/kotlin/renderers/html/htmlPreprocessors.kt
index a72c77ea..9fed74e2 100644
--- a/plugins/base/src/main/kotlin/renderers/html/htmlPreprocessors.kt
+++ b/plugins/base/src/main/kotlin/renderers/html/htmlPreprocessors.kt
@@ -8,10 +8,6 @@ import org.jetbrains.dokka.base.renderers.platforms
 import org.jetbrains.dokka.pages.*
 import org.jetbrains.dokka.transformers.pages.PageTransformer
 
-object RootCreator : PageTransformer {
-    override fun invoke(input: RootPageNode) =
-        RendererSpecificRootPage("", listOf(input), RenderingStrategy.DoNothing)
-}
 
 object SearchPageInstaller : PageTransformer {
     override fun invoke(input: RootPageNode) = input.modified(children = input.children + searchPage)
@@ -37,19 +33,22 @@ object SearchPageInstaller : PageTransformer {
 object NavigationPageInstaller : PageTransformer {
     override fun invoke(input: RootPageNode) = input.modified(
         children = input.children + NavigationPage(
-            input.children.filterIsInstance<ContentPage>().single().let(::visit)
+            input.children.filterIsInstance<ContentPage>().single()
+                .let(NavigationPageInstaller::visit)
         )
     )
 
-    private fun visit(page: ContentPage): NavigationNode = NavigationNode(
-        page.name,
-        page.dri.first(),
-        page.platforms(),
-        if (page !is ClasslikePageNode)
-            page.children.filterIsInstance<ContentPage>().map { visit(it) }
-        else
-            emptyList()
-    )
+    private fun visit(page: ContentPage): NavigationNode =
+        NavigationNode(
+            page.name,
+            page.dri.first(),
+            page.platforms(),
+            if (page !is ClasslikePageNode)
+                page.children.filterIsInstance<ContentPage>()
+                    .map { visit(it) }
+            else
+                emptyList()
+        )
 }
 
 object ResourceInstaller : PageTransformer {
@@ -69,4 +68,4 @@ object StyleAndScriptsAppender : PageTransformer {
             )
         )
     }
-}
+}
\ No newline at end of file
diff --git a/plugins/base/src/main/kotlin/renderers/preprocessors.kt b/plugins/base/src/main/kotlin/renderers/preprocessors.kt
new file mode 100644
index 00000000..bf2a9eb4
--- /dev/null
+++ b/plugins/base/src/main/kotlin/renderers/preprocessors.kt
@@ -0,0 +1,27 @@
+package org.jetbrains.dokka.base.renderers
+
+import org.jetbrains.dokka.pages.*
+import org.jetbrains.dokka.plugability.DokkaContext
+import org.jetbrains.dokka.transformers.pages.PageTransformer
+
+object RootCreator : PageTransformer {
+    override fun invoke(input: RootPageNode) =
+        RendererSpecificRootPage("", listOf(input), RenderingStrategy.DoNothing)
+}
+
+
+class PackageListCreator(val context: DokkaContext, val format: String, val linkExtension: String) : PageTransformer {
+    override fun invoke(input: RootPageNode) =
+        input.modified(children = input.children.map {
+            it.takeUnless { it is ModulePageNode }
+                ?: it.modified(children = it.children + packageList(input)) // TODO packageList should take module as an input
+        })
+
+
+    private fun packageList(pageNode: RootPageNode) =
+        RendererSpecificResourcePage(
+            "${pageNode.name}/package-list",
+            emptyList(),
+            RenderingStrategy.Write(PackageListService(context).formatPackageList(pageNode, format, linkExtension))
+        )
+}
diff --git a/plugins/base/src/test/kotlin/renderers/RenderingOnlyTestBase.kt b/plugins/base/src/test/kotlin/renderers/RenderingOnlyTestBase.kt
index 5f8d1dc4..b9809ac1 100644
--- a/plugins/base/src/test/kotlin/renderers/RenderingOnlyTestBase.kt
+++ b/plugins/base/src/test/kotlin/renderers/RenderingOnlyTestBase.kt
@@ -2,7 +2,7 @@ package renderers
 
 import org.jetbrains.dokka.DokkaConfigurationImpl
 import org.jetbrains.dokka.base.DokkaBase
-import org.jetbrains.dokka.base.renderers.html.RootCreator
+import org.jetbrains.dokka.base.renderers.RootCreator
 import org.jetbrains.dokka.base.resolvers.external.DokkaExternalLocationProviderFactory
 import org.jetbrains.dokka.base.resolvers.external.JavadocExternalLocationProviderFactory
 import org.jetbrains.dokka.base.resolvers.local.DefaultLocationProviderFactory
diff --git a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/package-list b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/package-list
new file mode 100644
index 00000000..caf6273a
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/package-list
@@ -0,0 +1,5 @@
+$dokka.format:html
+$dokka.linkExtension:html
+$dokka.location://f/#//root/<jvm root>/f.html
+<jvm root>
+
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/package-list b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/package-list
new file mode 100644
index 00000000..d2e42c86
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/package-list
@@ -0,0 +1,8 @@
+$dokka.format:html
+$dokka.linkExtension:html
+$dokka.location://f/#//root/<jvm root>/f.html
+$dokka.location:/Fancy/equals/#kotlin.Any?//root/<jvm root>/-fancy/equals.html
+$dokka.location:/Fancy/hashCode/#//root/<jvm root>/-fancy/hash-code.html
+$dokka.location:/Fancy/toString/#//root/<jvm root>/-fancy/to-string.html
+<jvm root>
+
diff --git a/plugins/base/src/test/resources/expect/function/out/html/root/package-list b/plugins/base/src/test/resources/expect/function/out/html/root/package-list
new file mode 100644
index 00000000..3a7c6807
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/function/out/html/root/package-list
@@ -0,0 +1,5 @@
+$dokka.format:html
+$dokka.linkExtension:html
+$dokka.location://fn/#//root/<jvm root>/fn.html
+<jvm root>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/package-list b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/package-list
new file mode 100644
index 00000000..0b48e7e0
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/package-list
@@ -0,0 +1,8 @@
+$dokka.format:html
+$dokka.linkExtension:html
+$dokka.location://function/#kotlin.Function0[kotlin.Unit]//root/<jvm root>/function.html
+$dokka.location:/Fancy/equals/#kotlin.Any?//root/<jvm root>/-fancy/equals.html
+$dokka.location:/Fancy/hashCode/#//root/<jvm root>/-fancy/hash-code.html
+$dokka.location:/Fancy/toString/#//root/<jvm root>/-fancy/to-string.html
+<jvm root>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/package-list b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/package-list
new file mode 100644
index 00000000..c8e4e8e1
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/package-list
@@ -0,0 +1,5 @@
+$dokka.format:html
+$dokka.linkExtension:html
+$dokka.location://f/#kotlin.String//root/<jvm root>/f.html
+<jvm root>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/package-list b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/package-list
new file mode 100644
index 00000000..7de7dd3b
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/package-list
@@ -0,0 +1,5 @@
+$dokka.format:html
+$dokka.linkExtension:html
+$dokka.location://function/#kotlin.Function0[kotlin.Unit]//root/<jvm root>/function.html
+<jvm root>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/package-list b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/package-list
new file mode 100644
index 00000000..caf6273a
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/package-list
@@ -0,0 +1,5 @@
+$dokka.format:html
+$dokka.linkExtension:html
+$dokka.location://f/#//root/<jvm root>/f.html
+<jvm root>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/package-list b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/package-list
new file mode 100644
index 00000000..8b5d43ee
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/package-list
@@ -0,0 +1,5 @@
+$dokka.format:html
+$dokka.linkExtension:html
+$dokka.location://function/#kotlin.Int//root/<jvm root>/function.html
+<jvm root>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/package-list b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/package-list
new file mode 100644
index 00000000..13dc2923
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/package-list
@@ -0,0 +1,6 @@
+$dokka.format:html
+$dokka.linkExtension:html
+$dokka.location://fn/kotlin.String#//root/<jvm root>/fn.html
+$dokka.location://fn/kotlin.String#kotlin.Int//root/<jvm root>/fn.html
+<jvm root>
+
diff --git a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/package-list b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/package-list
new file mode 100644
index 00000000..30905d0f
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/package-list
@@ -0,0 +1,5 @@
+$dokka.format:html
+$dokka.linkExtension:html
+$dokka.location://generic/#//root/<jvm root>/generic.html
+<jvm root>
+
diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/package-list b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/package-list
new file mode 100644
index 00000000..30905d0f
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/package-list
@@ -0,0 +1,5 @@
+$dokka.format:html
+$dokka.linkExtension:html
+$dokka.location://generic/#//root/<jvm root>/generic.html
+<jvm root>
+
diff --git a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/package-list b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/package-list
new file mode 100644
index 00000000..60993388
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/package-list
@@ -0,0 +1,5 @@
+$dokka.format:html
+$dokka.linkExtension:html
+$dokka.location://f/#kotlin.Function0[kotlin.String]//root/<jvm root>/f.html
+<jvm root>
+
diff --git a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/package-list b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/package-list
new file mode 100644
index 00000000..60993388
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/package-list
@@ -0,0 +1,5 @@
+$dokka.format:html
+$dokka.linkExtension:html
+$dokka.location://f/#kotlin.Function0[kotlin.String]//root/<jvm root>/f.html
+<jvm root>
+
diff --git a/plugins/base/src/test/resources/expect/signatureTest/out/html/root/package-list b/plugins/base/src/test/resources/expect/signatureTest/out/html/root/package-list
new file mode 100644
index 00000000..3c53d355
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/signatureTest/out/html/root/package-list
@@ -0,0 +1,5 @@
+$dokka.format:html
+$dokka.linkExtension:html
+
+signatureTest
+
diff --git a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/package-list b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/package-list
new file mode 100644
index 00000000..8810ec13
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/package-list
@@ -0,0 +1,5 @@
+$dokka.format:html
+$dokka.linkExtension:html
+$dokka.location://availableSince1.1/#//root/<jvm root>/available-since1.1.html
+<jvm root>
+
diff --git a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/package-list b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/package-list
new file mode 100644
index 00000000..caf6273a
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/package-list
@@ -0,0 +1,5 @@
+$dokka.format:html
+$dokka.linkExtension:html
+$dokka.location://f/#//root/<jvm root>/f.html
+<jvm root>
+
diff --git a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/package-list b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/package-list
new file mode 100644
index 00000000..60993388
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/package-list
@@ -0,0 +1,5 @@
+$dokka.format:html
+$dokka.linkExtension:html
+$dokka.location://f/#kotlin.Function0[kotlin.String]//root/<jvm root>/f.html
+<jvm root>
+
diff --git a/plugins/gfm/src/main/kotlin/GfmPlugin.kt b/plugins/gfm/src/main/kotlin/GfmPlugin.kt
index 7c0ce509..91b6f7b5 100644
--- a/plugins/gfm/src/main/kotlin/GfmPlugin.kt
+++ b/plugins/gfm/src/main/kotlin/GfmPlugin.kt
@@ -3,17 +3,23 @@ package org.jetbrains.dokka.gfm
 import org.jetbrains.dokka.CoreExtensions
 import org.jetbrains.dokka.base.DokkaBase
 import org.jetbrains.dokka.base.renderers.DefaultRenderer
-import org.jetbrains.dokka.base.renderers.OutputWriter
+import org.jetbrains.dokka.base.renderers.PackageListCreator
+import org.jetbrains.dokka.base.renderers.RootCreator
 import org.jetbrains.dokka.base.resolvers.local.DefaultLocationProvider
 import org.jetbrains.dokka.base.resolvers.local.LocationProviderFactory
 import org.jetbrains.dokka.pages.*
 import org.jetbrains.dokka.plugability.DokkaContext
 import org.jetbrains.dokka.plugability.DokkaPlugin
+import org.jetbrains.dokka.plugability.plugin
+import org.jetbrains.dokka.plugability.query
+import org.jetbrains.dokka.transformers.pages.PageTransformer
 import java.lang.StringBuilder
 
 
 class GfmPlugin : DokkaPlugin() {
 
+    val gfmPreprocessors by extensionPoint<PageTransformer>()
+
     val renderer by extending {
         CoreExtensions.renderer providing { CommonmarkRenderer(it) } applyIf { format == "gfm" }
     }
@@ -21,11 +27,28 @@ class GfmPlugin : DokkaPlugin() {
     val locationProvider by extending {
         plugin<DokkaBase>().locationProviderFactory providing { MarkdownLocationProviderFactory(it) } applyIf { format == "gfm" }
     }
+
+    val rootCreator by extending {
+        gfmPreprocessors with RootCreator
+    }
+
+    val packageListCreator by extending {
+        gfmPreprocessors providing {
+            PackageListCreator(
+                it,
+                "gfm",
+                "md"
+            )
+        } order { after(rootCreator) }
+    }
 }
 
 open class CommonmarkRenderer(
     context: DokkaContext
 ) : DefaultRenderer<StringBuilder>(context) {
+
+    override val preprocessors = context.plugin<GfmPlugin>().query { gfmPreprocessors }
+
     override fun StringBuilder.buildHeader(level: Int, content: StringBuilder.() -> Unit) {
         buildParagraph()
         append("#".repeat(level) + " ")
diff --git a/plugins/jekyll/src/main/kotlin/JekyllPlugin.kt b/plugins/jekyll/src/main/kotlin/JekyllPlugin.kt
index c4f7f2c7..b9f5e1a5 100644
--- a/plugins/jekyll/src/main/kotlin/JekyllPlugin.kt
+++ b/plugins/jekyll/src/main/kotlin/JekyllPlugin.kt
@@ -1,24 +1,47 @@
 package org.jetbrains.dokka.jekyll
 
 import org.jetbrains.dokka.CoreExtensions
+import org.jetbrains.dokka.base.renderers.PackageListCreator
+import org.jetbrains.dokka.base.renderers.RootCreator
 import org.jetbrains.dokka.gfm.CommonmarkRenderer
 import org.jetbrains.dokka.pages.*
 import org.jetbrains.dokka.plugability.DokkaContext
 import org.jetbrains.dokka.plugability.DokkaPlugin
+import org.jetbrains.dokka.plugability.plugin
+import org.jetbrains.dokka.plugability.query
+import org.jetbrains.dokka.transformers.pages.PageTransformer
 import java.lang.StringBuilder
 
 
 class JekyllPlugin : DokkaPlugin() {
 
+    val jekyllPreprocessors by extensionPoint<PageTransformer>()
+
     val renderer by extending {
         CoreExtensions.renderer providing { JekyllRenderer(it) } applyIf { format == "jekyll" }
     }
+
+    val rootCreator by extending {
+        jekyllPreprocessors with RootCreator
+    }
+
+    val packageListCreator by extending {
+        jekyllPreprocessors providing {
+            PackageListCreator(
+                it,
+                "jekyll",
+                "md"
+            )
+        } order { after(rootCreator) }
+    }
 }
 
 class JekyllRenderer(
     context: DokkaContext
 ) : CommonmarkRenderer(context) {
 
+    override val preprocessors = context.plugin<JekyllPlugin>().query { jekyllPreprocessors }
+
     override fun buildPage(page: ContentPage, content: (StringBuilder, ContentPage) -> Unit): String {
         val builder = StringBuilder()
         builder.append("---\n")
-- 
cgit 


From 0533ef9a56ae34138a3f8a5e996805713c48c384 Mon Sep 17 00:00:00 2001
From: Paweł Marks <pmarks@virtuslab.com>
Date: Wed, 1 Jul 2020 17:36:50 +0200
Subject: Add overrides to provided plugins

---
 .../base/src/test/kotlin/utils/TestOutputWriter.kt | 16 ++++++----
 plugins/gfm/src/main/kotlin/GfmPlugin.kt           | 35 ++++++++++++++--------
 .../src/main/kotlin/javadoc/JavadocPlugin.kt       | 13 ++++----
 plugins/jekyll/src/main/kotlin/JekyllPlugin.kt     |  6 +++-
 .../src/main/kotlin/KotlinAsJavaPlugin.kt          |  8 ++---
 5 files changed, 45 insertions(+), 33 deletions(-)

(limited to 'plugins/jekyll/src/main/kotlin/JekyllPlugin.kt')

diff --git a/plugins/base/src/test/kotlin/utils/TestOutputWriter.kt b/plugins/base/src/test/kotlin/utils/TestOutputWriter.kt
index 46ada43a..83f1d180 100644
--- a/plugins/base/src/test/kotlin/utils/TestOutputWriter.kt
+++ b/plugins/base/src/test/kotlin/utils/TestOutputWriter.kt
@@ -3,15 +3,20 @@ package utils
 import org.jetbrains.dokka.base.DokkaBase
 import org.jetbrains.dokka.base.renderers.OutputWriter
 import org.jetbrains.dokka.plugability.DokkaPlugin
-import java.io.File
 
-class TestOutputWriterPlugin(failOnOverwrite: Boolean = true): DokkaPlugin() {
+class TestOutputWriterPlugin(failOnOverwrite: Boolean = true) : DokkaPlugin() {
     val writer = TestOutputWriter(failOnOverwrite)
 
-    val testWriter by extending { plugin<DokkaBase>().outputWriter with writer }
+    private val dokkaBase by lazy { plugin<DokkaBase>() }
+
+    val testWriter by extending {
+        (dokkaBase.outputWriter
+                with writer
+                override dokkaBase.fileWriter)
+    }
 }
 
-class TestOutputWriter(private val failOnOverwrite: Boolean = true): OutputWriter {
+class TestOutputWriter(private val failOnOverwrite: Boolean = true) : OutputWriter {
     val contents: Map<String, String> get() = _contents
 
     private val _contents = mutableMapOf<String, String>()
@@ -23,5 +28,6 @@ class TestOutputWriter(private val failOnOverwrite: Boolean = true): OutputWrite
         }
     }
 
-    override suspend fun writeResources(pathFrom: String, pathTo: String) = write(pathTo, "*** content of $pathFrom ***", "")
+    override suspend fun writeResources(pathFrom: String, pathTo: String) =
+        write(pathTo, "*** content of $pathFrom ***", "")
 }
diff --git a/plugins/gfm/src/main/kotlin/GfmPlugin.kt b/plugins/gfm/src/main/kotlin/GfmPlugin.kt
index 287ef74f..32c0b7b7 100644
--- a/plugins/gfm/src/main/kotlin/GfmPlugin.kt
+++ b/plugins/gfm/src/main/kotlin/GfmPlugin.kt
@@ -19,12 +19,20 @@ class GfmPlugin : DokkaPlugin() {
 
     val gfmPreprocessors by extensionPoint<PageTransformer>()
 
+    private val dokkaBase by lazy { plugin<DokkaBase>() }
+
     val renderer by extending {
-        CoreExtensions.renderer providing { CommonmarkRenderer(it) } applyIf { format == "gfm" }
+        (CoreExtensions.renderer
+                providing { CommonmarkRenderer(it) }
+                applyIf { format == "gfm" }
+                override dokkaBase.htmlRenderer)
     }
 
     val locationProvider by extending {
-        plugin<DokkaBase>().locationProviderFactory providing { MarkdownLocationProviderFactory(it) } applyIf { format == "gfm" }
+        (dokkaBase.locationProviderFactory
+                providing { MarkdownLocationProviderFactory(it) }
+                applyIf { format == "gfm" }
+                override dokkaBase.locationProvider)
     }
 
     val rootCreator by extending {
@@ -32,13 +40,9 @@ class GfmPlugin : DokkaPlugin() {
     }
 
     val packageListCreator by extending {
-        gfmPreprocessors providing {
-            PackageListCreator(
-                it,
-                "gfm",
-                "md"
-            )
-        } order { after(rootCreator) }
+        (gfmPreprocessors
+                providing { PackageListCreator(it, "gfm", "md") }
+                order { after(rootCreator) })
     }
 }
 
@@ -128,7 +132,7 @@ open class CommonmarkRenderer(
         sourceSets: Set<DokkaSourceSet>,
         pageContext: ContentPage,
     ) {
-        if(content is ContentGroup && content.children.firstOrNull{ it is ContentTable } != null){
+        if (content is ContentGroup && content.children.firstOrNull { it is ContentTable } != null) {
             buildContentNode(content, pageContext)
         } else {
             val distinct = sourceSets.map {
@@ -155,11 +159,16 @@ open class CommonmarkRenderer(
         pageContext: ContentPage,
         sourceSetRestriction: Set<DokkaSourceSet>?
     ) {
-        if(node.dci.kind == ContentKind.Sample || node.dci.kind == ContentKind.Parameters){
-            node.sourceSets.forEach {sourcesetData ->
+        if (node.dci.kind == ContentKind.Sample || node.dci.kind == ContentKind.Parameters) {
+            node.sourceSets.forEach { sourcesetData ->
                 append("${sourcesetData.moduleDisplayName}/${sourcesetData.sourceSetID}")
                 buildNewLine()
-                buildTable(node.copy(children = node.children.filter { it.sourceSets.contains(sourcesetData) }, dci = node.dci.copy(kind = ContentKind.Main)), pageContext, sourceSetRestriction)
+                buildTable(
+                    node.copy(
+                        children = node.children.filter { it.sourceSets.contains(sourcesetData) },
+                        dci = node.dci.copy(kind = ContentKind.Main)
+                    ), pageContext, sourceSetRestriction
+                )
                 buildNewLine()
             }
         } else {
diff --git a/plugins/javadoc/src/main/kotlin/javadoc/JavadocPlugin.kt b/plugins/javadoc/src/main/kotlin/javadoc/JavadocPlugin.kt
index 6e467542..7b4aa64d 100644
--- a/plugins/javadoc/src/main/kotlin/javadoc/JavadocPlugin.kt
+++ b/plugins/javadoc/src/main/kotlin/javadoc/JavadocPlugin.kt
@@ -15,13 +15,10 @@ class JavadocPlugin : DokkaPlugin() {
     val locationProviderFactory by extensionPoint<JavadocLocationProviderFactory>()
 
     val dokkaJavadocPlugin by extending {
-        CoreExtensions.renderer providing { ctx ->
-            KorteJavadocRenderer(
-                dokkaBasePlugin.querySingle { outputWriter },
-                ctx,
-                "views"
-            )
-        } applyIf { format == "javadoc" }
+        (CoreExtensions.renderer
+                providing { ctx -> KorteJavadocRenderer(dokkaBasePlugin.querySingle { outputWriter }, ctx, "views") }
+                applyIf { format == "javadoc" }
+                override dokkaBasePlugin.htmlRenderer)
     }
 
     val pageTranslator by extending {
@@ -31,7 +28,7 @@ class JavadocPlugin : DokkaPlugin() {
                 dokkaBasePlugin.querySingle { signatureProvider },
                 context.logger
             )
-        }
+        } override dokkaBasePlugin.documentableToPageTranslator
     }
 
     val javadocLocationProviderFactory by extending {
diff --git a/plugins/jekyll/src/main/kotlin/JekyllPlugin.kt b/plugins/jekyll/src/main/kotlin/JekyllPlugin.kt
index b9f5e1a5..ad83ca76 100644
--- a/plugins/jekyll/src/main/kotlin/JekyllPlugin.kt
+++ b/plugins/jekyll/src/main/kotlin/JekyllPlugin.kt
@@ -1,6 +1,7 @@
 package org.jetbrains.dokka.jekyll
 
 import org.jetbrains.dokka.CoreExtensions
+import org.jetbrains.dokka.base.DokkaBase
 import org.jetbrains.dokka.base.renderers.PackageListCreator
 import org.jetbrains.dokka.base.renderers.RootCreator
 import org.jetbrains.dokka.gfm.CommonmarkRenderer
@@ -18,7 +19,10 @@ class JekyllPlugin : DokkaPlugin() {
     val jekyllPreprocessors by extensionPoint<PageTransformer>()
 
     val renderer by extending {
-        CoreExtensions.renderer providing { JekyllRenderer(it) } applyIf { format == "jekyll" }
+        (CoreExtensions.renderer
+                providing { JekyllRenderer(it) }
+                applyIf { format == "jekyll" }
+                override plugin<DokkaBase>().htmlRenderer)
     }
 
     val rootCreator by extending {
diff --git a/plugins/kotlin-as-java/src/main/kotlin/KotlinAsJavaPlugin.kt b/plugins/kotlin-as-java/src/main/kotlin/KotlinAsJavaPlugin.kt
index bf9b8dc0..5f06852e 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/KotlinAsJavaPlugin.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/KotlinAsJavaPlugin.kt
@@ -13,11 +13,7 @@ class KotlinAsJavaPlugin : DokkaPlugin() {
     val javaSignatureProvider by extending {
         val dokkaBasePlugin = plugin<DokkaBase>()
         dokkaBasePlugin.signatureProvider providing { ctx ->
-            JavaSignatureProvider(
-                ctx.single(
-                    dokkaBasePlugin.commentsToContentConverter
-                ), ctx.logger
-            )
-        }
+            JavaSignatureProvider(ctx.single(dokkaBasePlugin.commentsToContentConverter), ctx.logger)
+        } override dokkaBasePlugin.kotlinSignatureProvider
     }
 }
\ No newline at end of file
-- 
cgit 


From 2c967fb5389b0f7891b59d8a9334e4efca546b46 Mon Sep 17 00:00:00 2001
From: "sebastian.sellmair" <sebastian.sellmair@jetbrains.com>
Date: Thu, 9 Jul 2020 16:30:36 +0200
Subject: Remove `format` from dokka DokkaConfiguration

---
 core/src/main/kotlin/configuration.kt                    |  1 -
 core/src/main/kotlin/defaultConfiguration.kt             |  1 -
 plugins/base/src/main/kotlin/DokkaBase.kt                | 16 ++++++++--------
 .../kotlin/renderers/html/HtmlRenderingOnlyTestBase.kt   |  2 +-
 plugins/gfm/src/main/kotlin/GfmPlugin.kt                 |  2 --
 .../kotlin/renderers/gfm/GfmRenderingOnlyTestBase.kt     |  4 ++--
 plugins/javadoc/src/main/kotlin/javadoc/JavadocPlugin.kt | 11 +++--------
 plugins/jekyll/src/main/kotlin/JekyllPlugin.kt           |  3 +--
 runners/cli/src/main/kotlin/cli/main.kt                  |  5 -----
 .../org/jetbrains/dokka/gradle/DokkaCollectorTask.kt     |  4 ++--
 .../org/jetbrains/dokka/gradle/DokkaMultimoduleTask.kt   |  4 ----
 .../main/kotlin/org/jetbrains/dokka/gradle/DokkaTask.kt  |  4 ----
 .../dokka/gradle/configurationImplementations.kt         |  1 -
 .../dokka/gradle/KotlinDslDokkaTaskConfigurationTest.kt  |  4 ++--
 runners/maven-plugin/src/main/kotlin/DokkaMojo.kt        | 10 ----------
 testApi/src/main/kotlin/testApi/testRunner/TestRunner.kt |  1 -
 16 files changed, 19 insertions(+), 54 deletions(-)

(limited to 'plugins/jekyll/src/main/kotlin/JekyllPlugin.kt')

diff --git a/core/src/main/kotlin/configuration.kt b/core/src/main/kotlin/configuration.kt
index c531ab9a..eaee351b 100644
--- a/core/src/main/kotlin/configuration.kt
+++ b/core/src/main/kotlin/configuration.kt
@@ -66,7 +66,6 @@ fun DokkaConfiguration.toJson(): String {
 
 interface DokkaConfiguration {
     val outputDir: String
-    val format: String
     val cacheRoot: String?
     val offlineMode: Boolean
     val failOnWarning: Boolean
diff --git a/core/src/main/kotlin/defaultConfiguration.kt b/core/src/main/kotlin/defaultConfiguration.kt
index 79beddd7..02274e5d 100644
--- a/core/src/main/kotlin/defaultConfiguration.kt
+++ b/core/src/main/kotlin/defaultConfiguration.kt
@@ -7,7 +7,6 @@ import java.io.Serializable
 
 data class DokkaConfigurationImpl(
     override val outputDir: String,
-    override val format: String,
     override val cacheRoot: String?,
     override val offlineMode: Boolean,
     override val sourceSets: List<DokkaSourceSetImpl>,
diff --git a/plugins/base/src/main/kotlin/DokkaBase.kt b/plugins/base/src/main/kotlin/DokkaBase.kt
index 8fed0afd..bcd2c93e 100644
--- a/plugins/base/src/main/kotlin/DokkaBase.kt
+++ b/plugins/base/src/main/kotlin/DokkaBase.kt
@@ -135,7 +135,7 @@ class DokkaBase : DokkaPlugin() {
     }
 
     val htmlRenderer by extending {
-        CoreExtensions.renderer providing ::HtmlRenderer applyIf { format == "html" }
+        CoreExtensions.renderer providing ::HtmlRenderer
     }
 
     val defaultKotlinAnalysis by extending {
@@ -159,7 +159,7 @@ class DokkaBase : DokkaPlugin() {
     }
 
     val rootCreator by extending {
-        htmlPreprocessors with RootCreator applyIf { format == "html" }
+        htmlPreprocessors with RootCreator
     }
 
     val defaultSamplesTransformer by extending {
@@ -182,19 +182,19 @@ class DokkaBase : DokkaPlugin() {
     }
 
     val navigationPageInstaller by extending {
-        htmlPreprocessors with NavigationPageInstaller order { after(rootCreator) } applyIf { format == "html" }
+        htmlPreprocessors with NavigationPageInstaller order { after(rootCreator) }
     }
 
     val searchPageInstaller by extending {
-        htmlPreprocessors with SearchPageInstaller order { after(rootCreator) } applyIf { format == "html" }
+        htmlPreprocessors with SearchPageInstaller order { after(rootCreator) }
     }
 
     val resourceInstaller by extending {
-        htmlPreprocessors with ResourceInstaller order { after(rootCreator) } applyIf { format == "html" }
+        htmlPreprocessors with ResourceInstaller order { after(rootCreator) }
     }
 
     val styleAndScriptsAppender by extending {
-        htmlPreprocessors with StyleAndScriptsAppender order { after(rootCreator) } applyIf { format == "html" }
+        htmlPreprocessors with StyleAndScriptsAppender order { after(rootCreator) }
     }
 
     val packageListCreator by extending {
@@ -204,7 +204,7 @@ class DokkaBase : DokkaPlugin() {
                 "html",
                 "html"
             )
-        } order { after(rootCreator) } applyIf { format == "html" }
+        } order { after(rootCreator) }
     }
 
     val sourcesetDependencyAppender by extending {
@@ -216,4 +216,4 @@ class DokkaBase : DokkaPlugin() {
             MultimodulePageCreator(it)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/base/src/test/kotlin/renderers/html/HtmlRenderingOnlyTestBase.kt b/plugins/base/src/test/kotlin/renderers/html/HtmlRenderingOnlyTestBase.kt
index 5ac5aafa..397a9c45 100644
--- a/plugins/base/src/test/kotlin/renderers/html/HtmlRenderingOnlyTestBase.kt
+++ b/plugins/base/src/test/kotlin/renderers/html/HtmlRenderingOnlyTestBase.kt
@@ -24,7 +24,7 @@ abstract class HtmlRenderingOnlyTestBase : RenderingOnlyTestBase<Element>() {
         DokkaBase().externalLocationProviderFactory to { ::JavadocExternalLocationProviderFactory },
         DokkaBase().externalLocationProviderFactory to { ::DokkaExternalLocationProviderFactory },
         testConfiguration = DokkaConfigurationImpl(
-            "", "", null, false, emptyList(), emptyList(), emptyMap(), emptyList(), false
+            "", null, false, emptyList(), emptyList(), emptyMap(), emptyList(), false
         )
     )
 
diff --git a/plugins/gfm/src/main/kotlin/GfmPlugin.kt b/plugins/gfm/src/main/kotlin/GfmPlugin.kt
index 15fe6943..a07a26f2 100644
--- a/plugins/gfm/src/main/kotlin/GfmPlugin.kt
+++ b/plugins/gfm/src/main/kotlin/GfmPlugin.kt
@@ -24,14 +24,12 @@ class GfmPlugin : DokkaPlugin() {
     val renderer by extending {
         (CoreExtensions.renderer
                 providing { CommonmarkRenderer(it) }
-                applyIf { format == "gfm" }
                 override dokkaBase.htmlRenderer)
     }
 
     val locationProvider by extending {
         (dokkaBase.locationProviderFactory
                 providing { MarkdownLocationProviderFactory(it) }
-                applyIf { format == "gfm" }
                 override dokkaBase.locationProvider)
     }
 
diff --git a/plugins/gfm/src/test/kotlin/renderers/gfm/GfmRenderingOnlyTestBase.kt b/plugins/gfm/src/test/kotlin/renderers/gfm/GfmRenderingOnlyTestBase.kt
index 64e55f4f..6d0dd3a6 100644
--- a/plugins/gfm/src/test/kotlin/renderers/gfm/GfmRenderingOnlyTestBase.kt
+++ b/plugins/gfm/src/test/kotlin/renderers/gfm/GfmRenderingOnlyTestBase.kt
@@ -22,11 +22,11 @@ abstract class GfmRenderingOnlyTestBase : RenderingOnlyTestBase<String>() {
         GfmPlugin().gfmPreprocessors to { _ -> RootCreator },
 
         testConfiguration = DokkaConfigurationImpl(
-            "", "", null, false, emptyList(), emptyList(), emptyMap(), emptyList(), false
+            "", null, false, emptyList(), emptyList(), emptyMap(), emptyList(), false
         )
     )
 
     override val renderedContent: String by lazy {
         files.contents.getValue("test-page.md")
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/javadoc/src/main/kotlin/javadoc/JavadocPlugin.kt b/plugins/javadoc/src/main/kotlin/javadoc/JavadocPlugin.kt
index 1a14e97e..8283bd78 100644
--- a/plugins/javadoc/src/main/kotlin/javadoc/JavadocPlugin.kt
+++ b/plugins/javadoc/src/main/kotlin/javadoc/JavadocPlugin.kt
@@ -20,7 +20,6 @@ class JavadocPlugin : DokkaPlugin() {
     val dokkaJavadocPlugin by extending {
         (CoreExtensions.renderer
                 providing { ctx -> KorteJavadocRenderer(dokkaBasePlugin.querySingle { outputWriter }, ctx, "views") }
-                applyIf { format == javadocFormat }
                 override dokkaBasePlugin.htmlRenderer)
     }
 
@@ -31,13 +30,13 @@ class JavadocPlugin : DokkaPlugin() {
                 dokkaBasePlugin.querySingle { signatureProvider },
                 context.logger
             )
-        } override dokkaBasePlugin.documentableToPageTranslator applyIf { format == javadocFormat }
+        } override dokkaBasePlugin.documentableToPageTranslator
     }
 
     val javadocLocationProviderFactory by extending {
         locationProviderFactory providing { context ->
             JavadocLocationProviderFactory(context)
-        } applyIf { format == javadocFormat }
+        }
     }
 
     val javadocSignatureProvider by extending {
@@ -48,11 +47,7 @@ class JavadocPlugin : DokkaPlugin() {
                     dokkaBasePlugin.commentsToContentConverter
                 ), ctx.logger
             )
-        } override kotinAsJavaPlugin.javaSignatureProvider applyIf { format == javadocFormat }
-    }
-
-    companion object {
-        private val javadocFormat = "javadoc"
+        } override kotinAsJavaPlugin.javaSignatureProvider
     }
 }
 
diff --git a/plugins/jekyll/src/main/kotlin/JekyllPlugin.kt b/plugins/jekyll/src/main/kotlin/JekyllPlugin.kt
index ad83ca76..f6ea894c 100644
--- a/plugins/jekyll/src/main/kotlin/JekyllPlugin.kt
+++ b/plugins/jekyll/src/main/kotlin/JekyllPlugin.kt
@@ -21,7 +21,6 @@ class JekyllPlugin : DokkaPlugin() {
     val renderer by extending {
         (CoreExtensions.renderer
                 providing { JekyllRenderer(it) }
-                applyIf { format == "jekyll" }
                 override plugin<DokkaBase>().htmlRenderer)
     }
 
@@ -54,4 +53,4 @@ class JekyllRenderer(
         content(builder, page)
         return builder.toString()
     }
-}
\ No newline at end of file
+}
diff --git a/runners/cli/src/main/kotlin/cli/main.kt b/runners/cli/src/main/kotlin/cli/main.kt
index d284e653..a30ffa42 100644
--- a/runners/cli/src/main/kotlin/cli/main.kt
+++ b/runners/cli/src/main/kotlin/cli/main.kt
@@ -20,11 +20,6 @@ class GlobalArguments(args: Array<String>) : DokkaConfiguration {
     override val outputDir by parser.option(ArgType.String, description = "Output directory path")
         .default(DokkaDefaults.outputDir)
 
-    override val format by parser.option(
-        ArgType.String,
-        description = "Output format (html, gfm, jekyll)"
-    ).default(DokkaDefaults.format)
-
     override val cacheRoot by parser.option(
         ArgType.String,
         description = "Path to cache folder, or 'default' to use ~/.cache/dokka, if not provided caching is disabled"
diff --git a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaCollectorTask.kt b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaCollectorTask.kt
index 7aa7c0fa..da834775 100644
--- a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaCollectorTask.kt
+++ b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaCollectorTask.kt
@@ -37,8 +37,8 @@ open class DokkaCollectorTask : DefaultTask() {
 
         // TODO this certainly not the ideal solution
         configuration = configurations.fold(initial) { acc, it: GradleDokkaConfigurationImpl ->
-            if (acc.format != it.format || acc.cacheRoot != it.cacheRoot)
-                throw IllegalStateException("Dokka task configurations differ on core arguments (format, cacheRoot)")
+            if (acc.cacheRoot != it.cacheRoot)
+                throw IllegalStateException("Dokka task configurations differ on core argument cacheRoot")
             acc.sourceSets = acc.sourceSets + it.sourceSets
             acc.pluginsClasspath = (acc.pluginsClasspath + it.pluginsClasspath).distinct()
             acc
diff --git a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaMultimoduleTask.kt b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaMultimoduleTask.kt
index 3ed81054..76a2e80a 100644
--- a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaMultimoduleTask.kt
+++ b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaMultimoduleTask.kt
@@ -20,9 +20,6 @@ open class DokkaMultimoduleTask : DefaultTask(), Configurable {
     @Input
     var documentationFileName: String = "README.md"
 
-    @Input
-    var outputFormat: String = "html"
-
     @Input
     var outputDirectory: String = ""
 
@@ -73,7 +70,6 @@ open class DokkaMultimoduleTask : DefaultTask(), Configurable {
     internal fun getConfiguration(): GradleDokkaConfigurationImpl =
         GradleDokkaConfigurationImpl().apply {
             outputDir = project.file(outputDirectory).absolutePath
-            format = outputFormat
             pluginsClasspath = plugins.resolve().toList()
             pluginsConfiguration = this@DokkaMultimoduleTask.pluginsConfiguration
             modules = project.subprojects
diff --git a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTask.kt b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTask.kt
index 09088968..2bdfa0bd 100644
--- a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTask.kt
+++ b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTask.kt
@@ -45,9 +45,6 @@ open class DokkaTask : DefaultTask(), Configurable {
         dependsOn(Callable { kotlinTasks.map { it.taskDependencies } })
     }
 
-    @Input
-    var outputFormat: String = "html"
-
     @Input
     var outputDirectory: String = ""
 
@@ -186,7 +183,6 @@ open class DokkaTask : DefaultTask(), Configurable {
 
         return GradleDokkaConfigurationImpl().apply {
             outputDir = project.file(outputDirectory).absolutePath
-            format = outputFormat
             cacheRoot = this@DokkaTask.cacheRoot
             offlineMode = this@DokkaTask.offlineMode
             sourceSets = defaultModulesConfiguration
diff --git a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/configurationImplementations.kt b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/configurationImplementations.kt
index 49819f9a..b6b8399c 100644
--- a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/configurationImplementations.kt
+++ b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/configurationImplementations.kt
@@ -225,7 +225,6 @@ class GradleDokkaModuleDescription : DokkaModuleDescription {
 
 class GradleDokkaConfigurationImpl : DokkaConfiguration {
     override var outputDir: String = ""
-    override var format: String = DokkaDefaults.format
     override var cacheRoot: String? = DokkaDefaults.cacheRoot
     override var offlineMode: Boolean = DokkaDefaults.offlineMode
     override var failOnWarning: Boolean = DokkaDefaults.failOnWarning
diff --git a/runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/KotlinDslDokkaTaskConfigurationTest.kt b/runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/KotlinDslDokkaTaskConfigurationTest.kt
index da6daeea..3ba5602f 100644
--- a/runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/KotlinDslDokkaTaskConfigurationTest.kt
+++ b/runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/KotlinDslDokkaTaskConfigurationTest.kt
@@ -13,10 +13,10 @@ class KotlinDslDokkaTaskConfigurationTest {
     fun `configure project using dokka extension function`() {
         val project = ProjectBuilder.builder().build()
         project.plugins.apply("org.jetbrains.dokka")
-        project.dokka { this.outputFormat = "test" }
+        project.dokka { this.outputDirectory = "test" }
 
         project.tasks.withType(DokkaTask::class.java).forEach { dokkaTask ->
-            assertEquals("test", dokkaTask.outputFormat)
+            assertEquals("test", dokkaTask.outputDirectory)
         }
     }
 
diff --git a/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt b/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt
index aa92516f..fdd1c646 100644
--- a/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt
+++ b/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt
@@ -170,8 +170,6 @@ abstract class AbstractDokkaMojo : AbstractMojo() {
 
     protected abstract fun getOutDir(): String
 
-    protected abstract fun getOutFormat(): String
-
     override fun execute() {
         if (skip) {
             log.info("Dokka skip parameter is true so no dokka output will be produced")
@@ -239,7 +237,6 @@ abstract class AbstractDokkaMojo : AbstractMojo() {
 
         val configuration = DokkaConfigurationImpl(
             outputDir = getOutDir(),
-            format = getOutFormat(),
             offlineMode = offlineMode,
             cacheRoot = cacheRoot,
             sourceSets = listOf(sourceSet).also {
@@ -319,13 +316,9 @@ abstract class AbstractDokkaMojo : AbstractMojo() {
     requiresProject = true
 )
 class DokkaMojo : AbstractDokkaMojo() {
-    @Parameter(required = true, defaultValue = "html")
-    var outputFormat: String = "html"
-
     @Parameter(required = true, defaultValue = "\${project.basedir}/target/dokka")
     var outputDir: String = ""
 
-    override fun getOutFormat() = outputFormat
     override fun getOutDir() = outputDir
 }
 
@@ -339,8 +332,6 @@ class DokkaMojo : AbstractDokkaMojo() {
 class DokkaJavadocMojo : AbstractDokkaMojo() {
     @Parameter(required = true, defaultValue = "\${project.basedir}/target/dokkaJavadoc")
     var outputDir: String = ""
-
-    override fun getOutFormat() = "javadoc"
     override fun getOutDir() = outputDir
 }
 
@@ -396,7 +387,6 @@ class DokkaJavadocJarMojo : AbstractDokkaMojo() {
     @Component(role = Archiver::class, hint = "jar")
     private var jarArchiver: JarArchiver? = null
 
-    override fun getOutFormat() = "javadoc"
     override fun getOutDir() = outputDir
 
     override fun execute() {
diff --git a/testApi/src/main/kotlin/testApi/testRunner/TestRunner.kt b/testApi/src/main/kotlin/testApi/testRunner/TestRunner.kt
index 381fb2af..9aae4b0c 100644
--- a/testApi/src/main/kotlin/testApi/testRunner/TestRunner.kt
+++ b/testApi/src/main/kotlin/testApi/testRunner/TestRunner.kt
@@ -164,7 +164,6 @@ abstract class AbstractCoreTest {
         private val sourceSets = mutableListOf<DokkaSourceSetImpl>()
         fun build() = DokkaConfigurationImpl(
             outputDir = outputDir,
-            format = format,
             cacheRoot = cacheRoot,
             offlineMode = offlineMode,
             sourceSets = sourceSets,
-- 
cgit 


From 663b2f4106347d413242e369f10eb30a27e908c5 Mon Sep 17 00:00:00 2001
From: "sebastian.sellmair" <sebastian.sellmair@jetbrains.com>
Date: Fri, 10 Jul 2020 08:58:05 +0200
Subject: Support dokkaJekyll and dokkaGfm tasks in new task configuration

---
 plugins/gfm/build.gradle.kts                   | 2 +-
 plugins/jekyll/build.gradle.kts                | 2 +-
 plugins/jekyll/src/main/kotlin/JekyllPlugin.kt | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'plugins/jekyll/src/main/kotlin/JekyllPlugin.kt')

diff --git a/plugins/gfm/build.gradle.kts b/plugins/gfm/build.gradle.kts
index 16b318fb..fac2c1c0 100644
--- a/plugins/gfm/build.gradle.kts
+++ b/plugins/gfm/build.gradle.kts
@@ -12,7 +12,7 @@ publishing {
 configureBintrayPublication("gfmPlugin")
 
 dependencies {
-    compileOnly(project(":plugins:base"))
+    implementation(project(":plugins:base"))
     testImplementation(project(":plugins:base"))
     testImplementation(project(":plugins:base:test-utils"))
 }
diff --git a/plugins/jekyll/build.gradle.kts b/plugins/jekyll/build.gradle.kts
index b47633db..90002466 100644
--- a/plugins/jekyll/build.gradle.kts
+++ b/plugins/jekyll/build.gradle.kts
@@ -12,6 +12,6 @@ publishing {
 configureBintrayPublication("jekyllPlugin")
 
 dependencies {
-    compileOnly(project(":plugins:base"))
+    implementation(project(":plugins:base"))
     implementation(project(":plugins:gfm"))
 }
diff --git a/plugins/jekyll/src/main/kotlin/JekyllPlugin.kt b/plugins/jekyll/src/main/kotlin/JekyllPlugin.kt
index f6ea894c..84c22eae 100644
--- a/plugins/jekyll/src/main/kotlin/JekyllPlugin.kt
+++ b/plugins/jekyll/src/main/kotlin/JekyllPlugin.kt
@@ -5,6 +5,7 @@ import org.jetbrains.dokka.base.DokkaBase
 import org.jetbrains.dokka.base.renderers.PackageListCreator
 import org.jetbrains.dokka.base.renderers.RootCreator
 import org.jetbrains.dokka.gfm.CommonmarkRenderer
+import org.jetbrains.dokka.gfm.GfmPlugin
 import org.jetbrains.dokka.pages.*
 import org.jetbrains.dokka.plugability.DokkaContext
 import org.jetbrains.dokka.plugability.DokkaPlugin
@@ -21,7 +22,8 @@ class JekyllPlugin : DokkaPlugin() {
     val renderer by extending {
         (CoreExtensions.renderer
                 providing { JekyllRenderer(it) }
-                override plugin<DokkaBase>().htmlRenderer)
+                // TODO NOW: Is this correct?
+                override plugin<GfmPlugin>().renderer)
     }
 
     val rootCreator by extending {
-- 
cgit 


From 9f822143aca6ecf6daba8dd757f85bd56a150dbe Mon Sep 17 00:00:00 2001
From: "sebastian.sellmair" <sebastian.sellmair@jetbrains.com>
Date: Mon, 13 Jul 2020 12:49:36 +0200
Subject: Remove TODO NOW in JekyllPlugin

---
 plugins/jekyll/src/main/kotlin/JekyllPlugin.kt | 1 -
 1 file changed, 1 deletion(-)

(limited to 'plugins/jekyll/src/main/kotlin/JekyllPlugin.kt')

diff --git a/plugins/jekyll/src/main/kotlin/JekyllPlugin.kt b/plugins/jekyll/src/main/kotlin/JekyllPlugin.kt
index 84c22eae..45afb072 100644
--- a/plugins/jekyll/src/main/kotlin/JekyllPlugin.kt
+++ b/plugins/jekyll/src/main/kotlin/JekyllPlugin.kt
@@ -22,7 +22,6 @@ class JekyllPlugin : DokkaPlugin() {
     val renderer by extending {
         (CoreExtensions.renderer
                 providing { JekyllRenderer(it) }
-                // TODO NOW: Is this correct?
                 override plugin<GfmPlugin>().renderer)
     }
 
-- 
cgit