Fixed tests

48 files changed, 108 insertions, 199 deletions

diff --git a/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt b/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt
index f38d68dd..53222325 100644
--- a/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt
+++ b/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt
@@ -46,7 +46,7 @@ open class HtmlRenderer(
             consumer.onTagContentUnsafe { +distinct.keys.single() }
         else
             distinct.forEach { text, platforms ->
-                consumer.onTagContentUnsafe { +platforms.joinToString(prefix = " [", postfix = "] $text") { it.platformType.key } }
+                consumer.onTagContentUnsafe { +platforms.joinToString(prefix = " [", postfix = "] $text") { it.name } }
             }
     }
 
diff --git a/plugins/base/src/test/kotlin/model/ClassesTest.kt b/plugins/base/src/test/kotlin/model/ClassesTest.kt
index a7ec861a..ee109ba1 100644
--- a/plugins/base/src/test/kotlin/model/ClassesTest.kt
+++ b/plugins/base/src/test/kotlin/model/ClassesTest.kt
@@ -1,7 +1,9 @@
 package model
 
+import org.jetbrains.dokka.Platform
 import org.jetbrains.dokka.model.*
 import org.jetbrains.dokka.model.KotlinModifier.*
+import org.jetbrains.dokka.pages.PlatformData
 import org.junit.jupiter.api.Assertions.assertNull
 import org.junit.jupiter.api.Test
 import utils.AbstractModelTest
@@ -167,7 +169,7 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
         ) {
             with((this / "classes" / "Klass").cast<DClass>()) {
                 name equals "Klass"
-                modifier equals Sealed
+                modifier.allValues.forEach { it equals Sealed }
             }
         }
     }
@@ -209,15 +211,15 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
             val D = (this / "classes" / "D").cast<DClass>()
 
             with(C) {
-                modifier equals Open
+                modifier.allValues.forEach { it equals Open }
                 with((this / "f").cast<DFunction>()) {
-                    modifier equals Open
+                    modifier.allValues.forEach { it equals Open }
                 }
             }
             with(D) {
-                modifier equals Final
+                modifier.allValues.forEach { it equals Final }
                 with((this / "f").cast<DFunction>()) {
-                    modifier equals Open
+                    modifier.allValues.forEach { it equals Open }
                 }
                 D.supertypes.flatMap { it.component2() }.firstOrNull() equals C.dri
             }
@@ -244,16 +246,16 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class
             val E = (this / "classes" / "E").cast<DClass>()
 
             with(C) {
-                modifier equals Abstract
-                ((this / "foo").cast<DFunction>()).modifier equals Abstract
+                modifier.allValues.forEach { it equals Abstract }
+                ((this / "foo").cast<DFunction>()).modifier.allValues.forEach { it equals Abstract }
             }
 
             with(D) {
-                modifier equals Abstract
+                modifier.allValues.forEach { it equals Abstract }
             }
 
             with(E) {
-                modifier equals Final
+                modifier.allValues.forEach { it equals Final }
 
             }
             D.supers.firstOrNull() equals C.dri
diff --git a/plugins/base/src/test/kotlin/renderers/html/PlatformDependentHintTest.kt b/plugins/base/src/test/kotlin/renderers/html/PlatformDependentHintTest.kt
index f46f8b59..f8ba51a6 100644
--- a/plugins/base/src/test/kotlin/renderers/html/PlatformDependentHintTest.kt
+++ b/plugins/base/src/test/kotlin/renderers/html/PlatformDependentHintTest.kt
@@ -40,7 +40,7 @@ class PlatformDependentHintTest : RenderingOnlyTestBase() {
         }
 
         HtmlRenderer(context).render(page)
-        renderedContent.match(Div("a"), "[pl1]", Div("b"), "[pl2]", Div("c"), "[pl3]")
+        renderedContent.match("[pl1]", Div("a"), "[pl2]",  Div("b"), "[pl3]", Div("c"))
     }
 
     @Test
@@ -54,7 +54,7 @@ class PlatformDependentHintTest : RenderingOnlyTestBase() {
         }
 
         HtmlRenderer(context).render(page)
-        renderedContent.match(Div("ab"), "[pl1]", Div("bc"), "[pl2]")
+        renderedContent.match("[pl1]", Div("ab"), "[pl2]", Div("bc"))
     }
 
     @Test
@@ -84,7 +84,7 @@ class PlatformDependentHintTest : RenderingOnlyTestBase() {
         }
 
         HtmlRenderer(context).render(page)
-        renderedContent.match(Div(Div("ab")), "[pl1]", Div(Div("a"), "b"), "[pl2]")
+        renderedContent.match("[pl1]", Div(Div("ab")), "[pl2]", Div(Div("a"), "b"))
     }
 
     @Test
@@ -115,6 +115,6 @@ class PlatformDependentHintTest : RenderingOnlyTestBase() {
         }
 
         HtmlRenderer(context).render(page)
-        renderedContent.match(Div("a"), "[pl1, pl2]", Div("b"), "[pl3]")
+        renderedContent.match("[pl1, pl2]", Div("a"), "[pl3]",  Div("b"))
     }
 }
\ No newline at end of file
diff --git a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/f.html b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/f.html
index 699949e0..b212ca00 100644
--- a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/f.html
+++ b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/f.html
@@ -18,8 +18,7 @@
         </div>
         <div id="content" pageIds="//f/#//">//<a href="../index.html">root</a>/<a href="index.html"></a>/<a href="f.html">f</a>
           <h1>f</h1>
