From c0064d2b43ec30237d0d39bf5a9aaa4ce5e14744 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Mon, 4 Jul 2016 19:48:27 +0200 Subject: Rewrite output generation; much cleaner Markdown and HTML generated. Resolves #71, #72 --- core/testdata/format/accessor.md | 8 ------ core/testdata/format/annotatedTypeParameter.md | 5 +--- core/testdata/format/annotationClass.md | 4 --- core/testdata/format/annotationClass.package.md | 3 --- core/testdata/format/annotationParams.md | 5 +--- core/testdata/format/annotations.md | 10 +------- core/testdata/format/arrayAverage.md | 15 ++--------- core/testdata/format/bracket.html | 4 +-- core/testdata/format/brokenLink.html | 4 +-- core/testdata/format/classWithCompanionObject.html | 4 +-- core/testdata/format/classWithCompanionObject.md | 8 ------ core/testdata/format/codeBlock.md | 14 +--------- core/testdata/format/codeSpan.html | 4 +-- core/testdata/format/companionObjectExtension.md | 11 +------- .../crossLanguage/kotlinExtendsJava/Bar.html | 7 +++-- core/testdata/format/deprecated.class.html | 6 ----- core/testdata/format/emptyDescription.md | 3 --- core/testdata/format/entity.html | 7 +++-- core/testdata/format/enumClass.md | 4 --- core/testdata/format/enumClass.value.md | 5 +--- core/testdata/format/exceptionClass.md | 6 +---- core/testdata/format/exceptionClass.package.md | 5 +--- core/testdata/format/extensionFunctionParameter.md | 5 +--- .../format/extensionWithDocumentedReceiver.md | 4 --- core/testdata/format/extensions.class.md | 13 ++-------- core/testdata/format/extensions.package.md | 3 --- .../format/functionWithDefaultParameter.md | 5 +--- core/testdata/format/genericInheritedExtensions.md | 12 +++------ core/testdata/format/gfm/listInTableCell.kt | 8 ++++++ core/testdata/format/gfm/listInTableCell.md | 17 ++++++++++++ core/testdata/format/gfm/sample.md | 19 +++----------- core/testdata/format/htmlEscaping.html | 4 +-- .../format/inapplicableExtensionFunctions.md | 10 ++------ .../format/inheritedCompanionObjectProperties.md | 14 +--------- core/testdata/format/inheritedExtensions.md | 12 +++------ core/testdata/format/inheritedMembers.md | 14 +--------- core/testdata/format/javaCodeInParam.md | 14 ++-------- core/testdata/format/javaCodeLiteralTags.md | 22 +++------------- core/testdata/format/javaDeprecated.html | 4 +-- core/testdata/format/javaLinkTag.html | 9 +++---- core/testdata/format/javaLinkTagWithLabel.html | 9 +++---- core/testdata/format/javaSeeTag.html | 8 ++---- core/testdata/format/javaSpaceInAuthor.md | 13 +--------- core/testdata/format/javaSupertype.html | 4 +-- core/testdata/format/javadocHtml.md | 30 +++++++--------------- core/testdata/format/javadocOrderedList.md | 15 +++-------- core/testdata/format/jdkLinks.md | 12 ++------- core/testdata/format/linkWithLabel.html | 7 +++-- core/testdata/format/linkWithStarProjection.html | 4 +-- core/testdata/format/markdownInLinks.html | 4 +-- .../format/multipleTypeParameterConstraints.md | 5 +--- core/testdata/format/nullability.md | 10 ++------ core/testdata/format/operatorOverloading.md | 5 +--- core/testdata/format/orderedList.html | 14 +++++----- core/testdata/format/overloads.html | 3 ++- core/testdata/format/overloadsWithDescription.html | 11 +++----- .../format/overloadsWithDifferentDescriptions.html | 27 ++++++++----------- core/testdata/format/overridingFunction.md | 3 +-- core/testdata/format/paramTag.md | 7 ++--- core/testdata/format/parameterAnchor.html | 9 +++---- core/testdata/format/parenthesis.html | 4 +-- core/testdata/format/propertyVar.md | 5 +--- core/testdata/format/receiverParameterTypeBound.md | 8 +----- core/testdata/format/reifiedTypeParameter.md | 5 +--- core/testdata/format/returnWithLink.html | 4 +-- core/testdata/format/see.html | 13 +++------- core/testdata/format/shadowedExtensionFunctions.md | 13 +++------- core/testdata/format/starProjection.md | 4 +-- core/testdata/format/summarizeSignatures.md | 13 ++-------- .../testdata/format/summarizeSignaturesProperty.md | 13 ++-------- core/testdata/format/throwsTag.md | 5 +--- core/testdata/format/tripleBackticks.html | 7 ++--- core/testdata/format/typeLink.html | 4 +-- core/testdata/format/typeParameterBounds.md | 8 ++---- core/testdata/format/typeParameterVariance.md | 6 +---- core/testdata/format/typeProjectionVariance.md | 4 +-- .../format/uninterpretedEmphasisCharacters.html | 4 +-- core/testdata/format/varargsFunction.md | 5 +--- core/testdata/format/website/returnTag.md | 7 +---- core/testdata/format/website/sample.md | 14 +++------- 80 files changed, 164 insertions(+), 513 deletions(-) create mode 100644 core/testdata/format/gfm/listInTableCell.kt create mode 100644 core/testdata/format/gfm/listInTableCell.md (limited to 'core/testdata') diff --git a/core/testdata/format/accessor.md b/core/testdata/format/accessor.md index eb326727..dcdef0f8 100644 --- a/core/testdata/format/accessor.md +++ b/core/testdata/format/accessor.md @@ -1,6 +1,5 @@ [test](test/index) / [C](test/-c/index) / [x](test/-c/x) - # x `var x: String` @@ -9,14 +8,7 @@ The getter returns an empty string. - - - **Setter** The setter does nothing. - - - - diff --git a/core/testdata/format/annotatedTypeParameter.md b/core/testdata/format/annotatedTypeParameter.md index 7d26a162..0aa1b9d7 100644 --- a/core/testdata/format/annotatedTypeParameter.md +++ b/core/testdata/format/annotatedTypeParameter.md @@ -1,8 +1,5 @@ [test](test/index) / [containsAll](test/contains-all) - # containsAll -`fun <E> containsAll(elements: Collection<@UnsafeVariance E>): @UnsafeVariance E` - - +`fun containsAll(elements: Collection<@UnsafeVariance E>): @UnsafeVariance E` \ No newline at end of file diff --git a/core/testdata/format/annotationClass.md b/core/testdata/format/annotationClass.md index 03548aa3..2f4da736 100644 --- a/core/testdata/format/annotationClass.md +++ b/core/testdata/format/annotationClass.md @@ -1,14 +1,10 @@ [test](test/index) / [fancy](test/fancy/index) - # fancy `annotation class fancy` - - ### Constructors - | [<init>](test/fancy/-init-) | `fancy()` | diff --git a/core/testdata/format/annotationClass.package.md b/core/testdata/format/annotationClass.package.md index f7c8405d..f52b28b6 100644 --- a/core/testdata/format/annotationClass.package.md +++ b/core/testdata/format/annotationClass.package.md @@ -1,11 +1,8 @@ [test](test/index) - ## Package <root> - ### Annotations - | [fancy](test/fancy/index) | `annotation class fancy` | diff --git a/core/testdata/format/annotationParams.md b/core/testdata/format/annotationParams.md index 8cdd6e96..132078ce 100644 --- a/core/testdata/format/annotationParams.md +++ b/core/testdata/format/annotationParams.md @@ -1,8 +1,5 @@ [test](test/index) / [f](test/f) - # f -`@JvmName("FFF") fun f(): Unit` - - +`@JvmName("FFF") fun f(): Unit` \ No newline at end of file diff --git a/core/testdata/format/annotations.md b/core/testdata/format/annotations.md index b898d55c..cc27d5af 100644 --- a/core/testdata/format/annotations.md +++ b/core/testdata/format/annotations.md @@ -1,26 +1,18 @@ [test](test/index) / [Foo](test/-foo/index) - # Foo `data class Foo` - - ### Constructors - | [<init>](test/-foo/-init-) | `Foo()` | - ### Properties - | [x](test/-foo/x) | `val x: Int` | - ### Functions - -| [bar](test/-foo/bar) | `fun bar(notInlined: () -> Unit): Unit` | +| [bar](test/-foo/bar) | `fun bar(notInlined: () -> Unit): Unit` | diff --git a/core/testdata/format/arrayAverage.md b/core/testdata/format/arrayAverage.md index 9ffa3650..7cc31c47 100644 --- a/core/testdata/format/arrayAverage.md +++ b/core/testdata/format/arrayAverage.md @@ -1,25 +1,14 @@ [test](test/index) / [XArray](test/-x-array/index) - # XArray -`class XArray<T>` - - +`class XArray` ### Constructors - | [<init>](test/-x-array/-init-) | `XArray()` | - ### Extension Functions - -| [average](test/average) | `fun [XArray](test/-x-array/index)<out Byte>.average(): Double` -`fun [XArray](test/-x-array/index)<out Double>.average(): Double` -`fun [XArray](test/-x-array/index)<out Float>.average(): Double` -`fun [XArray](test/-x-array/index)<out Int>.average(): Double` -`fun [XArray](test/-x-array/index)<out Long>.average(): Double` -`fun [XArray](test/-x-array/index)<out Short>.average(): Double` | +| [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` | diff --git a/core/testdata/format/bracket.html b/core/testdata/format/bracket.html index f96c6459..8f4310c3 100644 --- a/core/testdata/format/bracket.html +++ b/core/testdata/format/bracket.html @@ -7,9 +7,7 @@

