azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix rendering in test output after introducing type aliases for the types used in those tests.

Browse Source
This commit is contained in:
Ilya Gorbunov
2016-09-01 21:55:18 +03:00
parent ed3c54dbd0
commit daac46bce5
9 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/Builders.txt
Vendored
+15 -15
View File
@@ -20,7 +20,7 @@ package html {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
protected final override /*1*/ /*fake_override*/ fun </*0*/ T : html.Element> initTag(/*0*/ tag: T, /*1*/ init: T.() -> kotlin.Unit): T
public final override /*1*/ /*fake_override*/ fun p(/*0*/ init: html.P.() -> kotlin.Unit): html.P
public open override /*1*/ /*fake_override*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: kotlin.String): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun render(/*0*/ builder: kotlin.text.StringBuilder /* = java.lang.StringBuilder */, /*1*/ indent: kotlin.String): kotlin.Unit
invisible_fake final override /*1*/ /*fake_override*/ fun renderAttributes(): kotlin.String?
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ul(/*0*/ init: html.UL.() -> kotlin.Unit): html.UL
@@ -39,7 +39,7 @@ package html {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
protected final override /*1*/ /*fake_override*/ fun </*0*/ T : html.Element> initTag(/*0*/ tag: T, /*1*/ init: T.() -> kotlin.Unit): T
public final override /*1*/ /*fake_override*/ fun p(/*0*/ init: html.P.() -> kotlin.Unit): html.P
public open override /*1*/ /*fake_override*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: kotlin.String): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun render(/*0*/ builder: kotlin.text.StringBuilder /* = java.lang.StringBuilder */, /*1*/ indent: kotlin.String): kotlin.Unit
invisible_fake final override /*1*/ /*fake_override*/ fun renderAttributes(): kotlin.String?
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ul(/*0*/ init: html.UL.() -> kotlin.Unit): html.UL
@@ -58,7 +58,7 @@ package html {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
protected final override /*1*/ /*fake_override*/ fun </*0*/ T : html.Element> initTag(/*0*/ tag: T, /*1*/ init: T.() -> kotlin.Unit): T
public final override /*1*/ /*fake_override*/ fun p(/*0*/ init: html.P.() -> kotlin.Unit): html.P
public open override /*1*/ /*fake_override*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: kotlin.String): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun render(/*0*/ builder: kotlin.text.StringBuilder /* = java.lang.StringBuilder */, /*1*/ indent: kotlin.String): kotlin.Unit
invisible_fake final override /*1*/ /*fake_override*/ fun renderAttributes(): kotlin.String?
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ul(/*0*/ init: html.UL.() -> kotlin.Unit): html.UL
@@ -77,7 +77,7 @@ package html {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
protected final override /*1*/ /*fake_override*/ fun </*0*/ T : html.Element> initTag(/*0*/ tag: T, /*1*/ init: T.() -> kotlin.Unit): T
public final fun p(/*0*/ init: html.P.() -> kotlin.Unit): html.P
public open override /*1*/ /*fake_override*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: kotlin.String): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun render(/*0*/ builder: kotlin.text.StringBuilder /* = java.lang.StringBuilder */, /*1*/ indent: kotlin.String): kotlin.Unit
invisible_fake final override /*1*/ /*fake_override*/ fun renderAttributes(): kotlin.String?
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final fun ul(/*0*/ init: html.UL.() -> kotlin.Unit): html.UL
@@ -88,7 +88,7 @@ package html {
public constructor Element()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public abstract fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: kotlin.String): kotlin.Unit
public abstract fun render(/*0*/ builder: kotlin.text.StringBuilder /* = java.lang.StringBuilder */, /*1*/ indent: kotlin.String): kotlin.Unit
public open override /*1*/ fun toString(): kotlin.String
}
@@ -104,7 +104,7 @@ package html {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
protected final override /*1*/ /*fake_override*/ fun </*0*/ T : html.Element> initTag(/*0*/ tag: T, /*1*/ init: T.() -> kotlin.Unit): T
public final override /*1*/ /*fake_override*/ fun p(/*0*/ init: html.P.() -> kotlin.Unit): html.P
public open override /*1*/ /*fake_override*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: kotlin.String): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun render(/*0*/ builder: kotlin.text.StringBuilder /* = java.lang.StringBuilder */, /*1*/ indent: kotlin.String): kotlin.Unit
invisible_fake final override /*1*/ /*fake_override*/ fun renderAttributes(): kotlin.String?
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ul(/*0*/ init: html.UL.() -> kotlin.Unit): html.UL
@@ -121,7 +121,7 @@ package html {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final fun head(/*0*/ init: html.Head.() -> kotlin.Unit): html.Head
protected final override /*1*/ /*fake_override*/ fun </*0*/ T : html.Element> initTag(/*0*/ tag: T, /*1*/ init: T.() -> kotlin.Unit): T
public open override /*1*/ /*fake_override*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: kotlin.String): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun render(/*0*/ builder: kotlin.text.StringBuilder /* = java.lang.StringBuilder */, /*1*/ indent: kotlin.String): kotlin.Unit
invisible_fake final override /*1*/ /*fake_override*/ fun renderAttributes(): kotlin.String?
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final override /*1*/ /*fake_override*/ fun kotlin.String.unaryPlus(): kotlin.Unit
@@ -135,7 +135,7 @@ package html {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
protected final override /*1*/ /*fake_override*/ fun </*0*/ T : html.Element> initTag(/*0*/ tag: T, /*1*/ init: T.() -> kotlin.Unit): T
public open override /*1*/ /*fake_override*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: kotlin.String): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun render(/*0*/ builder: kotlin.text.StringBuilder /* = java.lang.StringBuilder */, /*1*/ indent: kotlin.String): kotlin.Unit
invisible_fake final override /*1*/ /*fake_override*/ fun renderAttributes(): kotlin.String?
public final fun title(/*0*/ init: html.Title.() -> kotlin.Unit): html.Title
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -154,7 +154,7 @@ package html {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
protected final override /*1*/ /*fake_override*/ fun </*0*/ T : html.Element> initTag(/*0*/ tag: T, /*1*/ init: T.() -> kotlin.Unit): T
public final override /*1*/ /*fake_override*/ fun p(/*0*/ init: html.P.() -> kotlin.Unit): html.P
public open override /*1*/ /*fake_override*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: kotlin.String): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun render(/*0*/ builder: kotlin.text.StringBuilder /* = java.lang.StringBuilder */, /*1*/ indent: kotlin.String): kotlin.Unit
invisible_fake final override /*1*/ /*fake_override*/ fun renderAttributes(): kotlin.String?
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ul(/*0*/ init: html.UL.() -> kotlin.Unit): html.UL
@@ -173,7 +173,7 @@ package html {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
protected final override /*1*/ /*fake_override*/ fun </*0*/ T : html.Element> initTag(/*0*/ tag: T, /*1*/ init: T.() -> kotlin.Unit): T
public final override /*1*/ /*fake_override*/ fun p(/*0*/ init: html.P.() -> kotlin.Unit): html.P
public open override /*1*/ /*fake_override*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: kotlin.String): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun render(/*0*/ builder: kotlin.text.StringBuilder /* = java.lang.StringBuilder */, /*1*/ indent: kotlin.String): kotlin.Unit
invisible_fake final override /*1*/ /*fake_override*/ fun renderAttributes(): kotlin.String?
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ul(/*0*/ init: html.UL.() -> kotlin.Unit): html.UL
@@ -188,7 +188,7 @@ package html {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
protected final fun </*0*/ T : html.Element> initTag(/*0*/ tag: T, /*1*/ init: T.() -> kotlin.Unit): T
public open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: kotlin.String): kotlin.Unit
public open override /*1*/ fun render(/*0*/ builder: kotlin.text.StringBuilder /* = java.lang.StringBuilder */, /*1*/ indent: kotlin.String): kotlin.Unit
private final fun renderAttributes(): kotlin.String?
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@@ -201,7 +201,7 @@ package html {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
protected final override /*1*/ /*fake_override*/ fun </*0*/ T : html.Element> initTag(/*0*/ tag: T, /*1*/ init: T.() -> kotlin.Unit): T
public open override /*1*/ /*fake_override*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: kotlin.String): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun render(/*0*/ builder: kotlin.text.StringBuilder /* = java.lang.StringBuilder */, /*1*/ indent: kotlin.String): kotlin.Unit
invisible_fake final override /*1*/ /*fake_override*/ fun renderAttributes(): kotlin.String?
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final operator fun kotlin.String.unaryPlus(): kotlin.Unit
@@ -212,7 +212,7 @@ package html {
public final val text: kotlin.String
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: kotlin.String): kotlin.Unit
public open override /*1*/ fun render(/*0*/ builder: kotlin.text.StringBuilder /* = java.lang.StringBuilder */, /*1*/ indent: kotlin.String): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@@ -224,7 +224,7 @@ package html {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
protected final override /*1*/ /*fake_override*/ fun </*0*/ T : html.Element> initTag(/*0*/ tag: T, /*1*/ init: T.() -> kotlin.Unit): T
public open override /*1*/ /*fake_override*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: kotlin.String): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun render(/*0*/ builder: kotlin.text.StringBuilder /* = java.lang.StringBuilder */, /*1*/ indent: kotlin.String): kotlin.Unit
invisible_fake final override /*1*/ /*fake_override*/ fun renderAttributes(): kotlin.String?
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final override /*1*/ /*fake_override*/ fun kotlin.String.unaryPlus(): kotlin.Unit
@@ -243,7 +243,7 @@ package html {
protected final override /*1*/ /*fake_override*/ fun </*0*/ T : html.Element> initTag(/*0*/ tag: T, /*1*/ init: T.() -> kotlin.Unit): T
public final fun li(/*0*/ init: html.LI.() -> kotlin.Unit): html.LI
public final override /*1*/ /*fake_override*/ fun p(/*0*/ init: html.P.() -> kotlin.Unit): html.P
public open override /*1*/ /*fake_override*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: kotlin.String): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun render(/*0*/ builder: kotlin.text.StringBuilder /* = java.lang.StringBuilder */, /*1*/ indent: kotlin.String): kotlin.Unit
invisible_fake final override /*1*/ /*fake_override*/ fun renderAttributes(): kotlin.String?
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ul(/*0*/ init: html.UL.() -> kotlin.Unit): html.UL
compiler/testData/diagnostics/tests/FunctionReturnTypes.txt
Vendored
+1 -1
View File
@@ -30,7 +30,7 @@ public fun blockReturnValueTypeMismatchUnit(): kotlin.Int
public fun f(): kotlin.Int
public fun f1(): kotlin.Int
public fun f2(): kotlin.Int
public fun foo(/*0*/ expr: java.lang.StringBuilder): kotlin.Int
public fun foo(/*0*/ expr: kotlin.text.StringBuilder /* = java.lang.StringBuilder */): kotlin.Int
public fun illegalConstantBlock(): kotlin.String
public fun illegalConstantBody(): kotlin.Int
public fun illegalIfBlock(): kotlin.Boolean
compiler/testData/diagnostics/tests/labels/kt4586.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
package
public val str: kotlin.String
public fun string(/*0*/ init: java.lang.StringBuilder.() -> kotlin.Unit): kotlin.String
public fun string(/*0*/ init: kotlin.text.StringBuilder /* = java.lang.StringBuilder */.() -> kotlin.Unit): kotlin.String
compiler/testData/diagnostics/tests/regressions/DoubleDefine.txt
Vendored
+3 -3
View File
@@ -1,7 +1,7 @@
package
public fun evaluate(/*0*/ expr: java.lang.StringBuilder, /*1*/ numbers: java.util.ArrayList<kotlin.Int>): kotlin.Int
public fun evaluateAdd(/*0*/ expr: java.lang.StringBuilder, /*1*/ numbers: java.util.ArrayList<kotlin.Int>): kotlin.Int
public fun evaluate(/*0*/ expr: kotlin.text.StringBuilder /* = java.lang.StringBuilder */, /*1*/ numbers: java.util.ArrayList<kotlin.Int>): kotlin.Int
public fun evaluateAdd(/*0*/ expr: kotlin.text.StringBuilder /* = java.lang.StringBuilder */, /*1*/ numbers: java.util.ArrayList<kotlin.Int>): kotlin.Int
public fun evaluateArg(/*0*/ expr: kotlin.CharSequence, /*1*/ numbers: java.util.ArrayList<kotlin.Int>): kotlin.Int
public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
public fun takeFirst(/*0*/ expr: java.lang.StringBuilder): kotlin.Char
public fun takeFirst(/*0*/ expr: kotlin.text.StringBuilder /* = java.lang.StringBuilder */): kotlin.Char
compiler/testData/diagnostics/tests/regressions/kt524.txt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
package
package StringBuilder {
public val kotlin.Int.bd: java.lang.StringBuilder
public val kotlin.Int.bd: kotlin.text.StringBuilder /* = java.lang.StringBuilder */
public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
public fun java.lang.StringBuilder.plus(/*0*/ other: java.lang.StringBuilder): java.lang.StringBuilder
public fun kotlin.text.StringBuilder /* = java.lang.StringBuilder */.plus(/*0*/ other: kotlin.text.StringBuilder /* = java.lang.StringBuilder */): kotlin.text.StringBuilder /* = java.lang.StringBuilder */
public fun </*0*/ T : kotlin.Any> T?.sure1(): T
}