diff options
| author | vmishenev <vad-mishenev@yandex.ru> | 2021-07-28 08:49:52 +0300 |
|---|---|---|
| committer | vmishenev <vad-mishenev@yandex.ru> | 2021-07-30 01:32:42 +0300 |
| commit | 85cec2dd7ae435d84bad0721c6fd79e9c644c275 (patch) | |
| tree | 1228d08e124b215fdaa00f08242f5c4ba7a83912 /plugins/base/src/test | |
| parent | f068030082cd38ec93988c911f4b5511ed64fca3 (diff) | |
| download | dokka-85cec2dd7ae435d84bad0721c6fd79e9c644c275.tar.gz dokka-85cec2dd7ae435d84bad0721c6fd79e9c644c275.tar.bz2 dokka-85cec2dd7ae435d84bad0721c6fd79e9c644c275.zip | |
Improve annotations rendering (#2045)
omit parentheses if there are no parameters
add quotes for string literals into annotations
Diffstat (limited to 'plugins/base/src/test')
| -rw-r--r-- | plugins/base/src/test/kotlin/signatures/SignatureTest.kt | 14 | ||||
| -rw-r--r-- | plugins/base/src/test/kotlin/utils/contentUtils.kt | 14 |
2 files changed, 15 insertions, 13 deletions
diff --git a/plugins/base/src/test/kotlin/signatures/SignatureTest.kt b/plugins/base/src/test/kotlin/signatures/SignatureTest.kt index 5605d867..35590d52 100644 --- a/plugins/base/src/test/kotlin/signatures/SignatureTest.kt +++ b/plugins/base/src/test/kotlin/signatures/SignatureTest.kt @@ -270,7 +270,7 @@ class SignatureTest : BaseAbstractTest() { renderingStage = { _, _ -> writerPlugin.writer.renderedContent("root/example/simple-fun.html").firstSignature().match( Div( - Div("@", A("Marking"), "()") + Div("@", A("Marking")) ), "fun ", A("simpleFun"), "(): ", A("String"), Span() @@ -309,8 +309,8 @@ class SignatureTest : BaseAbstractTest() { .firstSignature() .match( Div( - Div("@", A("Marking"), "(", Span("msg = ", Span("Nenya")), Wbr, ")"), - Div("@", A("Marking2"), "(", Span("int = ", Span("1")), Wbr, ")") + Div("@", A("Marking"), "(", Span("msg = ", Span("\"Nenya\"")), Wbr, ")"), + Div("@", A("Marking2"), "(", Span("int = ", Span("1")), Wbr, ")") ), "fun ", A("simpleFun"), "(): ", A("String"), Span() @@ -346,9 +346,9 @@ class SignatureTest : BaseAbstractTest() { Div( "@", A("Marking"), "(", Span( "msg = [", - Span(Span("Nenya"), ", "), Wbr, - Span(Span("Vilya"), ", "), Wbr, - Span(Span("Narya")), Wbr, "]" + Span(Span("\"Nenya\""), ", "), Wbr, + Span(Span("\"Vilya\""), ", "), Wbr, + Span(Span("\"Narya\"")), Wbr, "]" ), Wbr, ")" ) ), @@ -457,7 +457,7 @@ class SignatureTest : BaseAbstractTest() { writerPlugin.writer.renderedContent("root/example/index.html").signature().first().match( Div( Div( - "@", A("SomeAnnotation"), "()" + "@", A("SomeAnnotation") ) ), "typealias ", A("PlainTypealias"), " = ", A("Int"), Span() diff --git a/plugins/base/src/test/kotlin/utils/contentUtils.kt b/plugins/base/src/test/kotlin/utils/contentUtils.kt index 5d8673d0..be796c89 100644 --- a/plugins/base/src/test/kotlin/utils/contentUtils.kt +++ b/plugins/base/src/test/kotlin/utils/contentUtils.kt @@ -242,14 +242,16 @@ fun ContentMatcherBuilder<*>.unwrapAnnotation(elem: Map.Entry<String, Set<String group { +"@" link { +elem.key } - +"(" - elem.value.forEach { - group { - +("$it = ") - skipAllNotMatching() + if(elem.value.isNotEmpty()) { + +"(" + elem.value.forEach { + group { + +("$it = ") + skipAllNotMatching() + } } + +")" } - +")" } } |