diff options
| -rw-r--r-- | src/Formats/JekyllFormatService.kt | 2 | ||||
| -rw-r--r-- | src/Locations/FoldersLocationService.kt | 4 | ||||
| -rw-r--r-- | src/main.kt | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/Formats/JekyllFormatService.kt b/src/Formats/JekyllFormatService.kt index 93ba4704..e4c3ccd5 100644 --- a/src/Formats/JekyllFormatService.kt +++ b/src/Formats/JekyllFormatService.kt @@ -4,8 +4,6 @@ public open class JekyllFormatService(locationService: LocationService, signatureGenerator: LanguageService) : MarkdownFormatService(locationService, signatureGenerator) { - override fun link(from: DocumentationNode, to: DocumentationNode): FormatLink = link(from, to, "html") - override fun appendNodes(location: Location, to: StringBuilder, nodes: Iterable<DocumentationNode>) { to.appendln("---") appendFrontMatter(nodes, to) diff --git a/src/Locations/FoldersLocationService.kt b/src/Locations/FoldersLocationService.kt index ce202cfe..2e9a9cd5 100644 --- a/src/Locations/FoldersLocationService.kt +++ b/src/Locations/FoldersLocationService.kt @@ -4,7 +4,9 @@ import java.io.File public fun FoldersLocationService(root: String): FoldersLocationService = FoldersLocationService(File(root), "") public class FoldersLocationService(val root: File, val extension: String) : FileLocationService { - override fun withExtension(newExtension: String): LocationService = FoldersLocationService(root, newExtension) + override fun withExtension(newExtension: String): LocationService { + return if (extension.isEmpty()) FoldersLocationService(root, newExtension) else this + } override fun location(qualifiedName: List<String>, hasMembers: Boolean): FileLocation { return FileLocation(File(root, relativePathToNode(qualifiedName, hasMembers)).appendExtension(extension)) diff --git a/src/main.kt b/src/main.kt index 242ac85a..3192d711 100644 --- a/src/main.kt +++ b/src/main.kt @@ -141,8 +141,8 @@ class DokkaGenerator(val logger: DokkaLogger, htmlFormatService to htmlFormatService } "markdown" -> MarkdownFormatService(locationService, signatureGenerator) to null - "jekyll" -> JekyllFormatService(locationService, signatureGenerator) to null - "kotlin-website" -> KotlinWebsiteFormatService(locationService, signatureGenerator) to + "jekyll" -> JekyllFormatService(locationService.withExtension("html"), signatureGenerator) to null + "kotlin-website" -> KotlinWebsiteFormatService(locationService.withExtension("html"), signatureGenerator) to YamlOutlineService(locationService, signatureGenerator) else -> { logger.error("Unrecognized output format ${outputFormat}") |