diff options
| author | Dmitry Jemerov <yole@jetbrains.com> | 2015-01-16 19:19:54 +0100 |
|---|---|---|
| committer | Dmitry Jemerov <yole@jetbrains.com> | 2015-01-16 19:19:54 +0100 |
| commit | db6f8c09977be52109fc65f810ad030fe13bc3e1 (patch) | |
| tree | 02332a5d90746c92470a288e684cc79a3ab8aed5 | |
| parent | 18bd85cc710718658d6c902c04de5d356cd0aee8 (diff) | |
| download | dokka-db6f8c09977be52109fc65f810ad030fe13bc3e1.tar.gz dokka-db6f8c09977be52109fc65f810ad030fe13bc3e1.tar.bz2 dokka-db6f8c09977be52109fc65f810ad030fe13bc3e1.zip | |
fix tests after merge
| -rw-r--r-- | src/Formats/HtmlFormatService.kt | 2 | ||||
| -rw-r--r-- | src/Kotlin/KotlinLanguageService.kt | 3 | ||||
| -rw-r--r-- | test/data/format/brokenLink.html | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/Formats/HtmlFormatService.kt b/src/Formats/HtmlFormatService.kt index 9572dde0..3415bfd7 100644 --- a/src/Formats/HtmlFormatService.kt +++ b/src/Formats/HtmlFormatService.kt @@ -126,7 +126,7 @@ public open class HtmlFormatService(locationService: LocationService, } override fun appendOutline(location: Location, to: StringBuilder, nodes: Iterable<DocumentationNode>) { - templateService.appendHeader(to) + templateService.appendHeader(to, "Module Contents") super<OutlineFormatService>.appendOutline(location, to, nodes) templateService.appendFooter(to) } diff --git a/src/Kotlin/KotlinLanguageService.kt b/src/Kotlin/KotlinLanguageService.kt index 04da05d9..267c0a52 100644 --- a/src/Kotlin/KotlinLanguageService.kt +++ b/src/Kotlin/KotlinLanguageService.kt @@ -16,7 +16,8 @@ class KotlinLanguageService : LanguageService { DocumentationNode.Kind.AnnotationClass, DocumentationNode.Kind.Object -> renderClass(node) - DocumentationNode.Kind.EnumItem -> if (renderMode == RenderMode.FULL) identifier(node.name) + DocumentationNode.Kind.EnumItem, + DocumentationNode.Kind.ExternalClass -> if (renderMode == RenderMode.FULL) identifier(node.name) DocumentationNode.Kind.TypeParameter -> renderTypeParameter(node) DocumentationNode.Kind.Type, diff --git a/test/data/format/brokenLink.html b/test/data/format/brokenLink.html index d5f8707f..39fe8617 100644 --- a/test/data/format/brokenLink.html +++ b/test/data/format/brokenLink.html @@ -1,5 +1,6 @@ <HTML> <HEAD> +<title>test / f</title> </HEAD> <BODY> <a href="out.html">test</a> / <a href="out.html"></a> / <a href="out.html">f</a><br/> |