-          <div class="symbol monospace">final fun <a href="f.html">f</a>()</div>
-        </div>
+<div class="symbol monospace">final fun <a href="f.html">f</a>()</div>        </div>
       </div>
     </div>
   </body>
diff --git a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/index.html b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/index.html
index 6ed21e80..b22194f8 100644
--- a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/index.html
@@ -24,9 +24,8 @@
             <tbody>
               <tr>
                 <td><a href="f.html">f</a></td>
-                <td>
-                  <div class="symbol monospace">final fun <a href="f.html">f</a>()</div>
-                  <div class="brief "></div>
+                <td><div class="symbol monospace">final fun <a href="f.html">f</a>()</div>
+                  <div class="brief "> </div>
                 </td>
               </tr>
             </tbody>
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/-init-.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/-init-.html
index 1f8f163c..54f356bf 100644
--- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/-init-.html
+++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/-init-.html
@@ -18,8 +18,7 @@
         </div>
         <div id="content" pageIds="/Fancy/&lt;init&gt;/#kotlin.Int//">//<a href="../../index.html">root</a>/<a href="../index.html"></a>/<a href="index.html">Fancy</a>/<a href="-init-.html">&lt;init&gt;</a>
           <h1>&lt;init&gt;</h1>
-          <div class="symbol monospace">final fun <a href="-init-.html">&lt;init&gt;</a>(size: <a href="">Int</a>)</div>
-        </div>
+<div class="symbol monospace">final fun <a href="-init-.html">&lt;init&gt;</a>(size: <a href="">Int</a>)</div>        </div>
       </div>
     </div>
   </body>
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/equals.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/equals.html
index 095832b0..3047ead0 100644
--- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/equals.html
+++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/equals.html
@@ -18,8 +18,7 @@
         </div>
         <div id="content" pageIds="/Fancy/equals/#kotlin.Any?//">//<a href="../../index.html">root</a>/<a href="../index.html"></a>/<a href="index.html">Fancy</a>/<a href="equals.html">equals</a>
           <h1>equals</h1>
-          <div class="symbol monospace">open fun <a href="equals.html">equals</a>(other: <a href="">Any</a>): <a href="">Boolean</a></div>
-        </div>
+<div class="symbol monospace">open fun <a href="equals.html">equals</a>(other: <a href="">Any</a>): <a href="">Boolean</a></div>        </div>
       </div>
     </div>
   </body>
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/hash-code.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/hash-code.html
index c600cba6..aae30759 100644
--- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/hash-code.html
+++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/hash-code.html
@@ -18,8 +18,7 @@
         </div>
         <div id="content" pageIds="/Fancy/hashCode/#//">//<a href="../../index.html">root</a>/<a href="../index.html"></a>/<a href="index.html">Fancy</a>/<a href="hash-code.html">hashCode</a>
           <h1>hashCode</h1>
-          <div class="symbol monospace">open fun <a href="hash-code.html">hashCode</a>(): <a href="">Int</a></div>
-        </div>
+<div class="symbol monospace">open fun <a href="hash-code.html">hashCode</a>(): <a href="">Int</a></div>        </div>
       </div>
     </div>
   </body>
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/index.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/index.html
index fd1f598b..e43d5514 100644
--- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/index.html
+++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/index.html
@@ -18,30 +18,27 @@
         </div>
         <div id="content" pageIds="/Fancy////">//<a href="../../index.html">root</a>/<a href="../index.html"></a>/<a href="index.html">Fancy</a>
           <h1>Fancy</h1>
-          <div class="symbol monospace">annotation class <a href="index.html">Fancy</a></div>
+<div class="symbol monospace">annotation class <a href="index.html">Fancy</a></div><br>
           <h2>Functions</h2>
           <table>
             <thead></thead>
             <tbody>
               <tr>
                 <td><a href="equals.html">equals</a></td>
-                <td>
-                  <div class="symbol monospace">open fun <a href="equals.html">equals</a>(other: <a href="">Any</a>): <a href="">Boolean</a></div>
-                  <div class="brief "></div>
+                <td><div class="symbol monospace">open fun <a href="equals.html">equals</a>(other: <a href="">Any</a>): <a href="">Boolean</a></div>
+                  <div class="brief "> </div>
                 </td>
               </tr>
               <tr>
                 <td><a href="hash-code.html">hashCode</a></td>
-                <td>
-                  <div class="symbol monospace">open fun <a href="hash-code.html">hashCode</a>(): <a href="">Int</a></div>
-                  <div class="brief "></div>
+                <td><div class="symbol monospace">open fun <a href="hash-code.html">hashCode</a>(): <a href="">Int</a></div>
+                  <div class="brief "> </div>
                 </td>
               </tr>
               <tr>
                 <td><a href="to-string.html">toString</a></td>
-                <td>
-                  <div class="symbol monospace">open fun <a href="to-string.html">toString</a>(): <a href="">String</a></div>
-                  <div class="brief "></div>
+                <td><div class="symbol monospace">open fun <a href="to-string.html">toString</a>(): <a href="">String</a></div>
+                  <div class="brief "> </div>
                 </td>
               </tr>
             </tbody>
@@ -52,12 +49,9 @@
             <tbody>
               <tr>
                 <td><a href="">size</a></td>
+                <td><div class="symbol monospace"><a href="">Int</a></div></td>
                 <td>
