Merge branch 'kotlin-website-html' into multiplatform-support

7 files changed, 48 insertions, 16 deletions

diff --git a/core/testdata/format/website-html/dropImport.html b/core/testdata/format/website-html/dropImport.html
index e0fcb12b..b6748a5c 100644
--- a/core/testdata/format/website-html/dropImport.html
+++ b/core/testdata/format/website-html/dropImport.html
@@ -1,11 +1,15 @@
-<div class='api-docs-breadcrumbs'><a href="index.html">test</a> / <a href="./foo.html">foo</a></div>
+<div class='api-docs-breadcrumbs'><a href="../index.html">test</a> / <a href="./foo.html">foo</a></div>
 <h1>foo</h1>
+<div class="node-page-main" data-platform="" data-kotlin-version=""><div class="tags"><div class="spacer"></div>
+<div class="tags__tag kotlin-version"></div>
+</div>
 <a name="$foo()"></a>
 <div class="signature"><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></div>
-<div class="sample"><pre><code class="lang-kotlin">import some.*
+<div class="sample" data-min-compiler-version="1.3"><pre><code class="lang-kotlin">import some.*
 
 fun main(args: Array&lt;String&gt;) {
 //sampleStart
 
 //sampleEnd
 }</code></pre></div>
+</div>
diff --git a/core/testdata/format/website-html/newLinesInImportList.html b/core/testdata/format/website-html/newLinesInImportList.html
index b5a07325..712b6a4b 100644
--- a/core/testdata/format/website-html/newLinesInImportList.html
+++ b/core/testdata/format/website-html/newLinesInImportList.html
@@ -1,8 +1,11 @@
-<div class='api-docs-breadcrumbs'><a href="index.html">test</a> / <a href="./foo.html">foo</a></div>
+<div class='api-docs-breadcrumbs'><a href="../index.html">test</a> / <a href="./foo.html">foo</a></div>
 <h1>foo</h1>
+<div class="node-page-main" data-platform="" data-kotlin-version=""><div class="tags"><div class="spacer"></div>
+<div class="tags__tag kotlin-version"></div>
+</div>
 <a name="$foo()"></a>
 <div class="signature"><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></div>
