From 955a4f706c54a271473424c817daaeb02bea5cc5 Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Tue, 5 Dec 2017 18:17:52 +0300 Subject: Update testData --- core/testdata/format/JavaSupertype.html | 10 +-- core/testdata/format/accessor.md | 2 +- core/testdata/format/annotatedTypeParameter.md | 4 +- core/testdata/format/annotationClass.md | 4 +- core/testdata/format/annotationClass.package.md | 4 +- core/testdata/format/annotationParams.md | 2 +- core/testdata/format/annotations.md | 8 +- core/testdata/format/arrayAverage.md | 6 +- core/testdata/format/backtickInCodeBlock.md | 2 +- core/testdata/format/blankLineInsideCodeBlock.html | 2 +- core/testdata/format/blankLineInsideCodeBlock.md | 2 +- core/testdata/format/bracket.html | 2 +- core/testdata/format/brokenLink.html | 2 +- core/testdata/format/classWithCompanionObject.html | 8 +- core/testdata/format/classWithCompanionObject.md | 8 +- core/testdata/format/codeBlock.html | 44 ++++++++++- core/testdata/format/codeBlock.md | 14 +++- core/testdata/format/codeBlockNoHtmlEscape.md | 2 +- core/testdata/format/codeSpan.html | 2 +- core/testdata/format/companionImplements.md | 8 +- core/testdata/format/companionObjectExtension.md | 6 +- .../crossLanguage/kotlinExtendsJava/Bar.html | 12 +-- core/testdata/format/deprecated.class.html | 38 ++++++++- core/testdata/format/deprecated.package.html | 8 +- core/testdata/format/dynamicExtension.md | 4 +- core/testdata/format/dynamicType.md | 2 +- core/testdata/format/emptyDescription.md | 2 +- core/testdata/format/entity.html | 4 +- core/testdata/format/enumClass.md | 6 +- core/testdata/format/enumClass.value.md | 2 +- core/testdata/format/exceptionClass.md | 4 +- core/testdata/format/exceptionClass.package.md | 4 +- core/testdata/format/exclInCodeBlock.md | 2 +- core/testdata/format/extensionFunctionParameter.md | 4 +- core/testdata/format/extensionScope.md | 4 +- .../format/extensionWithDocumentedReceiver.md | 2 +- core/testdata/format/extensions.class.md | 6 +- core/testdata/format/extensions.package.md | 4 +- core/testdata/format/externalReferenceLink.md | 2 +- .../format/functionWithDefaultParameter.md | 2 +- .../format/functionalTypeWithNamedParameters.html | 90 ++++++++++++++++++++-- .../format/functionalTypeWithNamedParameters.md | 36 +++++++-- core/testdata/format/genericInheritedExtensions.md | 10 +-- core/testdata/format/gfm/listInTableCell.md | 6 +- core/testdata/format/gfm/sample.md | 8 +- core/testdata/format/htmlEscaping.html | 4 +- .../format/inapplicableExtensionFunctions.md | 8 +- core/testdata/format/indentedCodeBlock.html | 2 +- core/testdata/format/indentedCodeBlock.md | 2 +- .../format/inheritedCompanionObjectProperties.md | 16 ++-- core/testdata/format/inheritedExtensions.md | 10 +-- core/testdata/format/inheritedMembers.md | 14 ++-- core/testdata/format/javaCodeInParam.md | 4 +- core/testdata/format/javaCodeLiteralTags.md | 4 +- core/testdata/format/javaDeprecated.html | 4 +- core/testdata/format/javaLinkTag.html | 10 +-- core/testdata/format/javaLinkTagWithLabel.html | 10 +-- core/testdata/format/javaSeeTag.html | 8 +- core/testdata/format/javaSpaceInAuthor.md | 4 +- core/testdata/format/javadocHtml.md | 4 +- core/testdata/format/javadocOrderedList.md | 4 +- core/testdata/format/jdkLinks.md | 4 +- core/testdata/format/linkWithLabel.html | 10 +-- core/testdata/format/linkWithStarProjection.html | 4 +- core/testdata/format/linksInEmphasis.md | 14 ++-- core/testdata/format/linksInHeaders.md | 28 +++---- core/testdata/format/linksInStrong.md | 14 ++-- core/testdata/format/markdownInLinks.html | 2 +- core/testdata/format/memberExtension.md | 6 +- .../multiplatform.md | 2 +- .../multiplatform/groupNode/multiplatform.md | 6 +- .../groupNode/multiplatform.package.md | 8 +- core/testdata/format/multiplatform/implied/foo.md | 16 ++-- .../multiplatform/merge/multiplatform.package.md | 4 +- .../format/multiplatform/mergeMembers/foo.md | 16 ++-- .../format/multiplatform/omitRedundant/foo.md | 8 +- .../multiplatform.index.md | 4 +- .../multiplatform.package.md | 4 +- .../multiplatform.index.md | 4 +- .../multiplatform.package.md | 4 +- .../multiplatform/simple/multiplatform.package.md | 6 +- .../format/multipleTypeParameterConstraints.md | 13 +++- core/testdata/format/nestedLists.md | 30 ++++---- core/testdata/format/newlineInTableCell.package.md | 4 +- .../format/notPublishedTypeAliasAutoExpansion.md | 6 +- core/testdata/format/nullability.md | 6 +- core/testdata/format/operatorOverloading.md | 4 +- core/testdata/format/orderedList.html | 4 +- core/testdata/format/overloads.html | 4 +- core/testdata/format/overloadsWithDescription.html | 4 +- .../format/overloadsWithDifferentDescriptions.html | 2 +- core/testdata/format/overridingFunction.md | 4 +- core/testdata/format/paramTag.md | 2 +- core/testdata/format/parameterAnchor.html | 6 +- core/testdata/format/parenthesis.html | 2 +- core/testdata/format/propertyVar.md | 2 +- core/testdata/format/qualifiedNameLink.md | 2 +- core/testdata/format/receiverParameterTypeBound.md | 6 +- core/testdata/format/receiverReference.md | 4 +- core/testdata/format/referenceLink.md | 10 ++- core/testdata/format/reifiedTypeParameter.md | 2 +- ...rFunctionalTypeInParenthesisWhenItIsReceiver.md | 4 +- core/testdata/format/returnWithLink.html | 4 +- core/testdata/format/sampleByFQName.md | 7 +- core/testdata/format/sampleByShortName.md | 7 +- core/testdata/format/see.html | 31 ++++++-- core/testdata/format/shadowedExtensionFunctions.md | 10 +-- core/testdata/format/sinceKotlin.html | 4 +- core/testdata/format/sinceKotlin.md | 4 +- core/testdata/format/sinceKotlin.package.md | 4 +- core/testdata/format/sinceKotlinWide.package.md | 6 +- core/testdata/format/starProjection.md | 4 +- core/testdata/format/summarizeSignatures.md | 10 +-- .../testdata/format/summarizeSignaturesProperty.md | 10 +-- core/testdata/format/suspendParam.md | 2 +- core/testdata/format/suspendParam.package.md | 4 +- core/testdata/format/throwsTag.md | 2 +- core/testdata/format/tokensInEmphasis.md | 10 +-- core/testdata/format/tokensInHeaders.md | 26 +++---- core/testdata/format/tokensInStrong.md | 12 +-- core/testdata/format/tripleBackticks.html | 2 +- core/testdata/format/typeAliases.md | 73 ++++++++++++++---- core/testdata/format/typeAliases.package.md | 30 ++++---- core/testdata/format/typeLink.html | 6 +- core/testdata/format/typeParameterBounds.md | 4 +- core/testdata/format/typeParameterReference.md | 6 +- core/testdata/format/typeParameterVariance.md | 4 +- core/testdata/format/typeProjectionVariance.md | 4 +- .../format/uninterpretedEmphasisCharacters.html | 2 +- core/testdata/format/unorderedLists.md | 24 +++--- core/testdata/format/varargsFunction.md | 2 +- .../dataTags/multiplatform.package.html | 18 ++--- .../dataTagsInGroupNode/multiplatform.html | 6 +- .../dataTagsInGroupNode/multiplatform.package.html | 8 +- core/testdata/format/website-html/dropImport.html | 2 +- .../format/website-html/newLinesInImportList.html | 2 +- .../format/website-html/newLinesInSamples.html | 2 +- .../format/website-html/overloadGroup.html | 2 +- core/testdata/format/website-html/returnTag.html | 8 +- core/testdata/format/website-html/sample.html | 2 +- .../format/website-html/sampleWithAsserts.html | 2 +- 141 files changed, 711 insertions(+), 452 deletions(-) (limited to 'core/testdata') diff --git a/core/testdata/format/JavaSupertype.html b/core/testdata/format/JavaSupertype.html index 3e5e273a..27b8e5d0 100644 --- a/core/testdata/format/JavaSupertype.html +++ b/core/testdata/format/JavaSupertype.html @@ -4,16 +4,16 @@ JavaSupertype.Bar - test -test / JavaSupertype / Bar
+test / JavaSupertype / Bar

Bar

-open class Bar : Foo +open class Bar : Foo

Constructors

@@ -25,10 +25,10 @@ +open fun returnFoo(foo: Foo): Foo
-

<init>

+

<init>

 Bar()
-

returnFoo

+

returnFoo

 -open fun returnFoo(foo: Foo): Foo
diff --git a/core/testdata/format/accessor.md b/core/testdata/format/accessor.md index dcdef0f8..190e8538 100644 --- a/core/testdata/format/accessor.md +++ b/core/testdata/format/accessor.md @@ -1,4 +1,4 @@ -[test](test/index) / [C](test/-c/index) / [x](test/-c/x) +[test](../index.md) / [C](index.md) / [x](./x.md) # x diff --git a/core/testdata/format/annotatedTypeParameter.md b/core/testdata/format/annotatedTypeParameter.md index aa8b8592..aa622eac 100644 --- a/core/testdata/format/annotatedTypeParameter.md +++ b/core/testdata/format/annotatedTypeParameter.md @@ -1,5 +1,5 @@ -[test](test/index) / [containsAll](test/contains-all) +[test](index.md) / [containsAll](./contains-all.md) # containsAll -`fun containsAll(elements: Collection<@UnsafeVariance `[`E`](test/contains-all#E)`>): @UnsafeVariance `[`E`](test/contains-all#E) \ No newline at end of file +`fun containsAll(elements: Collection<@UnsafeVariance `[`E`](contains-all.md#E)`>): @UnsafeVariance `[`E`](contains-all.md#E) \ No newline at end of file diff --git a/core/testdata/format/annotationClass.md b/core/testdata/format/annotationClass.md index 2f4da736..55fda40c 100644 --- a/core/testdata/format/annotationClass.md +++ b/core/testdata/format/annotationClass.md @@ -1,4 +1,4 @@ -[test](test/index) / [fancy](test/fancy/index) +[test](../index.md) / [fancy](./index.md) # fancy @@ -6,5 +6,5 @@ ### Constructors -| [<init>](test/fancy/-init-) | `fancy()` | +| [<init>](-init-.md) | `fancy()` | diff --git a/core/testdata/format/annotationClass.package.md b/core/testdata/format/annotationClass.package.md index f52b28b6..c8aff7a3 100644 --- a/core/testdata/format/annotationClass.package.md +++ b/core/testdata/format/annotationClass.package.md @@ -1,8 +1,8 @@ -[test](test/index) +[test](./index.md) ## Package <root> ### Annotations -| [fancy](test/fancy/index) | `annotation class fancy` | +| [fancy](fancy/index.md) | `annotation class fancy` | diff --git a/core/testdata/format/annotationParams.md b/core/testdata/format/annotationParams.md index 132078ce..cfa3b822 100644 --- a/core/testdata/format/annotationParams.md +++ b/core/testdata/format/annotationParams.md @@ -1,4 +1,4 @@ -[test](test/index) / [f](test/f) +[test](index.md) / [f](./f.md) # f diff --git a/core/testdata/format/annotations.md b/core/testdata/format/annotations.md index cc27d5af..2e1604d0 100644 --- a/core/testdata/format/annotations.md +++ b/core/testdata/format/annotations.md @@ -1,4 +1,4 @@ -[test](test/index) / [Foo](test/-foo/index) +[test](../index.md) / [Foo](./index.md) # Foo @@ -6,13 +6,13 @@ ### Constructors -| [<init>](test/-foo/-init-) | `Foo()` | +| [<init>](-init-.md) | `Foo()` | ### Properties -| [x](test/-foo/x) | `val x: Int` | +| [x](x.md) | `val x: Int` | ### Functions -| [bar](test/-foo/bar) | `fun bar(notInlined: () -> Unit): Unit` | +| [bar](bar.md) | `fun bar(notInlined: () -> Unit): Unit` | diff --git a/core/testdata/format/arrayAverage.md b/core/testdata/format/arrayAverage.md index 7cc31c47..2c6927d6 100644 --- a/core/testdata/format/arrayAverage.md +++ b/core/testdata/format/arrayAverage.md @@ -1,4 +1,4 @@ -[test](test/index) / [XArray](test/-x-array/index) +[test](../index.md) / [XArray](./index.md) # XArray @@ -6,9 +6,9 @@ ### Constructors -| [<init>](test/-x-array/-init-) | `XArray()` | +| [<init>](-init-.md) | `XArray()` | ### Extension Functions -| [average](test/average) | `fun `[`XArray`](test/-x-array/index)`.average(): Double`
`fun `[`XArray`](test/-x-array/index)`.average(): Double`
`fun `[`XArray`](test/-x-array/index)`.average(): Double`
`fun `[`XArray`](test/-x-array/index)`.average(): Double`
`fun `[`XArray`](test/-x-array/index)`.average(): Double`
`fun `[`XArray`](test/-x-array/index)`.average(): Double` | +| [average](../average.md) | `fun `[`XArray`](./index.md)`.average(): Double`
`fun `[`XArray`](./index.md)`.average(): Double`
`fun `[`XArray`](./index.md)`.average(): Double`
`fun `[`XArray`](./index.md)`.average(): Double`
`fun `[`XArray`](./index.md)`.average(): Double`
`fun `[`XArray`](./index.md)`.average(): Double` | diff --git a/core/testdata/format/backtickInCodeBlock.md b/core/testdata/format/backtickInCodeBlock.md index fc244630..830539ac 100644 --- a/core/testdata/format/backtickInCodeBlock.md +++ b/core/testdata/format/backtickInCodeBlock.md @@ -1,4 +1,4 @@ -[test](test/index) / [foo](test/foo) +[test](index.md) / [foo](./foo.md) # foo diff --git a/core/testdata/format/blankLineInsideCodeBlock.html b/core/testdata/format/blankLineInsideCodeBlock.html index 168dd0dd..f0351d72 100644 --- a/core/testdata/format/blankLineInsideCodeBlock.html +++ b/core/testdata/format/blankLineInsideCodeBlock.html @@ -4,7 +4,7 @@ u - test -test / u
+test / u

u

diff --git a/core/testdata/format/blankLineInsideCodeBlock.md b/core/testdata/format/blankLineInsideCodeBlock.md index 66f4d65f..956f8954 100644 --- a/core/testdata/format/blankLineInsideCodeBlock.md +++ b/core/testdata/format/blankLineInsideCodeBlock.md @@ -1,4 +1,4 @@ -[test](test/index) / [u](test/u) +[test](index.md) / [u](./u.md) # u diff --git a/core/testdata/format/bracket.html b/core/testdata/format/bracket.html index a76ff885..01aaaf04 100644 --- a/core/testdata/format/bracket.html +++ b/core/testdata/format/bracket.html @@ -4,7 +4,7 @@ foo - test -test / foo
+test / foo

foo

diff --git a/core/testdata/format/brokenLink.html b/core/testdata/format/brokenLink.html index d1b8ccb0..c598a73e 100644 --- a/core/testdata/format/brokenLink.html +++ b/core/testdata/format/brokenLink.html @@ -4,7 +4,7 @@ f - test -test / f
+test / f

f

diff --git a/core/testdata/format/classWithCompanionObject.html b/core/testdata/format/classWithCompanionObject.html index 2954d5a7..88feea5e 100644 --- a/core/testdata/format/classWithCompanionObject.html +++ b/core/testdata/format/classWithCompanionObject.html @@ -4,7 +4,7 @@ Klass - test -test / Klass
+test / Klass

Klass

class Klass @@ -13,7 +13,7 @@ -

<init>

+

<init>

Klass() @@ -25,7 +25,7 @@ -

x

+

x

val x: Int @@ -37,7 +37,7 @@ -

foo

+

foo

