From 8e3130129def0a185099a876da8978211a1eb44a Mon Sep 17 00:00:00 2001 From: Marcin Aman Date: Tue, 21 Jul 2020 14:24:42 +0200 Subject: Wrap superclasses in Javadoc (#1191) --- .../src/main/kotlin/javadoc/signatures/JavadocSignatureProvider.kt | 2 +- .../src/main/resources/static_res/dokka-javadoc-stylesheet.css | 6 ++++++ plugins/javadoc/src/main/resources/views/class.korte | 4 ++-- plugins/javadoc/src/main/resources/views/components/head.korte | 1 + 4 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 plugins/javadoc/src/main/resources/static_res/dokka-javadoc-stylesheet.css (limited to 'plugins/javadoc') diff --git a/plugins/javadoc/src/main/kotlin/javadoc/signatures/JavadocSignatureProvider.kt b/plugins/javadoc/src/main/kotlin/javadoc/signatures/JavadocSignatureProvider.kt index f9bee318..73ba9989 100644 --- a/plugins/javadoc/src/main/kotlin/javadoc/signatures/JavadocSignatureProvider.kt +++ b/plugins/javadoc/src/main/kotlin/javadoc/signatures/JavadocSignatureProvider.kt @@ -70,7 +70,7 @@ class JavadocSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLo if (c is WithSupertypes) { c.supertypes.map { (p, dris) -> val (classes, interfaces) = dris.partition { it.kind == JavaClassKindTypes.CLASS } - list(classes, prefix = " extends ", sourceSets = setOf(p)) { + list(classes, prefix = "extends ", sourceSets = setOf(p)) { link(it.dri.sureClassNames, it.dri, sourceSets = setOf(p)) } list(interfaces, prefix = " implements ", sourceSets = setOf(p)){ diff --git a/plugins/javadoc/src/main/resources/static_res/dokka-javadoc-stylesheet.css b/plugins/javadoc/src/main/resources/static_res/dokka-javadoc-stylesheet.css new file mode 100644 index 00000000..b37eef35 --- /dev/null +++ b/plugins/javadoc/src/main/resources/static_res/dokka-javadoc-stylesheet.css @@ -0,0 +1,6 @@ +pre.wrap-overflow { + overflow-x: auto; + white-space: pre-wrap; + white-space: -moz-pre-wrap; + word-wrap: break-word; +} \ No newline at end of file diff --git a/plugins/javadoc/src/main/resources/views/class.korte b/plugins/javadoc/src/main/resources/views/class.korte index 1ddf6796..ddaadc3a 100644 --- a/plugins/javadoc/src/main/resources/views/class.korte +++ b/plugins/javadoc/src/main/resources/views/class.korte @@ -32,10 +32,10 @@ {% endif %}
-
+                    
 {% if signature.annotations != null %}{{ signature.annotations|raw }} {% endif %}
 {{ signature.modifiers }} {{ signature.signatureWithoutModifiers|raw }}
-{% if signature.supertypes != null %}{{signature.supertypes|raw}} {% endif %}
+{% if signature.supertypes != null %}{{signature.supertypes|raw}}{% endif %}
                     
{{ classlikeDocumentation|raw }}
diff --git a/plugins/javadoc/src/main/resources/views/components/head.korte b/plugins/javadoc/src/main/resources/views/components/head.korte index a3c74f12..1b8a61ca 100644 --- a/plugins/javadoc/src/main/resources/views/components/head.korte +++ b/plugins/javadoc/src/main/resources/views/components/head.korte @@ -3,6 +3,7 @@ + -- cgit