-<div class="sample"><pre><code class="lang-kotlin">import same.*
+<div class="sample" data-min-compiler-version="1.3"><pre><code class="lang-kotlin">import same.*
 import some.*
 
 fun main(args: Array&lt;String&gt;) {
@@ -10,3 +13,4 @@ fun main(args: Array&lt;String&gt;) {
 
 //sampleEnd
 }</code></pre></div>
+</div>
diff --git a/core/testdata/format/website-html/newLinesInSamples.html b/core/testdata/format/website-html/newLinesInSamples.html
index 50f875da..7e379c68 100644
--- a/core/testdata/format/website-html/newLinesInSamples.html
+++ b/core/testdata/format/website-html/newLinesInSamples.html
@@ -1,8 +1,11 @@
-<div class='api-docs-breadcrumbs'><a href="index.html">test</a> / <a href="./foo.html">foo</a></div>
+<div class='api-docs-breadcrumbs'><a href="../index.html">test</a> / <a href="./foo.html">foo</a></div>
 <h1>foo</h1>
+<div class="node-page-main" data-platform="" data-kotlin-version=""><div class="tags"><div class="spacer"></div>
+<div class="tags__tag kotlin-version"></div>
+</div>
 <a name="$foo()"></a>
 <div class="signature"><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></div>
-<div class="sample"><pre><code class="lang-kotlin">
+<div class="sample" data-min-compiler-version="1.3"><pre><code class="lang-kotlin">
 
 fun main(args: Array&lt;String&gt;) {
 //sampleStart
@@ -17,3 +20,4 @@ val mutableByLength: MutableMap&lt;Int, MutableList&lt;String&gt;&gt; = words.gr
 println("mutableByLength == byLength is ${mutableByLength == byLength}") // true
 //sampleEnd
 }</code></pre></div>
+</div>
diff --git a/core/testdata/format/website-html/overloadGroup.html b/core/testdata/format/website-html/overloadGroup.html
index aaba9c96..808cd606 100644
--- a/core/testdata/format/website-html/overloadGroup.html
+++ b/core/testdata/format/website-html/overloadGroup.html
@@ -1,13 +1,19 @@
-<div class='api-docs-breadcrumbs'><a href="index.html">test</a> / <a href="./magic.html">magic</a></div>
+<div class='api-docs-breadcrumbs'><a href="../index.html">test</a> / <a href="./magic.html">magic</a></div>
 <h1>magic</h1>
-<div class="overload-group"><a name="$magic(kotlin.String)"></a>
+<div class="overload-group"data-platform="" data-kotlin-version=""><div class="tags"><div class="spacer"></div>
+<div class="tags__tag kotlin-version"></div>
+</div>
+<a name="$magic(kotlin.String)"></a>
 <div class="signature"><code><span class="keyword">fun </span><span class="identifier">magic</span><span class="symbol">(</span><span class="parameterName" id="$magic(kotlin.String)/spell">spell</span><span class="symbol">:</span>&nbsp;<span class="identifier">String</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Int</span></code></div>
 <h3>Parameters</h3>
 <p><a name="spell"></a>
 <code>spell</code> - The text of spell, often distributed on scrolls</p>
 <p><strong>Return</strong> Spell ID for future casts</p>
 </div>
-<div class="overload-group"><a name="$magic(kotlin.Int)"></a>
+<div class="overload-group"data-platform="" data-kotlin-version=""><div class="tags"><div class="spacer"></div>
+<div class="tags__tag kotlin-version"></div>
+</div>
+<a name="$magic(kotlin.Int)"></a>
 <div class="signature"><code><span class="keyword">fun </span><span class="identifier">magic</span><span class="symbol">(</span><span class="parameterName" id="$magic(kotlin.Int)/spell">spell</span><span class="symbol">:</span>&nbsp;<span class="identifier">Int</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Int</span></code></div>
 <h3>Parameters</h3>
 <p><a name="spell"></a>
diff --git a/core/testdata/format/website-html/returnTag.html b/core/testdata/format/website-html/returnTag.html
index 7724eaa7..2e761527 100644
--- a/core/testdata/format/website-html/returnTag.html
+++ b/core/testdata/format/website-html/returnTag.html
@@ -1,5 +1,8 @@
-<div class='api-docs-breadcrumbs'><a href="index.html">test</a> / <a href="./index-of.html">indexOf</a></div>
+<div class='api-docs-breadcrumbs'><a href="../index.html">test</a> / <a href="./index-of.html">indexOf</a></div>
 <h1>indexOf</h1>
+<div class="node-page-main" data-platform="" data-kotlin-version=""><div class="tags"><div class="spacer"></div>
+<div class="tags__tag kotlin-version"></div>
+</div>
 <a name="$indexOf(Foo, kotlin.Char, kotlin.Int, kotlin.Boolean)"></a>
 <div class="signature"><code><span class="keyword">fun </span><a href="-foo/index.html"><span class="identifier">Foo</span></a><span class="symbol">.</span><span class="identifier">indexOf</span><span class="symbol">(</span><br/>&nbsp;&nbsp;&nbsp;&nbsp;<span class="parameterName" id="$indexOf(Foo, kotlin.Char, kotlin.Int, kotlin.Boolean)/char">char</span><span class="symbol">:</span>&nbsp;<span class="identifier">Char</span><span class="symbol">, </span><br/>&nbsp;&nbsp;&nbsp;&nbsp;<span class="parameterName" id="$indexOf(Foo, kotlin.Char, kotlin.Int, kotlin.Boolean)/startIndex">startIndex</span><span class="symbol">:</span>&nbsp;<span class="identifier">Int</span>&nbsp;<span class="symbol">=</span>&nbsp;0<span class="symbol">, </span><br/>&nbsp;&nbsp;&nbsp;&nbsp;<span class="parameterName" id="$indexOf(Foo, kotlin.Char, kotlin.Int, kotlin.Boolean)/ignoreCase">ignoreCase</span><span class="symbol">:</span>&nbsp;<span class="identifier">Boolean</span>&nbsp;<span class="symbol">=</span>&nbsp;false<br/><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Int</span></code></div>
 <p>Returns the index within this string of the first occurrence of the specified character, starting from the specified <a href="index-of.html#$indexOf(Foo, kotlin.Char, kotlin.Int, kotlin.Boolean)/startIndex">startIndex</a>.</p>
@@ -7,3 +10,4 @@
 <p><a name="ignoreCase"></a>
 <code>ignoreCase</code> - <code>true</code> to ignore character case when matching a character. By default <code>false</code>.</p>
 <p><strong>Returns</strong> An index of the first occurrence of <a href="index-of.html#$indexOf(Foo, kotlin.Char, kotlin.Int, kotlin.Boolean)/char">char</a> or -1 if none is found.</p>
+</div>
diff --git a/core/testdata/format/website-html/sample.html b/core/testdata/format/website-html/sample.html
index 1fb26e41..479af45c 100644
--- a/core/testdata/format/website-html/sample.html
+++ b/core/testdata/format/website-html/sample.html
@@ -1,10 +1,13 @@
-<div class='api-docs-breadcrumbs'><a href="index.html">test</a> / <a href="./foo.html">foo</a></div>
+<div class='api-docs-breadcrumbs'><a href="../index.html">test</a> / <a href="./foo.html">foo</a></div>
 <h1>foo</h1>
-<div class="overload-group"><a name="$foo()"></a>
+<div class="overload-group"data-platform="" data-kotlin-version=""><div class="tags"><div class="spacer"></div>
+<div class="tags__tag kotlin-version"></div>
+</div>
+<a name="$foo()"></a>
 <div class="signature"><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">Int</span></code></div>
 <p>Groups elements of the original sequence by the key returned by the given <a href="#">keySelector</a> function
 applied to each element and returns a map where each group key is associated with a list of corresponding elements.</p>
-<div class="sample"><pre><code class="lang-kotlin">
+<div class="sample" data-min-compiler-version="1.3"><pre><code class="lang-kotlin">
 
 fun main(args: Array&lt;String&gt;) {
 //sampleStart
@@ -14,6 +17,9 @@ if (true) {
 //sampleEnd
 }</code></pre></div>
 </div>
-<div class="overload-group"><a name="$foo(kotlin.Int)"></a>
+<div class="overload-group"data-platform="" data-kotlin-version=""><div class="tags"><div class="spacer"></div>
+<div class="tags__tag kotlin-version"></div>
+</div>
+<a name="$foo(kotlin.Int)"></a>
 <div class="signature"><code><span class="keyword">fun </span><span class="identifier">foo</span><span class="symbol">(</span><span class="parameterName" id="$foo(kotlin.Int)/i">i</span><span class="symbol">:</span>&nbsp;<span class="identifier">Int</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Int</span></code></div>
 </div>
diff --git a/core/testdata/format/website-html/sampleWithAsserts.html b/core/testdata/format/website-html/sampleWithAsserts.html
index 2b2a9ac5..3febe91e 100644
--- a/core/testdata/format/website-html/sampleWithAsserts.html
+++ b/core/testdata/format/website-html/sampleWithAsserts.html
@@ -1,8 +1,11 @@
-<div class='api-docs-breadcrumbs'><a href="index.html">test</a> / <a href="./a.html">a</a></div>
+<div class='api-docs-breadcrumbs'><a href="../index.html">test</a> / <a href="./a.html">a</a></div>
 <h1>a</h1>
+<div class="node-page-main" data-platform="" data-kotlin-version=""><div class="tags"><div class="spacer"></div>
+<div class="tags__tag kotlin-version"></div>
+</div>
 <a name="$a()"></a>
 <div class="signature"><code><span class="keyword">fun </span><span class="identifier">a</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">String</span></code></div>
-<div class="sample"><pre><code class="lang-kotlin">import java.io.FileNotFoundException
+<div class="sample" data-min-compiler-version="1.3"><pre><code class="lang-kotlin">import java.io.FileNotFoundException
 import java.io.File
 
 fun main(args: Array&lt;String&gt;) {
@@ -22,3 +25,4 @@ fun indented() {
 }
 //sampleEnd
 }</code></pre></div>
+</div>