From 3f9dedbc9a0d559ab1320c395847ff88af7ad497 Mon Sep 17 00:00:00 2001 From: Filip Zybała Date: Thu, 26 Mar 2020 09:54:01 +0100 Subject: Fixed tests --- .../src/main/kotlin/renderers/html/HtmlRenderer.kt | 2 +- plugins/base/src/test/kotlin/model/ClassesTest.kt | 20 ++++++++++-------- .../renderers/html/PlatformDependentHintTest.kt | 8 ++++---- .../expect/annotatedFunction/out/html/root/f.html | 3 +-- .../annotatedFunction/out/html/root/index.html | 5 ++--- .../out/html/root/-fancy/-init-.html | 3 +-- .../out/html/root/-fancy/equals.html | 3 +-- .../out/html/root/-fancy/hash-code.html | 3 +-- .../out/html/root/-fancy/index.html | 24 ++++++++-------------- .../out/html/root/-fancy/to-string.html | 3 +-- .../out/html/root/f.html | 3 +-- .../out/html/root/index.html | 10 ++++----- .../expect/function/out/html/root/fn.html | 6 ++---- .../expect/function/out/html/root/index.html | 5 ++--- .../out/html/root/-fancy/-init-.html | 3 +-- .../out/html/root/-fancy/equals.html | 3 +-- .../out/html/root/-fancy/hash-code.html | 3 +-- .../out/html/root/-fancy/index.html | 17 +++++++-------- .../out/html/root/-fancy/to-string.html | 3 +-- .../out/html/root/function.html | 5 +---- .../out/html/root/index.html | 12 ++++------- .../out/html/root/f.html | 3 +-- .../out/html/root/index.html | 5 ++--- .../out/html/root/function.html | 5 +---- .../out/html/root/index.html | 7 ++----- .../out/html/root/f.html | 3 +-- .../out/html/root/index.html | 5 ++--- .../functionWithParams/out/html/root/function.html | 6 ++---- .../functionWithParams/out/html/root/index.html | 5 ++--- .../functionWithReceiver/out/html/root/fn.html | 13 ++++-------- .../functionWithReceiver/out/html/root/index.html | 10 ++++----- .../genericFunction/out/html/root/generic.html | 6 ++---- .../genericFunction/out/html/root/index.html | 5 ++--- .../out/html/root/generic.html | 6 ++---- .../out/html/root/index.html | 5 ++--- .../expect/inlineFunction/out/html/root/f.html | 5 +---- .../expect/inlineFunction/out/html/root/index.html | 7 ++----- .../inlineSuspendFunction/out/html/root/f.html | 5 +---- .../inlineSuspendFunction/out/html/root/index.html | 7 ++----- .../out/html/root/signatureTest/index.html | 14 ++++--------- .../out/html/root/signatureTest/test.html | 5 +---- .../out/html/root/signatureTest/test2.html | 5 +---- .../out/html/root/available-since1.1.html | 6 ++---- .../expect/sinceKotlin/out/html/root/index.html | 5 ++--- .../expect/suspendFunction/out/html/root/f.html | 3 +-- .../suspendFunction/out/html/root/index.html | 5 ++--- .../suspendInlineFunction/out/html/root/f.html | 5 +---- .../suspendInlineFunction/out/html/root/index.html | 7 ++----- 48 files changed, 108 insertions(+), 199 deletions(-) (limited to 'plugins') diff --git a/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt b/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt index f38d68dd..53222325 100644 --- a/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt +++ b/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt @@ -46,7 +46,7 @@ open class HtmlRenderer( consumer.onTagContentUnsafe { +distinct.keys.single() } else distinct.forEach { text, platforms -> - consumer.onTagContentUnsafe { +platforms.joinToString(prefix = " [", postfix = "] $text") { it.platformType.key } } + consumer.onTagContentUnsafe { +platforms.joinToString(prefix = " [", postfix = "] $text") { it.name } } } } diff --git a/plugins/base/src/test/kotlin/model/ClassesTest.kt b/plugins/base/src/test/kotlin/model/ClassesTest.kt index a7ec861a..ee109ba1 100644 --- a/plugins/base/src/test/kotlin/model/ClassesTest.kt +++ b/plugins/base/src/test/kotlin/model/ClassesTest.kt @@ -1,7 +1,9 @@ package model +import org.jetbrains.dokka.Platform import org.jetbrains.dokka.model.* import org.jetbrains.dokka.model.KotlinModifier.* +import org.jetbrains.dokka.pages.PlatformData import org.junit.jupiter.api.Assertions.assertNull import org.junit.jupiter.api.Test import utils.AbstractModelTest @@ -167,7 +169,7 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class ) { with((this / "classes" / "Klass").cast()) { name equals "Klass" - modifier equals Sealed + modifier.allValues.forEach { it equals Sealed } } } } @@ -209,15 +211,15 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class val D = (this / "classes" / "D").cast() with(C) { - modifier equals Open + modifier.allValues.forEach { it equals Open } with((this / "f").cast()) { - modifier equals Open + modifier.allValues.forEach { it equals Open } } } with(D) { - modifier equals Final + modifier.allValues.forEach { it equals Final } with((this / "f").cast()) { - modifier equals Open + modifier.allValues.forEach { it equals Open } } D.supertypes.flatMap { it.component2() }.firstOrNull() equals C.dri } @@ -244,16 +246,16 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class val E = (this / "classes" / "E").cast() with(C) { - modifier equals Abstract - ((this / "foo").cast()).modifier equals Abstract + modifier.allValues.forEach { it equals Abstract } + ((this / "foo").cast()).modifier.allValues.forEach { it equals Abstract } } with(D) { - modifier equals Abstract + modifier.allValues.forEach { it equals Abstract } } with(E) { - modifier equals Final + modifier.allValues.forEach { it equals Final } } D.supers.firstOrNull() equals C.dri diff --git a/plugins/base/src/test/kotlin/renderers/html/PlatformDependentHintTest.kt b/plugins/base/src/test/kotlin/renderers/html/PlatformDependentHintTest.kt index f46f8b59..f8ba51a6 100644 --- a/plugins/base/src/test/kotlin/renderers/html/PlatformDependentHintTest.kt +++ b/plugins/base/src/test/kotlin/renderers/html/PlatformDependentHintTest.kt @@ -40,7 +40,7 @@ class PlatformDependentHintTest : RenderingOnlyTestBase() { } HtmlRenderer(context).render(page) - renderedContent.match(Div("a"), "[pl1]", Div("b"), "[pl2]", Div("c"), "[pl3]") + renderedContent.match("[pl1]", Div("a"), "[pl2]", Div("b"), "[pl3]", Div("c")) } @Test @@ -54,7 +54,7 @@ class PlatformDependentHintTest : RenderingOnlyTestBase() { } HtmlRenderer(context).render(page) - renderedContent.match(Div("ab"), "[pl1]", Div("bc"), "[pl2]") + renderedContent.match("[pl1]", Div("ab"), "[pl2]", Div("bc")) } @Test @@ -84,7 +84,7 @@ class PlatformDependentHintTest : RenderingOnlyTestBase() { } HtmlRenderer(context).render(page) - renderedContent.match(Div(Div("ab")), "[pl1]", Div(Div("a"), "b"), "[pl2]") + renderedContent.match("[pl1]", Div(Div("ab")), "[pl2]", Div(Div("a"), "b")) } @Test @@ -115,6 +115,6 @@ class PlatformDependentHintTest : RenderingOnlyTestBase() { } HtmlRenderer(context).render(page) - renderedContent.match(Div("a"), "[pl1, pl2]", Div("b"), "[pl3]") + renderedContent.match("[pl1, pl2]", Div("a"), "[pl3]", Div("b")) } } \ No newline at end of file diff --git a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/f.html b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/f.html index 699949e0..b212ca00 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/f.html +++ b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/f.html @@ -18,8 +18,7 @@
//root//f