-                  <div class="symbol monospace"><a href="">Int</a></div>
-                </td>
-                <td><br></td>
-                <td>
-                  <div class="brief "></div>
+                  <div class="brief "> </div>
                 </td>
               </tr>
             </tbody>
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/to-string.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/to-string.html
index 01f5bd2f..89cc4ecc 100644
--- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/to-string.html
+++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/to-string.html
@@ -18,8 +18,7 @@
         </div>
         <div id="content" pageIds="/Fancy/toString/#//">//<a href="../../index.html">root</a>/<a href="../index.html"></a>/<a href="index.html">Fancy</a>/<a href="to-string.html">toString</a>
           <h1>toString</h1>
-          <div class="symbol monospace">open fun <a href="to-string.html">toString</a>(): <a href="">String</a></div>
-        </div>
+<div class="symbol monospace">open fun <a href="to-string.html">toString</a>(): <a href="">String</a></div>        </div>
       </div>
     </div>
   </body>
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/f.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/f.html
index 699949e0..b212ca00 100644
--- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/f.html
+++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/f.html
@@ -18,8 +18,7 @@
         </div>
         <div id="content" pageIds="//f/#//">//<a href="../index.html">root</a>/<a href="index.html"></a>/<a href="f.html">f</a>
           <h1>f</h1>
-          <div class="symbol monospace">final fun <a href="f.html">f</a>()</div>
-        </div>
+<div class="symbol monospace">final fun <a href="f.html">f</a>()</div>        </div>
       </div>
     </div>
   </body>
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/index.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/index.html
index 7bd8b485..f485569d 100644
--- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/index.html
@@ -24,9 +24,8 @@
             <tbody>
               <tr>
                 <td><a href="-fancy/index.html">Fancy</a></td>
-                <td>
-                  <div class="symbol monospace">annotation class <a href="-fancy/index.html">Fancy</a></div>
-                  <div class="brief "></div>
+                <td><div class="symbol monospace">annotation class <a href="-fancy/index.html">Fancy</a></div>
+                  <div class="brief "> </div>
                 </td>
               </tr>
             </tbody>
@@ -37,9 +36,8 @@
             <tbody>
               <tr>
                 <td><a href="f.html">f</a></td>
-                <td>
-                  <div class="symbol monospace">final fun <a href="f.html">f</a>()</div>
-                  <div class="brief "></div>
+                <td><div class="symbol monospace">final fun <a href="f.html">f</a>()</div>
+                  <div class="brief "> </div>
                 </td>
               </tr>
             </tbody>
diff --git a/plugins/base/src/test/resources/expect/function/out/html/root/fn.html b/plugins/base/src/test/resources/expect/function/out/html/root/fn.html
index 9e52f490..600c6f19 100644
--- a/plugins/base/src/test/resources/expect/function/out/html/root/fn.html
+++ b/plugins/base/src/test/resources/expect/function/out/html/root/fn.html
@@ -18,10 +18,8 @@
         </div>
         <div id="content" pageIds="//fn/#//">//<a href="../index.html">root</a>/<a href="index.html"></a>/<a href="fn.html">fn</a>
           <h1>fn</h1>
-          <div class="symbol monospace">final fun <a href="fn.html">fn</a>()</div>
-          <h3>Description</h3>
-Function fn
-</div>
+<div class="symbol monospace">final fun <a href="fn.html">fn</a>()</div>          <h3>Description</h3>
+Function fn<br>        </div>
       </div>
     </div>
   </body>
diff --git a/plugins/base/src/test/resources/expect/function/out/html/root/index.html b/plugins/base/src/test/resources/expect/function/out/html/root/index.html
index fe2eeab7..8c346556 100644
--- a/plugins/base/src/test/resources/expect/function/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/function/out/html/root/index.html
@@ -24,9 +24,8 @@
             <tbody>
               <tr>
                 <td><a href="fn.html">fn</a></td>
-                <td>
-                  <div class="symbol monospace">final fun <a href="fn.html">fn</a>()</div>
-                  <div class="brief ">Function fn</div>
+                <td><div class="symbol monospace">final fun <a href="fn.html">fn</a>()</div>
+                  <div class="brief "> </div>
                 </td>
               </tr>
             </tbody>
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/-init-.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/-init-.html
index 68608d40..51e4544a 100644
--- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/-init-.html
+++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/-init-.html
@@ -18,8 +18,7 @@
         </div>
         <div id="content" pageIds="/Fancy/&lt;init&gt;/#//">//<a href="../../index.html">root</a>/<a href="../index.html"></a>/<a href="index.html">Fancy</a>/<a href="-init-.html">&lt;init&gt;</a>
           <h1>&lt;init&gt;</h1>
-          <div class="symbol monospace">final fun <a href="-init-.html">&lt;init&gt;</a>()</div>
-        </div>
+<div class="symbol monospace">final fun <a href="-init-.html">&lt;init&gt;</a>()</div>        </div>
       </div>
     </div>
   </body>
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/equals.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/equals.html
index 095832b0..3047ead0 100644
--- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/equals.html
+++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/equals.html
@@ -18,8 +18,7 @@
         </div>
         <div id="content" pageIds="/Fancy/equals/#kotlin.Any?//">//<a href="../../index.html">root</a>/<a href="../index.html"></a>/<a href="index.html">Fancy</a>/<a href="equals.html">equals</a>
           <h1>equals</h1>