foo

-fun foo(): Unit
+fun foo(): Unit

bar[]

-
-
diff --git a/core/testdata/format/brokenLink.html b/core/testdata/format/brokenLink.html index 860ffc26..8803781a 100644 --- a/core/testdata/format/brokenLink.html +++ b/core/testdata/format/brokenLink.html @@ -7,9 +7,7 @@

f

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

This references noSuchIdentifier.

-
-
diff --git a/core/testdata/format/classWithCompanionObject.html b/core/testdata/format/classWithCompanionObject.html index 679420bd..376bae9b 100644 --- a/core/testdata/format/classWithCompanionObject.html +++ b/core/testdata/format/classWithCompanionObject.html @@ -6,9 +6,7 @@ test / Klass

Klass

-class Klass
-
-
+class Klass

Constructors

diff --git a/core/testdata/format/classWithCompanionObject.md b/core/testdata/format/classWithCompanionObject.md index 9398c3d3..45684c0e 100644 --- a/core/testdata/format/classWithCompanionObject.md +++ b/core/testdata/format/classWithCompanionObject.md @@ -1,26 +1,18 @@ [test](test/index) / [Klass](test/-klass/index) - # Klass `class Klass` - - ### Constructors - | [<init>](test/-klass/-init-) | `Klass()` | - ### Companion Object Properties - | [x](test/-klass/x) | `val x: Int` | - ### Companion Object Functions - | [foo](test/-klass/foo) | `fun foo(): Unit` | diff --git a/core/testdata/format/codeBlock.md b/core/testdata/format/codeBlock.md index 08710390..016ea9e8 100644 --- a/core/testdata/format/codeBlock.md +++ b/core/testdata/format/codeBlock.md @@ -1,31 +1,19 @@ [test](test/index) / [Throws](test/-throws/index) - # Throws `class Throws` This annotation indicates what exceptions should be declared by a function when compiled to a JVM method. - Example: - ``` Throws(IOException::class) fun readFile(name: String): String {...} ``` - - - - - ### Constructors - -| [<init>](test/-throws/-init-) | `Throws()` -This annotation indicates what exceptions should be declared by a function when compiled to a JVM method. - - | +| [<init>](test/-throws/-init-) | `Throws()`
This annotation indicates what exceptions should be declared by a function when compiled to a JVM method. | diff --git a/core/testdata/format/codeSpan.html b/core/testdata/format/codeSpan.html index 216a15e9..f28e6957 100644 --- a/core/testdata/format/codeSpan.html +++ b/core/testdata/format/codeSpan.html @@ -7,9 +7,7 @@

foo

-fun foo(): Unit
+fun foo(): Unit

This is a code span.