fun foo(): Unit diff --git a/core/testdata/format/classWithCompanionObject.md b/core/testdata/format/classWithCompanionObject.md index 45684c0e..40f605be 100644 --- a/core/testdata/format/classWithCompanionObject.md +++ b/core/testdata/format/classWithCompanionObject.md @@ -1,4 +1,4 @@ -[test](test/index) / [Klass](test/-klass/index) +[test](../index.md) / [Klass](./index.md) # Klass @@ -6,13 +6,13 @@ ### Constructors -| [<init>](test/-klass/-init-) | `Klass()` | +| [<init>](-init-.md) | `Klass()` | ### Companion Object Properties -| [x](test/-klass/x) | `val x: Int` | +| [x](x.md) | `val x: Int` | ### Companion Object Functions -| [foo](test/-klass/foo) | `fun foo(): Unit` | +| [foo](foo.md) | `fun foo(): Unit` | diff --git a/core/testdata/format/codeBlock.html b/core/testdata/format/codeBlock.html index 48c2ffd2..1e07ff09 100644 --- a/core/testdata/format/codeBlock.html +++ b/core/testdata/format/codeBlock.html @@ -1,9 +1,11 @@ + +Throws - test -test / Throws
+test / Throws

Throws

class Throws @@ -11,12 +13,50 @@

Example:

Throws(IOException::class)
 fun readFile(name: String): String {...}
-
test / ItDoesSomeObfuscatedThing
+ +

Constructors

+ + + + + + + +
+

<init>

+		 +Throws() +

This annotation indicates what exceptions should be declared by a function when compiled to a JVM method.

+
+ + + + + + +ItDoesSomeObfuscatedThing - test + + +test / ItDoesSomeObfuscatedThing

ItDoesSomeObfuscatedThing

class ItDoesSomeObfuscatedThing

Check output of

++++++++++[>+++++++>++++++++++>+++>+<<<<-]>++.>+.+++++++..+++.>++.<<+++++++++++++++.>.+++.------.--------.>+.>.
+

Constructors

+ + + + + + + +
+

<init>

+		 +ItDoesSomeObfuscatedThing() +

Check output of

+
diff --git a/core/testdata/format/codeBlock.md b/core/testdata/format/codeBlock.md index d64fb9fd..d183a8ba 100644 --- a/core/testdata/format/codeBlock.md +++ b/core/testdata/format/codeBlock.md @@ -1,4 +1,5 @@ -[test](test/index) / [Throws](test/-throws/index) + +[test](../index.md) / [Throws](./index.md) # Throws @@ -13,7 +14,12 @@ Throws(IOException::class) fun readFile(name: String): String {...} ``` -[test](test/index) / [ItDoesSomeObfuscatedThing](test/-it-does-some-obfuscated-thing/index) +### Constructors + +| [<init>](-init-.md) | `Throws()`
This annotation indicates what exceptions should be declared by a function when compiled to a JVM method. | + + +[test](../index.md) / [ItDoesSomeObfuscatedThing](./index.md) # ItDoesSomeObfuscatedThing @@ -25,3 +31,7 @@ Check output of ++++++++++[>+++++++>++++++++++>+++>+<<<<-]>++.>+.+++++++..+++.>++.<<+++++++++++++++.>.+++.------.--------.>+.>. ``` +### Constructors + +| [<init>](-init-.md) | `ItDoesSomeObfuscatedThing()`
Check output of | + diff --git a/core/testdata/format/codeBlockNoHtmlEscape.md b/core/testdata/format/codeBlockNoHtmlEscape.md index 2622ef38..548dac4f 100644 --- a/core/testdata/format/codeBlockNoHtmlEscape.md +++ b/core/testdata/format/codeBlockNoHtmlEscape.md @@ -1,4 +1,4 @@ -[test](test/index) / [hackTheArithmetic](test/hack-the-arithmetic) +[test](index.md) / [hackTheArithmetic](./hack-the-arithmetic.md) # hackTheArithmetic diff --git a/core/testdata/format/codeSpan.html b/core/testdata/format/codeSpan.html index 33cbdba3..bfe93f36 100644 --- a/core/testdata/format/codeSpan.html +++ b/core/testdata/format/codeSpan.html @@ -4,7 +4,7 @@ foo - test -test / foo
+test / foo

foo

diff --git a/core/testdata/format/companionImplements.md b/core/testdata/format/companionImplements.md index 8a93ed6b..aac7b3e6 100644 --- a/core/testdata/format/companionImplements.md +++ b/core/testdata/format/companionImplements.md @@ -1,16 +1,16 @@ -[test](test/index) / [Foo](test/-foo/index) +[test](../index.md) / [Foo](./index.md) # Foo `class Foo` -Correct ref [Foo.Companion](test/-foo/-companion) +Correct ref [Foo.Companion](-companion.md) ### Types -| [Companion](test/-foo/-companion) | `companion object Companion : `[`Bar`](test/-bar) | +| [Companion](-companion.md) | `companion object Companion : `[`Bar`](../-bar.md) | ### Constructors -| [<init>](test/-foo/-init-) | `Foo()`
Correct ref [Foo.Companion](test/-foo/-companion) | +| [<init>](-init-.md) | `Foo()`
Correct ref [Foo.Companion](-companion.md) | diff --git a/core/testdata/format/companionObjectExtension.md b/core/testdata/format/companionObjectExtension.md index e019c184..c0e268e6 100644 --- a/core/testdata/format/companionObjectExtension.md +++ b/core/testdata/format/companionObjectExtension.md @@ -1,4 +1,4 @@ -[test](test/index) / [Foo](test/-foo/index) +[test](../index.md) / [Foo](./index.md) # Foo @@ -6,9 +6,9 @@ ### Constructors -| [<init>](test/-foo/-init-) | `Foo()` | +| [<init>](-init-.md) | `Foo()` | ### Companion Object Extension Properties -| [x](test/x) | `val Foo.Default.x: Int`
The default object property. | +| [x](../x.md) | `val Foo.Default.x: Int`
The default object property. | diff --git a/core/testdata/format/crossLanguage/kotlinExtendsJava/Bar.html b/core/testdata/format/crossLanguage/kotlinExtendsJava/Bar.html index 42f21d3c..8842969e 100644 --- a/core/testdata/format/crossLanguage/kotlinExtendsJava/Bar.html +++ b/core/testdata/format/crossLanguage/kotlinExtendsJava/Bar.html @@ -4,21 +4,21 @@ Bar - test -test / test / Bar
+test / test / Bar

Bar

-class Bar : Foo -

See xyzzy

+class Bar : Foo +

See xyzzy

Constructors

@@ -28,7 +28,7 @@ diff --git a/core/testdata/format/deprecated.class.html b/core/testdata/format/deprecated.class.html index 66eb9ff1..540060d1 100644 --- a/core/testdata/format/deprecated.class.html +++ b/core/testdata/format/deprecated.class.html @@ -1,22 +1,54 @@ + +C - test -test / C
+test / C

C

class C
Deprecated: This class sucks

-test / f
+

Constructors

+
-

<init>

+

<init>

 Bar() -

See xyzzy

+

See xyzzy
-

xyzzy

+

xyzzy

 open fun xyzzy(): Unit
+ + + + + + +
+

<init>

+		 +C()
+ + + + + + +f - test + + +test / f

f

fun f(): Unit
Deprecated: This function sucks

-test / p
+ + + + + + +p - test + + +test / p

p

diff --git a/core/testdata/format/deprecated.package.html b/core/testdata/format/deprecated.package.html index b85e53bd..3506de61 100644 --- a/core/testdata/format/deprecated.package.html +++ b/core/testdata/format/deprecated.package.html @@ -4,7 +4,7 @@ root package - test -test
+test

Package <root>

Types

@@ -12,7 +12,7 @@ -

C

+

C

class C @@ -24,7 +24,7 @@ -

p

+

p

val p: Int @@ -36,7 +36,7 @@ -

f

+

f

fun f(): Unit diff --git a/core/testdata/format/dynamicExtension.md b/core/testdata/format/dynamicExtension.md index 2fd928f6..382cf973 100644 --- a/core/testdata/format/dynamicExtension.md +++ b/core/testdata/format/dynamicExtension.md @@ -1,4 +1,4 @@ -[test](test/index) / [Foo](test/-foo/index) +[test](../index.md) / [Foo](./index.md) # Foo @@ -6,5 +6,5 @@ ### Constructors -| [<init>](test/-foo/-init-) | `Foo()` | +| [<init>](-init-.md) | `Foo()` | diff --git a/core/testdata/format/dynamicType.md b/core/testdata/format/dynamicType.md index a3d6696b..07a1d103 100644 --- a/core/testdata/format/dynamicType.md +++ b/core/testdata/format/dynamicType.md @@ -1,4 +1,4 @@ -[test](test/index) / [foo](test/foo) +[test](index.md) / [foo](./foo.md) # foo diff --git a/core/testdata/format/emptyDescription.md b/core/testdata/format/emptyDescription.md index 8c0fe109..5d56d968 100644 --- a/core/testdata/format/emptyDescription.md +++ b/core/testdata/format/emptyDescription.md @@ -1,4 +1,4 @@ -[test](test/index) / [fn](test/fn) +[test](index.md) / [fn](./fn.md) # fn diff --git a/core/testdata/format/entity.html b/core/testdata/format/entity.html index abe89502..639f2903 100644 --- a/core/testdata/format/entity.html +++ b/core/testdata/format/entity.html @@ -4,7 +4,7 @@ Bar - test -test / Bar
+test / Bar

Bar

class Bar @@ -14,7 +14,7 @@ -

<init>

+

<init>

Bar() diff --git a/core/testdata/format/enumClass.md b/core/testdata/format/enumClass.md index d3a6f186..50cccfbb 100644 --- a/core/testdata/format/enumClass.md +++ b/core/testdata/format/enumClass.md @@ -1,4 +1,4 @@ -[test](test/index) / [InlineOption](test/-inline-option/index) +[test](../index.md) / [InlineOption](./index.md) # InlineOption @@ -6,6 +6,6 @@ ### Enum Values -| [ONLY_LOCAL_RETURN](test/-inline-option/-o-n-l-y_-l-o-c-a-l_-r-e-t-u-r-n) | | -| [LOCAL_CONTINUE_AND_BREAK](test/-inline-option/-l-o-c-a-l_-c-o-n-t-i-n-u-e_-a-n-d_-b-r-e-a-k) | | +| [ONLY_LOCAL_RETURN](-o-n-l-y_-l-o-c-a-l_-r-e-t-u-r-n.md) | | +| [LOCAL_CONTINUE_AND_BREAK](-l-o-c-a-l_-c-o-n-t-i-n-u-e_-a-n-d_-b-r-e-a-k.md) | | diff --git a/core/testdata/format/enumClass.value.md b/core/testdata/format/enumClass.value.md index feed2fe5..150016cc 100644 --- a/core/testdata/format/enumClass.value.md +++ b/core/testdata/format/enumClass.value.md @@ -1,4 +1,4 @@ -[test](test/index) / [InlineOption](test/-inline-option/index) / [LOCAL_CONTINUE_AND_BREAK](test/-inline-option/-l-o-c-a-l_-c-o-n-t-i-n-u-e_-a-n-d_-b-r-e-a-k) +[test](../index.md) / [InlineOption](index.md) / [LOCAL_CONTINUE_AND_BREAK](./-l-o-c-a-l_-c-o-n-t-i-n-u-e_-a-n-d_-b-r-e-a-k.md) # LOCAL_CONTINUE_AND_BREAK diff --git a/core/testdata/format/exceptionClass.md b/core/testdata/format/exceptionClass.md index e3714ecc..1e928bb6 100644 --- a/core/testdata/format/exceptionClass.md +++ b/core/testdata/format/exceptionClass.md @@ -1,4 +1,4 @@ -[test](test/index) / [MyException](test/-my-exception/index) +[test](../index.md) / [MyException](./index.md) # MyException @@ -6,5 +6,5 @@ ### Constructors -| [<init>](test/-my-exception/-init-) | `MyException()` | +| [<init>](-init-.md) | `MyException()` | diff --git a/core/testdata/format/exceptionClass.package.md b/core/testdata/format/exceptionClass.package.md index e10478e4..8716df0a 100644 --- a/core/testdata/format/exceptionClass.package.md +++ b/core/testdata/format/exceptionClass.package.md @@ -1,8 +1,8 @@ -[test](test/index) +[test](./index.md) ## Package <root> ### Exceptions -| [MyException](test/-my-exception/index) | `class MyException : Exception` | +| [MyException](-my-exception/index.md) | `class MyException : Exception` | diff --git a/core/testdata/format/exclInCodeBlock.md b/core/testdata/format/exclInCodeBlock.md index 9c9e424a..d665c415 100644 --- a/core/testdata/format/exclInCodeBlock.md +++ b/core/testdata/format/exclInCodeBlock.md @@ -1,4 +1,4 @@ -[test](test/index) / [foo](test/foo) +[test](index.md) / [foo](./foo.md) # foo diff --git a/core/testdata/format/extensionFunctionParameter.md b/core/testdata/format/extensionFunctionParameter.md index 501d731d..e1e85824 100644 --- a/core/testdata/format/extensionFunctionParameter.md +++ b/core/testdata/format/extensionFunctionParameter.md @@ -1,5 +1,5 @@ -[test](test/index) / [apply](test/apply) +[test](index.md) / [apply](./apply.md) # apply -`inline fun `[`T`](test/apply#T)`.apply(f: `[`T`](test/apply#T)`.() -> Unit): `[`T`](test/apply#T) \ No newline at end of file +`inline fun `[`T`](apply.md#T)`.apply(f: `[`T`](apply.md#T)`.() -> Unit): `[`T`](apply.md#T) \ No newline at end of file diff --git a/core/testdata/format/extensionScope.md b/core/testdata/format/extensionScope.md index 3515ed84..ea765bd5 100644 --- a/core/testdata/format/extensionScope.md +++ b/core/testdata/format/extensionScope.md @@ -1,8 +1,8 @@ -[test](test/index) / [test](test/test) +[test](index.md) / [test](./test.md) # test `fun test(): Unit` -Correct link: [Foo.ext](test/ext) +Correct link: [Foo.ext](ext.md) diff --git a/core/testdata/format/extensionWithDocumentedReceiver.md b/core/testdata/format/extensionWithDocumentedReceiver.md index 125da37e..0679ac8f 100644 --- a/core/testdata/format/extensionWithDocumentedReceiver.md +++ b/core/testdata/format/extensionWithDocumentedReceiver.md @@ -1,4 +1,4 @@ -[test](test/index) / [kotlin.String](test/kotlin.-string/index) / [fn](test/kotlin.-string/fn) +[test](../index.md) / [kotlin.String](index.md) / [fn](./fn.md) # fn diff --git a/core/testdata/format/extensions.class.md b/core/testdata/format/extensions.class.md index f75b4dc8..b8fa200a 100644 --- a/core/testdata/format/extensions.class.md +++ b/core/testdata/format/extensions.class.md @@ -1,7 +1,7 @@ -[test](test/index) / [foo](test/foo/index) / [kotlin.String](test/foo/kotlin.-string/index) +[test](../../index.md) / [foo](../index.md) / [kotlin.String](./index.md) ### Extensions for kotlin.String -| [fn](test/foo/kotlin.-string/fn) | `fun String.fn(): Unit`
`fun String.fn(x: Int): Unit`
Function with receiver | -| [foobar](test/foo/kotlin.-string/foobar) | `val String.foobar: Int`
Property with receiver. | +| [fn](fn.md) | `fun String.fn(): Unit`
`fun String.fn(x: Int): Unit`
Function with receiver | +| [foobar](foobar.md) | `val String.foobar: Int`
Property with receiver. | diff --git a/core/testdata/format/extensions.package.md b/core/testdata/format/extensions.package.md index 4dc0cfab..ad895116 100644 --- a/core/testdata/format/extensions.package.md +++ b/core/testdata/format/extensions.package.md @@ -1,8 +1,8 @@ -[test](test/index) / [foo](test/foo/index) +[test](../index.md) / [foo](./index.md) ## Package foo ### Extensions for External Classes -| [kotlin.String](test/foo/kotlin.-string/index) | | +| [kotlin.String](kotlin.-string/index.md) | | diff --git a/core/testdata/format/externalReferenceLink.md b/core/testdata/format/externalReferenceLink.md index 29d64afe..38ffde78 100644 --- a/core/testdata/format/externalReferenceLink.md +++ b/core/testdata/format/externalReferenceLink.md @@ -1,4 +1,4 @@ -[test](test/index) / [a](test/a) +[test](index.md) / [a](./a.md) # a diff --git a/core/testdata/format/functionWithDefaultParameter.md b/core/testdata/format/functionWithDefaultParameter.md index 568c106c..05f7fbe6 100644 --- a/core/testdata/format/functionWithDefaultParameter.md +++ b/core/testdata/format/functionWithDefaultParameter.md @@ -1,4 +1,4 @@ -[test](test/index) / [f](test/f) +[test](index.md) / [f](./f.md) # f diff --git a/core/testdata/format/functionalTypeWithNamedParameters.html b/core/testdata/format/functionalTypeWithNamedParameters.html index 84a489ff..83d03d8f 100644 --- a/core/testdata/format/functionalTypeWithNamedParameters.html +++ b/core/testdata/format/functionalTypeWithNamedParameters.html @@ -1,25 +1,103 @@ + +A - test -test / A
+test / A

