diff options
Diffstat (limited to 'core')
50 files changed, 125 insertions, 98 deletions
diff --git a/core/src/main/kotlin/Formats/MarkdownFormatService.kt b/core/src/main/kotlin/Formats/MarkdownFormatService.kt index 71356619..216dd2ef 100644 --- a/core/src/main/kotlin/Formats/MarkdownFormatService.kt +++ b/core/src/main/kotlin/Formats/MarkdownFormatService.kt @@ -177,10 +177,17 @@ open class MarkdownOutputBuilder(to: StringBuilder, } override fun appendHeader(level: Int, body: () -> Unit) { - ensureParagraph() - to.append("${"#".repeat(level)} ") - body() - ensureParagraph() + when { + inTableCell -> { + body() + } + else -> { + ensureParagraph() + to.append("${"#".repeat(level)} ") + body() + ensureParagraph() + } + } } override fun appendBlockCode(language: String, body: () -> Unit) { diff --git a/core/src/main/kotlin/Formats/StructuredFormatService.kt b/core/src/main/kotlin/Formats/StructuredFormatService.kt index 264a176d..62ea1108 100644 --- a/core/src/main/kotlin/Formats/StructuredFormatService.kt +++ b/core/src/main/kotlin/Formats/StructuredFormatService.kt @@ -767,10 +767,10 @@ abstract class StructuredOutputBuilder(val to: StringBuilder, if (summarized.platformPlacement == Summarized.PlatformPlacement.Row) { appendPlatforms(platforms) } -// appendHeader(level = 4) { -// appendParagraph { - appendLink(memberLocation) - + appendHeader(level = 4) { + // appendParagraph { + appendLink(memberLocation) + } if (node.sinceKotlin != null) { appendSinceKotlin(node.sinceKotlin.toString()) } @@ -832,6 +832,7 @@ abstract class StructuredOutputBuilder(val to: StringBuilder, if (summarized.platformPlacement == Summarized.PlatformPlacement.Summary) { appendPlatforms(summary.platforms) } + appendContent(summary.content) summary.signatures.subList(0, summary.signatures.size - 1).forEach { appendSignatures( it, @@ -843,7 +844,6 @@ abstract class StructuredOutputBuilder(val to: StringBuilder, summary.signatures.last(), summarized.platformPlacement == Summarized.PlatformPlacement.Signature ) - appendContent(summary.content) } } diff --git a/core/testdata/format/JavaSupertype.html b/core/testdata/format/JavaSupertype.html index 93346a4a..85fb6d84 100644 --- a/core/testdata/format/JavaSupertype.html +++ b/core/testdata/format/JavaSupertype.html @@ -13,7 +13,8 @@ <tbody> <tr> <td> -<a href="-init-.html"><init></a></td> +<h4><a href="-init-.html"><init></a></h4> +</td> <td> <code><span class="identifier">Bar</span><span class="symbol">(</span><span class="symbol">)</span></code></td> </tr> @@ -24,7 +25,8 @@ <tbody> <tr> <td> -<a href="return-foo.html">returnFoo</a></td> +<h4><a href="return-foo.html">returnFoo</a></h4> +</td> <td> <code><span class="keyword">open</span> <span class="keyword">fun </span><span class="identifier">returnFoo</span><span class="symbol">(</span><span class="identifier" id="JavaSupertype.Bar$returnFoo(JavaSupertype.Foo)/foo">foo</span><span class="symbol">:</span> <a href="../-foo/index.html"><span class="identifier">JavaSupertype.Foo</span></a><span class="symbol">!</span><span class="symbol">)</span><span class="symbol">: </span><a href="../-foo/index.html"><span class="identifier">JavaSupertype.Foo</span></a><span class="symbol">!</span></code></td> </tr> diff --git a/core/testdata/format/classWithCompanionObject.html b/core/testdata/format/classWithCompanionObject.html index 95fcbf6b..e477b53b 100644 --- a/core/testdata/format/classWithCompanionObject.html +++ b/core/testdata/format/classWithCompanionObject.html @@ -13,7 +13,8 @@ <tbody> <tr> <td> -<a href="-init-.html"><init></a></td> +<h4><a href="-init-.html"><init></a></h4> +</td> <td> <code><span class="identifier">Klass</span><span class="symbol">(</span><span class="symbol">)</span></code></td> </tr> @@ -24,7 +25,8 @@ <tbody> <tr> <td> -<a href="x.html">x</a></td> +<h4><a href="x.html">x</a></h4> +</td> <td> <code><span class="keyword">val </span><span class="identifier">x</span><span class="symbol">: </span><span class="identifier">Int</span></code></td> </tr> @@ -35,7 +37,8 @@ <tbody> <tr> <td> -<a href="foo.html">foo</a></td> +<h4><a href="foo.html">foo</a></h4> +</td> <td> <code><span class="keyword">fun </span><span class="identifier">foo</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></td> </tr> diff --git a/core/testdata/format/codeBlock.html b/core/testdata/format/codeBlock.html index a877e8c6..ead4dbc0 100644 --- a/core/testdata/format/codeBlock.html +++ b/core/testdata/format/codeBlock.html @@ -19,11 +19,11 @@ fun readFile(name: String): String {...} <tbody> <tr> <td> -<a href="-init-.html"><init></a></td> +<h4><a href="-init-.html"><init></a></h4> +</td> <td> -<code><span class="identifier">Throws</span><span class="symbol">(</span><span class="symbol">)</span></code> <p>This annotation indicates what exceptions should be declared by a function when compiled to a JVM method.</p> -</td> +<code><span class="identifier">Throws</span><span class="symbol">(</span><span class="symbol">)</span></code></td> </tr> </tbody> </table> @@ -48,11 +48,11 @@ fun readFile(name: String): String {...} <tbody> <tr> <td> -<a href="-init-.html"><init></a></td> +<h4><a href="-init-.html"><init></a></h4> +</td> <td> -<code><span class="identifier">ItDoesSomeObfuscatedThing</span><span class="symbol">(</span><span class="symbol">)</span></code> <p>Check output of</p> -</td> +<code><span class="identifier">ItDoesSomeObfuscatedThing</span><span class="symbol">(</span><span class="symbol">)</span></code></td> </tr> </tbody> </table> diff --git a/core/testdata/format/codeBlock.md b/core/testdata/format/codeBlock.md index b6163a37..c14fc7bd 100644 --- a/core/testdata/format/codeBlock.md +++ b/core/testdata/format/codeBlock.md @@ -16,7 +16,7 @@ fun readFile(name: String): String {...} ### Constructors -| [<init>](-init-.md) | `Throws()`<br>This annotation indicates what exceptions should be declared by a function when compiled to a JVM method. | +| [<init>](-init-.md) | This annotation indicates what exceptions should be declared by a function when compiled to a JVM method.`Throws()` | <!-- File: test/--root--/-it-does-some-obfuscated-thing/index.md --> [test](../../index.md) / [ItDoesSomeObfuscatedThing](./index.md) @@ -33,5 +33,5 @@ Check output of ### Constructors -| [<init>](-init-.md) | `ItDoesSomeObfuscatedThing()`<br>Check output of | +| [<init>](-init-.md) | Check output of`ItDoesSomeObfuscatedThing()` | diff --git a/core/testdata/format/companionImplements.md b/core/testdata/format/companionImplements.md index ead95193..2734e1fe 100644 --- a/core/testdata/format/companionImplements.md +++ b/core/testdata/format/companionImplements.md @@ -12,5 +12,5 @@ Correct ref [Foo.Companion](-companion.md) ### Constructors -| [<init>](-init-.md) | `Foo()`<br>Correct ref [Foo.Companion](-companion.md) | +| [<init>](-init-.md) | Correct ref [Foo.Companion](-companion.md)`Foo()` | diff --git a/core/testdata/format/companionObjectExtension.md b/core/testdata/format/companionObjectExtension.md index f62c856e..43dff899 100644 --- a/core/testdata/format/companionObjectExtension.md +++ b/core/testdata/format/companionObjectExtension.md @@ -10,5 +10,5 @@ ### Companion Object Extension Properties -| [x](../x.md) | `val Foo.Default.x: Int`<br>The default object property. | +| [x](../x.md) | The default object property.`val Foo.Default.x: Int` | diff --git a/core/testdata/format/crossLanguage/kotlinExtendsJava/Bar.html b/core/testdata/format/crossLanguage/kotlinExtendsJava/Bar.html index c413595b..4d08043c 100644 --- a/core/testdata/format/crossLanguage/kotlinExtendsJava/Bar.html +++ b/core/testdata/format/crossLanguage/kotlinExtendsJava/Bar.html @@ -14,11 +14,11 @@ <tbody> <tr> <td> -<a href="-init-.html"><init></a></td> +<h4><a href="-init-.html"><init></a></h4> +</td> <td> -<code><span class="identifier">Bar</span><span class="symbol">(</span><span class="symbol">)</span></code> <p>See <a href="../-foo/xyzzy.html">xyzzy</a></p> -</td> +<code><span class="identifier">Bar</span><span class="symbol">(</span><span class="symbol">)</span></code></td> </tr> </tbody> </table> @@ -27,7 +27,8 @@ <tbody> <tr> <td> -<a href="../-foo/xyzzy.html">xyzzy</a></td> +<h4><a href="../-foo/xyzzy.html">xyzzy</a></h4> +</td> <td> <code><span class="keyword">open</span> <span class="keyword">fun </span><span class="identifier">xyzzy</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></td> </tr> diff --git a/core/testdata/format/deprecated.class.html b/core/testdata/format/deprecated.class.html index d0e27e88..11d2e944 100644 --- a/core/testdata/format/deprecated.class.html +++ b/core/testdata/format/deprecated.class.html @@ -16,7 +16,8 @@ <tbody> <tr> <td> -<a href="-init-.html"><init></a></td> +<h4><a href="-init-.html"><init></a></h4> +</td> <td> <code><span class="identifier">C</span><span class="symbol">(</span><span class="symbol">)</span></code></td> </tr> diff --git a/core/testdata/format/deprecated.package.html b/core/testdata/format/deprecated.package.html index a02783b6..5b218f74 100644 --- a/core/testdata/format/deprecated.package.html +++ b/core/testdata/format/deprecated.package.html @@ -12,7 +12,8 @@ <tbody> <tr> <td> -<a href="-c/index.html">C</a></td> +<h4><a href="-c/index.html">C</a></h4> +</td> <td> <code><span class="keyword">class </span><s><span class="identifier">C</span></s></code></td> </tr> @@ -23,7 +24,8 @@ <tbody> <tr> <td> -<a href="p.html">p</a></td> +<h4><a href="p.html">p</a></h4> +</td> <td> <code><span class="keyword">val </span><s><span class="identifier">p</span></s><span class="symbol">: </span><span class="identifier">Int</span></code></td> </tr> @@ -34,7 +36,8 @@ <tbody> <tr> <td> -<a href="f.html">f</a></td> +<h4><a href="f.html">f</a></h4> +</td> <td> <code><span class="keyword">fun </span><s><span class="identifier">f</span></s><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></td> </tr> diff --git a/core/testdata/format/entity.html b/core/testdata/format/entity.html index 2068009e..bfeb34ea 100644 --- a/core/testdata/format/entity.html +++ b/core/testdata/format/entity.html @@ -14,11 +14,11 @@ <tbody> <tr> <td> -<a href="-init-.html"><init></a></td> +<h4><a href="-init-.html"><init></a></h4> +</td> <td> -<code><span class="identifier">Bar</span><span class="symbol">(</span><span class="symbol">)</span></code> <p>Copyright © JetBrains 2015 "</p> -</td> +<code><span class="identifier">Bar</span><span class="symbol">(</span><span class="symbol">)</span></code></td> </tr> </tbody> </table> diff --git a/core/testdata/format/extensions.class.md b/core/testdata/format/extensions.class.md index b8fa200a..cd1bb70e 100644 --- a/core/testdata/format/extensions.class.md +++ b/core/testdata/format/extensions.class.md @@ -2,6 +2,6 @@ ### Extensions for kotlin.String -| [fn](fn.md) | `fun String.fn(): Unit`<br>`fun String.fn(x: Int): Unit`<br>Function with receiver | -| [foobar](foobar.md) | `val String.foobar: Int`<br>Property with receiver. | +| [fn](fn.md) | Function with receiver`fun String.fn(): Unit`<br>`fun String.fn(x: Int): Unit` | +| [foobar](foobar.md) | Property with receiver.`val String.foobar: Int` | diff --git a/core/testdata/format/functionalTypeWithNamedParameters.html b/core/testdata/format/functionalTypeWithNamedParameters.html index c0b0306b..af97eb4e 100644 --- a/core/testdata/format/functionalTypeWithNamedParameters.html +++ b/core/testdata/format/functionalTypeWithNamedParameters.html @@ -14,7 +14,8 @@ <tbody> <tr> <td> -<a href="-init-.html"><init></a></td> +<h4><a href="-init-.html"><init></a></h4> +</td> <td> <code><span class="identifier">A</span><span class="symbol">(</span><span class="symbol">)</span></code></td> </tr> @@ -38,7 +39,8 @@ <tbody> <tr> <td> -<a href="-init-.html"><init></a></td> +<h4><a href="-init-.html"><init></a></h4> +</td> <td> <code><span class="identifier">B</span><span class="symbol">(</span><span class="symbol">)</span></code></td> </tr> @@ -62,7 +64,8 @@ <tbody> <tr> <td> -<a href="-init-.html"><init></a></td> +<h4><a href="-init-.html"><init></a></h4> +</td> <td> <code><span class="identifier">C</span><span class="symbol">(</span><span class="symbol">)</span></code></td> </tr> diff --git a/core/testdata/format/gfm/listInTableCell.md b/core/testdata/format/gfm/listInTableCell.md index 59fba5c4..1cafb61a 100644 --- a/core/testdata/format/gfm/listInTableCell.md +++ b/core/testdata/format/gfm/listInTableCell.md @@ -14,4 +14,4 @@ | Name | Summary | |---|---| -| [foo](foo.md) | `fun foo(): Unit`<ol><li>Foo</li><li>Bar</li></ol> | +| [foo](foo.md) | <ol><li>Foo</li><li>Bar</li></ol>`fun foo(): Unit` | diff --git a/core/testdata/format/gfm/sample.md b/core/testdata/format/gfm/sample.md index a720881f..a9464ea3 100644 --- a/core/testdata/format/gfm/sample.md +++ b/core/testdata/format/gfm/sample.md @@ -10,11 +10,11 @@ The class Foo. | Name | Summary | |---|---| -| [<init>](-init-.md) | `Foo()`<br>The class Foo. | +| [<init>](-init-.md) | The class Foo.`Foo()` | ### Functions | Name | Summary | |---|---| -| [bar](bar.md) | `fun bar(): Unit`<br>The method bar. | -| [baz](baz.md) | `fun baz(): Unit`<br>The method baz. | +| [bar](bar.md) | The method bar.`fun bar(): Unit` | +| [baz](baz.md) | The method baz.`fun baz(): Unit` | diff --git a/core/testdata/format/javaCodeLiteralTags.md b/core/testdata/format/javaCodeLiteralTags.md index 83d535fc..88472b87 100644 --- a/core/testdata/format/javaCodeLiteralTags.md +++ b/core/testdata/format/javaCodeLiteralTags.md @@ -12,5 +12,5 @@ A<B>C ### Constructors -| [<init>](-init-.md) | `C()`<br>`A<B>C` | +| [<init>](-init-.md) | `A<B>C``C()` | diff --git a/core/testdata/format/javaLinkTag.html b/core/testdata/format/javaLinkTag.html index 0a027c0e..f61673d5 100644 --- a/core/testdata/format/javaLinkTag.html +++ b/core/testdata/format/javaLinkTag.html @@ -14,11 +14,11 @@ <tbody> <tr> <td> -<a href="-init-.html"><init></a></td> +<h4><a href="-init-.html"><init></a></h4> +</td> <td> -<code><span class="identifier">Foo</span><span class="symbol">(</span><span class="symbol">)</span></code> <p>Call <code><a href="bar.html">#bar()</a></code> to do the job.</p> -</td> +<code><span class="identifier">Foo</span><span class="symbol">(</span><span class="symbol">)</span></code></td> </tr> </tbody> </table> @@ -27,7 +27,8 @@ <tbody> <tr> <td> -<a href="bar.html">bar</a></td> +<h4><a href="bar.html">bar</a></h4> +</td> <td> <code><span class="keyword">open</span> <span class="keyword">fun </span><span class="identifier">bar</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></td> </tr> diff --git a/core/testdata/format/javaLinkTagWithLabel.html b/core/testdata/format/javaLinkTagWithLabel.html index f592f85e..92c67795 100644 --- a/core/testdata/format/javaLinkTagWithLabel.html +++ b/core/testdata/format/javaLinkTagWithLabel.html @@ -14,11 +14,11 @@ <tbody> <tr> <td> -<a href="-init-.html"><init></a></td> +<h4><a href="-init-.html"><init></a></h4> +</td> <td> -<code><span class="identifier">Foo</span><span class="symbol">(</span><span class="symbol">)</span></code> <p>Call <code><a href="bar.html">this wonderful method</a></code> to do the job.</p> -</td> +<code><span class="identifier">Foo</span><span class="symbol">(</span><span class="symbol">)</span></code></td> </tr> </tbody> </table> @@ -27,7 +27,8 @@ <tbody> <tr> <td> -<a href="bar.html">bar</a></td> +<h4><a href="bar.html">bar</a></h4> +</td> <td> <code><span class="keyword">open</span> <span class="keyword">fun </span><span class="identifier">bar</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></td> </tr> diff --git a/core/testdata/format/javaSeeTag.html b/core/testdata/format/javaSeeTag.html index 0f5465aa..dd19c56c 100644 --- a/core/testdata/format/javaSeeTag.html +++ b/core/testdata/format/javaSeeTag.html @@ -15,7 +15,8 @@ <tbody> <tr> <td> -<a href="-init-.html"><init></a></td> +<h4><a href="-init-.html"><init></a></h4> +</td> <td> <code><span class="identifier">Foo</span><span class="symbol">(</span><span class="symbol">)</span></code></td> </tr> @@ -26,7 +27,8 @@ <tbody> <tr> <td> -<a href="bar.html">bar</a></td> +<h4><a href="bar.html">bar</a></h4> +</td> <td> <code><span class="keyword">open</span> <span class="keyword">fun </span><span class="identifier">bar</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></td> </tr> diff --git a/core/testdata/format/javadocHtml.md b/core/testdata/format/javadocHtml.md index 0e8c7ca8..b6a03cd6 100644 --- a/core/testdata/format/javadocHtml.md +++ b/core/testdata/format/javadocHtml.md @@ -34,5 +34,5 @@ with (some) { <code> } ### Constructors -| [<init>](-init-.md) | `C()`<br>**Bold** **Strong** *Italic* *Emphasized* | +| [<init>](-init-.md) | **Bold** **Strong** *Italic* *Emphasized* `C()` | diff --git a/core/testdata/format/javadocOrderedList.md b/core/testdata/format/javadocOrderedList.md index a861df46..1d94ad5b 100644 --- a/core/testdata/format/javadocOrderedList.md +++ b/core/testdata/format/javadocOrderedList.md @@ -10,8 +10,8 @@ ### Constructors -| [<init>](-init-.md) | `Bar()`<br> +| [<init>](-init-.md) | 1. Rinse 2. Repeat - <br> | + <br>`Bar()` | diff --git a/core/testdata/format/jdkLinks.md b/core/testdata/format/jdkLinks.md index 4312aa2d..eddee485 100644 --- a/core/testdata/format/jdkLinks.md +++ b/core/testdata/format/jdkLinks.md @@ -10,5 +10,5 @@ You can print something to [java.lang.System.out](https://docs.oracle.com/javase ### Constructors -| [<init>](-init-.md) | `C()`<br>This is a [ClassLoader](https://docs.oracle.com/javase/6/docs/api/java/lang/ClassLoader.html) and I can get its [ClassLoader.getResource](https://docs.oracle.com/javase/6/docs/api/java/lang/ClassLoader.html#getResource(java.lang.String)) | +| [<init>](-init-.md) | This is a [ClassLoader](https://docs.oracle.com/javase/6/docs/api/java/lang/ClassLoader.html) and I can get its [ClassLoader.getResource](https://docs.oracle.com/javase/6/docs/api/java/lang/ClassLoader.html#getResource(java.lang.String))`C()` | diff --git a/core/testdata/format/linkWithLabel.html b/core/testdata/format/linkWithLabel.html index daed792c..52dfa4a3 100644 --- a/core/testdata/format/linkWithLabel.html +++ b/core/testdata/format/linkWithLabel.html @@ -14,11 +14,11 @@ <tbody> <tr> <td> -<a href="-init-.html"><init></a></td> +<h4><a href="-init-.html"><init></a></h4> +</td> <td> -<code><span class="identifier">Bar</span><span class="symbol">(</span><span class="symbol">)</span></code> <p>Use <a href="foo.html">this method</a> for best results.</p> -</td> +<code><span class="identifier">Bar</span><span class="symbol">(</span><span class="symbol">)</span></code></td> </tr> </tbody> </table> @@ -27,7 +27,8 @@ <tbody> <tr> <td> -<a href="foo.html">foo</a></td> +<h4><a href="foo.html">foo</a></h4> +</td> <td> <code><span class="keyword">fun </span><span class="identifier">foo</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></td> </tr> diff --git a/core/testdata/format/linkWithStarProjection.html b/core/testdata/format/linkWithStarProjection.html index a9d6b125..ce9b82c6 100644 --- a/core/testdata/format/linkWithStarProjection.html +++ b/core/testdata/format/linkWithStarProjection.html @@ -13,7 +13,8 @@ <tbody> <tr> <td> -<a href="foo.html">foo</a></td> +<h4><a href="foo.html">foo</a></h4> +</td> <td> <code><span class="keyword">fun </span><span class="identifier">foo</span><span class="symbol">(</span><span class="identifier" id="KClassLoader$foo(kotlin.Enum(()))/c">c</span><span class="symbol">:</span> <span class="identifier">Enum</span><span class="symbol"><</span><span class="identifier">*</span><span class="symbol">></span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></td> </tr> diff --git a/core/testdata/format/linksInEmphasis.md b/core/testdata/format/linksInEmphasis.md index 0cd1aca1..984941fa 100644 --- a/core/testdata/format/linksInEmphasis.md +++ b/core/testdata/format/linksInEmphasis.md @@ -14,7 +14,7 @@ An emphasised class. ### Constructors -| [<init>](-init-.md) | `Bar()`<br>An emphasised class. | +| [<init>](-init-.md) | An emphasised class.`Bar()` | ### Functions diff --git a/core/testdata/format/linksInHeaders.md b/core/testdata/format/linksInHeaders.md index f771aabd..2f18d442 100644 --- a/core/testdata/format/linksInHeaders.md +++ b/core/testdata/format/linksInHeaders.md @@ -20,7 +20,7 @@ Some class with really useless documentation. ### Constructors -| [<init>](-init-.md) | `Bar()`<br>Some class with really useless documentation. | +| [<init>](-init-.md) | Some class with really useless documentation.`Bar()` | ### Functions diff --git a/core/testdata/format/linksInStrong.md b/core/testdata/format/linksInStrong.md index 34359a3d..d234937b 100644 --- a/core/testdata/format/linksInStrong.md +++ b/core/testdata/format/linksInStrong.md @@ -14,7 +14,7 @@ A strong class. ### Constructors -| [<init>](-init-.md) | `Bar()`<br>A strong class. | +| [<init>](-init-.md) | A strong class.`Bar()` | ### Functions diff --git a/core/testdata/format/multiplatform/implied/foo.md b/core/testdata/format/multiplatform/implied/foo.md index 5c43ca29..c261df36 100644 --- a/core/testdata/format/multiplatform/implied/foo.md +++ b/core/testdata/format/multiplatform/implied/foo.md @@ -8,7 +8,7 @@ This is a foo. ### Constructors -| (JVM, JS) [<init>](-init-.md) | `<init>()`<br>This is a foo. | +| (JVM, JS) [<init>](-init-.md) | This is a foo.`<init>()` | ### Properties diff --git a/core/testdata/format/multiplatform/merge/multiplatform.package.md b/core/testdata/format/multiplatform/merge/multiplatform.package.md index 2dfdce38..60ed85c4 100644 --- a/core/testdata/format/multiplatform/merge/multiplatform.package.md +++ b/core/testdata/format/multiplatform/merge/multiplatform.package.md @@ -4,5 +4,5 @@ ### Types -| (JVM, JS) [Foo](-foo/index.md) | `class Foo`<br>This is a foo. | +| (JVM, JS) [Foo](-foo/index.md) | This is a foo.`class Foo` | diff --git a/core/testdata/format/multiplatform/mergeMembers/foo.md b/core/testdata/format/multiplatform/mergeMembers/foo.md index 5c43ca29..c261df36 100644 --- a/core/testdata/format/multiplatform/mergeMembers/foo.md +++ b/core/testdata/format/multiplatform/mergeMembers/foo.md @@ -8,7 +8,7 @@ This is a foo. ### Constructors -| (JVM, JS) [<init>](-init-.md) | `<init>()`<br>This is a foo. | +| (JVM, JS) [<init>](-init-.md) | This is a foo.`<init>()` | ### Properties diff --git a/core/testdata/format/multiplatform/omitRedundant/foo.md b/core/testdata/format/multiplatform/omitRedundant/foo.md index 49a46972..5ed92d51 100644 --- a/core/testdata/format/multiplatform/omitRedundant/foo.md +++ b/core/testdata/format/multiplatform/omitRedundant/foo.md @@ -8,7 +8,7 @@ This is a foo. ### Constructors -| (JVM) [<init>](-init-.md) | `Foo()`<br>This is a foo. | +| (JVM) [<init>](-init-.md) | This is a foo.`Foo()` | ### Properties diff --git a/core/testdata/format/multiplatform/simple/multiplatform.package.md b/core/testdata/format/multiplatform/simple/multiplatform.package.md index b5d9cc7d..73f7d1df 100644 --- a/core/testdata/format/multiplatform/simple/multiplatform.package.md +++ b/core/testdata/format/multiplatform/simple/multiplatform.package.md @@ -4,6 +4,6 @@ ### Types -| (JS) [Bar](-bar/index.md) | `class Bar`<br>This is a bar. | -| (JVM) [Foo](-foo/index.md) | `class Foo`<br>This is a foo. | +| (JS) [Bar](-bar/index.md) | This is a bar.`class Bar` | +| (JVM) [Foo](-foo/index.md) | This is a foo.`class Foo` | diff --git a/core/testdata/format/nestedLists.md b/core/testdata/format/nestedLists.md index c785ba42..6b8de8dc 100644 --- a/core/testdata/format/nestedLists.md +++ b/core/testdata/format/nestedLists.md @@ -29,7 +29,7 @@ Usage instructions: ### Constructors -| [<init>](-init-.md) | `Bar()`<br>Usage instructions: | +| [<init>](-init-.md) | Usage instructions:`Bar()` | ### Properties diff --git a/core/testdata/format/newlineInTableCell.package.md b/core/testdata/format/newlineInTableCell.package.md index dbc1770a..6ed783b3 100644 --- a/core/testdata/format/newlineInTableCell.package.md +++ b/core/testdata/format/newlineInTableCell.package.md @@ -4,5 +4,5 @@ ### Types -| [A](-a/index.md) | `class A`<br>There is `long long int` story full of new lines | +| [A](-a/index.md) | There is `long long int` story full of new lines`class A` | diff --git a/core/testdata/format/orderedList.html b/core/testdata/format/orderedList.html index b011b5b3..b84de731 100644 --- a/core/testdata/format/orderedList.html +++ b/core/testdata/format/orderedList.html @@ -17,11 +17,11 @@ <tbody> <tr> <td> -<a href="-init-.html"><init></a></td> +<h4><a href="-init-.html"><init></a></h4> +</td> <td> -<code><span class="identifier">Bar</span><span class="symbol">(</span><span class="symbol">)</span></code> <p>Usage instructions:</p> -</td> +<code><span class="identifier">Bar</span><span class="symbol">(</span><span class="symbol">)</span></code></td> </tr> </tbody> </table> diff --git a/core/testdata/format/overloads.html b/core/testdata/format/overloads.html index 1545cb9f..8e0693bf 100644 --- a/core/testdata/format/overloads.html +++ b/core/testdata/format/overloads.html @@ -12,12 +12,12 @@ <tbody> <tr> <td> -<a href="f.html">f</a></td> +<h4><a href="f.html">f</a></h4> +</td> <td> -<code><span class="keyword">fun </span><span class="identifier">f</span><span class="symbol">(</span><span class="identifier" id="$f(kotlin.Int)/x">x</span><span class="symbol">:</span> <span class="identifier">Int</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code><br/> -<code><span class="keyword">fun </span><span class="identifier">f</span><span class="symbol">(</span><span class="identifier" id="$f(kotlin.String)/x">x</span><span class="symbol">:</span> <span class="identifier">String</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code> <p>Performs an action on x.</p> -</td> +<code><span class="keyword">fun </span><span class="identifier">f</span><span class="symbol">(</span><span class="identifier" id="$f(kotlin.Int)/x">x</span><span class="symbol">:</span> <span class="identifier">Int</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code><br/> +<code><span class="keyword">fun </span><span class="identifier">f</span><span class="symbol">(</span><span class="identifier" id="$f(kotlin.String)/x">x</span><span class="symbol">:</span> <span class="identifier">String</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></td> </tr> </tbody> </table> diff --git a/core/testdata/format/receiverReference.md b/core/testdata/format/receiverReference.md index 9d36e863..96c6ec61 100644 --- a/core/testdata/format/receiverReference.md +++ b/core/testdata/format/receiverReference.md @@ -2,5 +2,5 @@ ### Extensions for kotlin.String -| [some](some.md) | `fun String.some(): Unit`<br>Prints [this](some/-this-.md) | +| [some](some.md) | Prints [this](some/-this-.md)`fun String.some(): Unit` | diff --git a/core/testdata/format/sinceKotlin.html b/core/testdata/format/sinceKotlin.html index 1173a8ab..3ca6889a 100644 --- a/core/testdata/format/sinceKotlin.html +++ b/core/testdata/format/sinceKotlin.html @@ -14,11 +14,11 @@ <tbody> <tr> <td> -<a href="-init-.html"><init></a>Since: <code>1.1</code></td> +<h4><a href="-init-.html"><init></a></h4> +Since: <code>1.1</code></td> <td> -<code><span class="identifier">Since1.1</span><span class="symbol">(</span><span class="symbol">)</span></code> <p>Useful</p> -</td> +<code><span class="identifier">Since1.1</span><span class="symbol">(</span><span class="symbol">)</span></code></td> </tr> </tbody> </table> diff --git a/core/testdata/format/sinceKotlin.md b/core/testdata/format/sinceKotlin.md index e9b29229..197be48c 100644 --- a/core/testdata/format/sinceKotlin.md +++ b/core/testdata/format/sinceKotlin.md @@ -8,5 +8,5 @@ Useful ### Constructors -| [<init>](-init-.md)Since: `1.1` | `Since1.1()`<br>Useful | +| [<init>](-init-.md)Since: `1.1` | Useful`Since1.1()` | diff --git a/core/testdata/format/sinceKotlin.package.md b/core/testdata/format/sinceKotlin.package.md index 92197648..fa29e019 100644 --- a/core/testdata/format/sinceKotlin.package.md +++ b/core/testdata/format/sinceKotlin.package.md @@ -4,5 +4,5 @@ ### Types -| [Since1.1](-since1.1/index.md) (Since: `1.1`) | `class Since1.1`<br>Useful | +| [Since1.1](-since1.1/index.md) (Since: `1.1`) | Useful`class Since1.1` | diff --git a/core/testdata/format/sinceKotlinWide.package.md b/core/testdata/format/sinceKotlinWide.package.md index fd7d45aa..d79d593d 100644 --- a/core/testdata/format/sinceKotlinWide.package.md +++ b/core/testdata/format/sinceKotlinWide.package.md @@ -4,6 +4,6 @@ ### Types -| [Since1.1](-since1.1/index.md) (Since: `1.1`) | `class Since1.1`<br>Useful | -| [Since1.2](-since1.2/index.md) (Since: `1.2`) | `class Since1.2`<br>Useful also | +| [Since1.1](-since1.1/index.md) (Since: `1.1`) | Useful`class Since1.1` | +| [Since1.2](-since1.2/index.md) (Since: `1.2`) | Useful also`class Since1.2` | diff --git a/core/testdata/format/summarizeSignatures.md b/core/testdata/format/summarizeSignatures.md index 4f494166..a6755328 100644 --- a/core/testdata/format/summarizeSignatures.md +++ b/core/testdata/format/summarizeSignatures.md @@ -10,5 +10,5 @@ ### Functions -| [foo](foo.md) | `fun <T> any_array<T>.foo(predicate: (`[`T`](foo.md#T)`) -> Boolean): Boolean`<br>Returns true if foo. | +| [foo](foo.md) | Returns true if foo.`fun <T> any_array<T>.foo(predicate: (`[`T`](foo.md#T)`) -> Boolean): Boolean` | diff --git a/core/testdata/format/summarizeSignaturesProperty.md b/core/testdata/format/summarizeSignaturesProperty.md index 507ad6a5..1070a060 100644 --- a/core/testdata/format/summarizeSignaturesProperty.md +++ b/core/testdata/format/summarizeSignaturesProperty.md @@ -10,5 +10,5 @@ ### Properties -| [foo](foo.md) | `val <T> any_array<T>.foo: Int`<br>Returns true if foo. | +| [foo](foo.md) | Returns true if foo.`val <T> any_array<T>.foo: Int` | diff --git a/core/testdata/format/tokensInEmphasis.md b/core/testdata/format/tokensInEmphasis.md index 50bd694f..0dd78dec 100644 --- a/core/testdata/format/tokensInEmphasis.md +++ b/core/testdata/format/tokensInEmphasis.md @@ -12,7 +12,7 @@ Another emphasised class. ### Constructors -| [<init>](-init-.md) | `Bar()`<br>Another emphasised class. | +| [<init>](-init-.md) | Another emphasised class.`Bar()` | ### Functions diff --git a/core/testdata/format/tokensInHeaders.md b/core/testdata/format/tokensInHeaders.md index 293c15cc..31abd971 100644 --- a/core/testdata/format/tokensInHeaders.md +++ b/core/testdata/format/tokensInHeaders.md @@ -24,7 +24,7 @@ Why did the token cross the road? ### Constructors -| [<init>](-init-.md) | `The()`<br>Why did the token cross the road? | +| [<init>](-init-.md) | Why did the token cross the road?`The()` | ### Functions diff --git a/core/testdata/format/tokensInStrong.md b/core/testdata/format/tokensInStrong.md index e81503e4..8a444c8d 100644 --- a/core/testdata/format/tokensInStrong.md +++ b/core/testdata/format/tokensInStrong.md @@ -12,7 +12,7 @@ ### Constructors -| [<init>](-init-.md) | `Yasc()`<br>**YASC: [Yasc](./index.md) Yet Another Strong Class** | +| [<init>](-init-.md) | **YASC: [Yasc](./index.md) Yet Another Strong Class**`Yasc()` | ### Functions diff --git a/core/testdata/format/typeAliases.package.md b/core/testdata/format/typeAliases.package.md index d5ed2247..0c083811 100644 --- a/core/testdata/format/typeAliases.package.md +++ b/core/testdata/format/typeAliases.package.md @@ -16,6 +16,6 @@ | [J](-j.md) | `typealias J = `[`H`](-h.md)`<`[`A`](-a/index.md)`>` | | [K](-k.md) | `typealias K = `[`H`](-h.md)`<`[`J`](-j.md)`>` | | [L](-l.md) | `typealias L = (`[`K`](-k.md)`, `[`B`](-b/index.md)`) -> `[`J`](-j.md) | -| [M](-m.md) | `typealias M = `[`A`](-a/index.md)<br>Documented | +| [M](-m.md) | Documented`typealias M = `[`A`](-a/index.md) | | [N](-n.md) | `typealias ~~N~~ = `[`A`](-a/index.md) | diff --git a/core/testdata/format/typeLink.html b/core/testdata/format/typeLink.html index f25efe3c..7909be23 100644 --- a/core/testdata/format/typeLink.html +++ b/core/testdata/format/typeLink.html @@ -13,7 +13,8 @@ <tbody> <tr> <td> -<a href="-init-.html"><init></a></td> +<h4><a href="-init-.html"><init></a></h4> +</td> <td> <code><span class="identifier">Bar</span><span class="symbol">(</span><span class="symbol">)</span></code></td> </tr> diff --git a/core/testdata/format/unorderedLists.md b/core/testdata/format/unorderedLists.md index 14143a46..1beb2c64 100644 --- a/core/testdata/format/unorderedLists.md +++ b/core/testdata/format/unorderedLists.md @@ -32,7 +32,7 @@ Rinse options: ### Constructors -| [<init>](-init-.md) | `Bar()`<br>Usage summary: | +| [<init>](-init-.md) | Usage summary:`Bar()` | ### Properties |