-          <div class="symbol monospace">open fun <a href="equals.html">equals</a>(other: <a href="">Any</a>): <a href="">Boolean</a></div>
-        </div>
+<div class="symbol monospace">open fun <a href="equals.html">equals</a>(other: <a href="">Any</a>): <a href="">Boolean</a></div>        </div>
       </div>
     </div>
   </body>
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/hash-code.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/hash-code.html
index c600cba6..aae30759 100644
--- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/hash-code.html
+++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/hash-code.html
@@ -18,8 +18,7 @@
         </div>
         <div id="content" pageIds="/Fancy/hashCode/#//">//<a href="../../index.html">root</a>/<a href="../index.html"></a>/<a href="index.html">Fancy</a>/<a href="hash-code.html">hashCode</a>
           <h1>hashCode</h1>
-          <div class="symbol monospace">open fun <a href="hash-code.html">hashCode</a>(): <a href="">Int</a></div>
-        </div>
+<div class="symbol monospace">open fun <a href="hash-code.html">hashCode</a>(): <a href="">Int</a></div>        </div>
       </div>
     </div>
   </body>
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/index.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/index.html
index 9d89328b..5c51a927 100644
--- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/index.html
+++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/index.html
@@ -18,30 +18,27 @@
         </div>
         <div id="content" pageIds="/Fancy////">//<a href="../../index.html">root</a>/<a href="../index.html"></a>/<a href="index.html">Fancy</a>
           <h1>Fancy</h1>
-          <div class="symbol monospace">annotation class <a href="index.html">Fancy</a></div>
+<div class="symbol monospace">annotation class <a href="index.html">Fancy</a></div><br>
           <h2>Functions</h2>
           <table>
             <thead></thead>
             <tbody>
               <tr>
                 <td><a href="equals.html">equals</a></td>
-                <td>
-                  <div class="symbol monospace">open fun <a href="equals.html">equals</a>(other: <a href="">Any</a>): <a href="">Boolean</a></div>
-                  <div class="brief "></div>
+                <td><div class="symbol monospace">open fun <a href="equals.html">equals</a>(other: <a href="">Any</a>): <a href="">Boolean</a></div>
+                  <div class="brief "> </div>
                 </td>
               </tr>
               <tr>
                 <td><a href="hash-code.html">hashCode</a></td>
-                <td>
-                  <div class="symbol monospace">open fun <a href="hash-code.html">hashCode</a>(): <a href="">Int</a></div>
-                  <div class="brief "></div>
+                <td><div class="symbol monospace">open fun <a href="hash-code.html">hashCode</a>(): <a href="">Int</a></div>
+                  <div class="brief "> </div>
                 </td>
               </tr>
               <tr>
                 <td><a href="to-string.html">toString</a></td>
-                <td>
-                  <div class="symbol monospace">open fun <a href="to-string.html">toString</a>(): <a href="">String</a></div>
-                  <div class="brief "></div>
+                <td><div class="symbol monospace">open fun <a href="to-string.html">toString</a>(): <a href="">String</a></div>
+                  <div class="brief "> </div>
                 </td>
               </tr>
             </tbody>
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/to-string.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/to-string.html
index 01f5bd2f..89cc4ecc 100644
--- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/to-string.html
+++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/to-string.html
@@ -18,8 +18,7 @@
         </div>
         <div id="content" pageIds="/Fancy/toString/#//">//<a href="../../index.html">root</a>/<a href="../index.html"></a>/<a href="index.html">Fancy</a>/<a href="to-string.html">toString</a>
           <h1>toString</h1>
-          <div class="symbol monospace">open fun <a href="to-string.html">toString</a>(): <a href="">String</a></div>
-        </div>
+<div class="symbol monospace">open fun <a href="to-string.html">toString</a>(): <a href="">String</a></div>        </div>
       </div>
     </div>
   </body>
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/function.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/function.html
index 4a0faa01..ad03758d 100644
--- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/function.html
+++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/function.html
@@ -18,10 +18,7 @@
         </div>
         <div id="content" pageIds="//function/#kotlin.Function0[kotlin.Unit]//">//<a href="../index.html">root</a>/<a href="index.html"></a>/<a href="function.html">function</a>
           <h1>function</h1>
-          <div class="symbol monospace">final fun <a href="function.html">function</a>(notInlined: 
-            <div class="symbol monospace">() -&gt; <a href="">Unit</a></div>
-)</div>
-        </div>
+<div class="symbol monospace">final fun <a href="function.html">function</a>(notInlined: <div class="symbol monospace">() -&gt; <a href="">Unit</a></div>)</div>        </div>
       </div>
     </div>
   </body>
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/index.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/index.html
index c6e84a04..88bff912 100644
--- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/index.html
@@ -24,9 +24,8 @@
             <tbody>
               <tr>
                 <td><a href="-fancy/index.html">Fancy</a></td>
-                <td>
-                  <div class="symbol monospace">annotation class <a href="-fancy/index.html">Fancy</a></div>
-                  <div class="brief "></div>
+                <td><div class="symbol monospace">annotation class <a href="-fancy/index.html">Fancy</a></div>
+                  <div class="brief "> </div>
                 </td>
               </tr>
             </tbody>
@@ -37,11 +36,8 @@
             <tbody>
               <tr>
                 <td><a href="function.html">function</a></td>
-                <td>
-                  <div class="symbol monospace">final fun <a href="function.html">function</a>(notInlined: 
-                    <div class="symbol monospace">() -&gt; <a href="">Unit</a></div>
-)</div>
-                  <div class="brief "></div>
+                <td><div class="symbol monospace">final fun <a href="function.html">function</a>(notInlined: <div class="symbol monospace">() -&gt; <a href="">Unit</a></div>)</div>
+                  <div class="brief "> </div>
                 </td>
               </tr>
             </tbody>