-
-
diff --git a/core/testdata/format/companionObjectExtension.md b/core/testdata/format/companionObjectExtension.md index 271da5b0..e019c184 100644 --- a/core/testdata/format/companionObjectExtension.md +++ b/core/testdata/format/companionObjectExtension.md @@ -1,23 +1,14 @@ [test](test/index) / [Foo](test/-foo/index) - # Foo `class Foo` - - ### Constructors - | [<init>](test/-foo/-init-) | `Foo()` | - ### Companion Object Extension Properties - -| [x](test/x) | `val Foo.Default.x: Int` -The default object property. - - | +| [x](test/x) | `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 295366b3..ca0725a0 100644 --- a/core/testdata/format/crossLanguage/kotlinExtendsJava/Bar.html +++ b/core/testdata/format/crossLanguage/kotlinExtendsJava/Bar.html @@ -6,10 +6,8 @@ test / test / Bar

Bar

-class Bar : Foo
+class Bar : Foo

See xyzzy

-
-

Constructors

@@ -17,7 +15,8 @@ diff --git a/core/testdata/format/deprecated.class.html b/core/testdata/format/deprecated.class.html index 71470c63..4d998c69 100644 --- a/core/testdata/format/deprecated.class.html +++ b/core/testdata/format/deprecated.class.html @@ -8,8 +8,6 @@ class C
Deprecated: This class sucks

-
-
test / f

f

@@ -17,8 +15,6 @@ fun f(): Unit
Deprecated: This function sucks

-
-
test / p

p

@@ -26,7 +22,5 @@ val p: Int
Deprecated: This property sucks

-
-
diff --git a/core/testdata/format/emptyDescription.md b/core/testdata/format/emptyDescription.md index e82e7228..8c0fe109 100644 --- a/core/testdata/format/emptyDescription.md +++ b/core/testdata/format/emptyDescription.md @@ -1,11 +1,8 @@ [test](test/index) / [fn](test/fn) - # fn `fun fn(): Unit` Function fn - - diff --git a/core/testdata/format/entity.html b/core/testdata/format/entity.html index 9c778020..db6f833f 100644 --- a/core/testdata/format/entity.html +++ b/core/testdata/format/entity.html @@ -6,10 +6,8 @@ test / Bar

Bar

-class Bar
+class Bar

Copyright © JetBrains 2015 "

-
-

Constructors

<init> -Bar()

See xyzzy

+Bar() +

See xyzzy
@@ -17,7 +15,8 @@ diff --git a/core/testdata/format/enumClass.md b/core/testdata/format/enumClass.md index 4f390dab..d3a6f186 100644 --- a/core/testdata/format/enumClass.md +++ b/core/testdata/format/enumClass.md @@ -1,15 +1,11 @@ [test](test/index) / [InlineOption](test/-inline-option/index) - # InlineOption `enum class InlineOption` - - ### 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) | | diff --git a/core/testdata/format/enumClass.value.md b/core/testdata/format/enumClass.value.md index bcb685d1..feed2fe5 100644 --- a/core/testdata/format/enumClass.value.md +++ b/core/testdata/format/enumClass.value.md @@ -1,8 +1,5 @@ [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) - # LOCAL_CONTINUE_AND_BREAK -`LOCAL_CONTINUE_AND_BREAK` - - +`LOCAL_CONTINUE_AND_BREAK` \ No newline at end of file diff --git a/core/testdata/format/exceptionClass.md b/core/testdata/format/exceptionClass.md index b3464d6f..df3457d7 100644 --- a/core/testdata/format/exceptionClass.md +++ b/core/testdata/format/exceptionClass.md @@ -1,14 +1,10 @@ [test](test/index) / [MyException](test/-my-exception/index) - # MyException -`class MyException : [Exception](http://docs.oracle.com/javase/6/docs/api/java/lang/Exception.html)` - - +`class MyException : `[`Exception`](http://docs.oracle.com/javase/6/docs/api/java/lang/Exception.html) ### Constructors - | [<init>](test/-my-exception/-init-) | `MyException()` | diff --git a/core/testdata/format/exceptionClass.package.md b/core/testdata/format/exceptionClass.package.md index fa220fe7..e27dd0ab 100644 --- a/core/testdata/format/exceptionClass.package.md +++ b/core/testdata/format/exceptionClass.package.md @@ -1,11 +1,8 @@ [test](test/index) - ## Package <root> - ### Exceptions - -| [MyException](test/-my-exception/index) | `class MyException : [Exception](http://docs.oracle.com/javase/6/docs/api/java/lang/Exception.html)` | +| [MyException](test/-my-exception/index) | `class MyException : `[`Exception`](http://docs.oracle.com/javase/6/docs/api/java/lang/Exception.html) | diff --git a/core/testdata/format/extensionFunctionParameter.md b/core/testdata/format/extensionFunctionParameter.md index 6980912d..b459d49e 100644 --- a/core/testdata/format/extensionFunctionParameter.md +++ b/core/testdata/format/extensionFunctionParameter.md @@ -1,8 +1,5 @@ [test](test/index) / [apply](test/apply) - # apply -`inline fun <T> T.apply(f: T.() -> Unit): T` - - +`inline fun T.apply(f: T.() -> Unit): T` \ No newline at end of file diff --git a/core/testdata/format/extensionWithDocumentedReceiver.md b/core/testdata/format/extensionWithDocumentedReceiver.md index 6fd179c6..125da37e 100644 --- a/core/testdata/format/extensionWithDocumentedReceiver.md +++ b/core/testdata/format/extensionWithDocumentedReceiver.md @@ -1,15 +1,11 @@ [test](test/index) / [kotlin.String](test/kotlin.-string/index) / [fn](test/kotlin.-string/fn) - # fn `fun String.fn(): Unit` Function with receiver - **Receiver** must be a non-empty string - - diff --git a/core/testdata/format/extensions.class.md b/core/testdata/format/extensions.class.md index c66cdb01..f75b4dc8 100644 --- a/core/testdata/format/extensions.class.md +++ b/core/testdata/format/extensions.class.md @@ -1,16 +1,7 @@ [test](test/index) / [foo](test/foo/index) / [kotlin.String](test/foo/kotlin.-string/index) - ### 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](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. | diff --git a/core/testdata/format/extensions.package.md b/core/testdata/format/extensions.package.md index 76ff3676..4dc0cfab 100644 --- a/core/testdata/format/extensions.package.md +++ b/core/testdata/format/extensions.package.md @@ -1,11 +1,8 @@ [test](test/index) / [foo](test/foo/index) - ## Package foo - ### Extensions for External Classes - | [kotlin.String](test/foo/kotlin.-string/index) | | diff --git a/core/testdata/format/functionWithDefaultParameter.md b/core/testdata/format/functionWithDefaultParameter.md index 21e9eff7..568c106c 100644 --- a/core/testdata/format/functionWithDefaultParameter.md +++ b/core/testdata/format/functionWithDefaultParameter.md @@ -1,8 +1,5 @@ [test](test/index) / [f](test/f) - # f -`fun f(x: String = ""): Unit` - - +`fun f(x: String = ""): Unit` \ No newline at end of file diff --git a/core/testdata/format/genericInheritedExtensions.md b/core/testdata/format/genericInheritedExtensions.md index e02683a9..a3091aeb 100644 --- a/core/testdata/format/genericInheritedExtensions.md +++ b/core/testdata/format/genericInheritedExtensions.md @@ -1,21 +1,15 @@ [test](test/index) / [Bar](test/-bar/index) - # Bar -`class Bar<T> : [Foo](test/-foo/index)<T>` - - +`class Bar : `[`Foo`](test/-foo/index)`` ### Constructors - | [<init>](test/-bar/-init-) | `Bar()` | - ### Extension Functions - -| [first](test/first) | `fun <T> [Foo](test/-foo/index)<T>.first(): Unit` | -| [second](test/second) | `fun <T> [Bar](test/-bar/index)<T>.second(): Unit` | +| [first](test/first) | `fun `[`Foo`](test/-foo/index)`.first(): Unit` | +| [second](test/second) | `fun `[`Bar`](test/-bar/index)`.second(): Unit` | diff --git a/core/testdata/format/gfm/listInTableCell.kt b/core/testdata/format/gfm/listInTableCell.kt new file mode 100644 index 00000000..2f4fdf54 --- /dev/null +++ b/core/testdata/format/gfm/listInTableCell.kt @@ -0,0 +1,8 @@ +class Foo { + /** + * 1. Foo + * 1. Bar + */ + fun foo() { + } +} diff --git a/core/testdata/format/gfm/listInTableCell.md b/core/testdata/format/gfm/listInTableCell.md new file mode 100644 index 00000000..73152ac9 --- /dev/null +++ b/core/testdata/format/gfm/listInTableCell.md @@ -0,0 +1,17 @@ +[test](test/index) / [Foo](test/-foo/index) + +# Foo + +`class Foo` + +### Constructors + +| Name | Summary | +|---|---| +| [<init>](test/-foo/-init-) | `Foo()` | + +### Functions + +| Name | Summary | +|---|---| +| [foo](test/-foo/foo) | `fun foo(): Unit`
  1. Foo
  2. Bar