A

-class Atest / B
+class A +

Constructors

+ + + + + + + +
+

<init>

+		 +A()
+ + + + + + +B - test + + +test / B

B

-class Btest / C
+class B +

Constructors

+ + + + + + + +
+

<init>

+		 +B()
+ + + + + + +C - test + + +test / C

C

-class Ctest / f
+class C +

Constructors

+ + + + + + + +
+

<init>

+		 +C()
+ + + + + + +f - test + + +test / f

f

-val f: (a: A, b: B) -> Ctest / acceptFunctionTypeWithNamedArguments
+val f: (a: A, b: B) -> C + + + + + + +acceptFunctionTypeWithNamedArguments - test + + +test / acceptFunctionTypeWithNamedArguments

acceptFunctionTypeWithNamedArguments

-fun acceptFunctionTypeWithNamedArguments(f: (bb: B, aa: A) -> C): Unit +fun acceptFunctionTypeWithNamedArguments(f: (bb: B, aa: A) -> C): Unit diff --git a/core/testdata/format/functionalTypeWithNamedParameters.md b/core/testdata/format/functionalTypeWithNamedParameters.md index 317fa6af..4e78694c 100644 --- a/core/testdata/format/functionalTypeWithNamedParameters.md +++ b/core/testdata/format/functionalTypeWithNamedParameters.md @@ -1,21 +1,45 @@ -[test](test/index) / [A](test/-a/index) + +[test](../index.md) / [A](./index.md) # A -`class A`[test](test/index) / [B](test/-b/index) +`class A` + +### Constructors + +| [<init>](-init-.md) | `A()` | + + +[test](../index.md) / [B](./index.md) # B -`class B`[test](test/index) / [C](test/-c/index) +`class B` + +### Constructors + +| [<init>](-init-.md) | `B()` | + + +[test](../index.md) / [C](./index.md) # C -`class C`[test](test/index) / [f](test/f) +`class C` + +### Constructors + +| [<init>](-init-.md) | `C()` | + + +[test](index.md) / [f](./f.md) # f -`val f: (a: `[`A`](test/-a/index)`, b: `[`B`](test/-b/index)`) -> `[`C`](test/-c/index)[test](test/index) / [acceptFunctionTypeWithNamedArguments](test/accept-function-type-with-named-arguments) +`val f: (a: `[`A`](-a/index.md)`, b: `[`B`](-b/index.md)`) -> `[`C`](-c/index.md) + +[test](index.md) / [acceptFunctionTypeWithNamedArguments](./accept-function-type-with-named-arguments.md) # acceptFunctionTypeWithNamedArguments -`fun acceptFunctionTypeWithNamedArguments(f: (bb: `[`B`](test/-b/index)`, aa: `[`A`](test/-a/index)`) -> `[`C`](test/-c/index)`): Unit` \ No newline at end of file +`fun acceptFunctionTypeWithNamedArguments(f: (bb: `[`B`](-b/index.md)`, aa: `[`A`](-a/index.md)`) -> `[`C`](-c/index.md)`): Unit` \ No newline at end of file diff --git a/core/testdata/format/genericInheritedExtensions.md b/core/testdata/format/genericInheritedExtensions.md index 163ff0c9..8d0e316f 100644 --- a/core/testdata/format/genericInheritedExtensions.md +++ b/core/testdata/format/genericInheritedExtensions.md @@ -1,15 +1,15 @@ -[test](test/index) / [Bar](test/-bar/index) +[test](../index.md) / [Bar](./index.md) # Bar -`class Bar : `[`Foo`](test/-foo/index)`<`[`T`](test/-bar/index#T)`>` +`class Bar : `[`Foo`](../-foo/index.md)`<`[`T`](index.md#T)`>` ### Constructors -| [<init>](test/-bar/-init-) | `Bar()` | +| [<init>](-init-.md) | `Bar()` | ### Extension Functions -| [first](test/first) | `fun `[`Foo`](test/-foo/index)`<`[`T`](test/first#T)`>.first(): Unit` | -| [second](test/second) | `fun `[`Bar`](test/-bar/index)`<`[`T`](test/second#T)`>.second(): Unit` | +| [first](../first.md) | `fun `[`Foo`](../-foo/index.md)`<`[`T`](../first.md#T)`>.first(): Unit` | +| [second](../second.md) | `fun `[`Bar`](./index.md)`<`[`T`](../second.md#T)`>.second(): Unit` | diff --git a/core/testdata/format/gfm/listInTableCell.md b/core/testdata/format/gfm/listInTableCell.md index 73152ac9..359ad916 100644 --- a/core/testdata/format/gfm/listInTableCell.md +++ b/core/testdata/format/gfm/listInTableCell.md @@ -1,4 +1,4 @@ -[test](test/index) / [Foo](test/-foo/index) +[test](../index.md) / [Foo](./index.md) # Foo @@ -8,10 +8,10 @@ | Name | Summary | |---|---| -| [<init>](test/-foo/-init-) | `Foo()` | +| [<init>](-init-.md) | `Foo()` | ### Functions | Name | Summary | |---|---| -| [foo](test/-foo/foo) | `fun foo(): Unit`
  1. Foo
  2. Bar
| +| [foo](foo.md) | `fun foo(): Unit`
  1. Foo
  2. Bar
| diff --git a/core/testdata/format/gfm/sample.md b/core/testdata/format/gfm/sample.md index c2af1c1e..2b082296 100644 --- a/core/testdata/format/gfm/sample.md +++ b/core/testdata/format/gfm/sample.md @@ -1,4 +1,4 @@ -[test](test/index) / [Foo](test/-foo/index) +[test](../index.md) / [Foo](./index.md) # Foo @@ -10,11 +10,11 @@ The class Foo. | Name | Summary | |---|---| -| [<init>](test/-foo/-init-) | `Foo()`
The class Foo. | +| [<init>](-init-.md) | `Foo()`
The class Foo. | ### Functions | Name | Summary | |---|---| -| [bar](test/-foo/bar) | `fun bar(): Unit`
The method bar. | -| [baz](test/-foo/baz) | `fun baz(): Unit`
The method baz. | +| [bar](bar.md) | `fun bar(): Unit`
The method bar. | +| [baz](baz.md) | `fun baz(): Unit`
The method baz. | diff --git a/core/testdata/format/htmlEscaping.html b/core/testdata/format/htmlEscaping.html index 17d48161..bd64454d 100644 --- a/core/testdata/format/htmlEscaping.html +++ b/core/testdata/format/htmlEscaping.html @@ -4,11 +4,11 @@ x - test -test / x
+test / x

x

-fun <T> x(): T? +fun <T> x(): T?

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

diff --git a/core/testdata/format/inapplicableExtensionFunctions.md b/core/testdata/format/inapplicableExtensionFunctions.md index 30246faa..08fc2739 100644 --- a/core/testdata/format/inapplicableExtensionFunctions.md +++ b/core/testdata/format/inapplicableExtensionFunctions.md @@ -1,14 +1,14 @@ -[test](test/index) / [Bar](test/-bar/index) +[test](../index.md) / [Bar](./index.md) # Bar -`class Bar : `[`Foo`](test/-foo/index)`` +`class Bar : `[`Foo`](../-foo/index.md)`` ### Constructors -| [<init>](test/-bar/-init-) | `Bar()` | +| [<init>](-init-.md) | `Bar()` | ### Extension Functions -| [xyzzy](test/xyzzy) | `fun `[`Bar`](test/-bar/index)`.xyzzy(): Unit` | +| [xyzzy](../xyzzy.md) | `fun `[`Bar`](./index.md)`.xyzzy(): Unit` | diff --git a/core/testdata/format/indentedCodeBlock.html b/core/testdata/format/indentedCodeBlock.html index 1ccf800a..86c129fb 100644 --- a/core/testdata/format/indentedCodeBlock.html +++ b/core/testdata/format/indentedCodeBlock.html @@ -4,7 +4,7 @@ foo - test -test / foo
+test / foo

foo

diff --git a/core/testdata/format/indentedCodeBlock.md b/core/testdata/format/indentedCodeBlock.md index 515bfee3..77b0630a 100644 --- a/core/testdata/format/indentedCodeBlock.md +++ b/core/testdata/format/indentedCodeBlock.md @@ -1,4 +1,4 @@ -[test](test/index) / [foo](test/foo) +[test](index.md) / [foo](./foo.md) # foo diff --git a/core/testdata/format/inheritedCompanionObjectProperties.md b/core/testdata/format/inheritedCompanionObjectProperties.md index db764ff0..ab8f0aa5 100644 --- a/core/testdata/format/inheritedCompanionObjectProperties.md +++ b/core/testdata/format/inheritedCompanionObjectProperties.md @@ -1,30 +1,30 @@ -[test](test/index) / [C](test/-c/index) +[test](../index.md) / [C](./index.md) # C -`class C : `[`A`](test/-a/index) +`class C : `[`A`](../-a/index.md) ### Types -| [Companion](test/-c/-companion/index) | `companion object Companion : `[`B`](test/-b/index) | +| [Companion](-companion/index.md) | `companion object Companion : `[`B`](../-b/index.md) | ### Constructors -| [<init>](test/-c/-init-) | `C()` | +| [<init>](-init-.md) | `C()` | ### Functions -| [xyzzy](test/-c/xyzzy) | `fun xyzzy(): Unit` | +| [xyzzy](xyzzy.md) | `fun xyzzy(): Unit` | ### Inherited Functions -| [foo](test/-a/foo) | `fun foo(): Unit` | +| [foo](../-a/foo.md) | `fun foo(): Unit` | ### Companion Object Functions -| [shazam](test/-c/shazam) | `fun shazam(): Unit` | +| [shazam](shazam.md) | `fun shazam(): Unit` | ### Inherited Companion Object Functions -| [bar](test/-b/bar) | `fun bar(): Unit` | +| [bar](../-b/bar.md) | `fun bar(): Unit` | diff --git a/core/testdata/format/inheritedExtensions.md b/core/testdata/format/inheritedExtensions.md index 611b4f6a..97a73666 100644 --- a/core/testdata/format/inheritedExtensions.md +++ b/core/testdata/format/inheritedExtensions.md @@ -1,15 +1,15 @@ -[test](test/index) / [Bar](test/-bar/index) +[test](../index.md) / [Bar](./index.md) # Bar -`class Bar : `[`Foo`](test/-foo/index) +`class Bar : `[`Foo`](../-foo/index.md) ### Constructors -| [<init>](test/-bar/-init-) | `Bar()` | +| [<init>](-init-.md) | `Bar()` | ### Extension Functions -| [first](test/first) | `fun `[`Foo`](test/-foo/index)`.first(): Unit` | -| [second](test/second) | `fun `[`Bar`](test/-bar/index)`.second(): Unit` | +| [first](../first.md) | `fun `[`Foo`](../-foo/index.md)`.first(): Unit` | +| [second](../second.md) | `fun `[`Bar`](./index.md)`.second(): Unit` | diff --git a/core/testdata/format/inheritedMembers.md b/core/testdata/format/inheritedMembers.md index bed5bd44..334df360 100644 --- a/core/testdata/format/inheritedMembers.md +++ b/core/testdata/format/inheritedMembers.md @@ -1,26 +1,26 @@ -[test](test/index) / [Bar](test/-bar/index) +[test](../index.md) / [Bar](./index.md) # Bar -`class Bar : `[`Foo`](test/-foo/index) +`class Bar : `[`Foo`](../-foo/index.md) ### Constructors -| [<init>](test/-bar/-init-) | `Bar()` | +| [<init>](-init-.md) | `Bar()` | ### Properties -| [secondProp](test/-bar/second-prop) | `val secondProp: Int` | +| [secondProp](second-prop.md) | `val secondProp: Int` | ### Inherited Properties -| [firstProp](test/-foo/first-prop) | `val firstProp: Int` | +| [firstProp](../-foo/first-prop.md) | `val firstProp: Int` | ### Functions -| [second](test/-bar/second) | `fun second(): Unit` | +| [second](second.md) | `fun second(): Unit` | ### Inherited Functions -| [first](test/-foo/first) | `fun first(): Unit` | +| [first](../-foo/first.md) | `fun first(): Unit` | diff --git a/core/testdata/format/javaCodeInParam.md b/core/testdata/format/javaCodeInParam.md index 696abdc4..319c6d87 100644 --- a/core/testdata/format/javaCodeInParam.md +++ b/core/testdata/format/javaCodeInParam.md @@ -1,4 +1,4 @@ -[test](test/index) / [C](test/-c/index) +[test](../index.md) / [C](./index.md) # C @@ -10,5 +10,5 @@ ### Constructors -| [<init>](test/-c/-init-) | `C()` | +| [<init>](-init-.md) | `C()` | diff --git a/core/testdata/format/javaCodeLiteralTags.md b/core/testdata/format/javaCodeLiteralTags.md index 99dbccfd..b36be04d 100644 --- a/core/testdata/format/javaCodeLiteralTags.md +++ b/core/testdata/format/javaCodeLiteralTags.md @@ -1,4 +1,4 @@ -[test](test/index) / [C](test/-c/index) +[test](../index.md) / [C](./index.md) # C @@ -12,5 +12,5 @@ A<B>C ### Constructors -| [<init>](test/-c/-init-) | `C()`
`AC`
A<B>C | +| [<init>](-init-.md) | `C()`
`AC`
A<B>C | diff --git a/core/testdata/format/javaDeprecated.html b/core/testdata/format/javaDeprecated.html index 67c5fd8f..d938fb9d 100644 --- a/core/testdata/format/javaDeprecated.html +++ b/core/testdata/format/javaDeprecated.html @@ -4,11 +4,11 @@ Foo.foo - test -test / Foo / foo
+test / Foo / foo

foo

open fun foo(): Unit
-Deprecated: use #bar instead +Deprecated: use #bar instead diff --git a/core/testdata/format/javaLinkTag.html b/core/testdata/format/javaLinkTag.html index 035bdd06..f90a58df 100644 --- a/core/testdata/format/javaLinkTag.html +++ b/core/testdata/format/javaLinkTag.html @@ -4,21 +4,21 @@ Foo - test -test / Foo
+test / Foo

Foo

protected open class Foo -

Call #bar() to do the job.

+

Call #bar() to do the job.

Constructors

@@ -28,7 +28,7 @@ diff --git a/core/testdata/format/javaLinkTagWithLabel.html b/core/testdata/format/javaLinkTagWithLabel.html index 69a15bc7..51917f7a 100644 --- a/core/testdata/format/javaLinkTagWithLabel.html +++ b/core/testdata/format/javaLinkTagWithLabel.html @@ -4,21 +4,21 @@ Foo - test -test / Foo
+test / Foo

Foo

protected open class Foo -

Call this wonderful method to do the job.

+

Call this wonderful method to do the job.

Constructors

-

<init>

+

<init>

 Foo() -

Call #bar() to do the job.

+

Call #bar() to do the job.
-

bar

+

bar

 open fun bar(): Unit
@@ -28,7 +28,7 @@ diff --git a/core/testdata/format/javaSeeTag.html b/core/testdata/format/javaSeeTag.html index c81eec31..f8866dc2 100644 --- a/core/testdata/format/javaSeeTag.html +++ b/core/testdata/format/javaSeeTag.html @@ -4,18 +4,18 @@ Foo - test -test / Foo
+test / Foo

Foo

open class Foo

See Also
-#bar

+#bar

Constructors

-

<init>

+

<init>

 Foo() -

Call this wonderful method to do the job.

+

Call this wonderful method to do the job.
-

bar

+

bar

 open fun bar(): Unit