f

-
final fun f()
-
+
final fun f()
diff --git a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/index.html b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/index.html index 6ed21e80..b22194f8 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/index.html @@ -24,9 +24,8 @@ f - -
final fun f()
-
+
final fun f()
+
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/-init-.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/-init-.html index 1f8f163c..54f356bf 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/-init-.html +++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/-init-.html @@ -18,8 +18,7 @@
//root//Fancy/<init>

<init>

-
final fun <init>(size: Int)
-
+
final fun <init>(size: Int)
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/equals.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/equals.html index 095832b0..3047ead0 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/equals.html +++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/equals.html @@ -18,8 +18,7 @@
//root//Fancy/equals

equals

-
open fun equals(other: Any): Boolean
-
+
open fun equals(other: Any): Boolean
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/hash-code.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/hash-code.html index c600cba6..aae30759 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/hash-code.html +++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/hash-code.html @@ -18,8 +18,7 @@
//root//Fancy/hashCode

hashCode

-
open fun hashCode(): Int
-
+
open fun hashCode(): Int
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/index.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/index.html index fd1f598b..e43d5514 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/index.html +++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/index.html @@ -18,30 +18,27 @@
//root//Fancy

Fancy

-
annotation class Fancy
+
annotation class Fancy

Functions

- - - @@ -52,12 +49,9 @@ + - - diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/to-string.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/to-string.html index 01f5bd2f..89cc4ecc 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/to-string.html +++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/to-string.html @@ -18,8 +18,7 @@
//root//Fancy/toString

