diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringEscape.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringEscape.txt index dbf328d0065..328683f8d54 100644 --- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringEscape.txt +++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringEscape.txt @@ -2,4 +2,4 @@ package public fun box(): kotlin.String public fun escapeChar(/*0*/ c: kotlin.Char): kotlin.String? -public tailrec fun kotlin.String.escape(/*0*/ i: kotlin.Int = ..., /*1*/ result: java.lang.StringBuilder = ...): kotlin.String +public tailrec fun kotlin.String.escape(/*0*/ i: kotlin.Int = ..., /*1*/ result: kotlin.text.StringBuilder /* = java.lang.StringBuilder */ = ...): kotlin.String diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringRepeat.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringRepeat.txt index 45afb437de6..a0d6f90a0f3 100644 --- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringRepeat.txt +++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringRepeat.txt @@ -1,4 +1,4 @@ package public fun box(): kotlin.String -public tailrec fun kotlin.String.repeat(/*0*/ num: kotlin.Int, /*1*/ acc: java.lang.StringBuilder = ...): kotlin.String +public tailrec fun kotlin.String.repeat(/*0*/ num: kotlin.Int, /*1*/ acc: kotlin.text.StringBuilder /* = java.lang.StringBuilder */ = ...): kotlin.String diff --git a/compiler/testData/diagnostics/tests/Builders.txt b/compiler/testData/diagnostics/tests/Builders.txt index f41b7e2ffb0..9e50572296a 100644 --- a/compiler/testData/diagnostics/tests/Builders.txt +++ b/compiler/testData/diagnostics/tests/Builders.txt @@ -20,7 +20,7 @@ package html { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int protected final override /*1*/ /*fake_override*/ fun 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 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 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 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 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 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 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 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 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 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 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 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 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 diff --git a/compiler/testData/diagnostics/tests/FunctionReturnTypes.txt b/compiler/testData/diagnostics/tests/FunctionReturnTypes.txt index 5c3e540cbfc..593c4142647 100644 --- a/compiler/testData/diagnostics/tests/FunctionReturnTypes.txt +++ b/compiler/testData/diagnostics/tests/FunctionReturnTypes.txt @@ -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 diff --git a/compiler/testData/diagnostics/tests/labels/kt4586.txt b/compiler/testData/diagnostics/tests/labels/kt4586.txt index 52d7baf3549..9118c4c54a1 100644 --- a/compiler/testData/diagnostics/tests/labels/kt4586.txt +++ b/compiler/testData/diagnostics/tests/labels/kt4586.txt @@ -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 diff --git a/compiler/testData/diagnostics/tests/regressions/DoubleDefine.txt b/compiler/testData/diagnostics/tests/regressions/DoubleDefine.txt index 8ed64ad0fdb..d25282cfc82 100644 --- a/compiler/testData/diagnostics/tests/regressions/DoubleDefine.txt +++ b/compiler/testData/diagnostics/tests/regressions/DoubleDefine.txt @@ -1,7 +1,7 @@ package -public fun evaluate(/*0*/ expr: java.lang.StringBuilder, /*1*/ numbers: java.util.ArrayList): kotlin.Int -public fun evaluateAdd(/*0*/ expr: java.lang.StringBuilder, /*1*/ numbers: java.util.ArrayList): kotlin.Int +public fun evaluate(/*0*/ expr: kotlin.text.StringBuilder /* = java.lang.StringBuilder */, /*1*/ numbers: java.util.ArrayList): kotlin.Int +public fun evaluateAdd(/*0*/ expr: kotlin.text.StringBuilder /* = java.lang.StringBuilder */, /*1*/ numbers: java.util.ArrayList): kotlin.Int public fun evaluateArg(/*0*/ expr: kotlin.CharSequence, /*1*/ numbers: java.util.ArrayList): kotlin.Int public fun main(/*0*/ args: kotlin.Array): 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 diff --git a/compiler/testData/diagnostics/tests/regressions/kt524.txt b/compiler/testData/diagnostics/tests/regressions/kt524.txt index 58483fe3aa5..7aa4b4bbf05 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt524.txt +++ b/compiler/testData/diagnostics/tests/regressions/kt524.txt @@ -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.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 T?.sure1(): T } diff --git a/compiler/testData/diagnostics/testsWithStdLib/when/kt10807.txt b/compiler/testData/diagnostics/testsWithStdLib/when/kt10807.txt index b3a68964599..6b8543dad30 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/when/kt10807.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/when/kt10807.txt @@ -1,7 +1,7 @@ package -public fun getComp(): java.util.Comparator -public fun getCompInverted(): java.util.Comparator +public fun getComp(): kotlin.comparisons.Comparator /* = java.util.Comparator */ +public fun getCompInverted(): kotlin.comparisons.Comparator /* = java.util.Comparator */ public final class Foo { public constructor Foo(/*0*/ a: kotlin.String, /*1*/ b: kotlin.Int) diff --git a/idea/testData/codeInsight/breadcrumbs/Lambdas.txt b/idea/testData/codeInsight/breadcrumbs/Lambdas.txt index dc2f945a6f7..943c3dba862 100644 --- a/idea/testData/codeInsight/breadcrumbs/Lambdas.txt +++ b/idea/testData/codeInsight/breadcrumbs/Lambdas.txt @@ -11,7 +11,7 @@ Crumbs: Something().apply{…} Tooltips: function foo() - lambda foo.<anonymous>() on StringBuilder + lambda foo.<anonymous>() on StringBuilder /* = StringBuilder */ lambda foo.<anonymous>.<anonymous>() on ??? lambda foo.<anonymous>.<anonymous>.<anonymous>() lambda foo.<anonymous>.<anonymous>.<anonymous>.<anonymous>()