@@ -27,7 +27,7 @@ diff --git a/core/testdata/format/javaSpaceInAuthor.md b/core/testdata/format/javaSpaceInAuthor.md index 6d738087..1d2251d0 100644 --- a/core/testdata/format/javaSpaceInAuthor.md +++ b/core/testdata/format/javaSpaceInAuthor.md @@ -1,4 +1,4 @@ -[test](test/index) / [C](test/-c/index) +[test](../index.md) / [C](./index.md) # C @@ -9,5 +9,5 @@ Dmitry Jemerov ### Constructors -| [<init>](test/-c/-init-) | `C()` | +| [<init>](-init-.md) | `C()` | diff --git a/core/testdata/format/javadocHtml.md b/core/testdata/format/javadocHtml.md index 8aba2059..a3c1baff 100644 --- a/core/testdata/format/javadocHtml.md +++ b/core/testdata/format/javadocHtml.md @@ -1,4 +1,4 @@ -[test](test/index) / [C](test/-c/index) +[test](../index.md) / [C](./index.md) # C @@ -18,7 +18,7 @@ Block code ### Constructors -| [<init>](test/-c/-init-) | `C()`
**Bold** **Strong** *Italic* *Emphasized*
Paragraph ~~Strikethrough~~ ~~Deleted~~ `Code` +| [<init>](-init-.md) | `C()`
**Bold** **Strong** *Italic* *Emphasized*
Paragraph ~~Strikethrough~~ ~~Deleted~~ `Code` ``` Block code
``` diff --git a/core/testdata/format/javadocOrderedList.md b/core/testdata/format/javadocOrderedList.md index f18ee96a..88d5f5b6 100644 --- a/core/testdata/format/javadocOrderedList.md +++ b/core/testdata/format/javadocOrderedList.md @@ -1,4 +1,4 @@ -[test](test/index) / [Bar](test/-bar/index) +[test](../index.md) / [Bar](./index.md) # Bar @@ -10,7 +10,7 @@ ### Constructors -| [<init>](test/-bar/-init-) | `Bar()`
+| [<init>](-init-.md) | `Bar()`
1. Rinse 2. Repeat
| diff --git a/core/testdata/format/jdkLinks.md b/core/testdata/format/jdkLinks.md index 607d63e5..7498171d 100644 --- a/core/testdata/format/jdkLinks.md +++ b/core/testdata/format/jdkLinks.md @@ -1,4 +1,4 @@ -[test](test/index) / [C](test/-c/index) +[test](../index.md) / [C](./index.md) # C @@ -10,5 +10,5 @@ You can print something to [java.lang.System.out](http://docs.oracle.com/javase/ ### Constructors -| [<init>](test/-c/-init-) | `C()`
This is a [ClassLoader](http://docs.oracle.com/javase/6/docs/api/java/lang/ClassLoader.html) and I can get its [ClassLoader.getResource](http://docs.oracle.com/javase/6/docs/api/java/lang/ClassLoader.html#getResource(java.lang.String)) | +| [<init>](-init-.md) | `C()`
This is a [ClassLoader](http://docs.oracle.com/javase/6/docs/api/java/lang/ClassLoader.html) and I can get its [ClassLoader.getResource](http://docs.oracle.com/javase/6/docs/api/java/lang/ClassLoader.html#getResource(java.lang.String)) | diff --git a/core/testdata/format/linkWithLabel.html b/core/testdata/format/linkWithLabel.html index b8fe2228..59bc6ddf 100644 --- a/core/testdata/format/linkWithLabel.html +++ b/core/testdata/format/linkWithLabel.html @@ -4,21 +4,21 @@ Bar - test -test / Bar
+test / Bar

Bar

class Bar -

Use this method for best results.

+

Use this method for best results.

Constructors

-

<init>

+

<init>

 Foo()
-

bar

+

bar

 open fun bar(): Unit
@@ -28,7 +28,7 @@ diff --git a/core/testdata/format/linkWithStarProjection.html b/core/testdata/format/linkWithStarProjection.html index bb9ce43c..e1b6e098 100644 --- a/core/testdata/format/linkWithStarProjection.html +++ b/core/testdata/format/linkWithStarProjection.html @@ -4,7 +4,7 @@ KClassLoader - test -test / KClassLoader
+test / KClassLoader

KClassLoader

object KClassLoader @@ -13,7 +13,7 @@ diff --git a/core/testdata/format/linksInEmphasis.md b/core/testdata/format/linksInEmphasis.md index 9441ef6a..d0ae70c8 100644 --- a/core/testdata/format/linksInEmphasis.md +++ b/core/testdata/format/linksInEmphasis.md @@ -1,4 +1,4 @@ -[test](test/index) / [Bar](test/-bar/index) +[test](../index.md) / [Bar](./index.md) # Bar @@ -6,18 +6,18 @@ An emphasised class. -*This class [Bar](test/-bar/index) is awesome.* +*This class [Bar](./index.md) is awesome.* -*Even more awesomer is the function [Bar.foo](test/-bar/foo)* +*Even more awesomer is the function [Bar.foo](foo.md)* -*[Bar.hello](test/-bar/hello) is also OK* +*[Bar.hello](hello.md) is also OK* ### Constructors -| [<init>](test/-bar/-init-) | `Bar()`
An emphasised class. | +| [<init>](-init-.md) | `Bar()`
An emphasised class. | ### Functions -| [foo](test/-bar/foo) | `fun foo(): Unit` | -| [hello](test/-bar/hello) | `fun hello(): Unit` | +| [foo](foo.md) | `fun foo(): Unit` | +| [hello](hello.md) | `fun hello(): Unit` | diff --git a/core/testdata/format/linksInHeaders.md b/core/testdata/format/linksInHeaders.md index 85d51356..1dc7d18b 100644 --- a/core/testdata/format/linksInHeaders.md +++ b/core/testdata/format/linksInHeaders.md @@ -1,4 +1,4 @@ -[test](test/index) / [Bar](test/-bar/index) +[test](../index.md) / [Bar](./index.md) # Bar @@ -6,29 +6,29 @@ Some class with really useless documentation. -# Beer o'clock - time to go to the [Bar](test/-bar/index) +# Beer o'clock - time to go to the [Bar](./index.md) ## But **is [it](isitbeeroclock.com)** really? -### [Bar.hello](test/-bar/hello) to the [Bar.world](test/-bar/world)! +### [Bar.hello](hello.md) to the [Bar.world](world.md)! -#### *Kotlin is amazing, [Bar.none](test/-bar/none)* +#### *Kotlin is amazing, [Bar.none](none.md)* -##### We need to go [Bar.deeper](test/-bar/deeper) +##### We need to go [Bar.deeper](deeper.md) -###### End of the [Bar.line](test/-bar/line) - we need to go back! +###### End of the [Bar.line](line.md) - we need to go back! ### Constructors -| [<init>](test/-bar/-init-) | `Bar()`
Some class with really useless documentation. | +| [<init>](-init-.md) | `Bar()`
Some class with really useless documentation. | ### Functions -| [deeper](test/-bar/deeper) | `fun deeper(): Unit` | -| [foo](test/-bar/foo) | `fun foo(): Unit` | -| [hello](test/-bar/hello) | `fun hello(): Unit` | -| [kotlin](test/-bar/kotlin) | `fun kotlin(): Unit` | -| [line](test/-bar/line) | `fun line(): Unit` | -| [none](test/-bar/none) | `fun none(): Unit` | -| [world](test/-bar/world) | `fun world(): Unit` | +| [deeper](deeper.md) | `fun deeper(): Unit` | +| [foo](foo.md) | `fun foo(): Unit` | +| [hello](hello.md) | `fun hello(): Unit` | +| [kotlin](kotlin.md) | `fun kotlin(): Unit` | +| [line](line.md) | `fun line(): Unit` | +| [none](none.md) | `fun none(): Unit` | +| [world](world.md) | `fun world(): Unit` | diff --git a/core/testdata/format/linksInStrong.md b/core/testdata/format/linksInStrong.md index e98d31cc..5b44112d 100644 --- a/core/testdata/format/linksInStrong.md +++ b/core/testdata/format/linksInStrong.md @@ -1,4 +1,4 @@ -[test](test/index) / [Bar](test/-bar/index) +[test](../index.md) / [Bar](./index.md) # Bar @@ -6,18 +6,18 @@ A strong class. -**This class [Bar](test/-bar/index) is awesome.** +**This class [Bar](./index.md) is awesome.** -**Even more awesomer is the function [Bar.foo](test/-bar/foo)** +**Even more awesomer is the function [Bar.foo](foo.md)** -**[Bar.hello](test/-bar/hello) is also OK** +**[Bar.hello](hello.md) is also OK** ### Constructors -| [<init>](test/-bar/-init-) | `Bar()`
A strong class. | +| [<init>](-init-.md) | `Bar()`
A strong class. | ### Functions -| [foo](test/-bar/foo) | `fun foo(): Unit` | -| [hello](test/-bar/hello) | `fun hello(): Unit` | +| [foo](foo.md) | `fun foo(): Unit` | +| [hello](hello.md) | `fun hello(): Unit` | diff --git a/core/testdata/format/markdownInLinks.html b/core/testdata/format/markdownInLinks.html index 6d2327be..596cca73 100644 --- a/core/testdata/format/markdownInLinks.html +++ b/core/testdata/format/markdownInLinks.html @@ -4,7 +4,7 @@ foo - test -test / foo
+test / foo

foo

diff --git a/core/testdata/format/memberExtension.md b/core/testdata/format/memberExtension.md index b9db4e3d..0ec1fda3 100644 --- a/core/testdata/format/memberExtension.md +++ b/core/testdata/format/memberExtension.md @@ -1,10 +1,10 @@ -[test](test/index) / [Foo](test/-foo/index) +[test](../index.md) / [Foo](./index.md) # Foo -`class Foo : `[`X`](test/-x/index) +`class Foo : `[`X`](../-x/index.md) ### Constructors -| [<init>](test/-foo/-init-) | `Foo()` | +| [<init>](-init-.md) | `Foo()` | diff --git a/core/testdata/format/multiplatform/breadcrumbsInMemberOfMemberOfGroupNode/multiplatform.md b/core/testdata/format/multiplatform/breadcrumbsInMemberOfMemberOfGroupNode/multiplatform.md index e3d4c070..37e943ad 100644 --- a/core/testdata/format/multiplatform/breadcrumbsInMemberOfMemberOfGroupNode/multiplatform.md +++ b/core/testdata/format/multiplatform/breadcrumbsInMemberOfMemberOfGroupNode/multiplatform.md @@ -1,4 +1,4 @@ -[test](test/index) / [pack](test/pack/index) / [Some](test/pack/-some/index) / [magic](test/pack/-some/-some/magic) +[test](../../../index.md) / [pack](../../index.md) / [Some](../index.md) / [magic](./magic.md) # magic diff --git a/core/testdata/format/multiplatform/groupNode/multiplatform.md b/core/testdata/format/multiplatform/groupNode/multiplatform.md index c0ef14b1..74d464c9 100644 --- a/core/testdata/format/multiplatform/groupNode/multiplatform.md +++ b/core/testdata/format/multiplatform/groupNode/multiplatform.md @@ -1,4 +1,4 @@ -[test](test/index) / [pack](test/pack/index) / [Some](test/pack/-some/index) +[test](../../index.md) / [pack](../index.md) / [Some](./index.md) # Some @@ -12,9 +12,9 @@ ### Constructors -| [<init>](test/pack/-some/-some/-init-) | `Some()` | +| [<init>](-some/-init-.md) | `Some()` | ### Functions -| [magic](test/pack/-some/-some/magic) | `fun magic(): Unit` | +| [magic](-some/magic.md) | `fun magic(): Unit` | diff --git a/core/testdata/format/multiplatform/groupNode/multiplatform.package.md b/core/testdata/format/multiplatform/groupNode/multiplatform.package.md index a9e2e404..5708795e 100644 --- a/core/testdata/format/multiplatform/groupNode/multiplatform.package.md +++ b/core/testdata/format/multiplatform/groupNode/multiplatform.package.md @@ -1,13 +1,13 @@ -[test](test/index) / [pack](test/pack/index) +[test](../index.md) / [pack](./index.md) ## Package pack ### Types -| [Some](test/pack/-some/index)
(JS) | `class Some` | -| [SomeCoolJvmClass](test/pack/-some-cool-jvm-class/index)
(JVM) | `class SomeCoolJvmClass` | +| [Some](-some/index.md)
(JS) | `class Some` | +| [SomeCoolJvmClass](-some-cool-jvm-class/index.md)
(JVM) | `class SomeCoolJvmClass` | ### Type Aliases -| [Some](test/pack/-some/index)
(JVM) | `typealias Some = SomeCoolJvmClass` | +| [Some](-some/index.md)
(JVM) | `typealias Some = SomeCoolJvmClass` | diff --git a/core/testdata/format/multiplatform/implied/foo.md b/core/testdata/format/multiplatform/implied/foo.md index c615dd8e..fca2aff4 100644 --- a/core/testdata/format/multiplatform/implied/foo.md +++ b/core/testdata/format/multiplatform/implied/foo.md @@ -1,4 +1,4 @@ -[test](test/index) / [foo](test/foo/index) / [Foo](test/foo/-foo/index) +[test](../../index.md) / [foo](../index.md) / [Foo](./index.md) # Foo @@ -8,17 +8,17 @@ This is a foo. ### Constructors -| [<init>](test/foo/-foo/-init-) | `Foo()`
This is a foo. | +| [<init>](-init-.md) | `Foo()`
This is a foo. | ### Properties -| [propJs](test/foo/-foo/prop-js)
(JS) | `val propJs: String` | -| [propJvm](test/foo/-foo/prop-jvm)
(JVM) | `val propJvm: String` | -| [propJvmAndJs](test/foo/-foo/prop-jvm-and-js) | `val propJvmAndJs: Int` | +| [propJs](prop-js.md)
(JS) | `val propJs: String` | +| [propJvm](prop-jvm.md)
(JVM) | `val propJvm: String` | +| [propJvmAndJs](prop-jvm-and-js.md) | `val propJvmAndJs: Int` | ### Functions -| [bothJvmAndJs](test/foo/-foo/both-jvm-and-js) | `fun bothJvmAndJs(): Unit` | -| [js](test/foo/-foo/js)
(JS) | `fun js(): Unit` | -| [jvm](test/foo/-foo/jvm)
(JVM) | `fun jvm(): Unit` | +| [bothJvmAndJs](both-jvm-and-js.md) | `fun bothJvmAndJs(): Unit` | +| [js](js.md)
(JS) | `fun js(): Unit` | +| [jvm](jvm.md)
(JVM) | `fun jvm(): Unit` | diff --git a/core/testdata/format/multiplatform/merge/multiplatform.package.md b/core/testdata/format/multiplatform/merge/multiplatform.package.md index 8e463327..ea78b5a3 100644 --- a/core/testdata/format/multiplatform/merge/multiplatform.package.md +++ b/core/testdata/format/multiplatform/merge/multiplatform.package.md @@ -1,4 +1,4 @@ -[test](test/index) / [foo](test/foo/index) +[test](../index.md) / [foo](./index.md) ## Package foo @@ -6,5 +6,5 @@ ### Types -| [Foo](test/foo/-foo/index)
(JVM, JS) | `class Foo`
This is a foo. | +| [Foo](-foo/index.md)
(JVM, JS) | `class Foo`
This is a foo. | diff --git a/core/testdata/format/multiplatform/mergeMembers/foo.md b/core/testdata/format/multiplatform/mergeMembers/foo.md index 7490c878..7f41b7d1 100644 --- a/core/testdata/format/multiplatform/mergeMembers/foo.md +++ b/core/testdata/format/multiplatform/mergeMembers/foo.md @@ -1,4 +1,4 @@ -[test](test/index) / [foo](test/foo/index) / [Foo](test/foo/-foo/index) +[test](../../index.md) / [foo](../index.md) / [Foo](./index.md) # Foo @@ -10,17 +10,17 @@ This is a foo. ### Constructors -| [<init>](test/foo/-foo/-init-) | `Foo()`
This is a foo. | +| [<init>](-init-.md) | `Foo()`
This is a foo. | ### Properties -| [propJs](test/foo/-foo/prop-js)
(JS) | `val propJs: String` | -| [propJvm](test/foo/-foo/prop-jvm)
(JVM) | `val propJvm: String` | -| [propJvmAndJs](test/foo/-foo/prop-jvm-and-js) | `val propJvmAndJs: Int` | +| [propJs](prop-js.md)
(JS) | `val propJs: String` | +| [propJvm](prop-jvm.md)
(JVM) | `val propJvm: String` | +| [propJvmAndJs](prop-jvm-and-js.md) | `val propJvmAndJs: Int` | ### Functions -| [bothJvmAndJs](test/foo/-foo/both-jvm-and-js) | `fun bothJvmAndJs(): Unit` | -| [js](test/foo/-foo/js)
(JS) | `fun js(): Unit` | -| [jvm](test/foo/-foo/jvm)
(JVM) | `fun jvm(): Unit` | +| [bothJvmAndJs](both-jvm-and-js.md) | `fun bothJvmAndJs(): Unit` | +| [js](js.md)
(JS) | `fun js(): Unit` | +| [jvm](jvm.md)
(JVM) | `fun jvm(): Unit` | diff --git a/core/testdata/format/multiplatform/omitRedundant/foo.md b/core/testdata/format/multiplatform/omitRedundant/foo.md index 088ced2c..a20b14cf 100644 --- a/core/testdata/format/multiplatform/omitRedundant/foo.md +++ b/core/testdata/format/multiplatform/omitRedundant/foo.md @@ -1,4 +1,4 @@ -[test](test/index) / [foo](test/foo/index) / [Foo](test/foo/-foo/index) +[test](../../index.md) / [foo](../index.md) / [Foo](./index.md) # Foo @@ -10,13 +10,13 @@ This is a foo. ### Constructors -| [<init>](test/foo/-foo/-init-) | `Foo()`
This is a foo. | +| [<init>](-init-.md) | `Foo()`
This is a foo. | ### Properties -| [propJvm](test/foo/-foo/prop-jvm) | `val propJvm: String` | +| [propJvm](prop-jvm.md) | `val propJvm: String` | ### Functions -| [jvm](test/foo/-foo/jvm) | `fun jvm(): Unit` | +| [jvm](jvm.md) | `fun jvm(): Unit` | diff --git a/core/testdata/format/multiplatform/packagePlatformsFromMembers/multiplatform.index.md b/core/testdata/format/multiplatform/packagePlatformsFromMembers/multiplatform.index.md index 1dda25d4..6f45342b 100644 --- a/core/testdata/format/multiplatform/packagePlatformsFromMembers/multiplatform.index.md +++ b/core/testdata/format/multiplatform/packagePlatformsFromMembers/multiplatform.index.md @@ -1,10 +1,10 @@ -[test](test/index) +[test](./index.md) **Platform and version requirements:** JVM, JS ### Packages -| [foo.bar](test/foo.bar/index)
(JVM, JS) | | +| [foo.bar](foo.bar/index.md)
(JVM, JS) | | ### Index diff --git a/core/testdata/format/multiplatform/packagePlatformsFromMembers/multiplatform.package.md b/core/testdata/format/multiplatform/packagePlatformsFromMembers/multiplatform.package.md index 2921cdd1..4ddfe2e3 100644 --- a/core/testdata/format/multiplatform/packagePlatformsFromMembers/multiplatform.package.md +++ b/core/testdata/format/multiplatform/packagePlatformsFromMembers/multiplatform.package.md @@ -1,4 +1,4 @@ -[test](test/index) / [foo.bar](test/foo.bar/index) +[test](../index.md) / [foo.bar](./index.md) ## Package foo.bar @@ -6,5 +6,5 @@ ### Functions -| [buz](test/foo.bar/buz)
(JVM, JS) | `fun buz(): Unit` | +| [buz](buz.md)
(JVM, JS) | `fun buz(): Unit` | diff --git a/core/testdata/format/multiplatform/packagePlatformsWithExtExtensions/multiplatform.index.md b/core/testdata/format/multiplatform/packagePlatformsWithExtExtensions/multiplatform.index.md index f6e770b2..f4186b6e 100644 --- a/core/testdata/format/multiplatform/packagePlatformsWithExtExtensions/multiplatform.index.md +++ b/core/testdata/format/multiplatform/packagePlatformsWithExtExtensions/multiplatform.index.md @@ -1,10 +1,10 @@ -[test](test/index) +[test](./index.md) **Platform and version requirements:** JVM ### Packages -| [some](test/some/index)
(JVM) | | +| [some](some/index.md)
(JVM) | | ### Index diff --git a/core/testdata/format/multiplatform/packagePlatformsWithExtExtensions/multiplatform.package.md b/core/testdata/format/multiplatform/packagePlatformsWithExtExtensions/multiplatform.package.md index 22f778d6..ff480b5a 100644 --- a/core/testdata/format/multiplatform/packagePlatformsWithExtExtensions/multiplatform.package.md +++ b/core/testdata/format/multiplatform/packagePlatformsWithExtExtensions/multiplatform.package.md @@ -1,4 +1,4 @@ -[test](test/index) / [some](test/some/index) +[test](../index.md) / [some](./index.md) ## Package some @@ -6,5 +6,5 @@ ### Extensions for External Classes -| [kotlin.String](test/some/kotlin.-string/index) | | +| [kotlin.String](kotlin.-string/index.md) | | diff --git a/core/testdata/format/multiplatform/simple/multiplatform.package.md b/core/testdata/format/multiplatform/simple/multiplatform.package.md index 3574942c..fad7e90d 100644 --- a/core/testdata/format/multiplatform/simple/multiplatform.package.md +++ b/core/testdata/format/multiplatform/simple/multiplatform.package.md @@ -1,9 +1,9 @@ -[test](test/index) / [foo](test/foo/index) +[test](../index.md) / [foo](./index.md) ## Package foo ### Types -| [Bar](test/foo/-bar/index)
(JS) | `class Bar`
This is a bar. | -| [Foo](test/foo/-foo/index)
(JVM) | `class Foo`
This is a foo. | +| [Bar](-bar/index.md)
(JS) | `class Bar`
This is a bar. | +| [Foo](-foo/index.md)
(JVM) | `class Foo`
This is a foo. | diff --git a/core/testdata/format/multipleTypeParameterConstraints.md b/core/testdata/format/multipleTypeParameterConstraints.md index 5dd45e4e..78586aca 100644 --- a/core/testdata/format/multipleTypeParameterConstraints.md +++ b/core/testdata/format/multipleTypeParameterConstraints.md @@ -1,13 +1,18 @@ -[test](test/index) / [A](test/-a) + +[test](index.md) / [A](./-a.md) # A -`interface A`[test](test/index) / [B](test/-b) +`interface A` + +[test](index.md) / [B](./-b.md) # B -`interface B`[test](test/index) / [f](test/f) +`interface B` + +[test](index.md) / [f](./f.md) # f -`fun f(): Unit where T : `[`A`](test/-a)`, T : `[`B`](test/-b) \ No newline at end of file +`fun f(): Unit where T : `[`A`](-a.md)`, T : `[`B`](-b.md) \ No newline at end of file diff --git a/core/testdata/format/nestedLists.md b/core/testdata/format/nestedLists.md index dd151944..fb25bc32 100644 --- a/core/testdata/format/nestedLists.md +++ b/core/testdata/format/nestedLists.md @@ -1,4 +1,4 @@ -[test](test/index) / [Bar](test/-bar/index) +[test](../index.md) / [Bar](./index.md) # Bar @@ -8,36 +8,36 @@ Usage instructions: * **Rinse** 1. Alter any rinse options *(optional)* - * Recommended to [Bar.useSoap](test/-bar/use-soap) + * Recommended to [Bar.useSoap](use-soap.md) * Optionally apply [Bar.elbowGrease](#) for best results - 2. [Bar.rinse](test/-bar/rinse) to begin rinse - 1. Thus you should call [Bar.rinse](test/-bar/rinse) - 2. *Then* call [Bar.repeat](test/-bar/repeat) + 2. [Bar.rinse](rinse.md) to begin rinse + 1. Thus you should call [Bar.rinse](rinse.md) + 2. *Then* call [Bar.repeat](repeat.md) * Don't forget to use: * Soap * Elbow Grease - 3. Finally, adjust soap usage [Bar.useSoap](test/-bar/use-soap) as needed - 3. Repeat with [Bar.repeat](test/-bar/repeat) + 3. Finally, adjust soap usage [Bar.useSoap](use-soap.md) as needed + 3. Repeat with [Bar.repeat](repeat.md) * **Repeat** * Will use previously used rinse options - * [Bar.rinse](test/-bar/rinse) must have been called once before + * [Bar.rinse](rinse.md) must have been called once before * Can be repeated any number of times * Options include: - * [Bar.useSoap](test/-bar/use-soap) - * [Bar.useElbowGrease](test/-bar/use-elbow-grease) + * [Bar.useSoap](use-soap.md) + * [Bar.useElbowGrease](use-elbow-grease.md) ### Constructors -| [<init>](test/-bar/-init-) | `Bar()`
Usage instructions: | +| [<init>](-init-.md) | `Bar()`
Usage instructions: | ### Properties -| [useElbowGrease](test/-bar/use-elbow-grease) | `var useElbowGrease: Boolean` | -| [useSoap](test/-bar/use-soap) | `var useSoap: Boolean` | +| [useElbowGrease](use-elbow-grease.md) | `var useElbowGrease: Boolean` | +| [useSoap](use-soap.md) | `var useSoap: Boolean` | ### Functions -| [repeat](test/-bar/repeat) | `fun repeat(): Unit` | -| [rinse](test/-bar/rinse) | `fun rinse(): Unit` | +| [repeat](repeat.md) | `fun repeat(): Unit` | +| [rinse](rinse.md) | `fun rinse(): Unit` | diff --git a/core/testdata/format/newlineInTableCell.package.md b/core/testdata/format/newlineInTableCell.package.md index 4b3875ba..53716db3 100644 --- a/core/testdata/format/newlineInTableCell.package.md +++ b/core/testdata/format/newlineInTableCell.package.md @@ -1,8 +1,8 @@ -[test](test/index) +[test](./index.md) ## Package <root> ### Types -| [A](test/-a/index) | `class A`
There is `long long int` story full of new lines | +| [A](-a/index.md) | `class A`
There is `long long int` story full of new lines | diff --git a/core/testdata/format/notPublishedTypeAliasAutoExpansion.md b/core/testdata/format/notPublishedTypeAliasAutoExpansion.md index 9e0f1560..ca95093c 100644 --- a/core/testdata/format/notPublishedTypeAliasAutoExpansion.md +++ b/core/testdata/format/notPublishedTypeAliasAutoExpansion.md @@ -1,9 +1,9 @@ -[test](test/index) / [foo](test/foo) +[test](index.md) / [foo](./foo.md) # foo `fun foo(): Unit` -Correct ref [TA](test/-a/index) -Correct ref [TB](test/-b/index) +Correct ref [TA](-a/index.md) +Correct ref [TB](-b/index.md) diff --git a/core/testdata/format/nullability.md b/core/testdata/format/nullability.md index 014eb485..7b81c255 100644 --- a/core/testdata/format/nullability.md +++ b/core/testdata/format/nullability.md @@ -1,4 +1,4 @@ -[test](test/index) / [C](test/-c/index) +[test](../index.md) / [C](./index.md) # C @@ -6,9 +6,9 @@ ### Constructors -| [<init>](test/-c/-init-) | `C()` | +| [<init>](-init-.md) | `C()` | ### Functions -| [foo](test/-c/foo) | `fun foo(): Comparable<`[`T`](test/-c/index#T)`>?` | +| [foo](foo.md) | `fun foo(): Comparable<`[`T`](index.md#T)`>?` | diff --git a/core/testdata/format/operatorOverloading.md b/core/testdata/format/operatorOverloading.md index 8e8d36eb..0a4c87b6 100644 --- a/core/testdata/format/operatorOverloading.md +++ b/core/testdata/format/operatorOverloading.md @@ -1,5 +1,5 @@ -[test](test/index) / [C](test/-c/index) / [plus](test/-c/plus) +[test](../index.md) / [C](index.md) / [plus](./plus.md) # plus -`fun plus(other: `[`C`](test/-c/index)`): `[`C`](test/-c/index) \ No newline at end of file +`fun plus(other: `[`C`](index.md)`): `[`C`](index.md) \ No newline at end of file diff --git a/core/testdata/format/orderedList.html b/core/testdata/format/orderedList.html index 66f37876..6f735bfd 100644 --- a/core/testdata/format/orderedList.html +++ b/core/testdata/format/orderedList.html @@ -4,7 +4,7 @@ Bar - test -test / Bar
+test / Bar

Bar

class Bar @@ -17,7 +17,7 @@
-

<init>

+

<init>

 Bar() -

Use this method for best results.

+

Use this method for best results.
-

foo

+

foo

 fun foo(): Unit
-

foo

+

foo

 fun foo(c: Enum<*>): Unit
-

<init>

+

<init>

 Bar() diff --git a/core/testdata/format/overloads.html b/core/testdata/format/overloads.html index d0f7f37d..feda82e4 100644 --- a/core/testdata/format/overloads.html +++ b/core/testdata/format/overloads.html @@ -4,7 +4,7 @@ root package - test -test
+test

Package <root>

Functions

@@ -12,7 +12,7 @@
-

f

+

f

 fun f(x: Int): Unit
diff --git a/core/testdata/format/overloadsWithDescription.html b/core/testdata/format/overloadsWithDescription.html index fe98b8fe..16b03f7e 100644 --- a/core/testdata/format/overloadsWithDescription.html +++ b/core/testdata/format/overloadsWithDescription.html @@ -4,14 +4,14 @@ f - test -test / f
+test / f

f

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

Performs an action on x.

+

Performs an action on x.

This is a long description.

Parameters

diff --git a/core/testdata/format/overloadsWithDifferentDescriptions.html b/core/testdata/format/overloadsWithDifferentDescriptions.html index 1f086039..4c4f7f74 100644 --- a/core/testdata/format/overloadsWithDifferentDescriptions.html +++ b/core/testdata/format/overloadsWithDifferentDescriptions.html @@ -4,7 +4,7 @@ f - test -test / f
+test / f

f

diff --git a/core/testdata/format/overridingFunction.md b/core/testdata/format/overridingFunction.md index dcc1c426..d0ec82fa 100644 --- a/core/testdata/format/overridingFunction.md +++ b/core/testdata/format/overridingFunction.md @@ -1,8 +1,8 @@ -[test](test/index) / [D](test/-d/index) / [f](test/-d/f) +[test](../index.md) / [D](index.md) / [f](./f.md) # f `fun f(): Unit` -Overrides [C.f](test/-c/f) +Overrides [C.f](../-c/f.md) diff --git a/core/testdata/format/paramTag.md b/core/testdata/format/paramTag.md index d3e948ae..7cc33d21 100644 --- a/core/testdata/format/paramTag.md +++ b/core/testdata/format/paramTag.md @@ -1,4 +1,4 @@ -[test](test/index) / [f](test/f) +[test](index.md) / [f](./f.md) # f diff --git a/core/testdata/format/parameterAnchor.html b/core/testdata/format/parameterAnchor.html index 3ffcf595..a4ae0997 100644 --- a/core/testdata/format/parameterAnchor.html +++ b/core/testdata/format/parameterAnchor.html @@ -4,12 +4,12 @@ processFiles - test -test / processFiles
+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 6f3c1d6b..c63154c1 100644 --- a/core/testdata/format/parenthesis.html +++ b/core/testdata/format/parenthesis.html @@ -4,7 +4,7 @@ foo - test -test / foo
+test / foo

foo

diff --git a/core/testdata/format/propertyVar.md b/core/testdata/format/propertyVar.md index 8232dff4..887d25a5 100644 --- a/core/testdata/format/propertyVar.md +++ b/core/testdata/format/propertyVar.md @@ -1,4 +1,4 @@ -[test](test/index) / [x](test/x) +[test](index.md) / [x](./x.md) # x diff --git a/core/testdata/format/qualifiedNameLink.md b/core/testdata/format/qualifiedNameLink.md index 590bb435..92fa8f7a 100644 --- a/core/testdata/format/qualifiedNameLink.md +++ b/core/testdata/format/qualifiedNameLink.md @@ -1,4 +1,4 @@ -[test](test/index) / [foo](test/foo) +[test](index.md) / [foo](./foo.md) # foo diff --git a/core/testdata/format/receiverParameterTypeBound.md b/core/testdata/format/receiverParameterTypeBound.md index 9c767449..978dc0f8 100644 --- a/core/testdata/format/receiverParameterTypeBound.md +++ b/core/testdata/format/receiverParameterTypeBound.md @@ -1,4 +1,4 @@ -[test](test/index) / [Foo](test/-foo/index) +[test](../index.md) / [Foo](./index.md) # Foo @@ -6,9 +6,9 @@ ### Constructors -| [<init>](test/-foo/-init-) | `Foo()` | +| [<init>](-init-.md) | `Foo()` | ### Extension Functions -| [xyzzy](test/xyzzy) | `fun `[`T`](test/xyzzy#T)`.xyzzy(): Unit` | +| [xyzzy](../xyzzy.md) | `fun `[`T`](../xyzzy.md#T)`.xyzzy(): Unit` | diff --git a/core/testdata/format/receiverReference.md b/core/testdata/format/receiverReference.md index 1584b2b1..bdcce322 100644 --- a/core/testdata/format/receiverReference.md +++ b/core/testdata/format/receiverReference.md @@ -1,6 +1,6 @@ -[test](test/index) / [kotlin.String](test/kotlin.-string/index) +[test](../index.md) / [kotlin.String](./index.md) ### Extensions for kotlin.String -| [some](test/kotlin.-string/some) | `fun String.some(): Unit`
Prints [this](test/kotlin.-string/some/-this-) | +| [some](some.md) | `fun String.some(): Unit`
Prints [this](some/-this-.md) | diff --git a/core/testdata/format/referenceLink.md b/core/testdata/format/referenceLink.md index b3d89e0d..ee910cbf 100644 --- a/core/testdata/format/referenceLink.md +++ b/core/testdata/format/referenceLink.md @@ -1,14 +1,16 @@ -[test](test/index) / [example](test/example/index) / [a](test/example/a) + +[test](../index.md) / [example](index.md) / [a](./a.md) # a `fun a(): Unit` -It is link to [example other func](test/example/some-other-func) +It is link to [example other func](some-other-func.md) -Sure, it is [example](test/example/some-other-func) +Sure, it is [example](some-other-func.md) -[test](test/index) / [example](test/example/index) / [someOtherFunc](test/example/some-other-func) + +[test](../index.md) / [example](index.md) / [someOtherFunc](./some-other-func.md) # someOtherFunc diff --git a/core/testdata/format/reifiedTypeParameter.md b/core/testdata/format/reifiedTypeParameter.md index 253f2438..40dbed7b 100644 --- a/core/testdata/format/reifiedTypeParameter.md +++ b/core/testdata/format/reifiedTypeParameter.md @@ -1,4 +1,4 @@ -[test](test/index) / [f](test/f) +[test](index.md) / [f](./f.md) # f diff --git a/core/testdata/format/renderFunctionalTypeInParenthesisWhenItIsReceiver.md b/core/testdata/format/renderFunctionalTypeInParenthesisWhenItIsReceiver.md index c9856976..ad632fef 100644 --- a/core/testdata/format/renderFunctionalTypeInParenthesisWhenItIsReceiver.md +++ b/core/testdata/format/renderFunctionalTypeInParenthesisWhenItIsReceiver.md @@ -1,6 +1,6 @@ -[test](test/index) / [kotlin.SuspendFunction0](test/kotlin.-suspend-function0/index) +[test](../index.md) / [kotlin.SuspendFunction0](./index.md) ### Extensions for kotlin.SuspendFunction0 -| [foo](test/kotlin.-suspend-function0/foo) | `fun (suspend () -> Unit).foo(): Unit` | +| [foo](foo.md) | `fun (suspend () -> Unit).foo(): Unit` | diff --git a/core/testdata/format/returnWithLink.html b/core/testdata/format/returnWithLink.html index f6e918dd..fe1d031b 100644 --- a/core/testdata/format/returnWithLink.html +++ b/core/testdata/format/returnWithLink.html @@ -4,12 +4,12 @@ foo - test -test / foo
+test / foo

foo

fun foo(s1: String): String

Return
-Returns s1 and does nothing else.

+Returns s1 and does nothing else.

diff --git a/core/testdata/format/sampleByFQName.md b/core/testdata/format/sampleByFQName.md index 06333e13..7093179d 100644 --- a/core/testdata/format/sampleByFQName.md +++ b/core/testdata/format/sampleByFQName.md @@ -1,8 +1,11 @@ -[test](test/index) / [test](test/test/index) / [sample](test/test/sample) + +[test](../index.md) / [test](index.md) / [sample](./sample.md) # sample -`fun sample(): Unit`[test](test/index) / [test](test/test/index) / [use](test/test/use) +`fun sample(): Unit` + +[test](../index.md) / [test](index.md) / [use](./use.md) # use diff --git a/core/testdata/format/sampleByShortName.md b/core/testdata/format/sampleByShortName.md index 06333e13..7093179d 100644 --- a/core/testdata/format/sampleByShortName.md +++ b/core/testdata/format/sampleByShortName.md @@ -1,8 +1,11 @@ -[test](test/index) / [test](test/test/index) / [sample](test/test/sample) + +[test](../index.md) / [test](index.md) / [sample](./sample.md) # sample -`fun sample(): Unit`[test](test/index) / [test](test/test/index) / [use](test/test/use) +`fun sample(): Unit` + +[test](../index.md) / [test](index.md) / [use](./use.md) # use diff --git a/core/testdata/format/see.html b/core/testdata/format/see.html index d350d6b7..74773951 100644 --- a/core/testdata/format/see.html +++ b/core/testdata/format/see.html @@ -1,22 +1,43 @@ + +quux - test -test / quux
+test / quux

quux

fun quux(): Unit

See Also
-

foo

-

bar

+

foo

+

bar

-test / foo
+ + + + + + +foo - test + + +test / foo

foo

-fun foo(): Unittest / bar
+fun foo(): Unit + + + + + + +bar - test + + +test / bar

bar

diff --git a/core/testdata/format/shadowedExtensionFunctions.md b/core/testdata/format/shadowedExtensionFunctions.md index 3b0a9dc9..f900ecb2 100644 --- a/core/testdata/format/shadowedExtensionFunctions.md +++ b/core/testdata/format/shadowedExtensionFunctions.md @@ -1,15 +1,15 @@ -[test](test/index) / [Bar](test/-bar/index) +[test](../index.md) / [Bar](./index.md) # Bar -`class Bar : `[`Foo`](test/-foo/index) +`class Bar : `[`Foo`](../-foo/index.md) ### Constructors -| [<init>](test/-bar/-init-) | `Bar()` | +| [<init>](-init-.md) | `Bar()` | ### Extension Functions -| [shazam](test/shazam) | `fun `[`Bar`](test/-bar/index)`.shazam(i: Int): Unit`
`fun `[`Foo`](test/-foo/index)`.shazam(): Unit` | -| [xyzzy](test/xyzzy) | `fun `[`Bar`](test/-bar/index)`.xyzzy(): Unit` | +| [shazam](../shazam.md) | `fun `[`Bar`](./index.md)`.shazam(i: Int): Unit`
`fun `[`Foo`](../-foo/index.md)`.shazam(): Unit` | +| [xyzzy](../xyzzy.md) | `fun `[`Bar`](./index.md)`.xyzzy(): Unit` | diff --git a/core/testdata/format/sinceKotlin.html b/core/testdata/format/sinceKotlin.html index ab25a002..32988de2 100644 --- a/core/testdata/format/sinceKotlin.html +++ b/core/testdata/format/sinceKotlin.html @@ -4,7 +4,7 @@ Since1.1 - test -test / Since1.1
+test / Since1.1

Since1.1

class Since1.1 @@ -15,7 +15,7 @@
-

<init>

+

<init>

 Since1.1() diff --git a/core/testdata/format/sinceKotlin.md b/core/testdata/format/sinceKotlin.md index a1abe5fd..df96db0a 100644 --- a/core/testdata/format/sinceKotlin.md +++ b/core/testdata/format/sinceKotlin.md @@ -1,4 +1,4 @@ -[test](test/index) / [Since1.1](test/-since1.1/index) +[test](../index.md) / [Since1.1](./index.md) # Since1.1 @@ -10,5 +10,5 @@ Useful ### Constructors -| [<init>](test/-since1.1/-init-) | `Since1.1()`
Useful | +| [<init>](-init-.md) | `Since1.1()`
Useful | diff --git a/core/testdata/format/sinceKotlin.package.md b/core/testdata/format/sinceKotlin.package.md index c811749c..eabf88d5 100644 --- a/core/testdata/format/sinceKotlin.package.md +++ b/core/testdata/format/sinceKotlin.package.md @@ -1,4 +1,4 @@ -[test](test/index) +[test](./index.md) ## Package <root> @@ -6,5 +6,5 @@ ### Types -| [Since1.1](test/-since1.1/index)
(Kotlin 1.1) | `class Since1.1`
Useful | +| [Since1.1](-since1.1/index.md)
(Kotlin 1.1) | `class Since1.1`
Useful | diff --git a/core/testdata/format/sinceKotlinWide.package.md b/core/testdata/format/sinceKotlinWide.package.md index f683b178..58a5045e 100644 --- a/core/testdata/format/sinceKotlinWide.package.md +++ b/core/testdata/format/sinceKotlinWide.package.md @@ -1,4 +1,4 @@ -[test](test/index) +[test](./index.md) ## Package <root> @@ -6,6 +6,6 @@ ### Types -| [Since1.1](test/-since1.1/index)
(Kotlin 1.1) | `class Since1.1`
Useful | -| [Since1.2](test/-since1.2/index)
(Kotlin 1.2) | `class Since1.2`
Useful also | +| [Since1.1](-since1.1/index.md)
(Kotlin 1.1) | `class Since1.1`
Useful | +| [Since1.2](-since1.2/index.md)
(Kotlin 1.2) | `class Since1.2`
Useful also | diff --git a/core/testdata/format/starProjection.md b/core/testdata/format/starProjection.md index 6f796e77..5a53e5b9 100644 --- a/core/testdata/format/starProjection.md +++ b/core/testdata/format/starProjection.md @@ -1,6 +1,6 @@ -[test](test/index) / [kotlin.collections.Iterable](test/kotlin.collections.-iterable/index) +[test](../index.md) / [kotlin.collections.Iterable](./index.md) ### Extensions for kotlin.collections.Iterable -| [containsFoo](test/kotlin.collections.-iterable/contains-foo) | `fun Iterable<*>.containsFoo(element: Any?): Boolean` | +| [containsFoo](contains-foo.md) | `fun Iterable<*>.containsFoo(element: Any?): Boolean` | diff --git a/core/testdata/format/summarizeSignatures.md b/core/testdata/format/summarizeSignatures.md index c1830fb5..4f494166 100644 --- a/core/testdata/format/summarizeSignatures.md +++ b/core/testdata/format/summarizeSignatures.md @@ -1,14 +1,14 @@ -[test](test/index) / [kotlin](test/kotlin/index) +[test](../index.md) / [kotlin](./index.md) ## Package kotlin ### Types -| [Array](test/kotlin/-array/index) | `class Array` | -| [CharArray](test/kotlin/-char-array/index) | `class CharArray` | -| [IntArray](test/kotlin/-int-array/index) | `class IntArray` | +| [Array](-array/index.md) | `class Array` | +| [CharArray](-char-array/index.md) | `class CharArray` | +| [IntArray](-int-array/index.md) | `class IntArray` | ### Functions -| [foo](test/kotlin/foo) | `fun any_array.foo(predicate: (`[`T`](test/kotlin/foo#T)`) -> Boolean): Boolean`
Returns true if foo. | +| [foo](foo.md) | `fun any_array.foo(predicate: (`[`T`](foo.md#T)`) -> Boolean): Boolean`
Returns true if foo. | diff --git a/core/testdata/format/summarizeSignaturesProperty.md b/core/testdata/format/summarizeSignaturesProperty.md index 712aebd4..507ad6a5 100644 --- a/core/testdata/format/summarizeSignaturesProperty.md +++ b/core/testdata/format/summarizeSignaturesProperty.md @@ -1,14 +1,14 @@ -[test](test/index) / [kotlin](test/kotlin/index) +[test](../index.md) / [kotlin](./index.md) ## Package kotlin ### Types -| [Array](test/kotlin/-array/index) | `class Array` | -| [CharArray](test/kotlin/-char-array/index) | `class CharArray` | -| [IntArray](test/kotlin/-int-array/index) | `class IntArray` | +| [Array](-array/index.md) | `class Array` | +| [CharArray](-char-array/index.md) | `class CharArray` | +| [IntArray](-int-array/index.md) | `class IntArray` | ### Properties -| [foo](test/kotlin/foo) | `val any_array.foo: Int`
Returns true if foo. | +| [foo](foo.md) | `val any_array.foo: Int`
Returns true if foo. | diff --git a/core/testdata/format/suspendParam.md b/core/testdata/format/suspendParam.md index cf11f57b..ab116140 100644 --- a/core/testdata/format/suspendParam.md +++ b/core/testdata/format/suspendParam.md @@ -1,4 +1,4 @@ -[test](test/index) / [takesSuspendParam](test/takes-suspend-param) +[test](index.md) / [takesSuspendParam](./takes-suspend-param.md) # takesSuspendParam diff --git a/core/testdata/format/suspendParam.package.md b/core/testdata/format/suspendParam.package.md index 463ba356..92bd7ee7 100644 --- a/core/testdata/format/suspendParam.package.md +++ b/core/testdata/format/suspendParam.package.md @@ -1,8 +1,8 @@ -[test](test/index) +[test](./index.md) ## Package <root> ### Functions -| [takesSuspendParam](test/takes-suspend-param) | `fun takesSuspendParam(func: suspend () -> Unit): Unit` | +| [takesSuspendParam](takes-suspend-param.md) | `fun takesSuspendParam(func: suspend () -> Unit): Unit` | diff --git a/core/testdata/format/throwsTag.md b/core/testdata/format/throwsTag.md index a476fa1b..70fba512 100644 --- a/core/testdata/format/throwsTag.md +++ b/core/testdata/format/throwsTag.md @@ -1,4 +1,4 @@ -[test](test/index) / [f](test/f) +[test](index.md) / [f](./f.md) # f diff --git a/core/testdata/format/tokensInEmphasis.md b/core/testdata/format/tokensInEmphasis.md index 79dde6f0..a68861de 100644 --- a/core/testdata/format/tokensInEmphasis.md +++ b/core/testdata/format/tokensInEmphasis.md @@ -1,4 +1,4 @@ -[test](test/index) / [Bar](test/-bar/index) +[test](../index.md) / [Bar](./index.md) # Bar @@ -6,15 +6,15 @@ Another emphasised class. -*This class, [Bar](test/-bar/index) is just meh.* +*This class, [Bar](./index.md) is just meh.* -*For a semicolon; [Bar.foo](test/-bar/foo) is for you!.* +*For a semicolon; [Bar.foo](foo.md) is for you!.* ### Constructors -| [<init>](test/-bar/-init-) | `Bar()`
Another emphasised class. | +| [<init>](-init-.md) | `Bar()`
Another emphasised class. | ### Functions -| [foo](test/-bar/foo) | `fun foo(): String` | +| [foo](foo.md) | `fun foo(): String` | diff --git a/core/testdata/format/tokensInHeaders.md b/core/testdata/format/tokensInHeaders.md index 46a1e9a5..bd25492e 100644 --- a/core/testdata/format/tokensInHeaders.md +++ b/core/testdata/format/tokensInHeaders.md @@ -1,4 +1,4 @@ -[test](test/index) / [The](test/-the/index) +[test](../index.md) / [The](./index.md) # The @@ -6,32 +6,32 @@ Why did the token cross the road? -# Because it was Beer o'clock @ [The.bar](test/-the/bar) +# Because it was Beer o'clock @ [The.bar](bar.md) ## But **waz *\[sic\]* [it](isitbeeroclock.com)** really? -### [The.bar](test/-the/bar) has? [The.foo](test/-the/foo)est drinks ever! +### [The.bar](bar.md) has? [The.foo](foo.md)est drinks ever! -#### *[The.kotlinz](test/-the/kotlinz) is [The.bestests](test/-the/bestests), [Bar.none](test/-the/-bar/none)* +#### *[The.kotlinz](kotlinz.md) is [The.bestests](bestests.md), [Bar.none](-bar/none.md)* -##### So many lame code "puns" (in) [The.house](test/-the/house) +##### So many lame code "puns" (in) [The.house](house.md) ###### End of the?? [Bar.line](#)! - we need to go back! ### Types -| [Bar](test/-the/-bar/index) | `object Bar` | +| [Bar](-bar/index.md) | `object Bar` | ### Constructors -| [<init>](test/-the/-init-) | `The()`
Why did the token cross the road? | +| [<init>](-init-.md) | `The()`
Why did the token cross the road? | ### Functions -| [bar](test/-the/bar) | `fun bar(): Unit` | -| [bestests](test/-the/bestests) | `fun bestests(): Unit` | -| [foo](test/-the/foo) | `fun foo(): Unit` | -| [house](test/-the/house) | `fun house(): Unit` | -| [kotlinz](test/-the/kotlinz) | `fun kotlinz(): Unit` | -| [line](test/-the/line) | `fun line(): Unit` | +| [bar](bar.md) | `fun bar(): Unit` | +| [bestests](bestests.md) | `fun bestests(): Unit` | +| [foo](foo.md) | `fun foo(): Unit` | +| [house](house.md) | `fun house(): Unit` | +| [kotlinz](kotlinz.md) | `fun kotlinz(): Unit` | +| [line](line.md) | `fun line(): Unit` | diff --git a/core/testdata/format/tokensInStrong.md b/core/testdata/format/tokensInStrong.md index e1abe030..2781656c 100644 --- a/core/testdata/format/tokensInStrong.md +++ b/core/testdata/format/tokensInStrong.md @@ -1,20 +1,20 @@ -[test](test/index) / [Yasc](test/-yasc/index) +[test](../index.md) / [Yasc](./index.md) # Yasc `class Yasc` -**YASC: [Yasc](test/-yasc/index) Yet Another Strong Class** +**YASC: [Yasc](./index.md) Yet Another Strong Class** -**This class, [Yasc](test/-yasc/index) *is* just meh.** +**This class, [Yasc](./index.md) *is* just meh.** -**For a semicolon; [Yasc.foo](test/-yasc/foo) is for you!.** +**For a semicolon; [Yasc.foo](foo.md) is for you!.** ### Constructors -| [<init>](test/-yasc/-init-) | `Yasc()`
**YASC: [Yasc](test/-yasc/index) Yet Another Strong Class** | +| [<init>](-init-.md) | `Yasc()`
**YASC: [Yasc](./index.md) Yet Another Strong Class** | ### Functions -| [foo](test/-yasc/foo) | `fun foo(): String` | +| [foo](foo.md) | `fun foo(): String` | diff --git a/core/testdata/format/tripleBackticks.html b/core/testdata/format/tripleBackticks.html index bac3385c..dacd0567 100644 --- a/core/testdata/format/tripleBackticks.html +++ b/core/testdata/format/tripleBackticks.html @@ -4,7 +4,7 @@ f - test -test / f
+test / f

f

diff --git a/core/testdata/format/typeAliases.md b/core/testdata/format/typeAliases.md index 2a813c32..218c4848 100644 --- a/core/testdata/format/typeAliases.md +++ b/core/testdata/format/typeAliases.md @@ -1,63 +1,104 @@ -[test](test/index) / [A](test/-a/index) + +[test](../index.md) / [A](./index.md) # A -`class A`[test](test/index) / [B](test/-b/index) +`class A` + +### Constructors + +| [<init>](-init-.md) | `A()` | + + +[test](../index.md) / [B](./index.md) # B -`class B`[test](test/index) / [C](test/-c/index) +`class B` + +### Constructors + +| [<init>](-init-.md) | `B()` | + + +[test](../index.md) / [C](./index.md) # C -`class C`[test](test/index) / [D](test/-d) +`class C` + +### Constructors + +| [<init>](-init-.md) | `C()` | + + +[test](index.md) / [D](./-d.md) # D -`typealias D = `[`A`](test/-a/index)[test](test/index) / [E](test/-e) +`typealias D = `[`A`](-a/index.md) + +[test](index.md) / [E](./-e.md) # E -`typealias E = `[`D`](test/-d)[test](test/index) / [F](test/-f) +`typealias E = `[`D`](-d.md) + +[test](index.md) / [F](./-f.md) # F -`typealias F = (`[`A`](test/-a/index)`) -> `[`B`](test/-b/index)[test](test/index) / [G](test/-g) +`typealias F = (`[`A`](-a/index.md)`) -> `[`B`](-b/index.md) + +[test](index.md) / [G](./-g.md) # G -`typealias G = `[`C`](test/-c/index)`<`[`A`](test/-a/index)`>`[test](test/index) / [H](test/-h) +`typealias G = `[`C`](-c/index.md)`<`[`A`](-a/index.md)`>` + +[test](index.md) / [H](./-h.md) # H -`typealias H = `[`C`](test/-c/index)`<`[`T`](test/-h#T)`>`[test](test/index) / [I](test/-i) +`typealias H = `[`C`](-c/index.md)`<`[`T`](-h.md#T)`>` + +[test](index.md) / [I](./-i.md) # I -`typealias I = `[`H`](test/-h)`<`[`T`](test/-i#T)`>`[test](test/index) / [J](test/-j) +`typealias I = `[`H`](-h.md)`<`[`T`](-i.md#T)`>` + +[test](index.md) / [J](./-j.md) # J -`typealias J = `[`H`](test/-h)`<`[`A`](test/-a/index)`>`[test](test/index) / [K](test/-k) +`typealias J = `[`H`](-h.md)`<`[`A`](-a/index.md)`>` + +[test](index.md) / [K](./-k.md) # K -`typealias K = `[`H`](test/-h)`<`[`J`](test/-j)`>`[test](test/index) / [L](test/-l) +`typealias K = `[`H`](-h.md)`<`[`J`](-j.md)`>` + +[test](index.md) / [L](./-l.md) # L -`typealias L = (`[`K`](test/-k)`, `[`B`](test/-b/index)`) -> `[`J`](test/-j)[test](test/index) / [M](test/-m) +`typealias L = (`[`K`](-k.md)`, `[`B`](-b/index.md)`) -> `[`J`](-j.md) + +[test](index.md) / [M](./-m.md) # M -`typealias M = `[`A`](test/-a/index) +`typealias M = `[`A`](-a/index.md) Documented -[test](test/index) / [N](test/-n) + +[test](index.md) / [N](./-n.md) # N -`typealias ~~N~~ = `[`A`](test/-a/index) +`typealias ~~N~~ = `[`A`](-a/index.md) **Deprecated:** !!! diff --git a/core/testdata/format/typeAliases.package.md b/core/testdata/format/typeAliases.package.md index 9407588b..199e91c2 100644 --- a/core/testdata/format/typeAliases.package.md +++ b/core/testdata/format/typeAliases.package.md @@ -1,24 +1,24 @@ -[test](test/index) +[test](./index.md) ## Package <root> ### Types -| [A](test/-a/index) | `class A` | -| [B](test/-b/index) | `class B` | -| [C](test/-c/index) | `class C` | +| [A](-a/index.md) | `class A` | +| [B](-b/index.md) | `class B` | +| [C](-c/index.md) | `class C` | ### Type Aliases -| [D](test/-d) | `typealias D = `[`A`](test/-a/index) | -| [E](test/-e) | `typealias E = `[`D`](test/-d) | -| [F](test/-f) | `typealias F = (`[`A`](test/-a/index)`) -> `[`B`](test/-b/index) | -| [G](test/-g) | `typealias G = `[`C`](test/-c/index)`<`[`A`](test/-a/index)`>` | -| [H](test/-h) | `typealias H = `[`C`](test/-c/index)`<`[`T`](test/-h#T)`>` | -| [I](test/-i) | `typealias I = `[`H`](test/-h)`<`[`T`](test/-i#T)`>` | -| [J](test/-j) | `typealias J = `[`H`](test/-h)`<`[`A`](test/-a/index)`>` | -| [K](test/-k) | `typealias K = `[`H`](test/-h)`<`[`J`](test/-j)`>` | -| [L](test/-l) | `typealias L = (`[`K`](test/-k)`, `[`B`](test/-b/index)`) -> `[`J`](test/-j) | -| [M](test/-m) | `typealias M = `[`A`](test/-a/index)
Documented | -| [N](test/-n) | `typealias ~~N~~ = `[`A`](test/-a/index) | +| [D](-d.md) | `typealias D = `[`A`](-a/index.md) | +| [E](-e.md) | `typealias E = `[`D`](-d.md) | +| [F](-f.md) | `typealias F = (`[`A`](-a/index.md)`) -> `[`B`](-b/index.md) | +| [G](-g.md) | `typealias G = `[`C`](-c/index.md)`<`[`A`](-a/index.md)`>` | +| [H](-h.md) | `typealias H = `[`C`](-c/index.md)`<`[`T`](-h.md#T)`>` | +| [I](-i.md) | `typealias I = `[`H`](-h.md)`<`[`T`](-i.md#T)`>` | +| [J](-j.md) | `typealias J = `[`H`](-h.md)`<`[`A`](-a/index.md)`>` | +| [K](-k.md) | `typealias K = `[`H`](-h.md)`<`[`J`](-j.md)`>` | +| [L](-l.md) | `typealias L = (`[`K`](-k.md)`, `[`B`](-b/index.md)`) -> `[`J`](-j.md) | +| [M](-m.md) | `typealias M = `[`A`](-a/index.md)
Documented | +| [N](-n.md) | `typealias ~~N~~ = `[`A`](-a/index.md) | diff --git a/core/testdata/format/typeLink.html b/core/testdata/format/typeLink.html index 2e51863f..30af8a93 100644 --- a/core/testdata/format/typeLink.html +++ b/core/testdata/format/typeLink.html @@ -4,16 +4,16 @@ Bar - test -test / Bar
+test / Bar

Bar

-class Bar : Foo +class Bar : Foo

Constructors

diff --git a/core/testdata/format/typeParameterBounds.md b/core/testdata/format/typeParameterBounds.md index 8f369ed6..cf03b3a7 100644 --- a/core/testdata/format/typeParameterBounds.md +++ b/core/testdata/format/typeParameterBounds.md @@ -1,8 +1,8 @@ -[test](test/index) / [generic](test/generic) +[test](index.md) / [generic](./generic.md) # generic -`fun generic(): Unit` +`fun generic(): Unit` generic function diff --git a/core/testdata/format/typeParameterReference.md b/core/testdata/format/typeParameterReference.md index ea49d48a..5001d321 100644 --- a/core/testdata/format/typeParameterReference.md +++ b/core/testdata/format/typeParameterReference.md @@ -1,8 +1,8 @@ -[test](test/index) / [tt](test/tt) +[test](index.md) / [tt](./tt.md) # tt -`fun `[`T`](test/tt#T)`.tt(): Unit` +`fun `[`T`](tt.md#T)`.tt(): Unit` -Correct ref to [T](test/tt#T) +Correct ref to [T](tt.md#T) diff --git a/core/testdata/format/typeParameterVariance.md b/core/testdata/format/typeParameterVariance.md index 01f5562c..b0615d43 100644 --- a/core/testdata/format/typeParameterVariance.md +++ b/core/testdata/format/typeParameterVariance.md @@ -1,4 +1,4 @@ -[test](test/index) / [Foo](test/-foo/index) +[test](../index.md) / [Foo](./index.md) # Foo @@ -10,5 +10,5 @@ ### Constructors -| [<init>](test/-foo/-init-) | `Foo()` | +| [<init>](-init-.md) | `Foo()` | diff --git a/core/testdata/format/typeProjectionVariance.md b/core/testdata/format/typeProjectionVariance.md index 072b9fc7..d3a55c58 100644 --- a/core/testdata/format/typeProjectionVariance.md +++ b/core/testdata/format/typeProjectionVariance.md @@ -1,6 +1,6 @@ -[test](test/index) / [kotlin.Array](test/kotlin.-array/index) +[test](../index.md) / [kotlin.Array](./index.md) ### Extensions for kotlin.Array -| [foo](test/kotlin.-array/foo) | `fun Array.foo(): Unit` | +| [foo](foo.md) | `fun Array.foo(): Unit` | diff --git a/core/testdata/format/uninterpretedEmphasisCharacters.html b/core/testdata/format/uninterpretedEmphasisCharacters.html index ced7d0a5..dd338f72 100644 --- a/core/testdata/format/uninterpretedEmphasisCharacters.html +++ b/core/testdata/format/uninterpretedEmphasisCharacters.html @@ -4,7 +4,7 @@ foo - test -test / foo
+test / foo

foo

diff --git a/core/testdata/format/unorderedLists.md b/core/testdata/format/unorderedLists.md index a6b00b34..52ad9a71 100644 --- a/core/testdata/format/unorderedLists.md +++ b/core/testdata/format/unorderedLists.md @@ -1,4 +1,4 @@ -[test](test/index) / [Bar](test/-bar/index) +[test](../index.md) / [Bar](./index.md) # Bar @@ -11,9 +11,9 @@ Usage summary: Usage instructions: -* [Bar.rinse](test/-bar/rinse) to rinse +* [Bar.rinse](rinse.md) to rinse * Alter any rinse options *(optional)* -* To repeat; [Bar.repeat](test/-bar/repeat) +* To repeat; [Bar.repeat](repeat.md) * Can reconfigure options: * Soap * Elbow Grease @@ -21,27 +21,27 @@ Usage instructions: Rinse options: -* [Bar.useSoap](test/-bar/use-soap) +* [Bar.useSoap](use-soap.md) * *recommended* -* [Bar.useElbowGrease](test/-bar/use-elbow-grease) +* [Bar.useElbowGrease](use-elbow-grease.md) * *warning: requires effort* -* [Bar.useBleach](test/-bar/use-bleach) +* [Bar.useBleach](use-bleach.md) * **use with caution** ### Constructors -| [<init>](test/-bar/-init-) | `Bar()`
Usage summary: | +| [<init>](-init-.md) | `Bar()`
Usage summary: | ### Properties -| [useBleach](test/-bar/use-bleach) | `var useBleach: Boolean` | -| [useElbowGrease](test/-bar/use-elbow-grease) | `var useElbowGrease: Boolean` | -| [useSoap](test/-bar/use-soap) | `var useSoap: Boolean` | +| [useBleach](use-bleach.md) | `var useBleach: Boolean` | +| [useElbowGrease](use-elbow-grease.md) | `var useElbowGrease: Boolean` | +| [useSoap](use-soap.md) | `var useSoap: Boolean` | ### Functions -| [repeat](test/-bar/repeat) | `fun repeat(): Unit` | -| [rinse](test/-bar/rinse) | `fun rinse(): Unit` | +| [repeat](repeat.md) | `fun repeat(): Unit` | +| [rinse](rinse.md) | `fun rinse(): Unit` | diff --git a/core/testdata/format/varargsFunction.md b/core/testdata/format/varargsFunction.md index 85ac9c92..550202cc 100644 --- a/core/testdata/format/varargsFunction.md +++ b/core/testdata/format/varargsFunction.md @@ -1,4 +1,4 @@ -[test](test/index) / [f](test/f) +[test](index.md) / [f](./f.md) # f diff --git a/core/testdata/format/website-html/dataTags/multiplatform.package.html b/core/testdata/format/website-html/dataTags/multiplatform.package.html index 15e1fc12..35453ab1 100644 --- a/core/testdata/format/website-html/dataTags/multiplatform.package.html +++ b/core/testdata/format/website-html/dataTags/multiplatform.package.html @@ -1,10 +1,10 @@ -
test / foo
+
test / foo

Package foo

Functions

-

<init>

+

<init>

 Bar()
-

jre7

+

jre7

 @@ -12,7 +12,7 @@
-

jre7New

+

jre7New

 @@ -20,7 +20,7 @@
-

js

+

js

 @@ -28,7 +28,7 @@
-

jsNew

+

jsNew

 @@ -36,7 +36,7 @@
-

jvm

+

jvm

 @@ -44,7 +44,7 @@
-

jvmNew

+

jvmNew

 @@ -52,7 +52,7 @@
-

shared

+

shared

 @@ -60,7 +60,7 @@
-

sharedNew

+

sharedNew

 diff --git a/core/testdata/format/website-html/dataTagsInGroupNode/multiplatform.html b/core/testdata/format/website-html/dataTagsInGroupNode/multiplatform.html index 35773561..3d34fc7e 100644 --- a/core/testdata/format/website-html/dataTagsInGroupNode/multiplatform.html +++ b/core/testdata/format/website-html/dataTagsInGroupNode/multiplatform.html @@ -1,4 +1,4 @@ -
test / pack / Some
+
test / pack / Some

Some

typealias Some = SomeCoolJvmClass

Platform and version requirements: JVM

@@ -10,7 +10,7 @@
-

<init>

+

<init>

 @@ -25,7 +25,7 @@
-

magic

+

magic

 diff --git a/core/testdata/format/website-html/dataTagsInGroupNode/multiplatform.package.html b/core/testdata/format/website-html/dataTagsInGroupNode/multiplatform.package.html index 15ae2a5b..c8926a28 100644 --- a/core/testdata/format/website-html/dataTagsInGroupNode/multiplatform.package.html +++ b/core/testdata/format/website-html/dataTagsInGroupNode/multiplatform.package.html @@ -1,10 +1,10 @@ -
test / pack
+
test / pack

Package pack

Types

-

Some

+

Some

 @@ -12,7 +12,7 @@
-

SomeCoolJvmClass

+

SomeCoolJvmClass

 @@ -25,7 +25,7 @@
-

Some

+

Some

 diff --git a/core/testdata/format/website-html/dropImport.html b/core/testdata/format/website-html/dropImport.html index 97ff4a68..e0fcb12b 100644 --- a/core/testdata/format/website-html/dropImport.html +++ b/core/testdata/format/website-html/dropImport.html @@ -1,4 +1,4 @@ -
test / foo
+
test / foo

foo

fun foo(): Unit
diff --git a/core/testdata/format/website-html/newLinesInImportList.html b/core/testdata/format/website-html/newLinesInImportList.html index 334ed11c..b5a07325 100644 --- a/core/testdata/format/website-html/newLinesInImportList.html +++ b/core/testdata/format/website-html/newLinesInImportList.html @@ -1,4 +1,4 @@ -
test / foo
+
test / foo

foo

fun foo(): Unit
diff --git a/core/testdata/format/website-html/newLinesInSamples.html b/core/testdata/format/website-html/newLinesInSamples.html index ab70140d..50f875da 100644 --- a/core/testdata/format/website-html/newLinesInSamples.html +++ b/core/testdata/format/website-html/newLinesInSamples.html @@ -1,4 +1,4 @@ -
test / foo
+
test / foo

foo

fun foo(): Unit
diff --git a/core/testdata/format/website-html/overloadGroup.html b/core/testdata/format/website-html/overloadGroup.html index 3ea7de94..aaba9c96 100644 --- a/core/testdata/format/website-html/overloadGroup.html +++ b/core/testdata/format/website-html/overloadGroup.html @@ -1,4 +1,4 @@ -
test / magic
+
test / magic

magic

fun magic(spell: String): Int
diff --git a/core/testdata/format/website-html/returnTag.html b/core/testdata/format/website-html/returnTag.html index d4190fa1..7724eaa7 100644 --- a/core/testdata/format/website-html/returnTag.html +++ b/core/testdata/format/website-html/returnTag.html @@ -1,9 +1,9 @@ -
test / indexOf
+
test / indexOf

indexOf

-
fun Foo.indexOf(
    char: Char,
    startIndex: Int = 0,
    ignoreCase: Boolean = false
): Int
-

Returns the index within this string of the first occurrence of the specified character, starting from the specified startIndex.

+
fun Foo.indexOf(
    char: Char,
    startIndex: Int = 0,
    ignoreCase: Boolean = false
): Int
+

Returns the index within this string of the first occurrence of the specified character, starting from the specified startIndex.

Parameters

ignoreCase - true to ignore character case when matching a character. By default false.

-

Returns An index of the first occurrence of char or -1 if none is found.

+

Returns An index of the first occurrence of char or -1 if none is found.

diff --git a/core/testdata/format/website-html/sample.html b/core/testdata/format/website-html/sample.html index d709edc4..1fb26e41 100644 --- a/core/testdata/format/website-html/sample.html +++ b/core/testdata/format/website-html/sample.html @@ -1,4 +1,4 @@ -
test / foo
+
test / foo

foo

fun foo(): Int
diff --git a/core/testdata/format/website-html/sampleWithAsserts.html b/core/testdata/format/website-html/sampleWithAsserts.html index 11a3a626..e91232f5 100644 --- a/core/testdata/format/website-html/sampleWithAsserts.html +++ b/core/testdata/format/website-html/sampleWithAsserts.html @@ -1,4 +1,4 @@ -
test / a
+
test / a

a

fun a(): String
-- cgit From d6ba6677cff2de399b8231127325af2cea210b50 Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Thu, 22 Mar 2018 23:12:56 +0300 Subject: Fix external references to Java enum entries Fix #274 --- core/src/main/kotlin/Kotlin/ExternalDocumentationLinkResolver.kt | 5 ++++- core/src/test/kotlin/format/MarkdownFormatTest.kt | 5 +++++ core/testdata/format/enumRef.kt | 4 ++++ core/testdata/format/enumRef.md | 8 ++++++++ 4 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 core/testdata/format/enumRef.kt create mode 100644 core/testdata/format/enumRef.md (limited to 'core/testdata') diff --git a/core/src/main/kotlin/Kotlin/ExternalDocumentationLinkResolver.kt b/core/src/main/kotlin/Kotlin/ExternalDocumentationLinkResolver.kt index 108cee78..ebea7183 100644 --- a/core/src/main/kotlin/Kotlin/ExternalDocumentationLinkResolver.kt +++ b/core/src/main/kotlin/Kotlin/ExternalDocumentationLinkResolver.kt @@ -5,6 +5,7 @@ import com.google.inject.Singleton import com.intellij.psi.PsiMethod import com.intellij.util.io.* import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.descriptors.impl.EnumEntrySyntheticClassDescriptor import org.jetbrains.kotlin.load.java.descriptors.JavaCallableMemberDescriptor import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor import org.jetbrains.kotlin.load.java.descriptors.JavaMethodDescriptor @@ -178,7 +179,9 @@ interface InboundExternalLinkResolutionService { class Javadoc : InboundExternalLinkResolutionService { override fun getPath(symbol: DeclarationDescriptor): String? { - if (symbol is JavaClassDescriptor) { + if (symbol is EnumEntrySyntheticClassDescriptor) { + return getPath(symbol.containingDeclaration)?.let { it + "#" + symbol.name.asString() } + } else if (symbol is JavaClassDescriptor) { return DescriptorUtils.getFqName(symbol).asString().replace(".", "/") + ".html" } else if (symbol is JavaCallableMemberDescriptor) { val containingClass = symbol.containingDeclaration as? JavaClassDescriptor ?: return null diff --git a/core/src/test/kotlin/format/MarkdownFormatTest.kt b/core/src/test/kotlin/format/MarkdownFormatTest.kt index f60969fc..f06f0e64 100644 --- a/core/src/test/kotlin/format/MarkdownFormatTest.kt +++ b/core/src/test/kotlin/format/MarkdownFormatTest.kt @@ -419,6 +419,11 @@ class MarkdownFormatTest: FileGeneratorTestCase() { verifyMarkdownNodeByName("companionImplements", "Foo") } + @Test fun enumRef() { + verifyMarkdownNode("enumRef") + } + + private fun buildMultiplePlatforms(path: String): DocumentationModule { val module = DocumentationModule("test") val options = DocumentationOptions( diff --git a/core/testdata/format/enumRef.kt b/core/testdata/format/enumRef.kt new file mode 100644 index 00000000..5c0b2de9 --- /dev/null +++ b/core/testdata/format/enumRef.kt @@ -0,0 +1,4 @@ +/** + * [java.math.RoundingMode.UP] + */ +fun f() {} \ No newline at end of file diff --git a/core/testdata/format/enumRef.md b/core/testdata/format/enumRef.md new file mode 100644 index 00000000..8b2a6650 --- /dev/null +++ b/core/testdata/format/enumRef.md @@ -0,0 +1,8 @@ +[test](index.md) / [f](./f.md) + +# f + +`fun f(): Unit` + +[java.math.RoundingMode.UP](http://docs.oracle.com/javase/6/docs/api/java/math/RoundingMode.html#UP) + -- cgit From b3fa0d91fd466c3319f3a37a1cc5e82be2b89697 Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Wed, 16 May 2018 18:06:56 +0300 Subject: Fix link resolution context for inherited docs Fix #229 --- .../kotlin/Kotlin/DescriptorDocumentationParser.kt | 18 ++++++++++++++---- core/src/test/kotlin/format/MarkdownFormatTest.kt | 16 ++++++++++++++++ core/testdata/format/inheritedLink.1.kt | 10 ++++++++++ core/testdata/format/inheritedLink.kt | 11 +++++++++++ core/testdata/format/inheritedLink.md | 17 +++++++++++++++++ 5 files changed, 68 insertions(+), 4 deletions(-) create mode 100644 core/testdata/format/inheritedLink.1.kt create mode 100644 core/testdata/format/inheritedLink.kt create mode 100644 core/testdata/format/inheritedLink.md (limited to 'core/testdata') diff --git a/core/src/main/kotlin/Kotlin/DescriptorDocumentationParser.kt b/core/src/main/kotlin/Kotlin/DescriptorDocumentationParser.kt index f2d9d3a7..6e44df74 100644 --- a/core/src/main/kotlin/Kotlin/DescriptorDocumentationParser.kt +++ b/core/src/main/kotlin/Kotlin/DescriptorDocumentationParser.kt @@ -8,14 +8,17 @@ import org.intellij.markdown.parser.LinkMap import org.jetbrains.dokka.* import org.jetbrains.dokka.Samples.SampleProcessingService import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny import org.jetbrains.kotlin.idea.kdoc.findKDoc import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.kdoc.parser.KDocKnownTag +import org.jetbrains.kotlin.kdoc.psi.api.KDoc import org.jetbrains.kotlin.kdoc.psi.impl.KDocSection import org.jetbrains.kotlin.kdoc.psi.impl.KDocTag import org.jetbrains.kotlin.load.java.descriptors.JavaCallableMemberDescriptor import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.annotations.argumentValue import org.jetbrains.kotlin.resolve.constants.StringValue @@ -49,6 +52,13 @@ class DescriptorDocumentationParser } return Content.Empty to { node -> } } + + val contextDescriptor = + (PsiTreeUtil.getParentOfType(kdoc, KDoc::class.java)?.context as? KtDeclaration) + ?.takeIf { it != descriptor.original.sourcePsi() } + ?.resolveToDescriptorIfAny() + ?: descriptor + var kdocText = kdoc.getContent() // workaround for code fence parsing problem in IJ markdown parser if (kdocText.endsWith("```") || kdocText.endsWith("~~~")) { @@ -56,20 +66,20 @@ class DescriptorDocumentationParser } val tree = parseMarkdown(kdocText) val linkMap = LinkMap.buildLinkMap(tree.node, kdocText) - val content = buildContent(tree, LinkResolver(linkMap, { href -> linkResolver.resolveContentLink(descriptor, href) }), inline) + val content = buildContent(tree, LinkResolver(linkMap, { href -> linkResolver.resolveContentLink(contextDescriptor, href) }), inline) if (kdoc is KDocSection) { val tags = kdoc.getTags() tags.forEach { when (it.knownTag) { KDocKnownTag.SAMPLE -> - content.append(sampleService.resolveSample(descriptor, it.getSubjectName(), it)) + content.append(sampleService.resolveSample(contextDescriptor, it.getSubjectName(), it)) KDocKnownTag.SEE -> - content.addTagToSeeAlso(descriptor, it) + content.addTagToSeeAlso(contextDescriptor, it) else -> { val section = content.addSection(javadocSectionDisplayName(it.name), it.getSubjectName()) val sectionContent = it.getContent() val markdownNode = parseMarkdown(sectionContent) - buildInlineContentTo(markdownNode, section, LinkResolver(linkMap, { href -> linkResolver.resolveContentLink(descriptor, href) })) + buildInlineContentTo(markdownNode, section, LinkResolver(linkMap, { href -> linkResolver.resolveContentLink(contextDescriptor, href) })) } } } diff --git a/core/src/test/kotlin/format/MarkdownFormatTest.kt b/core/src/test/kotlin/format/MarkdownFormatTest.kt index f06f0e64..9e4c831d 100644 --- a/core/src/test/kotlin/format/MarkdownFormatTest.kt +++ b/core/src/test/kotlin/format/MarkdownFormatTest.kt @@ -423,6 +423,22 @@ class MarkdownFormatTest: FileGeneratorTestCase() { verifyMarkdownNode("enumRef") } + @Test fun inheritedLink() { + val filePath = "testdata/format/inheritedLink" + verifyOutput( + arrayOf( + contentRootFromPath("$filePath.kt"), + contentRootFromPath("$filePath.1.kt") + ), + ".md", + withJdk = true, + withKotlinRuntime = true, + includeNonPublic = false + ) { model, output -> + buildPagesAndReadInto(model.members.single { it.name == "p2" }.members.single().members, output) + } + } + private fun buildMultiplePlatforms(path: String): DocumentationModule { val module = DocumentationModule("test") diff --git a/core/testdata/format/inheritedLink.1.kt b/core/testdata/format/inheritedLink.1.kt new file mode 100644 index 00000000..29cc12b4 --- /dev/null +++ b/core/testdata/format/inheritedLink.1.kt @@ -0,0 +1,10 @@ +package p1 + +import java.util.LinkedList + +interface Foo { + + /** Says hello - [LinkedList]. */ + fun sayHello() : String + +} \ No newline at end of file diff --git a/core/testdata/format/inheritedLink.kt b/core/testdata/format/inheritedLink.kt new file mode 100644 index 00000000..86b8f4e2 --- /dev/null +++ b/core/testdata/format/inheritedLink.kt @@ -0,0 +1,11 @@ +package p2 + +import p1.Foo + +class FooBar : Foo { + + override fun sayHello(): String { + return "Hello!" + } + +} \ No newline at end of file diff --git a/core/testdata/format/inheritedLink.md b/core/testdata/format/inheritedLink.md new file mode 100644 index 00000000..e5af326c --- /dev/null +++ b/core/testdata/format/inheritedLink.md @@ -0,0 +1,17 @@ + +[test](../../index.md) / [p2](../index.md) / [FooBar](index.md) / [<init>](./-init-.md) + +# <init> + +`FooBar()` + +[test](../../index.md) / [p2](../index.md) / [FooBar](index.md) / [sayHello](./say-hello.md) + +# sayHello + +`fun sayHello(): String` + +Overrides [Foo.sayHello](../../p1/-foo/say-hello.md) + +Says hello - [LinkedList](http://docs.oracle.com/javase/6/docs/api/java/util/LinkedList.html). + -- cgit From a838a096da246babd93dc518dec8d2470d1c14f5 Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Wed, 10 Jan 2018 22:25:11 +0300 Subject: Convert assertFails in kws samples without message properly --- .../KotlinWebsiteSampleProcessingService.kt | 40 ++++++++++++++++------ .../format/website-html/sampleWithAsserts.html | 2 ++ .../format/website-html/sampleWithAsserts.kt | 2 ++ 3 files changed, 33 insertions(+), 11 deletions(-) (limited to 'core/testdata') diff --git a/core/src/main/kotlin/Samples/KotlinWebsiteSampleProcessingService.kt b/core/src/main/kotlin/Samples/KotlinWebsiteSampleProcessingService.kt index b12e3a66..4525e9d9 100644 --- a/core/src/main/kotlin/Samples/KotlinWebsiteSampleProcessingService.kt +++ b/core/src/main/kotlin/Samples/KotlinWebsiteSampleProcessingService.kt @@ -1,7 +1,10 @@ package org.jetbrains.dokka.Samples import com.google.inject.Inject -import com.intellij.psi.* +import com.intellij.psi.PsiDocumentManager +import com.intellij.psi.PsiElement +import com.intellij.psi.PsiElementVisitor +import com.intellij.psi.PsiWhiteSpace import com.intellij.psi.impl.source.tree.LeafPsiElement import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.dokka.* @@ -61,27 +64,42 @@ open class KotlinWebsiteSampleProcessingService } fun convertAssertFails(expression: KtCallExpression) { - val (message, funcArgument) = expression.valueArguments + val valueArguments = expression.valueArguments + + val funcArgument: KtValueArgument + val message: KtValueArgument? + + if (valueArguments.size == 1) { + message = null + funcArgument = valueArguments.first() + } else { + message = valueArguments.first() + funcArgument = valueArguments.last() + } + builder.apply { - val argument = if (funcArgument.getArgumentExpression() is KtLambdaExpression) - PsiTreeUtil.findChildOfType(funcArgument, KtBlockExpression::class.java)?.text ?: "" - else - funcArgument.text + val argument = funcArgument.extractFunctionalArgumentText() append(argument.lines().joinToString(separator = "\n") { "// $it" }) append(" // ") - append(message.extractStringArgumentValue()) + if (message != null) { + append(message.extractStringArgumentValue()) + } append(" will fail") } } + private fun KtValueArgument.extractFunctionalArgumentText(): String { + return if (getArgumentExpression() is KtLambdaExpression) + PsiTreeUtil.findChildOfType(this, KtBlockExpression::class.java)?.text ?: "" + else + text + } + fun convertAssertFailsWith(expression: KtCallExpression) { val (funcArgument) = expression.valueArguments val (exceptionType) = expression.typeArguments builder.apply { - val argument = if (funcArgument.firstChild is KtLambdaExpression) - PsiTreeUtil.findChildOfType(funcArgument, KtBlockExpression::class.java)?.text ?: "" - else - funcArgument.text + val argument = funcArgument.extractFunctionalArgumentText() append(argument.lines().joinToString(separator = "\n") { "// $it" }) append(" // will fail with ") append(exceptionType.text) diff --git a/core/testdata/format/website-html/sampleWithAsserts.html b/core/testdata/format/website-html/sampleWithAsserts.html index e91232f5..2b2a9ac5 100644 --- a/core/testdata/format/website-html/sampleWithAsserts.html +++ b/core/testdata/format/website-html/sampleWithAsserts.html @@ -14,6 +14,8 @@ println("a() == b() is ${a() == b()}") // true // readSomeFile(File("some.txt")) // reading file now will fail // readSomeFile(File("some.txt")) // will fail with FileNotFoundException +// readSomeFile(File("some.txt")) // will fail + fun indented() { // A neq B println("a() != b() is ${a() != b()}") // false diff --git a/core/testdata/format/website-html/sampleWithAsserts.kt b/core/testdata/format/website-html/sampleWithAsserts.kt index b3bce11d..bb5848e6 100644 --- a/core/testdata/format/website-html/sampleWithAsserts.kt +++ b/core/testdata/format/website-html/sampleWithAsserts.kt @@ -26,6 +26,8 @@ fun sample() { assertFails("reading file now") { readSomeFile(File("some.txt")) } assertFailsWith { readSomeFile(File("some.txt")) } + assertFails { readSomeFile(File("some.txt")) } + fun indented() { assertFalse(a() != b(), "A neq B") } -- cgit