toString

-
open fun toString(): String
-
+
open fun toString(): String
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/f.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/f.html index 699949e0..b212ca00 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/f.html +++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/f.html @@ -18,8 +18,7 @@
//root//f

f

-
final fun f()
-
+
final fun f()
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/index.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/index.html index 7bd8b485..f485569d 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/index.html @@ -24,9 +24,8 @@ - @@ -37,9 +36,8 @@ - diff --git a/plugins/base/src/test/resources/expect/function/out/html/root/fn.html b/plugins/base/src/test/resources/expect/function/out/html/root/fn.html index 9e52f490..600c6f19 100644 --- a/plugins/base/src/test/resources/expect/function/out/html/root/fn.html +++ b/plugins/base/src/test/resources/expect/function/out/html/root/fn.html @@ -18,10 +18,8 @@
//root//fn

fn

-
final fun fn()
-

Description

-Function fn -
+
final fun fn()

Description

+Function fn
diff --git a/plugins/base/src/test/resources/expect/function/out/html/root/index.html b/plugins/base/src/test/resources/expect/function/out/html/root/index.html index fe2eeab7..8c346556 100644 --- a/plugins/base/src/test/resources/expect/function/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/function/out/html/root/index.html @@ -24,9 +24,8 @@ - diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/-init-.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/-init-.html index 68608d40..51e4544a 100644 --- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/-init-.html +++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/-init-.html @@ -18,8 +18,7 @@
//root//Fancy/<init>

<init>

-
final fun <init>()
-
+
final fun <init>()
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/equals.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/equals.html index 095832b0..3047ead0 100644 --- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/equals.html +++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/equals.html @@ -18,8 +18,7 @@
//root//Fancy/equals

equals

-
open fun equals(other: Any): Boolean
-
+
open fun equals(other: Any): Boolean
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/hash-code.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/hash-code.html index c600cba6..aae30759 100644 --- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/hash-code.html +++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/hash-code.html @@ -18,8 +18,7 @@
//root//Fancy/hashCode

hashCode

-
open fun hashCode(): Int
-
+
open fun hashCode(): Int
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/index.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/index.html index 9d89328b..5c51a927 100644 --- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/index.html +++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/index.html @@ -18,30 +18,27 @@
//root//Fancy

Fancy

-
annotation class Fancy
+
annotation class Fancy

Functions

equals -
open fun equals(other: Any): Boolean
-
+
open fun equals(other: Any): Boolean
+
hashCode -
open fun hashCode(): Int
-
+
open fun hashCode(): Int
+
toString -
open fun toString(): String
-
+
open fun toString(): String
+
size
Int
 -
Int
-
-
+
Fancy -
annotation class Fancy
-
+
annotation class Fancy
+
f -
final fun f()
-
+
final fun f()
+
fn -
final fun fn()
-
Function fn
+
final fun fn()
+
- - - diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/to-string.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/to-string.html index 01f5bd2f..89cc4ecc 100644 --- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/to-string.html +++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/to-string.html @@ -18,8 +18,7 @@
//root//Fancy/toString

toString

-
open fun toString(): String
-
+
open fun toString(): String
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/function.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/function.html index 4a0faa01..ad03758d 100644 --- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/function.html +++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/function.html @@ -18,10 +18,7 @@
//root//function

function