| diff --git a/core/testdata/format/gfm/sample.md b/core/testdata/format/gfm/sample.md index 1a26e599..c2af1c1e 100644 --- a/core/testdata/format/gfm/sample.md +++ b/core/testdata/format/gfm/sample.md @@ -1,33 +1,20 @@ [test](test/index) / [Foo](test/-foo/index) - # Foo `class Foo` The class Foo. - - - ### Constructors | Name | Summary | |---|---| -| [<init>](test/-foo/-init-) | `Foo()` -The class Foo. - - | +| [<init>](test/-foo/-init-) | `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](test/-foo/bar) | `fun bar(): Unit`
The method bar. | +| [baz](test/-foo/baz) | `fun baz(): Unit`
The method baz. | diff --git a/core/testdata/format/htmlEscaping.html b/core/testdata/format/htmlEscaping.html index ad8a7bed..7ddcec8e 100644 --- a/core/testdata/format/htmlEscaping.html +++ b/core/testdata/format/htmlEscaping.html @@ -7,9 +7,7 @@

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 8460cf2f..30246faa 100644 --- a/core/testdata/format/inapplicableExtensionFunctions.md +++ b/core/testdata/format/inapplicableExtensionFunctions.md @@ -1,20 +1,14 @@ [test](test/index) / [Bar](test/-bar/index) - # Bar -`class Bar : [Foo](test/-foo/index)<Char>` - - +`class Bar : `[`Foo`](test/-foo/index)`` ### Constructors - | [<init>](test/-bar/-init-) | `Bar()` | - ### Extension Functions - -| [xyzzy](test/xyzzy) | `fun [Bar](test/-bar/index).xyzzy(): Unit` | +| [xyzzy](test/xyzzy) | `fun `[`Bar`](test/-bar/index)`.xyzzy(): Unit` | diff --git a/core/testdata/format/inheritedCompanionObjectProperties.md b/core/testdata/format/inheritedCompanionObjectProperties.md index 9ec24edb..b3b3230e 100644 --- a/core/testdata/format/inheritedCompanionObjectProperties.md +++ b/core/testdata/format/inheritedCompanionObjectProperties.md @@ -1,38 +1,26 @@ [test](test/index) / [C](test/-c/index) - # C -`class C : [A](test/-a/index)` - - +`class C : `[`A`](test/-a/index) ### Constructors - | [<init>](test/-c/-init-) | `C()` | - ### Functions - | [xyzzy](test/-c/xyzzy) | `fun xyzzy(): Unit` | - ### Inherited Functions - | [foo](test/-a/foo) | `fun foo(): Unit` | - ### Companion Object Functions - | [shazam](test/-c/shazam) | `fun shazam(): Unit` | - ### Inherited Companion Object Functions - | [bar](test/-b/bar) | `fun bar(): Unit` | diff --git a/core/testdata/format/inheritedExtensions.md b/core/testdata/format/inheritedExtensions.md index 79137eac..611b4f6a 100644 --- a/core/testdata/format/inheritedExtensions.md +++ b/core/testdata/format/inheritedExtensions.md @@ -1,21 +1,15 @@ [test](test/index) / [Bar](test/-bar/index) - # Bar -`class Bar : [Foo](test/-foo/index)` - - +`class Bar : `[`Foo`](test/-foo/index) ### Constructors - | [<init>](test/-bar/-init-) | `Bar()` | - ### Extension Functions - -| [first](test/first) | `fun [Foo](test/-foo/index).first(): Unit` | -| [second](test/second) | `fun [Bar](test/-bar/index).second(): Unit` | +| [first](test/first) | `fun `[`Foo`](test/-foo/index)`.first(): Unit` | +| [second](test/second) | `fun `[`Bar`](test/-bar/index)`.second(): Unit` | diff --git a/core/testdata/format/inheritedMembers.md b/core/testdata/format/inheritedMembers.md index d58d3974..bed5bd44 100644 --- a/core/testdata/format/inheritedMembers.md +++ b/core/testdata/format/inheritedMembers.md @@ -1,38 +1,26 @@ [test](test/index) / [Bar](test/-bar/index) - # Bar -`class Bar : [Foo](test/-foo/index)` - - +`class Bar : `[`Foo`](test/-foo/index) ### Constructors - | [<init>](test/-bar/-init-) | `Bar()` | - ### Properties - | [secondProp](test/-bar/second-prop) | `val secondProp: Int` | - ### Inherited Properties - | [firstProp](test/-foo/first-prop) | `val firstProp: Int` | - ### Functions - | [second](test/-bar/second) | `fun second(): Unit` | - ### Inherited Functions - | [first](test/-foo/first) | `fun first(): Unit` | diff --git a/core/testdata/format/javaCodeInParam.md b/core/testdata/format/javaCodeInParam.md index 02d5d974..696abdc4 100644 --- a/core/testdata/format/javaCodeInParam.md +++ b/core/testdata/format/javaCodeInParam.md @@ -1,24 +1,14 @@ [test](test/index) / [C](test/-c/index) - # C -`protected open class C<T : Any>` - - - +`protected open class C` ### Parameters `T` - this is `some code` and other text - - ### Constructors - -| [<init>](test/-c/-init-) | `C()` - - - | +| [<init>](test/-c/-init-) | `C()` | diff --git a/core/testdata/format/javaCodeLiteralTags.md b/core/testdata/format/javaCodeLiteralTags.md index a705a01c..99dbccfd 100644 --- a/core/testdata/format/javaCodeLiteralTags.md +++ b/core/testdata/format/javaCodeLiteralTags.md @@ -1,32 +1,16 @@ [test](test/index) / [C](test/-c/index) - # C `protected open class C` - -`A<B>C` - - -A<B>C - - - +`AC` -### Constructors - - -| [<init>](test/-c/-init-) | `C()` - -`A<B>C` - - A<B>C - +### Constructors - | +| [<init>](test/-c/-init-) | `C()`
`AC`
A<B>C | diff --git a/core/testdata/format/javaDeprecated.html b/core/testdata/format/javaDeprecated.html index 35c0b820..619a3d5a 100644 --- a/core/testdata/format/javaDeprecated.html +++ b/core/testdata/format/javaDeprecated.html @@ -8,8 +8,6 @@

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 997e52ab..20940cc2 100644 --- a/core/testdata/format/javaLinkTag.html +++ b/core/testdata/format/javaLinkTag.html @@ -6,10 +6,8 @@ test / Foo

