diff options
Diffstat (limited to 'core/src/main/kotlin/Formats')
3 files changed, 31 insertions, 37 deletions
diff --git a/core/src/main/kotlin/Formats/HtmlFormatService.kt b/core/src/main/kotlin/Formats/HtmlFormatService.kt index 6819e652..12d39af3 100644 --- a/core/src/main/kotlin/Formats/HtmlFormatService.kt +++ b/core/src/main/kotlin/Formats/HtmlFormatService.kt @@ -46,6 +46,8 @@ open class HtmlOutputBuilder(to: StringBuilder, override fun appendParagraph(body: () -> Unit) = wrapInTag("p", body, newlineBeforeOpen = true, newlineAfterClose = true) + override fun appendSoftParagraph(body: () -> Unit) = appendParagraph(body) + override fun appendLine() { to.appendln("<br/>") } @@ -89,9 +91,7 @@ open class HtmlOutputBuilder(to: StringBuilder, } override fun ensureParagraph() { - if (!to.endsWith("<p>") && !to.endsWith("</p>")) { - to.append("\n<p>") - } + } } diff --git a/core/src/main/kotlin/Formats/KotlinWebsiteHtmlFormatService.kt b/core/src/main/kotlin/Formats/KotlinWebsiteHtmlFormatService.kt index d2962911..7b9279b2 100644 --- a/core/src/main/kotlin/Formats/KotlinWebsiteHtmlFormatService.kt +++ b/core/src/main/kotlin/Formats/KotlinWebsiteHtmlFormatService.kt @@ -7,14 +7,10 @@ import org.jetbrains.kotlin.utils.addToStdlib.ifNotEmpty import java.nio.file.Path -private object EmptyHtmlTemplateServie : HtmlTemplateService { - override fun appendFooter(to: StringBuilder) { +private object EmptyHtmlTemplateService : HtmlTemplateService { + override fun appendFooter(to: StringBuilder) {} - } - - override fun appendHeader(to: StringBuilder, title: String?, basePath: Path) { - - } + override fun appendHeader(to: StringBuilder, title: String?, basePath: Path) {} } @@ -24,13 +20,11 @@ open class KotlinWebsiteHtmlOutputBuilder(to: StringBuilder, languageService: LanguageService, extension: String, impliedPlatforms: List<String>) - : HtmlOutputBuilder(to, location, locationService, languageService, extension, impliedPlatforms, EmptyHtmlTemplateServie) { + : HtmlOutputBuilder(to, location, locationService, languageService, extension, impliedPlatforms, EmptyHtmlTemplateService) { private var needHardLineBreaks = false private var insideDiv = 0 - override fun appendLine() { - - } + override fun appendLine() {} override fun appendBreadcrumbs(path: Iterable<FormatLink>) { if (path.count() > 1) { @@ -42,8 +36,6 @@ open class KotlinWebsiteHtmlOutputBuilder(to: StringBuilder, override fun appendCode(body: () -> Unit) = wrapIfNotEmpty("<code>", "</code>", body) - override fun appendStrikethrough(body: () -> Unit) = wrapInTag("s", body) - protected fun div(to: StringBuilder, cssClass: String, otherAttributes: String = "", block: () -> Unit) { to.append("<div class=\"$cssClass\"$otherAttributes") to.append(">") @@ -68,9 +60,7 @@ open class KotlinWebsiteHtmlOutputBuilder(to: StringBuilder, override fun appendAsOverloadGroup(to: StringBuilder, platforms: Set<String>, block: () -> Unit) { div(to, "overload-group", calculateDataAttributes(platforms)) { - ensureParagraph() block() - ensureParagraph() } } @@ -158,9 +148,7 @@ open class KotlinWebsiteHtmlOutputBuilder(to: StringBuilder, appendTableRow(block) } - override fun appendPlatforms(platforms: Set<String>) { - - } + override fun appendPlatforms(platforms: Set<String>) {} override fun appendBreadcrumbSeparator() { to.append(" / ") @@ -181,11 +169,9 @@ open class KotlinWebsiteHtmlOutputBuilder(to: StringBuilder, class KotlinWebsiteHtmlFormatService @Inject constructor(locationService: LocationService, signatureGenerator: LanguageService, @Named(impliedPlatformsName) impliedPlatforms: List<String>) - : HtmlFormatService(locationService, signatureGenerator, EmptyHtmlTemplateServie, impliedPlatforms) { + : HtmlFormatService(locationService, signatureGenerator, EmptyHtmlTemplateService, impliedPlatforms) { - override fun enumerateSupportFiles(callback: (String, String) -> Unit) { - - } + override fun enumerateSupportFiles(callback: (String, String) -> Unit) {} override fun createOutputBuilder(to: StringBuilder, location: Location) = KotlinWebsiteHtmlOutputBuilder(to, location, locationService, languageService, extension, impliedPlatforms) diff --git a/core/src/main/kotlin/Formats/StructuredFormatService.kt b/core/src/main/kotlin/Formats/StructuredFormatService.kt index 743a6ac8..961c2c26 100644 --- a/core/src/main/kotlin/Formats/StructuredFormatService.kt +++ b/core/src/main/kotlin/Formats/StructuredFormatService.kt @@ -50,6 +50,12 @@ abstract class StructuredOutputBuilder(val to: StringBuilder, abstract fun appendBlockCode(language: String, body: () -> Unit) abstract fun appendHeader(level: Int = 1, body: () -> Unit) abstract fun appendParagraph(body: () -> Unit) + + open fun appendSoftParagraph(body: () -> Unit) { + ensureParagraph() + body() + } + abstract fun appendLine() abstract fun appendAnchor(anchor: String) @@ -288,9 +294,10 @@ abstract class StructuredOutputBuilder(val to: StringBuilder, formatOverloadGroup(breakdownBySummary.values.single()) } else { for ((_, items) in breakdownBySummary) { - ensureParagraph() - appendAsOverloadGroup(to, platformsOfItems(items)) { - formatOverloadGroup(items) + appendSoftParagraph { + appendAsOverloadGroup(to, platformsOfItems(items)) { + formatOverloadGroup(items) + } } } } @@ -414,12 +421,12 @@ abstract class StructuredOutputBuilder(val to: StringBuilder, subjectSections.forEach { val subjectName = it.subjectName if (subjectName != null) { - ensureParagraph() - - appendAnchor(subjectName) - appendCode { to.append(subjectName) } - to.append(" - ") - appendContent(it) + appendSoftParagraph { + appendAnchor(subjectName) + appendCode { to.append(subjectName) } + to.append(" - ") + appendContent(it) + } } } } @@ -443,9 +450,10 @@ abstract class StructuredOutputBuilder(val to: StringBuilder, } for (member in node.members.sortedBy(DocumentationNode::priority)) { - ensureParagraph() - appendAsOverloadGroup(to, platformsOfItems(listOf(member))) { - formatSubNodeOfGroup(member) + appendSoftParagraph { + appendAsOverloadGroup(to, platformsOfItems(listOf(member))) { + formatSubNodeOfGroup(member) + } } } } |