From f65fbf534807c168a81f4e80919680ca7dcff47b Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Fri, 24 Mar 2017 22:01:49 +0300 Subject: Tweak kws html format to match output of old format --- core/testdata/format/classWithCompanionObject.html | 9 +++++--- .../crossLanguage/kotlinExtendsJava/Bar.html | 6 ++++-- core/testdata/format/deprecated.package.html | 9 +++++--- core/testdata/format/entity.html | 3 ++- core/testdata/format/javaLinkTag.html | 6 ++++-- core/testdata/format/javaLinkTagWithLabel.html | 6 ++++-- core/testdata/format/javaSeeTag.html | 6 ++++-- core/testdata/format/javaSupertype.html | 6 ++++-- core/testdata/format/linkWithLabel.html | 6 ++++-- core/testdata/format/linkWithStarProjection.html | 3 ++- core/testdata/format/orderedList.html | 3 ++- core/testdata/format/overloads.html | 3 ++- core/testdata/format/overloadsWithDescription.html | 4 ++-- .../format/overloadsWithDifferentDescriptions.html | 13 +++++------- core/testdata/format/parameterAnchor.html | 4 ++-- core/testdata/format/sinceKotlin.html | 3 ++- core/testdata/format/typeLink.html | 3 ++- .../dataTags/multiplatform.package.html | 24 ++++++++++++++-------- .../dataTagsInGroupNode/multiplatform.html | 16 +++++++-------- .../dataTagsInGroupNode/multiplatform.package.html | 9 +++++--- .../format/website-html/overloadGroup.html | 14 ++++++------- core/testdata/format/website-html/returnTag.html | 2 +- core/testdata/format/website-html/sample.html | 6 ++---- 23 files changed, 96 insertions(+), 68 deletions(-) (limited to 'core/testdata') diff --git a/core/testdata/format/classWithCompanionObject.html b/core/testdata/format/classWithCompanionObject.html index 4a9d143a..2954d5a7 100644 --- a/core/testdata/format/classWithCompanionObject.html +++ b/core/testdata/format/classWithCompanionObject.html @@ -13,7 +13,8 @@ -<init> +

<init>

+ Klass() @@ -24,7 +25,8 @@ -x +

x

+ val x: Int @@ -35,7 +37,8 @@ -foo +

foo

+ fun foo(): Unit diff --git a/core/testdata/format/crossLanguage/kotlinExtendsJava/Bar.html b/core/testdata/format/crossLanguage/kotlinExtendsJava/Bar.html index 3cf9be00..42f21d3c 100644 --- a/core/testdata/format/crossLanguage/kotlinExtendsJava/Bar.html +++ b/core/testdata/format/crossLanguage/kotlinExtendsJava/Bar.html @@ -14,7 +14,8 @@ -<init> +

<init>

+ Bar()

See xyzzy

@@ -27,7 +28,8 @@ -xyzzy +

xyzzy

+ open fun xyzzy(): Unit diff --git a/core/testdata/format/deprecated.package.html b/core/testdata/format/deprecated.package.html index 739a84db..b85e53bd 100644 --- a/core/testdata/format/deprecated.package.html +++ b/core/testdata/format/deprecated.package.html @@ -12,7 +12,8 @@ -C +

C

+ class C @@ -23,7 +24,8 @@ -p +

p

+ val p: Int @@ -34,7 +36,8 @@ -f +

f

+ fun f(): Unit diff --git a/core/testdata/format/entity.html b/core/testdata/format/entity.html index fe787a99..abe89502 100644 --- a/core/testdata/format/entity.html +++ b/core/testdata/format/entity.html @@ -14,7 +14,8 @@ -<init> +

<init>

+ Bar()

Copyright © JetBrains 2015 "

diff --git a/core/testdata/format/javaLinkTag.html b/core/testdata/format/javaLinkTag.html index 62fb6299..035bdd06 100644 --- a/core/testdata/format/javaLinkTag.html +++ b/core/testdata/format/javaLinkTag.html @@ -14,7 +14,8 @@ -<init> +

<init>

+ Foo()

Call #bar() to do the job.

@@ -27,7 +28,8 @@ -bar +

bar

