From cb6928f9b823c7fde746f17da4834431de452c83 Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com>
Date: Thu, 22 Jun 2017 19:42:12 +0300
Subject: Wrap parameters in paragraphs for HTML format

#171 fixed
---
 core/src/main/kotlin/Formats/HtmlFormatService.kt            | 2 +-
 core/testdata/format/overloadsWithDescription.html           | 4 ++--
 core/testdata/format/overloadsWithDifferentDescriptions.html | 9 +++++----
 core/testdata/format/parameterAnchor.html                    | 4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/core/src/main/kotlin/Formats/HtmlFormatService.kt b/core/src/main/kotlin/Formats/HtmlFormatService.kt
index b6672434..5e05f51a 100644
--- a/core/src/main/kotlin/Formats/HtmlFormatService.kt
+++ b/core/src/main/kotlin/Formats/HtmlFormatService.kt
@@ -46,7 +46,7 @@ open class HtmlOutputBuilder(to: StringBuilder,
     override fun appendParagraph(body: () -> Unit) =
         wrapInTag("p", body, newlineBeforeOpen = true, newlineAfterClose = true)
 
-    override fun appendSoftParagraph(body: () -> Unit) = body()
+    override fun appendSoftParagraph(body: () -> Unit) = appendParagraph(body)
 
     override fun appendLine() {
         to.appendln("<br/>")
diff --git a/core/testdata/format/overloadsWithDescription.html b/core/testdata/format/overloadsWithDescription.html
index eefa6976..fe98b8fe 100644
--- a/core/testdata/format/overloadsWithDescription.html
+++ b/core/testdata/format/overloadsWithDescription.html
@@ -14,7 +14,7 @@
 <p>Performs an action on <a href="test/f#$f(kotlin.Int)/x">x</a>.</p>
 <p>This is a long description.</p>
 <h3>Parameters</h3>
-<a name="x"></a>
-<code>x</code> - the value to perform the action on.
+<p><a name="x"></a>
+<code>x</code> - the value to perform the action on.</p>
 </BODY>
 </HTML>
diff --git a/core/testdata/format/overloadsWithDifferentDescriptions.html b/core/testdata/format/overloadsWithDifferentDescriptions.html
index cdf380be..1f086039 100644
--- a/core/testdata/format/overloadsWithDifferentDescriptions.html
+++ b/core/testdata/format/overloadsWithDifferentDescriptions.html
@@ -12,13 +12,14 @@
 <p>Performs an action on x.</p>
 <p>This is a long description.</p>
 <h3>Parameters</h3>
-<a name="x"></a>
-<code>x</code> - the int value to perform the action on.<a name="$f(kotlin.String)"></a>
+<p><a name="x"></a>
+<code>x</code> - the int value to perform the action on.</p>
+<a name="$f(kotlin.String)"></a>
 <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>&nbsp;<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>
 <p>This is a long description.</p>
 <h3>Parameters</h3>
-<a name="x"></a>
-<code>x</code> - the string value to perform the action on.
+<p><a name="x"></a>
+<code>x</code> - the string value to perform the action on.</p>
 </BODY>
 </HTML>
diff --git a/core/testdata/format/parameterAnchor.html b/core/testdata/format/parameterAnchor.html
index aa51fff6..ecb89fe6 100644
--- a/core/testdata/format/parameterAnchor.html
+++ b/core/testdata/format/parameterAnchor.html
@@ -11,7 +11,7 @@
 <code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span> <span class="identifier">processFiles</span><span class="symbol">(</span><span class="identifier" id="$processFiles(kotlin.Function0((processFiles.T)))/processor">processor</span><span class="symbol">:</span>&nbsp;<span class="symbol">(</span><span class="symbol">)</span>&nbsp;<span class="symbol">-&gt;</span>&nbsp;<span class="identifier">T</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">List</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code>
 <p>Runs <a href="test/process-files#$processFiles(kotlin.Function0((processFiles.T)))/processor">processor</a> for each file and collects its results into single list</p>
 <h3>Parameters</h3>
-<a name="processor"></a>
-<code>processor</code> - function to receive context for symbol resolution and file for processing
+<p><a name="processor"></a>
+<code>processor</code> - function to receive context for symbol resolution and file for processing</p>
 </BODY>
 </HTML>
-- 
cgit