aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/src/main/kotlin/Formats/HtmlFormatService.kt6
-rw-r--r--core/src/main/kotlin/Formats/StructuredFormatService.kt11
-rw-r--r--core/src/main/kotlin/Kotlin/DocumentationBuilder.kt2
-rw-r--r--core/src/test/kotlin/format/KotlinWebSiteHtmlFormatTest.kt8
-rw-r--r--core/testdata/format/JavaSupertype.html2
-rw-r--r--core/testdata/format/accessor.md2
-rw-r--r--core/testdata/format/annotatedTypeParameter.md2
-rw-r--r--core/testdata/format/annotationClass.md2
-rw-r--r--core/testdata/format/annotationClass.package.md2
-rw-r--r--core/testdata/format/annotationParams.md2
-rw-r--r--core/testdata/format/annotations.md2
-rw-r--r--core/testdata/format/arrayAverage.md2
-rw-r--r--core/testdata/format/backtickInCodeBlock.md2
-rw-r--r--core/testdata/format/blankLineInsideCodeBlock.html2
-rw-r--r--core/testdata/format/blankLineInsideCodeBlock.md2
-rw-r--r--core/testdata/format/bracket.html2
-rw-r--r--core/testdata/format/brokenLink.html2
-rw-r--r--core/testdata/format/classWithCompanionObject.html2
-rw-r--r--core/testdata/format/classWithCompanionObject.md2
-rw-r--r--core/testdata/format/codeBlock.html8
-rw-r--r--core/testdata/format/codeBlock.md8
-rw-r--r--core/testdata/format/codeBlockNoHtmlEscape.md2
-rw-r--r--core/testdata/format/codeSpan.html2
-rw-r--r--core/testdata/format/companionImplements.md2
-rw-r--r--core/testdata/format/companionObjectExtension.md2
-rw-r--r--core/testdata/format/deprecated.class.html12
-rw-r--r--core/testdata/format/deprecated.package.html2
-rw-r--r--core/testdata/format/dynamicExtension.md2
-rw-r--r--core/testdata/format/dynamicType.md2
-rw-r--r--core/testdata/format/emptyDescription.md2
-rw-r--r--core/testdata/format/entity.html2
-rw-r--r--core/testdata/format/enumClass.md2
-rw-r--r--core/testdata/format/enumClass.value.md2
-rw-r--r--core/testdata/format/enumRef.md2
-rw-r--r--core/testdata/format/exceptionClass.md2
-rw-r--r--core/testdata/format/exceptionClass.package.md2
-rw-r--r--core/testdata/format/exclInCodeBlock.md2
-rw-r--r--core/testdata/format/extensionFunctionParameter.md2
-rw-r--r--core/testdata/format/extensionScope.md2
-rw-r--r--core/testdata/format/extensionWithDocumentedReceiver.md2
-rw-r--r--core/testdata/format/externalReferenceLink.md2
-rw-r--r--core/testdata/format/functionWithDefaultParameter.md2
-rw-r--r--core/testdata/format/functionalTypeWithNamedParameters.html20
-rw-r--r--core/testdata/format/functionalTypeWithNamedParameters.md20
-rw-r--r--core/testdata/format/genericInheritedExtensions.md2
-rw-r--r--core/testdata/format/gfm/listInTableCell.md2
-rw-r--r--core/testdata/format/gfm/sample.md2
-rw-r--r--core/testdata/format/htmlEscaping.html2
-rw-r--r--core/testdata/format/inapplicableExtensionFunctions.md2
-rw-r--r--core/testdata/format/indentedCodeBlock.html2
-rw-r--r--core/testdata/format/indentedCodeBlock.md2
-rw-r--r--core/testdata/format/inheritedCompanionObjectProperties.md2
-rw-r--r--core/testdata/format/inheritedExtensions.md2
-rw-r--r--core/testdata/format/inheritedMembers.md2
-rw-r--r--core/testdata/format/inlineSuspendFunction.md2
-rw-r--r--core/testdata/format/javaCodeInParam.md2
-rw-r--r--core/testdata/format/javaCodeLiteralTags.md2
-rw-r--r--core/testdata/format/javaDeprecated.html2
-rw-r--r--core/testdata/format/javaLinkTag.html2
-rw-r--r--core/testdata/format/javaLinkTagWithLabel.html2
-rw-r--r--core/testdata/format/javaSeeTag.html2
-rw-r--r--core/testdata/format/javaSpaceInAuthor.md2
-rw-r--r--core/testdata/format/javadocHtml.md2
-rw-r--r--core/testdata/format/javadocOrderedList.md2
-rw-r--r--core/testdata/format/jdkLinks.md2
-rw-r--r--core/testdata/format/linkWithLabel.html2
-rw-r--r--core/testdata/format/linkWithStarProjection.html2
-rw-r--r--core/testdata/format/linksInEmphasis.md2
-rw-r--r--core/testdata/format/linksInHeaders.md2
-rw-r--r--core/testdata/format/linksInStrong.md2
-rw-r--r--core/testdata/format/markdownInLinks.html2
-rw-r--r--core/testdata/format/memberExtension.md2
-rw-r--r--core/testdata/format/multipleTypeParameterConstraints.md12
-rw-r--r--core/testdata/format/nestedLists.md2
-rw-r--r--core/testdata/format/newlineInTableCell.package.md2
-rw-r--r--core/testdata/format/notPublishedTypeAliasAutoExpansion.md2
-rw-r--r--core/testdata/format/nullability.md2
-rw-r--r--core/testdata/format/nullableTypeParameterFunction.md2
-rw-r--r--core/testdata/format/operatorOverloading.md2
-rw-r--r--core/testdata/format/orderedList.html2
-rw-r--r--core/testdata/format/overloads.html2
-rw-r--r--core/testdata/format/overloadsWithDescription.html2
-rw-r--r--core/testdata/format/overloadsWithDifferentDescriptions.html2
-rw-r--r--core/testdata/format/overridingFunction.md2
-rw-r--r--core/testdata/format/paramTag.md2
-rw-r--r--core/testdata/format/parameterAnchor.html2
-rw-r--r--core/testdata/format/parenthesis.html2
-rw-r--r--core/testdata/format/propertyVar.md2
-rw-r--r--core/testdata/format/qualifiedNameLink.md2
-rw-r--r--core/testdata/format/receiverParameterTypeBound.md2
-rw-r--r--core/testdata/format/receiverReference.md2
-rw-r--r--core/testdata/format/reifiedTypeParameter.md2
-rw-r--r--core/testdata/format/renderFunctionalTypeInParenthesisWhenItIsReceiver.md2
-rw-r--r--core/testdata/format/see.html12
-rw-r--r--core/testdata/format/shadowedExtensionFunctions.md2
-rw-r--r--core/testdata/format/starProjection.md2
-rw-r--r--core/testdata/format/suspendInlineFunction.md4
-rw-r--r--core/testdata/format/suspendParam.md2
-rw-r--r--core/testdata/format/suspendParam.package.md2
-rw-r--r--core/testdata/format/throwsTag.md2
-rw-r--r--core/testdata/format/tokensInEmphasis.md2
-rw-r--r--core/testdata/format/tokensInHeaders.md2
-rw-r--r--core/testdata/format/tokensInStrong.md2
-rw-r--r--core/testdata/format/tripleBackticks.html2
-rw-r--r--core/testdata/format/typeAliases.md56
-rw-r--r--core/testdata/format/typeLink.html2
-rw-r--r--core/testdata/format/typeParameterBounds.md2
-rw-r--r--core/testdata/format/typeParameterReference.md2
-rw-r--r--core/testdata/format/typeParameterVariance.md2
-rw-r--r--core/testdata/format/typeProjectionVariance.md2
-rw-r--r--core/testdata/format/uninterpretedEmphasisCharacters.html2
-rw-r--r--core/testdata/format/unorderedLists.md2
-rw-r--r--core/testdata/format/varargsFunction.md2
-rw-r--r--core/testdata/functions/inlineFunction.kt2
-rw-r--r--core/testdata/functions/inlineSuspendFunction.kt2
-rw-r--r--core/testdata/functions/suspendInlineFunction.kt2
116 files changed, 198 insertions, 187 deletions
diff --git a/core/src/main/kotlin/Formats/HtmlFormatService.kt b/core/src/main/kotlin/Formats/HtmlFormatService.kt
index 0ad946be..d36ea0a2 100644
--- a/core/src/main/kotlin/Formats/HtmlFormatService.kt
+++ b/core/src/main/kotlin/Formats/HtmlFormatService.kt
@@ -88,9 +88,7 @@ open class HtmlOutputBuilder(to: StringBuilder,
to.append(" ")
}
- override fun ensureParagraph() {
-
- }
+ override fun ensureParagraph() {}
}
open class HtmlFormatService @Inject constructor(generator: NodeLocationAwareGenerator,
@@ -144,7 +142,7 @@ fun formatPageTitle(node: DocumentationNode): String {
}
val qName = qualifiedNameForPageTitle(node)
- return qName + " - " + moduleName
+ return "$qName - $moduleName"
}
private fun qualifiedNameForPageTitle(node: DocumentationNode): String {
diff --git a/core/src/main/kotlin/Formats/StructuredFormatService.kt b/core/src/main/kotlin/Formats/StructuredFormatService.kt
index 70cf4311..44b06e8b 100644
--- a/core/src/main/kotlin/Formats/StructuredFormatService.kt
+++ b/core/src/main/kotlin/Formats/StructuredFormatService.kt
@@ -775,7 +775,9 @@ abstract class StructuredOutputBuilder(val to: StringBuilder,
appendPlatforms(platforms)