diff --git a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/f.html b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/f.html
index d0f05c33..d2e1ac58 100644
--- a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/f.html
+++ b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/f.html
@@ -18,8 +18,7 @@
         </div>
         <div id="content" pageIds="//f/#kotlin.String//">//<a href="../index.html">root</a>/<a href="index.html"></a>/<a href="f.html">f</a>
           <h1>f</h1>
-          <div class="symbol monospace">final fun <a href="f.html">f</a>(x: <a href="">String</a>)</div>
-        </div>
+<div class="symbol monospace">final fun <a href="f.html">f</a>(x: <a href="">String</a>)</div>        </div>
       </div>
     </div>
   </body>
diff --git a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/index.html b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/index.html
index 8cd1b813..18e45a19 100644
--- a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/index.html
@@ -24,9 +24,8 @@
             <tbody>
               <tr>
                 <td><a href="f.html">f</a></td>
-                <td>
-                  <div class="symbol monospace">final fun <a href="f.html">f</a>(x: <a href="">String</a>)</div>
-                  <div class="brief "></div>
+                <td><div class="symbol monospace">final fun <a href="f.html">f</a>(x: <a href="">String</a>)</div>
+                  <div class="brief "> </div>
                 </td>
               </tr>
             </tbody>
diff --git a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/function.html b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/function.html
index 4a0faa01..ad03758d 100644
--- a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/function.html
+++ b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/function.html
@@ -18,10 +18,7 @@
         </div>
         <div id="content" pageIds="//function/#kotlin.Function0[kotlin.Unit]//">//<a href="../index.html">root</a>/<a href="index.html"></a>/<a href="function.html">function</a>
           <h1>function</h1>
-          <div class="symbol monospace">final fun <a href="function.html">function</a>(notInlined: 
-            <div class="symbol monospace">() -&gt; <a href="">Unit</a></div>
-)</div>
-        </div>
+<div class="symbol monospace">final fun <a href="function.html">function</a>(notInlined: <div class="symbol monospace">() -&gt; <a href="">Unit</a></div>)</div>        </div>
       </div>
     </div>
   </body>
diff --git a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/index.html b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/index.html
index 433663af..71c9c491 100644
--- a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/index.html
@@ -24,11 +24,8 @@
             <tbody>
               <tr>
                 <td><a href="function.html">function</a></td>
-                <td>
-                  <div class="symbol monospace">final fun <a href="function.html">function</a>(notInlined: 
-                    <div class="symbol monospace">() -&gt; <a href="">Unit</a></div>
-)</div>
-                  <div class="brief "></div>
+                <td><div class="symbol monospace">final fun <a href="function.html">function</a>(notInlined: <div class="symbol monospace">() -&gt; <a href="">Unit</a></div>)</div>
+                  <div class="brief "> </div>
                 </td>
               </tr>
             </tbody>
diff --git a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/f.html b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/f.html
index 699949e0..b212ca00 100644
--- a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/f.html
+++ b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/f.html
@@ -18,8 +18,7 @@
         </div>
         <div id="content" pageIds="//f/#//">//<a href="../index.html">root</a>/<a href="index.html"></a>/<a href="f.html">f</a>
           <h1>f</h1>
-          <div class="symbol monospace">final fun <a href="f.html">f</a>()</div>
-        </div>
+<div class="symbol monospace">final fun <a href="f.html">f</a>()</div>        </div>
       </div>
     </div>
   </body>
diff --git a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/index.html b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/index.html
index 6ed21e80..b22194f8 100644
--- a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/index.html
@@ -24,9 +24,8 @@
             <tbody>
               <tr>
                 <td><a href="f.html">f</a></td>
-                <td>
-                  <div class="symbol monospace">final fun <a href="f.html">f</a>()</div>
-                  <div class="brief "></div>
+                <td><div class="symbol monospace">final fun <a href="f.html">f</a>()</div>
+                  <div class="brief "> </div>
                 </td>
               </tr>
             </tbody>
diff --git a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/function.html b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/function.html
index db1ca3f4..02a6de53 100644
--- a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/function.html
+++ b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/function.html
@@ -18,10 +18,8 @@
         </div>
         <div id="content" pageIds="//function/#kotlin.Int//">//<a href="../index.html">root</a>/<a href="index.html"></a>/<a href="function.html">function</a>
           <h1>function</h1>
-          <div class="symbol monospace">final fun <a href="function.html">function</a>(x: <a href="">Int</a>)</div>
-          <h3>Description</h3>
-MultilineFunction Documentation
-</div>
+<div class="symbol monospace">final fun <a href="function.html">function</a>(x: <a href="">Int</a>)</div>          <h3>Description</h3>
+MultilineFunction Documentation<br>        </div>
       </div>
     </div>
   </body>
diff --git a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/index.html b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/index.html
index 3bd8f2ef..56955a0a 100644
--- a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/index.html
@@ -24,9 +24,8 @@
             <tbody>
               <tr>
                 <td><a href="function.html">function</a></td>
-                <td>
-                  <div class="symbol monospace">final fun <a href="function.html">function</a>(x: <a href="">Int</a>)</div>
-                  <div class="brief ">Multiline Function Documentation</div>
+                <td><div class="symbol monospace">final fun <a href="function.html">function</a>(x: <a href="">Int</a>)</div>
+                  <div class="brief "> </div>
                 </td>
               </tr>
             </tbody>