-
final fun function(notInlined: -
() -> Unit
-)
-
+
final fun function(notInlined:
() -> Unit
)
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/index.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/index.html index c6e84a04..88bff912 100644 --- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/index.html @@ -24,9 +24,8 @@ - @@ -37,11 +36,8 @@ - diff --git a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/f.html b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/f.html index d0f05c33..d2e1ac58 100644 --- a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/f.html +++ b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/f.html @@ -18,8 +18,7 @@
//root//f

f

-
final fun f(x: String)
-
+
final fun f(x: String)
diff --git a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/index.html b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/index.html index 8cd1b813..18e45a19 100644 --- a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/index.html @@ -24,9 +24,8 @@ - diff --git a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/function.html b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/function.html index 4a0faa01..ad03758d 100644 --- a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/function.html +++ b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/function.html @@ -18,10 +18,7 @@
//root//function

function

-
final fun function(notInlined: -
() -> Unit
-)
-
+
final fun function(notInlined:
() -> Unit
)
diff --git a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/index.html b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/index.html index 433663af..71c9c491 100644 --- a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/index.html @@ -24,11 +24,8 @@ - diff --git a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/f.html b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/f.html index 699949e0..b212ca00 100644 --- a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/f.html +++ b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/f.html @@ -18,8 +18,7 @@
//root//f

f

-
final fun f()
-
+
final fun f()
diff --git a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/index.html b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/index.html index 6ed21e80..b22194f8 100644 --- a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/index.html @@ -24,9 +24,8 @@ - diff --git a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/function.html b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/function.html index db1ca3f4..02a6de53 100644 --- a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/function.html +++ b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/function.html @@ -18,10 +18,8 @@
//root//function

function

-
final fun function(x: Int)
-

Description

-MultilineFunction Documentation -
+
final fun function(x: Int)

Description

+MultilineFunction Documentation
diff --git a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/index.html b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/index.html index 3bd8f2ef..56955a0a 100644 --- a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/index.html @@ -24,9 +24,8 @@ - diff --git a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/fn.html b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/fn.html index 519882b8..af435bd4 100644 --- a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/fn.html +++ b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/fn.html @@ -18,15 +18,10 @@
//root//fn

fn

-
final fun String.fn()
-

Description

-Function with receiver - -

fn

-
final fun String.fn(x: Int)
-

Description

-Function with receiver -
+
final fun String.fn()

Description

+Function with receiver

fn

+
final fun String.fn(x: Int)

Description

+Function with receiver
diff --git a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/index.html b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/index.html index 9ca38e30..ed7c004e 100644 --- a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/index.html @@ -24,16 +24,14 @@ - - diff --git a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/generic.html b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/generic.html index 0d90a5e5..a86d6f4e 100644 --- a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/generic.html +++ b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/generic.html @@ -18,10 +18,8 @@
//root//generic

generic

-
private final fun <T : Any> generic()
-

Description

-generic function -
+
private final fun <T : Any> generic()

Description

+generic function
diff --git a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/index.html b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/index.html index d10d959e..eb0ac0fc 100644 --- a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/index.html @@ -24,9 +24,8 @@ - diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/generic.html b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/generic.html index 3e9b2298..c9e8ad17 100644 --- a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/generic.html +++ b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/generic.html @@ -18,10 +18,8 @@
//root//generic

generic

-
final fun <T : R, R : Any> generic()
-

Description

-generic function -
+
final fun <T : R, R : Any> generic()

Description

+generic function
diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/index.html b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/index.html index 922f615f..4b702383 100644 --- a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/index.html @@ -24,9 +24,8 @@ - diff --git a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/f.html b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/f.html index c391e913..8a7bf1dc 100644 --- a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/f.html +++ b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/f.html @@ -18,10 +18,7 @@
//root//f

f

-
final fun f(a: -
() -> String
-)
-
+
final fun f(a:
() -> String
)
diff --git a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/index.html b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/index.html index c2f551a5..97dfd476 100644 --- a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/index.html @@ -24,11 +24,8 @@ - diff --git a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/f.html b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/f.html index c391e913..8a7bf1dc 100644 --- a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/f.html +++ b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/f.html @@ -18,10 +18,7 @@
//root//f

f