Foo

-protected open class Foo
-

Call #bar() to do the job.

-
-
+protected open class Foo +

Call #bar() to do the job.

Constructors

<init> -Bar()

Copyright © JetBrains 2015 "

+Bar() +

Copyright © JetBrains 2015 "
@@ -17,7 +15,8 @@ diff --git a/core/testdata/format/javaLinkTagWithLabel.html b/core/testdata/format/javaLinkTagWithLabel.html index fdddadf9..9194229a 100644 --- a/core/testdata/format/javaLinkTagWithLabel.html +++ b/core/testdata/format/javaLinkTagWithLabel.html @@ -6,10 +6,8 @@ test / Foo

Foo

-protected open class Foo
-

Call this wonderful method to do the job.

-
-
+protected open class Foo +

Call this wonderful method to do the job.

Constructors

<init> -Foo()

Call #bar() to do the job.

+Foo() +

Call #bar() to do the job.
@@ -17,7 +15,8 @@ diff --git a/core/testdata/format/javaSeeTag.html b/core/testdata/format/javaSeeTag.html index e22e8452..607375fc 100644 --- a/core/testdata/format/javaSeeTag.html +++ b/core/testdata/format/javaSeeTag.html @@ -6,12 +6,9 @@ test / Foo

Foo

-open class Foo
-

+open class Foo

See Also
#bar

-
-

Constructors

<init> -Foo()

Call this wonderful method to do the job.

+Foo() +

Call this wonderful method to do the job.
@@ -19,8 +16,7 @@ +Foo()
<init> -Foo()

-
diff --git a/core/testdata/format/javaSpaceInAuthor.md b/core/testdata/format/javaSpaceInAuthor.md index ddaaa35d..6d738087 100644 --- a/core/testdata/format/javaSpaceInAuthor.md +++ b/core/testdata/format/javaSpaceInAuthor.md @@ -1,24 +1,13 @@ [test](test/index) / [C](test/-c/index) - # C `protected open class C` - - - **Author** Dmitry Jemerov - - - ### Constructors - -| [<init>](test/-c/-init-) | `C()` - - - | +| [<init>](test/-c/-init-) | `C()` | diff --git a/core/testdata/format/javaSupertype.html b/core/testdata/format/javaSupertype.html index b2676459..421fe7a0 100644 --- a/core/testdata/format/javaSupertype.html +++ b/core/testdata/format/javaSupertype.html @@ -6,9 +6,7 @@ test / C / Bar

Bar

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

Constructors