diff --git a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/fn.html b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/fn.html
index 519882b8..af435bd4 100644
--- a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/fn.html
+++ b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/fn.html
@@ -18,15 +18,10 @@
         </div>
         <div id="content" pageIds="//fn/kotlin.String#//">//<a href="../index.html">root</a>/<a href="index.html"></a>/<a href="fn.html">fn</a>
           <h1>fn</h1>
-          <div class="symbol monospace">final fun <a href="">String</a>.<a href="fn.html">fn</a>()</div>
-          <h3>Description</h3>
-Function with receiver
-
-          <h1>fn</h1>
-          <div class="symbol monospace">final fun <a href="">String</a>.<a href="fn.html">fn</a>(x: <a href="">Int</a>)</div>
-          <h3>Description</h3>
-Function with receiver
-</div>
+<div class="symbol monospace">final fun <a href="">String</a>.<a href="fn.html">fn</a>()</div>          <h3>Description</h3>
+Function with receiver<br>          <h1>fn</h1>
+<div class="symbol monospace">final fun <a href="">String</a>.<a href="fn.html">fn</a>(x: <a href="">Int</a>)</div>          <h3>Description</h3>
+Function with receiver<br>        </div>
       </div>
     </div>
   </body>
diff --git a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/index.html b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/index.html
index 9ca38e30..ed7c004e 100644
--- a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/index.html
@@ -24,16 +24,14 @@
             <tbody>
               <tr>
                 <td><a href="fn.html">fn</a></td>
-                <td>
-                  <div class="symbol monospace">final fun <a href="">String</a>.<a href="fn.html">fn</a>()</div>
-                  <div class="brief ">Function with receiver</div>
+                <td><div class="symbol monospace">final fun <a href="">String</a>.<a href="fn.html">fn</a>()</div>
+                  <div class="brief "> </div>
                 </td>
               </tr>
               <tr>
                 <td><a href="fn.html">fn</a></td>
-                <td>
-                  <div class="symbol monospace">final fun <a href="">String</a>.<a href="fn.html">fn</a>(x: <a href="">Int</a>)</div>
-                  <div class="brief ">Function with receiver</div>
+                <td><div class="symbol monospace">final fun <a href="">String</a>.<a href="fn.html">fn</a>(x: <a href="">Int</a>)</div>
+                  <div class="brief "> </div>
                 </td>
               </tr>
             </tbody>
diff --git a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/generic.html b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/generic.html
index 0d90a5e5..a86d6f4e 100644
--- a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/generic.html
+++ b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/generic.html
@@ -18,10 +18,8 @@
         </div>
         <div id="content" pageIds="//generic/#//">//<a href="../index.html">root</a>/<a href="index.html"></a>/<a href="generic.html">generic</a>
           <h1>generic</h1>
-          <div class="symbol monospace">private final fun &lt;<a href="generic.html">T</a> : <a href="">Any</a>&gt; <a href="generic.html">generic</a>()</div>
-          <h3>Description</h3>
-generic function
-</div>
+<div class="symbol monospace">private final fun &lt;<a href="generic.html">T</a> : <a href="">Any</a>&gt; <a href="generic.html">generic</a>()</div>          <h3>Description</h3>
+generic function<br>        </div>
       </div>
     </div>
   </body>
diff --git a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/index.html b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/index.html
index d10d959e..eb0ac0fc 100644
--- a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/index.html
@@ -24,9 +24,8 @@
             <tbody>
               <tr>
                 <td><a href="generic.html">generic</a></td>
-                <td>
-                  <div class="symbol monospace">private final fun &lt;<a href="generic.html">T</a> : <a href="">Any</a>&gt; <a href="generic.html">generic</a>()</div>
-                  <div class="brief ">generic function</div>
+                <td><div class="symbol monospace">private final fun &lt;<a href="generic.html">T</a> : <a href="">Any</a>&gt; <a href="generic.html">generic</a>()</div>
+                  <div class="brief "> </div>
                 </td>
               </tr>
             </tbody>
diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/generic.html b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/generic.html
index 3e9b2298..c9e8ad17 100644
--- a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/generic.html
+++ b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/generic.html
@@ -18,10 +18,8 @@
         </div>
         <div id="content" pageIds="//generic/#//">//<a href="../index.html">root</a>/<a href="index.html"></a>/<a href="generic.html">generic</a>
           <h1>generic</h1>
-          <div class="symbol monospace">final fun &lt;<a href="generic.html">T</a> : R, <a href="generic.html">R</a> : <a href="">Any</a>&gt; <a href="generic.html">generic</a>()</div>
-          <h3>Description</h3>
-generic function
-</div>
+<div class="symbol monospace">final fun &lt;<a href="generic.html">T</a> : R, <a href="generic.html">R</a> : <a href="">Any</a>&gt; <a href="generic.html">generic</a>()</div>          <h3>Description</h3>
+generic function<br>        </div>
       </div>
     </div>
   </body>
diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/index.html b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/index.html
index 922f615f..4b702383 100644
--- a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/index.html
@@ -24,9 +24,8 @@
             <tbody>
               <tr>
                 <td><a href="generic.html">generic</a></td>
-                <td>
-                  <div class="symbol monospace">final fun &lt;<a href="generic.html">T</a> : R, <a href="generic.html">R</a> : <a href="">Any</a>&gt; <a href="generic.html">generic</a>()</div>
-                  <div class="brief ">generic function</div>
+                <td><div class="symbol monospace">final fun &lt;<a href="generic.html">T</a> : R, <a href="generic.html">R</a> : <a href="">Any</a>&gt; <a href="generic.html">generic</a>()</div>
+                  <div class="brief "> </div>
                 </td>
               </tr>
             </tbody>