+ open fun bar(): Unit diff --git a/core/testdata/format/javaLinkTagWithLabel.html b/core/testdata/format/javaLinkTagWithLabel.html index 61302f82..69a15bc7 100644 --- a/core/testdata/format/javaLinkTagWithLabel.html +++ b/core/testdata/format/javaLinkTagWithLabel.html @@ -14,7 +14,8 @@ -<init> +

<init>

+ Foo()

Call this wonderful method to do the job.

@@ -27,7 +28,8 @@ -bar +

bar

+ open fun bar(): Unit diff --git a/core/testdata/format/javaSeeTag.html b/core/testdata/format/javaSeeTag.html index 6044b60f..c81eec31 100644 --- a/core/testdata/format/javaSeeTag.html +++ b/core/testdata/format/javaSeeTag.html @@ -15,7 +15,8 @@ -<init> +

<init>

+ Foo() @@ -26,7 +27,8 @@ -bar +

bar

+ open fun bar(): Unit diff --git a/core/testdata/format/javaSupertype.html b/core/testdata/format/javaSupertype.html index 89003291..b46c8e54 100644 --- a/core/testdata/format/javaSupertype.html +++ b/core/testdata/format/javaSupertype.html @@ -13,7 +13,8 @@ -<init> +

<init>

+ Bar() @@ -24,7 +25,8 @@ -returnFoo +

returnFoo

+ open fun returnFoo(foo: Foo): Foo diff --git a/core/testdata/format/linkWithLabel.html b/core/testdata/format/linkWithLabel.html index fbaecd2b..b8fe2228 100644 --- a/core/testdata/format/linkWithLabel.html +++ b/core/testdata/format/linkWithLabel.html @@ -14,7 +14,8 @@ -<init> +

<init>

+ Bar()

Use this method for best results.

@@ -27,7 +28,8 @@ -foo +

foo

+ fun foo(): Unit diff --git a/core/testdata/format/linkWithStarProjection.html b/core/testdata/format/linkWithStarProjection.html index 3e4e884b..bb9ce43c 100644 --- a/core/testdata/format/linkWithStarProjection.html +++ b/core/testdata/format/linkWithStarProjection.html @@ -13,7 +13,8 @@ -foo +

foo

+ fun foo(c: Enum<*>): Unit diff --git a/core/testdata/format/orderedList.html b/core/testdata/format/orderedList.html index fa24e080..66f37876 100644 --- a/core/testdata/format/orderedList.html +++ b/core/testdata/format/orderedList.html @@ -17,7 +17,8 @@ -<init> +

<init>

+ Bar()

Usage instructions:

diff --git a/core/testdata/format/overloads.html b/core/testdata/format/overloads.html index 5e9bdbd3..d0f7f37d 100644 --- a/core/testdata/format/overloads.html +++ b/core/testdata/format/overloads.html @@ -12,7 +12,8 @@ -f +

f

+ fun f(x: Int): Unit
fun f(x: String): Unit diff --git a/core/testdata/format/overloadsWithDescription.html b/core/testdata/format/overloadsWithDescription.html index fe98b8fe..eefa6976 100644 --- a/core/testdata/format/overloadsWithDescription.html +++ b/core/testdata/format/overloadsWithDescription.html @@ -14,7 +14,7 @@

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 947c72d6..cdf380be 100644 --- a/core/testdata/format/overloadsWithDifferentDescriptions.html +++ b/core/testdata/format/overloadsWithDifferentDescriptions.html @@ -7,21 +7,18 @@ test / f

f

-

+ 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.

-

-

+ +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/parameterAnchor.html b/core/testdata/format/parameterAnchor.html index ecb89fe6..aa51fff6 100644 --- a/core/testdata/format/parameterAnchor.html +++ b/core/testdata/format/parameterAnchor.html @@ -11,7 +11,7 @@ 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/sinceKotlin.html b/core/testdata/format/sinceKotlin.html index 4788fcda..ab25a002 100644 --- a/core/testdata/format/sinceKotlin.html +++ b/core/testdata/format/sinceKotlin.html @@ -15,7 +15,8 @@ -<init> +

<init>

+ Since1.1()

Useful

