From a3ec2e2afd6f4140ac78f7630fa9c2ca1f8ca8af Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 12 Jan 2016 16:14:21 +0100 Subject: generate signature-based anchors for overloads; use signature instead of name as an anchor for in-page links --- core/testdata/format/bracket.html | 1 + core/testdata/format/brokenLink.html | 1 + core/testdata/format/codeSpan.html | 1 + core/testdata/format/deprecated.class.html | 2 ++ core/testdata/format/htmlEscaping.html | 1 + core/testdata/format/javaDeprecated.html | 1 + core/testdata/format/javaSupertype.html | 2 +- core/testdata/format/overloads.html | 4 ++-- core/testdata/format/overloadsWithDescription.html | 8 +++++--- core/testdata/format/overloadsWithDifferentDescriptions.html | 6 ++++-- core/testdata/format/parameterAnchor.html | 5 +++-- core/testdata/format/parenthesis.html | 1 + core/testdata/format/see.html | 3 +++ core/testdata/format/tripleBackticks.html | 1 + core/testdata/format/uninterpretedEmphasisCharacters.html | 1 + 15 files changed, 28 insertions(+), 10 deletions(-) (limited to 'core/testdata') 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 @@ test / foo

foo

+ fun foo(): Unit

bar[]


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 @@ test / f

f

+ fun f(): Unit

This references noSuchIdentifier.


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 @@ test / foo

foo

+ fun foo(): Unit

This is a code span.


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 @@ test / f

f

+ fun f(): Unit
Deprecated: This function sucks

@@ -21,6 +22,7 @@ test / p

p

+ val p: Int
Deprecated: This property sucks

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 @@ test / x

x

+ fun <T> x(): T?

Special characters: < is "less than", > is "greater than", & is "ampersand"


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 @@ test / Foo / foo

foo

+ open fun foo(): Unit
Deprecated: use #bar instead


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 @@ returnFoo -open fun returnFoo(foo: Foo): Foo +open fun returnFoo(foo: Foo): Foo 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 @@ f -fun f(x: Int): Unit
-fun f(x: String): Unit

Performs an action on x.

+fun f(x: Int): Unit
+fun f(x: String): Unit

Performs an action on x.

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 @@ test / f

f

-fun f(x: Int): Unit
-fun f(x: String): Unit
-

Performs an action on x.

+ +fun f(x: Int): Unit
+ +fun f(x: String): Unit
+

Performs an action on x.

This is a long description.



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 @@ test / f

f

-fun f(x: Int): Unit
+ +fun f(x: Int): Unit

Performs an action on x.

This is a long description.


@@ -16,7 +17,8 @@ x - the int value to perform the action on.


-fun f(x: String): Unit
+ +fun f(x: String): Unit

Performs an action on x.

This is a long description.


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 @@ test / processFiles

processFiles

-fun <T> processFiles(processor: () -> T): List<T>
-

Runs processor for each file and collects its results into single list

+ +fun <T> processFiles(processor: () -> T): List<T>
+

Runs processor for each file and collects its results into single list

Parameters

processor - function to receive context for symbol resolution and file for processing
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 @@ test / foo

foo

+ fun foo(): Unit

foo (bar)


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 @@ test / quux

quux

+ fun quux(): Unit
See Also

foo

@@ -15,12 +16,14 @@ test / foo

foo

+ fun foo(): Unit


test / bar

bar

+ fun bar(): Unit


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 @@ test / f

f

+ fun f(): Unit

Description

code sample

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 @@ test / foo

foo

+ fun foo(): Unit

This is emphasized text but text_with_underscores has to preserve the underscores. Single stars embedded in a word like Embedded*Star have to be preserved as well.

-- cgit