diff --git a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/f.html b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/f.html
index c391e913..8a7bf1dc 100644
--- a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/f.html
+++ b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/f.html
@@ -18,10 +18,7 @@
         </div>
         <div id="content" pageIds="//f/#kotlin.Function0[kotlin.String]//">//<a href="../index.html">root</a>/<a href="index.html"></a>/<a href="f.html">f</a>
           <h1>f</h1>
-          <div class="symbol monospace">final fun <a href="f.html">f</a>(a: 
-            <div class="symbol monospace">() -&gt; <a href="">String</a></div>
-)</div>
-        </div>
+<div class="symbol monospace">final fun <a href="f.html">f</a>(a: <div class="symbol monospace">() -&gt; <a href="">String</a></div>)</div>        </div>
       </div>
     </div>
   </body>
diff --git a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/index.html b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/index.html
index c2f551a5..97dfd476 100644
--- a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/index.html
@@ -24,11 +24,8 @@
             <tbody>
               <tr>
                 <td><a href="f.html">f</a></td>
-                <td>
-                  <div class="symbol monospace">final fun <a href="f.html">f</a>(a: 
-                    <div class="symbol monospace">() -&gt; <a href="">String</a></div>
-)</div>
-                  <div class="brief "></div>
+                <td><div class="symbol monospace">final fun <a href="f.html">f</a>(a: <div class="symbol monospace">() -&gt; <a href="">String</a></div>)</div>
+                  <div class="brief "> </div>
                 </td>
               </tr>
             </tbody>
diff --git a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/f.html b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/f.html
index c391e913..8a7bf1dc 100644
--- a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/f.html
+++ b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/f.html
@@ -18,10 +18,7 @@
         </div>
         <div id="content" pageIds="//f/#kotlin.Function0[kotlin.String]//">//<a href="../index.html">root</a>/<a href="index.html"></a>/<a href="f.html">f</a>
           <h1>f</h1>
-          <div class="symbol monospace">final fun <a href="f.html">f</a>(a: 
-            <div class="symbol monospace">() -&gt; <a href="">String</a></div>
-)</div>
-        </div>
+<div class="symbol monospace">final fun <a href="f.html">f</a>(a: <div class="symbol monospace">() -&gt; <a href="">String</a></div>)</div>        </div>
       </div>
     </div>
   </body>
diff --git a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/index.html b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/index.html
index c2f551a5..97dfd476 100644
--- a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/index.html
@@ -24,11 +24,8 @@
             <tbody>
               <tr>
                 <td><a href="f.html">f</a></td>
-                <td>
-                  <div class="symbol monospace">final fun <a href="f.html">f</a>(a: 
-                    <div class="symbol monospace">() -&gt; <a href="">String</a></div>
-)</div>
-                  <div class="brief "></div>
+                <td><div class="symbol monospace">final fun <a href="f.html">f</a>(a: <div class="symbol monospace">() -&gt; <a href="">String</a></div>)</div>
+                  <div class="brief "> </div>
                 </td>
               </tr>
             </tbody>
diff --git a/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/index.html b/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/index.html
index 8f68531d..851f13f0 100644
--- a/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/index.html
+++ b/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/index.html
@@ -24,20 +24,14 @@
             <tbody>
               <tr>
                 <td><a href="test.html">test</a></td>
-                <td>
-                  <div class="symbol monospace">final fun <a href="test.html">test</a>(i: 
-                    <div class="symbol monospace">(<a href="">Int</a>) -&gt; <a href="">Int</a></div>
-)</div>
-                  <div class="brief "></div>
+                <td><div class="symbol monospace">final fun <a href="test.html">test</a>(i: <div class="symbol monospace">(<a href="">Int</a>) -&gt; <a href="">Int</a></div>)</div>
+                  <div class="brief "> </div>
                 </td>
               </tr>
               <tr>
                 <td><a href="test2.html">test2</a></td>
-                <td>
-                  <div class="symbol monospace">final fun <a href="test2.html">test2</a>(i: 
-                    <div class="symbol monospace"><a href="">Int</a>.(<a href="">Int</a>) -&gt; <a href="">Int</a></div>
-)</div>
-                  <div class="brief "></div>
+                <td><div class="symbol monospace">final fun <a href="test2.html">test2</a>(i: <div class="symbol monospace"><a href="">Int</a>.(<a href="">Int</a>) -&gt; <a href="">Int</a></div>)</div>
+                  <div class="brief "> </div>
                 </td>
               </tr>
             </tbody>
diff --git a/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/test.html b/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/test.html
index 7449b3e1..353c5232 100644
--- a/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/test.html
+++ b/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/test.html
@@ -18,10 +18,7 @@
         </div>
         <div id="content" pageIds="signatureTest//test/#kotlin.Function1[kotlin.Int,kotlin.Int]//">//<a href="../index.html">root</a>/<a href="index.html">signatureTest</a>/<a href="test.html">test</a>
           <h1>test</h1>
-          <div class="symbol monospace">final fun <a href="test.html">test</a>(i: 
-            <div class="symbol monospace">(<a href="">Int</a>) -&gt; <a href="">Int</a></div>
-)</div>
-        </div>
+<div class="symbol monospace">final fun <a href="test.html">test</a>(i: <div class="symbol monospace">(<a href="">Int</a>) -&gt; <a href="">Int</a></div>)</div>        </div>
       </div>
     </div>
   </body>
