diff options
author | Dmitry Jemerov <yole@jetbrains.com> | 2016-01-12 16:14:21 +0100 |
---|---|---|
committer | Dmitry Jemerov <yole@jetbrains.com> | 2016-01-12 16:14:21 +0100 |
commit | a3ec2e2afd6f4140ac78f7630fa9c2ca1f8ca8af (patch) | |
tree | c0a87789124c2fff312c5b32f1a4e6815129abca /core/testdata/format | |
parent | 99b6196bde4773fd26bd733ecf5e3984ce0a4c63 (diff) | |
download | dokka-a3ec2e2afd6f4140ac78f7630fa9c2ca1f8ca8af.tar.gz dokka-a3ec2e2afd6f4140ac78f7630fa9c2ca1f8ca8af.tar.bz2 dokka-a3ec2e2afd6f4140ac78f7630fa9c2ca1f8ca8af.zip |
generate signature-based anchors for overloads; use signature instead of name as an anchor for in-page links
Diffstat (limited to 'core/testdata/format')
-rw-r--r-- | core/testdata/format/bracket.html | 1 | ||||
-rw-r--r-- | core/testdata/format/brokenLink.html | 1 | ||||
-rw-r--r-- | core/testdata/format/codeSpan.html | 1 | ||||
-rw-r--r-- | core/testdata/format/deprecated.class.html | 2 | ||||
-rw-r--r-- | core/testdata/format/htmlEscaping.html | 1 | ||||
-rw-r--r-- | core/testdata/format/javaDeprecated.html | 1 | ||||
-rw-r--r-- | core/testdata/format/javaSupertype.html | 2 | ||||
-rw-r--r-- | core/testdata/format/overloads.html | 4 | ||||
-rw-r--r-- | core/testdata/format/overloadsWithDescription.html | 8 | ||||
-rw-r--r-- | core/testdata/format/overloadsWithDifferentDescriptions.html | 6 | ||||
-rw-r--r-- | core/testdata/format/parameterAnchor.html | 5 | ||||
-rw-r--r-- | core/testdata/format/parenthesis.html | 1 | ||||
-rw-r--r-- | core/testdata/format/see.html | 3 | ||||
-rw-r--r-- | core/testdata/format/tripleBackticks.html | 1 | ||||
-rw-r--r-- | core/testdata/format/uninterpretedEmphasisCharacters.html | 1 |
15 files changed, 28 insertions, 10 deletions
diff --git a/core/testdata/format/bracket.html b/core/testdata/format/bracket.html index 5630073d..1cd8ccd1 100644 --- a/core/testdata/format/bracket.html +++ b/core/testdata/format/bracket.html @@ -6,6 +6,7 @@ <a href="test/index">test</a> / <a href="test/foo">foo</a><br/> <br/> <h1>foo</h1> +<a name="$foo()"></a> <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><br/> <p>bar[]</p> <br/> diff --git a/core/testdata/format/brokenLink.html b/core/testdata/format/brokenLink.html index 32135787..2f6d65cc 100644 --- a/core/testdata/format/brokenLink.html +++ b/core/testdata/format/brokenLink.html @@ -6,6 +6,7 @@ <a href="test/index">test</a> / <a href="test/f">f</a><br/> <br/> <h1>f</h1> +<a name="$f()"></a> <code><span class="keyword">fun </span><span class="identifier">f</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code><br/> <p>This references <a href="#">noSuchIdentifier</a>.</p> <br/> diff --git a/core/testdata/format/codeSpan.html b/core/testdata/format/codeSpan.html index cc553043..ce633e7c 100644 --- a/core/testdata/format/codeSpan.html +++ b/core/testdata/format/codeSpan.html @@ -6,6 +6,7 @@ <a href="test/index">test</a> / <a href="test/foo">foo</a><br/> <br/> <h1>foo</h1> +<a name="$foo()"></a> <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><br/> <p>This is a <code>code span</code>.</p> <br/> diff --git a/core/testdata/format/deprecated.class.html b/core/testdata/format/deprecated.class.html index b9939cd8..71470c63 100644 --- a/core/testdata/format/deprecated.class.html +++ b/core/testdata/format/deprecated.class.html @@ -13,6 +13,7 @@ <a href="test/index">test</a> / <a href="test/f">f</a><br/> <br/> <h1>f</h1> +<a name="$f()"></a> <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><br/> <strong>Deprecated:</strong> This function sucks<br/> <br/> @@ -21,6 +22,7 @@ <a href="test/index">test</a> / <a href="test/p">p</a><br/> <br/> <h1>p</h1> +<a name="$p"></a> <code><span class="keyword">val </span><s><span class="identifier">p</span></s><span class="symbol">: </span><span class="identifier">Int</span></code><br/> <strong>Deprecated:</strong> This property sucks<br/> <br/> diff --git a/core/testdata/format/htmlEscaping.html b/core/testdata/format/htmlEscaping.html index a485c08f..f5b97781 100644 --- a/core/testdata/format/htmlEscaping.html +++ b/core/testdata/format/htmlEscaping.html @@ -6,6 +6,7 @@ <a href="test/index">test</a> / <a href="test/x">x</a><br/> <br/> <h1>x</h1> +<a name="$x()"></a> <code><span class="keyword">fun </span><span class="symbol"><</span><span class="identifier">T</span><span class="symbol">></span> <span class="identifier">x</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">T</span><span class="symbol">?</span></code><br/> <p>Special characters: < is "less than", > is "greater than", & is "ampersand"</p> <br/> diff --git a/core/testdata/format/javaDeprecated.html b/core/testdata/format/javaDeprecated.html index 236c6490..b378bf4f 100644 --- a/core/testdata/format/javaDeprecated.html +++ b/core/testdata/format/javaDeprecated.html @@ -6,6 +6,7 @@ <a href="test/index">test</a> / <a href="test/-foo/index">Foo</a> / <a href="test/-foo/foo">foo</a><br/> <br/> <h1>foo</h1> +<a name="Foo$foo()"></a> <code><span class="keyword">open</span> <span class="keyword">fun </span><s><span class="identifier">foo</span></s><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code><br/> <strong>Deprecated:</strong> use <code><a href="test/-foo/bar">#bar</a></code> instead <p></p> <br/> diff --git a/core/testdata/format/javaSupertype.html b/core/testdata/format/javaSupertype.html index 4c847281..8d626212 100644 --- a/core/testdata/format/javaSupertype.html +++ b/core/testdata/format/javaSupertype.html @@ -27,7 +27,7 @@ <td> <a href="test/-c/-bar/return-foo">returnFoo</a></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">foo</span><span class="symbol">:</span> <a href="test/-c/-foo/index"><span class="identifier">Foo</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="test/-c/-foo/index"><span class="identifier">Foo</span></a></code></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="C.Bar$returnFoo(C.Foo)/foo">foo</span><span class="symbol">:</span> <a href="test/-c/-foo/index"><span class="identifier">Foo</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="test/-c/-foo/index"><span class="identifier">Foo</span></a></code></td> </tr> </tbody> </table> diff --git a/core/testdata/format/overloads.html b/core/testdata/format/overloads.html index 896d79a9..3557f660 100644 --- a/core/testdata/format/overloads.html +++ b/core/testdata/format/overloads.html @@ -13,8 +13,8 @@ <td> <a href="test/f">f</a></td> <td> -<code><span class="keyword">fun </span><span class="identifier">f</span><span class="symbol">(</span><span class="identifier">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">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> +<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> </tr> </tbody> diff --git a/core/testdata/format/overloadsWithDescription.html b/core/testdata/format/overloadsWithDescription.html index a0efb472..1ab62981 100644 --- a/core/testdata/format/overloadsWithDescription.html +++ b/core/testdata/format/overloadsWithDescription.html @@ -6,9 +6,11 @@ <a href="test/index">test</a> / <a href="test/f">f</a><br/> <br/> <h1>f</h1> -<code><span class="keyword">fun </span><span class="identifier">f</span><span class="symbol">(</span><span class="identifier">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">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><br/> -<p>Performs an action on <a href="test/f#x">x</a>.</p> +<a name="$f(kotlin.Int)"></a> +<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/> +<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> <span class="identifier">String</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code><br/> +<p>Performs an action on <a href="test/f#$f(kotlin.Int)/x">x</a>.</p> <p>This is a long description.</p> <br/> <br/> diff --git a/core/testdata/format/overloadsWithDifferentDescriptions.html b/core/testdata/format/overloadsWithDifferentDescriptions.html index 30a37e75..eba1e0fc 100644 --- a/core/testdata/format/overloadsWithDifferentDescriptions.html +++ b/core/testdata/format/overloadsWithDifferentDescriptions.html @@ -6,7 +6,8 @@ <a href="test/index">test</a> / <a href="test/f">f</a><br/> <br/> <h1>f</h1> -<code><span class="keyword">fun </span><span class="identifier">f</span><span class="symbol">(</span><span class="identifier">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/> +<a name="$f(kotlin.Int)"></a> +<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/> <p>Performs an action on x.</p> <p>This is a long description.</p> <br/> @@ -16,7 +17,8 @@ <code>x</code> - the int value to perform the action on.<br/> <br/> <br/> -<code><span class="keyword">fun </span><span class="identifier">f</span><span class="symbol">(</span><span class="identifier">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><br/> +<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> <span class="identifier">String</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code><br/> <p>Performs an action on x.</p> <p>This is a long description.</p> <br/> diff --git a/core/testdata/format/parameterAnchor.html b/core/testdata/format/parameterAnchor.html index c5920fb7..717bb0fd 100644 --- a/core/testdata/format/parameterAnchor.html +++ b/core/testdata/format/parameterAnchor.html @@ -6,8 +6,9 @@ <a href="test/index">test</a> / <a href="test/process-files">processFiles</a><br/> <br/> <h1>processFiles</h1> -<code><span class="keyword">fun </span><span class="symbol"><</span><span class="identifier">T</span><span class="symbol">></span> <span class="identifier">processFiles</span><span class="symbol">(</span><span class="identifier">processor</span><span class="symbol">:</span> <span class="symbol">(</span><span class="symbol">)</span> <span class="symbol">-></span> <span class="identifier">T</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">List</span><span class="symbol"><</span><span class="identifier">T</span><span class="symbol">></span></code><br/> -<p>Runs <a href="test/process-files#processor">processor</a> for each file and collects its results into single list</p> +<a name="$processFiles(kotlin.Function0((processFiles.T)))"></a> +<code><span class="keyword">fun </span><span class="symbol"><</span><span class="identifier">T</span><span class="symbol">></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> <span class="symbol">(</span><span class="symbol">)</span> <span class="symbol">-></span> <span class="identifier">T</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">List</span><span class="symbol"><</span><span class="identifier">T</span><span class="symbol">></span></code><br/> +<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<br/> diff --git a/core/testdata/format/parenthesis.html b/core/testdata/format/parenthesis.html index c36b311b..b1266fd4 100644 --- a/core/testdata/format/parenthesis.html +++ b/core/testdata/format/parenthesis.html @@ -6,6 +6,7 @@ <a href="test/index">test</a> / <a href="test/foo">foo</a><br/> <br/> <h1>foo</h1> +<a name="$foo()"></a> <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><br/> <p>foo (bar)</p> <br/> diff --git a/core/testdata/format/see.html b/core/testdata/format/see.html index b3ffb74b..e5ae4669 100644 --- a/core/testdata/format/see.html +++ b/core/testdata/format/see.html @@ -5,6 +5,7 @@ <a href="test/index">test</a> / <a href="test/quux">quux</a><br/> <br/> <h1>quux</h1> +<a name="$quux()"></a> <code><span class="keyword">fun </span><span class="identifier">quux</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code><br/> <strong>See Also</strong><br/> <p><a href="test/foo">foo</a></p> @@ -15,12 +16,14 @@ <a href="test/index">test</a> / <a href="test/foo">foo</a><br/> <br/> <h1>foo</h1> +<a name="$foo()"></a> <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><br/> <br/> <br/> <a href="test/index">test</a> / <a href="test/bar">bar</a><br/> <br/> <h1>bar</h1> +<a name="$bar()"></a> <code><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><br/> <br/> <br/> diff --git a/core/testdata/format/tripleBackticks.html b/core/testdata/format/tripleBackticks.html index 13954985..4fe604c3 100644 --- a/core/testdata/format/tripleBackticks.html +++ b/core/testdata/format/tripleBackticks.html @@ -6,6 +6,7 @@ <a href="test/index">test</a> / <a href="test/f">f</a><br/> <br/> <h1>f</h1> +<a name="$f()"></a> <code><span class="keyword">fun </span><span class="identifier">f</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code><br/> <p>Description</p> <pre><code>code sample</code></pre><br/> diff --git a/core/testdata/format/uninterpretedEmphasisCharacters.html b/core/testdata/format/uninterpretedEmphasisCharacters.html index 9afd88d9..00350140 100644 --- a/core/testdata/format/uninterpretedEmphasisCharacters.html +++ b/core/testdata/format/uninterpretedEmphasisCharacters.html @@ -6,6 +6,7 @@ <a href="test/index">test</a> / <a href="test/foo">foo</a><br/> <br/> <h1>foo</h1> +<a name="$foo()"></a> <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><br/> <p>This is <emph>emphasized text</emph> but text_with_underscores has to preserve the underscores. Single stars embedded in a word like Embedded*Star have to be preserved as well.</p> |