diff --git a/core/testdata/format/typeLink.html b/core/testdata/format/typeLink.html index ba42ef18..2e51863f 100644 --- a/core/testdata/format/typeLink.html +++ b/core/testdata/format/typeLink.html @@ -13,7 +13,8 @@ -<init> +

<init>

+ Bar() diff --git a/core/testdata/format/website-html/dataTags/multiplatform.package.html b/core/testdata/format/website-html/dataTags/multiplatform.package.html index 0430c6f2..15e1fc12 100644 --- a/core/testdata/format/website-html/dataTags/multiplatform.package.html +++ b/core/testdata/format/website-html/dataTags/multiplatform.package.html @@ -4,56 +4,64 @@
-jre7 +

jre7

+
fun jre7(): Unit
-jre7New +

jre7New

+
fun jre7New(): Unit
-js +

js

+
fun js(): Unit
-jsNew +

jsNew

+
fun jsNew(): Unit
-jvm +

jvm

+
fun jvm(): Unit
-jvmNew +

jvmNew

+
fun jvmNew(): Unit
-shared +

shared

+
fun shared(): Unit
-sharedNew +

sharedNew

+
fun sharedNew(): Unit
diff --git a/core/testdata/format/website-html/dataTagsInGroupNode/multiplatform.html b/core/testdata/format/website-html/dataTagsInGroupNode/multiplatform.html index bca7d36d..35773561 100644 --- a/core/testdata/format/website-html/dataTagsInGroupNode/multiplatform.html +++ b/core/testdata/format/website-html/dataTagsInGroupNode/multiplatform.html @@ -1,17 +1,17 @@
test / pack / Some

Some

-

typealias Some = SomeCoolJvmClass
+
typealias Some = SomeCoolJvmClass

Platform and version requirements: JVM

-

-

class Some
+
class Some

Platform and version requirements: JS

-

Constructors

+

Constructors

-<init> +

<init>

+
Some()
@@ -20,12 +20,13 @@
-

Functions

+

Functions

-magic +

magic

+
fun magic(): Unit
@@ -35,4 +36,3 @@
-

diff --git a/core/testdata/format/website-html/dataTagsInGroupNode/multiplatform.package.html b/core/testdata/format/website-html/dataTagsInGroupNode/multiplatform.package.html index 985f9f04..15ae2a5b 100644 --- a/core/testdata/format/website-html/dataTagsInGroupNode/multiplatform.package.html +++ b/core/testdata/format/website-html/dataTagsInGroupNode/multiplatform.package.html @@ -4,14 +4,16 @@
-Some +

Some

+
class Some
-SomeCoolJvmClass +

SomeCoolJvmClass

+
class SomeCoolJvmClass
@@ -23,7 +25,8 @@
-Some +

Some

+
typealias Some = SomeCoolJvmClass
diff --git a/core/testdata/format/website-html/overloadGroup.html b/core/testdata/format/website-html/overloadGroup.html index 2482f8fb..3ea7de94 100644 --- a/core/testdata/format/website-html/overloadGroup.html +++ b/core/testdata/format/website-html/overloadGroup.html @@ -1,18 +1,16 @@
test / magic

magic

-

+
fun magic(spell: String): Int
-

Parameters

+

Parameters

spell - The text of spell, often distributed on scrolls

-

ReturnSpell ID for future casts

+

Return Spell ID for future casts

-

-

+
fun magic(spell: Int): Int
-

Parameters

+

Parameters

spell - Spell ID of previously casted spell

-

ReturnSpell ID for future casts

+

Return Spell ID for future casts

-

diff --git a/core/testdata/format/website-html/returnTag.html b/core/testdata/format/website-html/returnTag.html index 92253130..d4190fa1 100644 --- a/core/testdata/format/website-html/returnTag.html +++ b/core/testdata/format/website-html/returnTag.html @@ -6,4 +6,4 @@

Parameters

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

-

ReturnsAn 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 00646a11..55d321c0 100644 --- a/core/testdata/format/website-html/sample.html +++ b/core/testdata/format/website-html/sample.html @@ -1,6 +1,6 @@
test / foo

foo

-

+
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.

@@ -14,8 +14,6 @@ if (true) { //sampleEnd }
-

-

+
fun foo(i: Int): Int
-

-- cgit