-
final fun f(a: -
() -> String
-)
-
+
final fun f(a:
() -> String
)
diff --git a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/index.html b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/index.html index c2f551a5..97dfd476 100644 --- a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/index.html @@ -24,11 +24,8 @@ - diff --git a/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/index.html b/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/index.html index 8f68531d..851f13f0 100644 --- a/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/index.html +++ b/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/index.html @@ -24,20 +24,14 @@ - - diff --git a/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/test.html b/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/test.html index 7449b3e1..353c5232 100644 --- a/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/test.html +++ b/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/test.html @@ -18,10 +18,7 @@
//root/signatureTest/test

test

-
final fun test(i: -
(Int) -> Int
-)
-
+
final fun test(i:
(Int) -> Int
)
diff --git a/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/test2.html b/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/test2.html index 9b2b441e..0b8c6dd4 100644 --- a/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/test2.html +++ b/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/test2.html @@ -18,10 +18,7 @@
//root/signatureTest/test2

test2

-
final fun test2(i: -
Int.(Int) -> Int
-)
-
+
final fun test2(i:
Int.(Int) -> Int
)
diff --git a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/available-since1.1.html b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/available-since1.1.html index 964602a2..7264fbf4 100644 --- a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/available-since1.1.html +++ b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/available-since1.1.html @@ -18,10 +18,8 @@
//root//availableSince1.1

availableSince1.1

-
final fun availableSince1.1(): String
-

Description

-Quite useful String -
+
final fun availableSince1.1(): String

Description

+Quite useful String
diff --git a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/index.html b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/index.html index c9ccf331..c54e53a5 100644 --- a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/index.html @@ -24,9 +24,8 @@ - diff --git a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/f.html b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/f.html index 699949e0..b212ca00 100644 --- a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/f.html +++ b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/f.html @@ -18,8 +18,7 @@
//root//f

f

-
final fun f()
-
+
final fun f()
diff --git a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/index.html b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/index.html index 6ed21e80..b22194f8 100644 --- a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/index.html @@ -24,9 +24,8 @@ - diff --git a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/f.html b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/f.html index c391e913..8a7bf1dc 100644 --- a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/f.html +++ b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/f.html @@ -18,10 +18,7 @@
//root//f

f

-
final fun f(a: -
() -> String
-)
-
+
final fun f(a:
() -> String
)
diff --git a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/index.html b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/index.html index c2f551a5..97dfd476 100644 --- a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/index.html @@ -24,11 +24,8 @@ - -- cgit
equals -
open fun equals(other: Any): Boolean
-
+
open fun equals(other: Any): Boolean
+
hashCode -
open fun hashCode(): Int
-
+
open fun hashCode(): Int
+
toString -
open fun toString(): String
-
+
open fun toString(): String
+
Fancy -
annotation class Fancy
-
+
annotation class Fancy
+
function -
final fun function(notInlined: -
() -> Unit
-)
-
+
final fun function(notInlined:
() -> Unit
)
+
f -
final fun f(x: String)
-
+
final fun f(x: String)
+
function -
final fun function(notInlined: -
() -> Unit
-)
-
+
final fun function(notInlined:
() -> Unit
)
+
f -
final fun f()
-
+
final fun f()
+
function -
final fun function(x: Int)
-
Multiline Function Documentation
+
final fun function(x: Int)
+
fn -
final fun String.fn()
-
Function with receiver
+
final fun String.fn()
+
fn -
final fun String.fn(x: Int)
-
Function with receiver
+
final fun String.fn(x: Int)
+
generic -
private final fun <T : Any> generic()
-
generic function
+
private final fun <T : Any> generic()
+
generic -
final fun <T : R, R : Any> generic()
-
generic function
+
final fun <T : R, R : Any> generic()
+
f -
final fun f(a: -
() -> String
-)
-
+
final fun f(a:
() -> String
)
+
f -
final fun f(a: -
() -> String
-)
-
+
final fun f(a:
() -> String
)
+
test -
final fun test(i: -
(Int) -> Int
-)
-
+
final fun test(i:
(Int) -> Int
)
+
test2 -
final fun test2(i: -
Int.(Int) -> Int
-)
-
+
final fun test2(i:
Int.(Int) -> Int
)
+
availableSince1.1 -
final fun availableSince1.1(): String
-
Quite useful String
+
final fun availableSince1.1(): String
+
f -
final fun f()
-
+
final fun f()
+
f -
final fun f(a: -
() -> String
-)
-
+
final fun f(a:
() -> String
)
+