diff options
author | Dmitry Jemerov <yole@jetbrains.com> | 2016-03-31 19:58:06 +0200 |
---|---|---|
committer | Dmitry Jemerov <yole@jetbrains.com> | 2016-03-31 19:58:06 +0200 |
commit | bebbee81476e6996064f49f2dbe5b41d3b2cf65a (patch) | |
tree | f0f3ca43ad75ae173030f03065eef518c16eb937 /core/src | |
parent | 1c53c64e212b2373d8243a1dc2df242ee2f1a079 (diff) | |
download | dokka-bebbee81476e6996064f49f2dbe5b41d3b2cf65a.tar.gz dokka-bebbee81476e6996064f49f2dbe5b41d3b2cf65a.tar.bz2 dokka-bebbee81476e6996064f49f2dbe5b41d3b2cf65a.zip |
Correctly format code samples in overload groups. Resolves #55
Diffstat (limited to 'core/src')
-rw-r--r-- | core/src/main/kotlin/Formats/KotlinWebsiteFormatService.kt | 3 | ||||
-rw-r--r-- | core/src/test/kotlin/format/KotlinWebSiteFormatTest.kt | 19 | ||||
-rw-r--r-- | core/src/test/kotlin/format/MarkdownFormatTest.kt | 2 |
3 files changed, 22 insertions, 2 deletions
diff --git a/core/src/main/kotlin/Formats/KotlinWebsiteFormatService.kt b/core/src/main/kotlin/Formats/KotlinWebsiteFormatService.kt index 14157cff..9a739216 100644 --- a/core/src/main/kotlin/Formats/KotlinWebsiteFormatService.kt +++ b/core/src/main/kotlin/Formats/KotlinWebsiteFormatService.kt @@ -51,7 +51,8 @@ class KotlinWebsiteFormatService @Inject constructor(locationService: LocationSe } override fun appendAsOverloadGroup(to: StringBuilder, block: () -> Unit) { - div(to, "overload-group", block) + block() + to.append("<div class=\"overload-group\"></div>") } override fun formatLink(text: String, href: String): String { diff --git a/core/src/test/kotlin/format/KotlinWebSiteFormatTest.kt b/core/src/test/kotlin/format/KotlinWebSiteFormatTest.kt new file mode 100644 index 00000000..a96139fd --- /dev/null +++ b/core/src/test/kotlin/format/KotlinWebSiteFormatTest.kt @@ -0,0 +1,19 @@ +package org.jetbrains.dokka.tests + +import org.jetbrains.dokka.KotlinLanguageService +import org.jetbrains.dokka.KotlinWebsiteFormatService +import org.junit.Test + +class KotlinWebSiteFormatTest { + private val kwsService = KotlinWebsiteFormatService(InMemoryLocationService, KotlinLanguageService()) + + @Test fun sample() { + verifyKWSNodeByName("sample", "foo") + } + + private fun verifyKWSNodeByName(fileName: String, name: String) { + verifyOutput("testdata/format/website/$fileName.kt", ".md") { model, output -> + kwsService.appendNodes(tempLocation, output, model.members.single().members.filter { it.name == name }) + } + } +} diff --git a/core/src/test/kotlin/format/MarkdownFormatTest.kt b/core/src/test/kotlin/format/MarkdownFormatTest.kt index f306ac74..15be6c77 100644 --- a/core/src/test/kotlin/format/MarkdownFormatTest.kt +++ b/core/src/test/kotlin/format/MarkdownFormatTest.kt @@ -4,7 +4,7 @@ import org.jetbrains.dokka.KotlinLanguageService import org.jetbrains.dokka.MarkdownFormatService import org.junit.Test -public class MarkdownFormatTest { +class MarkdownFormatTest { private val markdownService = MarkdownFormatService(InMemoryLocationService, KotlinLanguageService()) @Test fun emptyDescription() { |