diff --git a/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/test2.html b/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/test2.html
index 9b2b441e..0b8c6dd4 100644
--- a/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/test2.html
+++ b/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/test2.html
@@ -18,10 +18,7 @@
         </div>
         <div id="content" pageIds="signatureTest//test2/#kotlin.Function2[kotlin.Int,kotlin.Int,kotlin.Int]//">//<a href="../index.html">root</a>/<a href="index.html">signatureTest</a>/<a href="test2.html">test2</a>
           <h1>test2</h1>
-          <div class="symbol monospace">final fun <a href="test2.html">test2</a>(i: 
-            <div class="symbol monospace"><a href="">Int</a>.(<a href="">Int</a>) -&gt; <a href="">Int</a></div>
-)</div>
-        </div>
+<div class="symbol monospace">final fun <a href="test2.html">test2</a>(i: <div class="symbol monospace"><a href="">Int</a>.(<a href="">Int</a>) -&gt; <a href="">Int</a></div>)</div>        </div>
       </div>
     </div>
   </body>
diff --git a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/available-since1.1.html b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/available-since1.1.html
index 964602a2..7264fbf4 100644
--- a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/available-since1.1.html
+++ b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/available-since1.1.html
@@ -18,10 +18,8 @@
         </div>
         <div id="content" pageIds="//availableSince1.1/#//">//<a href="../index.html">root</a>/<a href="index.html"></a>/<a href="available-since1.1.html">availableSince1.1</a>
           <h1>availableSince1.1</h1>
-          <div class="symbol monospace">final fun <a href="available-since1.1.html">availableSince1.1</a>(): <a href="">String</a></div>
-          <h3>Description</h3>
-Quite useful <a href="">String</a>
-</div>
+<div class="symbol monospace">final fun <a href="available-since1.1.html">availableSince1.1</a>(): <a href="">String</a></div>          <h3>Description</h3>
+Quite useful <a href="">String</a><br>        </div>
       </div>
     </div>
   </body>
diff --git a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/index.html b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/index.html
index c9ccf331..c54e53a5 100644
--- a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/index.html
@@ -24,9 +24,8 @@
             <tbody>
               <tr>
                 <td><a href="available-since1.1.html">availableSince1.1</a></td>
-                <td>
-                  <div class="symbol monospace">final fun <a href="available-since1.1.html">availableSince1.1</a>(): <a href="">String</a></div>
-                  <div class="brief ">Quite useful  String</div>
+                <td><div class="symbol monospace">final fun <a href="available-since1.1.html">availableSince1.1</a>(): <a href="">String</a></div>
+                  <div class="brief "> </div>
                 </td>
               </tr>
             </tbody>
diff --git a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/f.html b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/f.html
index 699949e0..b212ca00 100644
--- a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/f.html
+++ b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/f.html
@@ -18,8 +18,7 @@
         </div>
         <div id="content" pageIds="//f/#//">//<a href="../index.html">root</a>/<a href="index.html"></a>/<a href="f.html">f</a>
           <h1>f</h1>
-          <div class="symbol monospace">final fun <a href="f.html">f</a>()</div>
-        </div>
+<div class="symbol monospace">final fun <a href="f.html">f</a>()</div>        </div>
       </div>
     </div>
   </body>
diff --git a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/index.html b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/index.html
index 6ed21e80..b22194f8 100644
--- a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/index.html
@@ -24,9 +24,8 @@
             <tbody>
               <tr>
                 <td><a href="f.html">f</a></td>
-                <td>
-                  <div class="symbol monospace">final fun <a href="f.html">f</a>()</div>
-                  <div class="brief "></div>
+                <td><div class="symbol monospace">final fun <a href="f.html">f</a>()</div>
+                  <div class="brief "> </div>
                 </td>
               </tr>
             </tbody>
diff --git a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/f.html b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/f.html
index c391e913..8a7bf1dc 100644
--- a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/f.html
+++ b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/f.html
@@ -18,10 +18,7 @@
         </div>
         <div id="content" pageIds="//f/#kotlin.Function0[kotlin.String]//">//<a href="../index.html">root</a>/<a href="index.html"></a>/<a href="f.html">f</a>
           <h1>f</h1>
-          <div class="symbol monospace">final fun <a href="f.html">f</a>(a: 
-            <div class="symbol monospace">() -&gt; <a href="">String</a></div>
-)</div>
-        </div>
+<div class="symbol monospace">final fun <a href="f.html">f</a>(a: <div class="symbol monospace">() -&gt; <a href="">String</a></div>)</div>        </div>
       </div>
     </div>
   </body>
diff --git a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/index.html b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/index.html
index c2f551a5..97dfd476 100644
--- a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/index.html
@@ -24,11 +24,8 @@
             <tbody>
               <tr>
                 <td><a href="f.html">f</a></td>
-                <td>
-                  <div class="symbol monospace">final fun <a href="f.html">f</a>(a: 
-                    <div class="symbol monospace">() -&gt; <a href="">String</a></div>
-)</div>
-                  <div class="brief "></div>
+                <td><div class="symbol monospace">final fun <a href="f.html">f</a>(a: <div class="symbol monospace">() -&gt; <a href="">String</a></div>)</div>
+                  <div class="brief "> </div>
                 </td>
               </tr>
             </tbody>