diff --git a/core/testdata/format/javadocHtml.md b/core/testdata/format/javadocHtml.md index 15b86bb4..8aba2059 100644 --- a/core/testdata/format/javadocHtml.md +++ b/core/testdata/format/javadocHtml.md @@ -1,40 +1,28 @@ [test](test/index) / [C](test/-c/index) - # C `open class C` -**Bold** **Strong** *Italic* *Emphasized* +**Bold** **Strong** *Italic* *Emphasized* + Paragraph - ~~Strikethrough~~ ~~Deleted~~ `Code` + ~~Strikethrough~~ ~~Deleted~~ `Code` + ``` Block code ``` * List Item - - - - - ### Constructors +| [<init>](test/-c/-init-) | `C()`
**Bold** **Strong** *Italic* *Emphasized*
Paragraph ~~Strikethrough~~ ~~Deleted~~ `Code` -| [<init>](test/-c/-init-) | `C()` -**Bold** **Strong** *Italic* *Emphasized* -Paragraph - - ~~Strikethrough~~ ~~Deleted~~ `Code` -``` -Block code ``` - - * List Item - - - - | +Block code
``` +
+* List Item +
| diff --git a/core/testdata/format/javadocOrderedList.md b/core/testdata/format/javadocOrderedList.md index 415e3479..00aa1bc4 100644 --- a/core/testdata/format/javadocOrderedList.md +++ b/core/testdata/format/javadocOrderedList.md @@ -1,26 +1,17 @@ [test](test/index) / [Bar](test/-bar/index) - # Bar `open class Bar` 1. Rinse 1. Repeat - - - - ### Constructors - -| [<init>](test/-bar/-init-) | `Bar()` - 1. Rinse +| [<init>](test/-bar/-init-) | `Bar()`
+1. Rinse 1. Repeat - - - - | +
| diff --git a/core/testdata/format/jdkLinks.md b/core/testdata/format/jdkLinks.md index 4f0344b5..460d3e32 100644 --- a/core/testdata/format/jdkLinks.md +++ b/core/testdata/format/jdkLinks.md @@ -1,20 +1,12 @@ [test](test/index) / [C](test/-c/index) - # C -`class C : [ClassLoader](http://docs.oracle.com/javase/6/docs/api/java/lang/ClassLoader.html)` +`class C : `[`ClassLoader`](http://docs.oracle.com/javase/6/docs/api/java/lang/ClassLoader.html) 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)) - - - ### 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>](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)) | diff --git a/core/testdata/format/linkWithLabel.html b/core/testdata/format/linkWithLabel.html index 32499d6f..8c7d228c 100644 --- a/core/testdata/format/linkWithLabel.html +++ b/core/testdata/format/linkWithLabel.html @@ -6,10 +6,8 @@ test / Bar

Bar

-class Bar
+class Bar

Use this method for best results.

-
-

Constructors

@@ -17,7 +15,8 @@ diff --git a/core/testdata/format/linkWithStarProjection.html b/core/testdata/format/linkWithStarProjection.html index 0e829e80..c810f3f4 100644 --- a/core/testdata/format/linkWithStarProjection.html +++ b/core/testdata/format/linkWithStarProjection.html @@ -6,9 +6,7 @@ test / KClassLoader

KClassLoader

-object KClassLoader
-
-
+object KClassLoader

Functions

<init> -Bar()

Use this method for best results.

+Bar() +

Use this method for best results.
diff --git a/core/testdata/format/markdownInLinks.html b/core/testdata/format/markdownInLinks.html index 38158eac..46c2944a 100644 --- a/core/testdata/format/markdownInLinks.html +++ b/core/testdata/format/markdownInLinks.html @@ -7,9 +7,7 @@

foo

-fun foo(): Unit
+fun foo(): Unit

abdkas

-
-
diff --git a/core/testdata/format/multipleTypeParameterConstraints.md b/core/testdata/format/multipleTypeParameterConstraints.md index 537b127a..14f048f4 100644 --- a/core/testdata/format/multipleTypeParameterConstraints.md +++ b/core/testdata/format/multipleTypeParameterConstraints.md @@ -1,8 +1,5 @@ [test](test/index) / [f](test/f) - # f -`fun <T> f(): Unit where T : [Appendable](http://docs.oracle.com/javase/6/docs/api/java/lang/Appendable.html), T : CharSequence` - - +`fun f(): Unit where T : `[`Appendable`](http://docs.oracle.com/javase/6/docs/api/java/lang/Appendable.html)`, T : CharSequence` \ No newline at end of file diff --git a/core/testdata/format/nullability.md b/core/testdata/format/nullability.md index ee50a0a5..6a4c3761 100644 --- a/core/testdata/format/nullability.md +++ b/core/testdata/format/nullability.md @@ -1,20 +1,14 @@ [test](test/index) / [C](test/-c/index) - # C -`class C<T>` - - +`class C` ### Constructors - | [<init>](test/-c/-init-) | `C()` | - ### Functions - -| [foo](test/-c/foo) | `fun foo(): Comparable<T>?` | +| [foo](test/-c/foo) | `fun foo(): Comparable?` | diff --git a/core/testdata/format/operatorOverloading.md b/core/testdata/format/operatorOverloading.md index 05fe3206..8e8d36eb 100644 --- a/core/testdata/format/operatorOverloading.md +++ b/core/testdata/format/operatorOverloading.md @@ -1,8 +1,5 @@ [test](test/index) / [C](test/-c/index) / [plus](test/-c/plus) - # plus -`fun plus(other: [C](test/-c/index)): [C](test/-c/index)` - - +`fun plus(other: `[`C`](test/-c/index)`): `[`C`](test/-c/index) \ No newline at end of file diff --git a/core/testdata/format/orderedList.html b/core/testdata/format/orderedList.html index 6b5fa007..518fbf5a 100644 --- a/core/testdata/format/orderedList.html +++ b/core/testdata/format/orderedList.html @@ -6,14 +6,11 @@ test / Bar

Bar

-class Bar
+class Bar

Usage instructions:

-

  1. Rinse

    -

  2. Repeat

    -

-
-
-
+
  1. Rinse
    2. +
  2. Repeat
    3. +

Constructors

@@ -21,7 +18,8 @@ diff --git a/core/testdata/format/overloads.html b/core/testdata/format/overloads.html index 58241e56..ae50668a 100644 --- a/core/testdata/format/overloads.html +++ b/core/testdata/format/overloads.html @@ -14,7 +14,8 @@ f diff --git a/core/testdata/format/overloadsWithDescription.html b/core/testdata/format/overloadsWithDescription.html index 89bddaa4..aacdebfd 100644 --- a/core/testdata/format/overloadsWithDescription.html +++ b/core/testdata/format/overloadsWithDescription.html @@ -9,15 +9,12 @@ fun f(x: Int): Unit
-fun f(x: String): Unit
+fun f(x: String): Unit

Performs an action on x.

This is a long description.

-
-

Parameters

- -x - the value to perform the action on.
-
-
+ +

+x - the value to perform the action on. diff --git a/core/testdata/format/overloadsWithDifferentDescriptions.html b/core/testdata/format/overloadsWithDifferentDescriptions.html index 549adbfa..83849f23 100644 --- a/core/testdata/format/overloadsWithDifferentDescriptions.html +++ b/core/testdata/format/overloadsWithDifferentDescriptions.html @@ -6,27 +6,22 @@ test / f

f

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

+fun f(x: Int): Unit

Performs an action on x.

This is a long description.

-
-

Parameters

- -x - the int value to perform the action on.
-
-
- -fun f(x: String): Unit
+ +

+x - the int value to perform the action on. +

+fun f(x: String): Unit

Performs an action on x.

This is a long description.

-
-

Parameters

- -x - the string value to perform the action on.
-
-
+ +

+x - the string value to perform the action on. diff --git a/core/testdata/format/overridingFunction.md b/core/testdata/format/overridingFunction.md index 2c898b9c..dcc1c426 100644 --- a/core/testdata/format/overridingFunction.md +++ b/core/testdata/format/overridingFunction.md @@ -1,9 +1,8 @@ [test](test/index) / [D](test/-d/index) / [f](test/-d/f) - # f `fun f(): Unit` -Overrides [C.f](test/-c/f) +Overrides [C.f](test/-c/f) diff --git a/core/testdata/format/paramTag.md b/core/testdata/format/paramTag.md index 20d8faac..dec4ad9c 100644 --- a/core/testdata/format/paramTag.md +++ b/core/testdata/format/paramTag.md @@ -1,15 +1,12 @@ [test](test/index) / [f](test/f) - # f -`fun f(x: String, y: Int): Unit` +`fun f(x: String, y: Int): Unit` ### Parameters `x` - A string `y` - A number with a really long description that spans multiple lines and goes -on and on and is very interesting to read - - +on and on and is very interesting to read \ No newline at end of file diff --git a/core/testdata/format/parameterAnchor.html b/core/testdata/format/parameterAnchor.html index ff9c9317..5a51e171 100644 --- a/core/testdata/format/parameterAnchor.html +++ b/core/testdata/format/parameterAnchor.html @@ -7,12 +7,11 @@

processFiles

-fun <T> processFiles(processor: () -> T): List<T>
+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
-
-
+ +

+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 3ae75ccb..65272af2 100644 --- a/core/testdata/format/parenthesis.html +++ b/core/testdata/format/parenthesis.html @@ -7,9 +7,7 @@

foo

-fun foo(): Unit
+fun foo(): Unit

foo (bar)

-
-
diff --git a/core/testdata/format/propertyVar.md b/core/testdata/format/propertyVar.md index f2110992..8232dff4 100644 --- a/core/testdata/format/propertyVar.md +++ b/core/testdata/format/propertyVar.md @@ -1,8 +1,5 @@ [test](test/index) / [x](test/x) - # x -`var x: Int` - - +`var x: Int` \ No newline at end of file diff --git a/core/testdata/format/receiverParameterTypeBound.md b/core/testdata/format/receiverParameterTypeBound.md index 872158ac..8a8c4220 100644 --- a/core/testdata/format/receiverParameterTypeBound.md +++ b/core/testdata/format/receiverParameterTypeBound.md @@ -1,20 +1,14 @@ [test](test/index) / [Foo](test/-foo/index) - # Foo `open class Foo` - - ### Constructors - | [<init>](test/-foo/-init-) | `Foo()` | - ### Extension Functions - -| [xyzzy](test/xyzzy) | `fun <T : [Foo](test/-foo/index)> T.xyzzy(): Unit` | +| [xyzzy](test/xyzzy) | `fun T.xyzzy(): Unit` | diff --git a/core/testdata/format/reifiedTypeParameter.md b/core/testdata/format/reifiedTypeParameter.md index 2e96018e..253f2438 100644 --- a/core/testdata/format/reifiedTypeParameter.md +++ b/core/testdata/format/reifiedTypeParameter.md @@ -1,8 +1,5 @@ [test](test/index) / [f](test/f) - # f -`inline fun <reified T> f(): Unit` - - +`inline fun f(): Unit` \ No newline at end of file diff --git a/core/testdata/format/returnWithLink.html b/core/testdata/format/returnWithLink.html index e5827e8e..7a52391b 100644 --- a/core/testdata/format/returnWithLink.html +++ b/core/testdata/format/returnWithLink.html @@ -7,10 +7,8 @@

foo

-fun foo(s1: String): String
+fun foo(s1: String): String

Return
Returns s1 and does nothing else.

-
-
diff --git a/core/testdata/format/see.html b/core/testdata/format/see.html index e39711bb..d9d1df13 100644 --- a/core/testdata/format/see.html +++ b/core/testdata/format/see.html @@ -6,26 +6,19 @@

quux

-fun quux(): Unit
+fun quux(): Unit

See Also

foo

bar

-
-
test / foo

foo

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

bar

-fun bar(): Unit
-
-
+fun bar(): Unit diff --git a/core/testdata/format/shadowedExtensionFunctions.md b/core/testdata/format/shadowedExtensionFunctions.md index 5218d299..3b0a9dc9 100644 --- a/core/testdata/format/shadowedExtensionFunctions.md +++ b/core/testdata/format/shadowedExtensionFunctions.md @@ -1,22 +1,15 @@ [test](test/index) / [Bar](test/-bar/index) - # Bar -`class Bar : [Foo](test/-foo/index)` - - +`class Bar : `[`Foo`](test/-foo/index) ### Constructors - | [<init>](test/-bar/-init-) | `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](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` | diff --git a/core/testdata/format/starProjection.md b/core/testdata/format/starProjection.md index c73a5aa9..6f796e77 100644 --- a/core/testdata/format/starProjection.md +++ b/core/testdata/format/starProjection.md @@ -1,8 +1,6 @@ [test](test/index) / [kotlin.collections.Iterable](test/kotlin.collections.-iterable/index) - ### Extensions for kotlin.collections.Iterable - -| [containsFoo](test/kotlin.collections.-iterable/contains-foo) | `fun Iterable<*>.containsFoo(element: Any?): Boolean` | +| [containsFoo](test/kotlin.collections.-iterable/contains-foo) | `fun Iterable<*>.containsFoo(element: Any?): Boolean` | diff --git a/core/testdata/format/summarizeSignatures.md b/core/testdata/format/summarizeSignatures.md index b1707f40..d37f2301 100644 --- a/core/testdata/format/summarizeSignatures.md +++ b/core/testdata/format/summarizeSignatures.md @@ -1,23 +1,14 @@ [test](test/index) / [kotlin](test/kotlin/index) - ## Package kotlin - ### Types - -| [Array](test/kotlin/-array/index) | `class Array<T>` | +| [Array](test/kotlin/-array/index) | `class Array` | | [CharArray](test/kotlin/-char-array/index) | `class CharArray` | | [IntArray](test/kotlin/-int-array/index) | `class IntArray` | - ### Functions - -| [foo](test/kotlin/foo) | `fun <T> any_array<T>.foo(predicate: (T) -> Boolean): Boolean` - -Returns true if foo. - - | +| [foo](test/kotlin/foo) | `fun any_array.foo(predicate: (T) -> Boolean): Boolean`
Returns true if foo. | diff --git a/core/testdata/format/summarizeSignaturesProperty.md b/core/testdata/format/summarizeSignaturesProperty.md index 9646b0f1..712aebd4 100644 --- a/core/testdata/format/summarizeSignaturesProperty.md +++ b/core/testdata/format/summarizeSignaturesProperty.md @@ -1,23 +1,14 @@ [test](test/index) / [kotlin](test/kotlin/index) - ## Package kotlin - ### Types - -| [Array](test/kotlin/-array/index) | `class Array<T>` | +| [Array](test/kotlin/-array/index) | `class Array` | | [CharArray](test/kotlin/-char-array/index) | `class CharArray` | | [IntArray](test/kotlin/-int-array/index) | `class IntArray` | - ### Properties - -| [foo](test/kotlin/foo) | `val <T> any_array<T>.foo: Int` - -Returns true if foo. - - | +| [foo](test/kotlin/foo) | `val any_array.foo: Int`
Returns true if foo. | diff --git a/core/testdata/format/throwsTag.md b/core/testdata/format/throwsTag.md index 21225297..a476fa1b 100644 --- a/core/testdata/format/throwsTag.md +++ b/core/testdata/format/throwsTag.md @@ -1,6 +1,5 @@ [test](test/index) / [f](test/f) - # f `fun f(): Unit` @@ -9,6 +8,4 @@ `IllegalArgumentException` - on Mondays -`NullPointerException` - on Tuesdays - - +`NullPointerException` - on Tuesdays \ No newline at end of file diff --git a/core/testdata/format/tripleBackticks.html b/core/testdata/format/tripleBackticks.html index b085c67a..5b6c9fd3 100644 --- a/core/testdata/format/tripleBackticks.html +++ b/core/testdata/format/tripleBackticks.html @@ -7,11 +7,8 @@

f

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

Description

-
code sample

-
-
-
+
code sample
diff --git a/core/testdata/format/typeLink.html b/core/testdata/format/typeLink.html index 23054c8d..68c7b487 100644 --- a/core/testdata/format/typeLink.html +++ b/core/testdata/format/typeLink.html @@ -6,9 +6,7 @@ test / Bar

Bar

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

Constructors

<init> -Bar()

Usage instructions:

+Bar() +

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

Performs an action on x.

+fun f(x: String): Unit +

Performs an action on x.
diff --git a/core/testdata/format/typeParameterBounds.md b/core/testdata/format/typeParameterBounds.md index e2551580..58df82a3 100644 --- a/core/testdata/format/typeParameterBounds.md +++ b/core/testdata/format/typeParameterBounds.md @@ -1,15 +1,11 @@ [test](test/index) / [generic](test/generic) - # generic -`fun <T : R, R> generic(): Unit` +`fun generic(): Unit` generic function - ### Parameters -`T` - the first type parameter - - +`T` - the first type parameter \ No newline at end of file diff --git a/core/testdata/format/typeParameterVariance.md b/core/testdata/format/typeParameterVariance.md index 241c2e87..01f5562c 100644 --- a/core/testdata/format/typeParameterVariance.md +++ b/core/testdata/format/typeParameterVariance.md @@ -1,18 +1,14 @@ [test](test/index) / [Foo](test/-foo/index) - # Foo -`class Foo<out T>` +`class Foo` ### Parameters `T` - the class parameter type - - ### Constructors - | [<init>](test/-foo/-init-) | `Foo()` | diff --git a/core/testdata/format/typeProjectionVariance.md b/core/testdata/format/typeProjectionVariance.md index 7aa34593..5b8fc190 100644 --- a/core/testdata/format/typeProjectionVariance.md +++ b/core/testdata/format/typeProjectionVariance.md @@ -1,8 +1,6 @@ [test](test/index) / [kotlin.Array](test/kotlin.-array/index) - ### Extensions for kotlin.Array - -| [foo](test/kotlin.-array/foo) | `fun <T> Array<out T>.foo(): Unit` | +| [foo](test/kotlin.-array/foo) | `fun Array.foo(): Unit` | diff --git a/core/testdata/format/uninterpretedEmphasisCharacters.html b/core/testdata/format/uninterpretedEmphasisCharacters.html index 70409577..62850fb0 100644 --- a/core/testdata/format/uninterpretedEmphasisCharacters.html +++ b/core/testdata/format/uninterpretedEmphasisCharacters.html @@ -7,10 +7,8 @@

foo

-fun foo(): Unit
+fun foo(): Unit

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

-
-
diff --git a/core/testdata/format/varargsFunction.md b/core/testdata/format/varargsFunction.md index 723437aa..85ac9c92 100644 --- a/core/testdata/format/varargsFunction.md +++ b/core/testdata/format/varargsFunction.md @@ -1,8 +1,5 @@ [test](test/index) / [f](test/f) - # f -`fun f(vararg s: String): Unit` - - +`fun f(vararg s: String): Unit` \ No newline at end of file diff --git a/core/testdata/format/website/returnTag.md b/core/testdata/format/website/returnTag.md index 301635ad..418babad 100644 --- a/core/testdata/format/website/returnTag.md +++ b/core/testdata/format/website/returnTag.md @@ -5,15 +5,12 @@ layout: api
test / indexOf
- # indexOf -
fun Foo.indexOf(
    char: Char,
    startIndex: Int = 0,
    ignoreCase: Boolean = false
): Int
-
+
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. @@ -21,5 +18,3 @@ Returns the index within this string of the first occurrence of the specified ch **Returns** An index of the first occurrence of char or -1 if none is found. - - diff --git a/core/testdata/format/website/sample.md b/core/testdata/format/website/sample.md index e416a039..3a52379b 100644 --- a/core/testdata/format/website/sample.md +++ b/core/testdata/format/website/sample.md @@ -5,28 +5,20 @@ layout: api
test / foo
- # foo -
fun foo(): Int
-
+
fun foo(): Int
Groups elements of the original sequence by the key returned by the given keySelector function applied to each element and returns a map where each group key is associated with a list of corresponding elements. - ``` kotlin if (true) { println(property) } ``` +
- - - -
fun foo(i: Int): Int
-
- - +
fun foo(i: Int): Int
\ No newline at end of file -- cgit