diff --git a/compiler/testData/cfg-variables/basic/UsageInFunctionLiteral.values b/compiler/testData/cfg-variables/basic/UsageInFunctionLiteral.values index 9998d68a207..797aa09ea5f 100644 --- a/compiler/testData/cfg-variables/basic/UsageInFunctionLiteral.values +++ b/compiler/testData/cfg-variables/basic/UsageInFunctionLiteral.values @@ -7,8 +7,8 @@ fun foo() { } } --------------------- -1 : Int NEW: r(1) -> -{ x: Int -> val y = x + a use(a) } : {<: (Int) -> Array} NEW: r({ x: Int -> val y = x + a use(a) }) -> +1 : Int NEW: r(1) -> +{ x: Int -> val y = x + a use(a) } : {<: (x: Int) -> Array} NEW: r({ x: Int -> val y = x + a use(a) }) -> ===================== == anonymous_0 == { x: Int -> diff --git a/compiler/testData/cfg-variables/lexicalScopes/functionLiteralScope.values b/compiler/testData/cfg-variables/lexicalScopes/functionLiteralScope.values index a60a459215d..5f8b48f3aed 100644 --- a/compiler/testData/cfg-variables/lexicalScopes/functionLiteralScope.values +++ b/compiler/testData/cfg-variables/lexicalScopes/functionLiteralScope.values @@ -8,11 +8,11 @@ fun foo() { "after" } --------------------- -"before" : * NEW: r("before") -> -1 : Int NEW: r(1) -> -{ x: Int -> val a = x + b } : {<: (Int) -> Unit} NEW: r({ x: Int -> val a = x + b }) -> -"after" : * NEW: r("after") -> -{ "before" val b = 1 val f = { x: Int -> val a = x + b } "after" } : * COPY +"before" : * NEW: r("before") -> +1 : Int NEW: r(1) -> +{ x: Int -> val a = x + b } : {<: (x: Int) -> Unit} NEW: r({ x: Int -> val a = x + b }) -> +"after" : * NEW: r("after") -> +{ "before" val b = 1 val f = { x: Int -> val a = x + b } "after" } : * COPY ===================== == anonymous_0 == { x: Int -> diff --git a/compiler/testData/cfg/declarations/functions/functionAsExpression.values b/compiler/testData/cfg/declarations/functions/functionAsExpression.values index e3a5cf484ea..96640646e67 100644 --- a/compiler/testData/cfg/declarations/functions/functionAsExpression.values +++ b/compiler/testData/cfg/declarations/functions/functionAsExpression.values @@ -4,8 +4,8 @@ fun test() { val g = fun foo(n: Int) = 2 } --------------------- -fun(n: Int): Int { return 1 } : {<: (Int) -> Int} NEW: r(fun(n: Int): Int { return 1 }) -> -fun foo(n: Int) = 2 : {<: (Int) -> Int} NEW: r(fun foo(n: Int) = 2) -> +fun(n: Int): Int { return 1 } : {<: (n: Int) -> Int} NEW: r(fun(n: Int): Int { return 1 }) -> +fun foo(n: Int) = 2 : {<: (n: Int) -> Int} NEW: r(fun foo(n: Int) = 2) -> ===================== == anonymous_0 == fun(n: Int): Int { return 1 } diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realIteratorFoldl.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realIteratorFoldl.txt index eec11394bf9..5fac038d69c 100644 --- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realIteratorFoldl.txt +++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realIteratorFoldl.txt @@ -1,4 +1,4 @@ package public fun box(): kotlin.String -public tailrec fun kotlin.collections.Iterator.foldl(/*0*/ acc: A, /*1*/ foldFunction: (T, A) -> A): A +public tailrec fun kotlin.collections.Iterator.foldl(/*0*/ acc: A, /*1*/ foldFunction: (e: T, acc: A) -> A): A diff --git a/compiler/testData/diagnostics/tests/AutoCreatedIt.txt b/compiler/testData/diagnostics/tests/AutoCreatedIt.txt index 76a467ded99..90c35a0ebdd 100644 --- a/compiler/testData/diagnostics/tests/AutoCreatedIt.txt +++ b/compiler/testData/diagnostics/tests/AutoCreatedIt.txt @@ -4,7 +4,7 @@ public fun bar(/*0*/ f: (kotlin.Int, kotlin.Int) -> kotlin.Int): kotlin.Unit public fun bar1(/*0*/ f: (kotlin.Int) -> kotlin.Int): kotlin.Unit public fun bar2(/*0*/ f: () -> kotlin.Int): kotlin.Unit public fun text(): kotlin.Unit -public infix fun kotlin.String.on(/*0*/ predicate: (URI) -> kotlin.Boolean): URI +public infix fun kotlin.String.on(/*0*/ predicate: (s: URI) -> kotlin.Boolean): URI public infix fun kotlin.String.to(/*0*/ dest: kotlin.String): kotlin.Unit public final class URI { diff --git a/compiler/testData/diagnostics/tests/BacktickNames.txt b/compiler/testData/diagnostics/tests/BacktickNames.txt index 64f5d36ed94..b45dfcb49bb 100644 --- a/compiler/testData/diagnostics/tests/BacktickNames.txt +++ b/compiler/testData/diagnostics/tests/BacktickNames.txt @@ -10,9 +10,9 @@ public val `[;]`: kotlin.Int = 10 public val `[]`: kotlin.Int = 9 public val `\`: kotlin.Int = 7 public val `]`: kotlin.Int = 3 -public val ff: (kotlin.Int) -> kotlin.Unit -public val fg: ((kotlin.Int) -> kotlin.Unit) -> kotlin.Unit -public val fh: (kotlin.Int) -> ((kotlin.Int) -> kotlin.Unit) -> kotlin.Unit +public val ff: (`x:X`: kotlin.Int) -> kotlin.Unit +public val fg: ((`x:X`: kotlin.Int) -> kotlin.Unit) -> kotlin.Unit +public val fh: (kotlin.Int) -> ((`x:X`: kotlin.Int) -> kotlin.Unit) -> kotlin.Unit public val `val:X`: kotlin.Int = 10 public val `val;X`: kotlin.Int = 10 public val `val kotlin.Unit +public val inVal: (x: kotlin.Int) -> kotlin.Unit public fun f(/*0*/ x: kotlin.Int = ...): kotlin.Unit -public fun inParam(/*0*/ fn: (kotlin.Int) -> kotlin.Unit): kotlin.Unit -public fun inParamNested(/*0*/ fn1: ((kotlin.Int) -> kotlin.Unit) -> kotlin.Unit): kotlin.Unit -public fun inReturn(): (kotlin.Int) -> kotlin.Unit +public fun inParam(/*0*/ fn: (x: kotlin.Int) -> kotlin.Unit): kotlin.Unit +public fun inParamNested(/*0*/ fn1: (fn2: (n: kotlin.Int) -> kotlin.Unit) -> kotlin.Unit): kotlin.Unit +public fun inReturn(): (x: kotlin.Int) -> kotlin.Unit public final class A : (kotlin.Int) -> kotlin.Unit { public constructor A() - public final val prop: (kotlin.Int) -> kotlin.Unit + public final val prop: (x: kotlin.Int) -> kotlin.Unit 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 invoke(/*0*/ p1: kotlin.Int): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.txt b/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.txt index d60c2d5c9e2..8aa11c9cb64 100644 --- a/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.txt +++ b/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.txt @@ -2,12 +2,12 @@ package package foo { public fun f(): kotlin.Int.() -> kotlin.Unit - public fun foo2(): (() -> kotlin.Unit) -> kotlin.Unit + public fun foo2(): (i: () -> kotlin.Unit) -> kotlin.Unit public fun fooT1(/*0*/ t: T): () -> T - public fun fooT2(): (T) -> T + public fun fooT2(): (t: T) -> T public fun main(/*0*/ args: kotlin.Array): kotlin.Unit public fun main1(): kotlin.Unit public fun test(): kotlin.Unit public fun kotlin.Any.foo(): () -> kotlin.Unit - public fun kotlin.Any.foo1(): (kotlin.Int) -> kotlin.Unit + public fun kotlin.Any.foo1(): (i: kotlin.Int) -> kotlin.Unit } diff --git a/compiler/testData/diagnostics/tests/FunctionParameterWithoutType.txt b/compiler/testData/diagnostics/tests/FunctionParameterWithoutType.txt index 524047d4560..8b688e318d6 100644 --- a/compiler/testData/diagnostics/tests/FunctionParameterWithoutType.txt +++ b/compiler/testData/diagnostics/tests/FunctionParameterWithoutType.txt @@ -1,8 +1,8 @@ package -public val bar: (???) -> kotlin.Unit -public val la: (???) -> kotlin.Unit -public val las: (kotlin.Int) -> kotlin.Unit +public val bar: (a: ???) -> kotlin.Unit +public val la: (a: ???) -> kotlin.Unit +public val las: (a: kotlin.Int) -> kotlin.Unit public fun test(/*0*/ a: [ERROR : Type annotation was missing for parameter a]): kotlin.Unit public final class A { diff --git a/compiler/testData/diagnostics/tests/NamedFunctionTypeParameterInSupertype.txt b/compiler/testData/diagnostics/tests/NamedFunctionTypeParameterInSupertype.txt index c53915ae9aa..98fa86d4a6b 100644 --- a/compiler/testData/diagnostics/tests/NamedFunctionTypeParameterInSupertype.txt +++ b/compiler/testData/diagnostics/tests/NamedFunctionTypeParameterInSupertype.txt @@ -16,7 +16,7 @@ public abstract class B : (kotlin.Int) -> kotlin.Unit { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -public final class C : (kotlin.Int) -> kotlin.Unit { +public final class C : (x: kotlin.Int) -> kotlin.Unit { public constructor C() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/ShiftFunctionTypes.txt b/compiler/testData/diagnostics/tests/ShiftFunctionTypes.txt index dbe0e91e1fb..4c6d1fdc1fe 100644 --- a/compiler/testData/diagnostics/tests/ShiftFunctionTypes.txt +++ b/compiler/testData/diagnostics/tests/ShiftFunctionTypes.txt @@ -35,18 +35,18 @@ public abstract class XXX { public abstract class YYY { public constructor YYY() - public final val a11: ((kotlin.Int) -> kotlin.Int)? = null - public final val a12: ((kotlin.Int) -> kotlin.Int)? = null - public abstract val a13: kotlin.Int.(kotlin.Int) -> kotlin.Int - public abstract val a14: n.B.(kotlin.Int) -> kotlin.Int - public abstract val a15: kotlin.Int?.(kotlin.Int) -> kotlin.Int - public abstract val a152: kotlin.Int?.(kotlin.Int) -> kotlin.Int - public abstract val a16: (kotlin.Int) -> (kotlin.Int) -> kotlin.Int - public abstract val a17: ((kotlin.Int) -> kotlin.Int).(kotlin.Int) -> kotlin.Int - public abstract val a18: (kotlin.Int) -> (kotlin.Int) -> kotlin.Int - public abstract val a19: ((kotlin.Int) -> kotlin.Int) -> kotlin.Int - public abstract val a7: (A) -> n.B - public abstract val a8: (A, n.B) -> n.B + public final val a11: ((a: kotlin.Int) -> kotlin.Int)? = null + public final val a12: ((a: kotlin.Int) -> kotlin.Int)? = null + public abstract val a13: kotlin.Int.(a: kotlin.Int) -> kotlin.Int + public abstract val a14: n.B.(a: kotlin.Int) -> kotlin.Int + public abstract val a15: kotlin.Int?.(a: kotlin.Int) -> kotlin.Int + public abstract val a152: kotlin.Int?.(a: kotlin.Int) -> kotlin.Int + public abstract val a16: (a: kotlin.Int) -> (a: kotlin.Int) -> kotlin.Int + public abstract val a17: ((a: kotlin.Int) -> kotlin.Int).(a: kotlin.Int) -> kotlin.Int + public abstract val a18: (a: kotlin.Int) -> (a: kotlin.Int) -> kotlin.Int + public abstract val a19: (b: (a: kotlin.Int) -> kotlin.Int) -> kotlin.Int + public abstract val a7: (a: A) -> n.B + public abstract val a8: (a: A, b: n.B) -> n.B 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*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/annotations/annotationOnParameterInFunctionType.txt b/compiler/testData/diagnostics/tests/annotations/annotationOnParameterInFunctionType.txt index b4fea6f7bc5..9e76e31db0d 100644 --- a/compiler/testData/diagnostics/tests/annotations/annotationOnParameterInFunctionType.txt +++ b/compiler/testData/diagnostics/tests/annotations/annotationOnParameterInFunctionType.txt @@ -1,16 +1,16 @@ package -public val inVal: (kotlin.Int) -> kotlin.Unit -public val onType: @TypeAnn() A.(@TypeAnn() A, A) -> @TypeAnn() A? +public val inVal: (x: kotlin.Int) -> kotlin.Unit +public val onType: @TypeAnn() A.(a: @TypeAnn() A, A) -> @TypeAnn() A? public fun f(/*0*/ @Ann() x: kotlin.Int): kotlin.Unit -public fun inParam(/*0*/ fn: (kotlin.Int) -> kotlin.Unit): kotlin.Unit -public fun inParamNested(/*0*/ fn1: ((kotlin.Int) -> kotlin.Unit) -> kotlin.Unit): kotlin.Unit -public fun inReturn(): (kotlin.Int) -> kotlin.Unit +public fun inParam(/*0*/ fn: (x: kotlin.Int) -> kotlin.Unit): kotlin.Unit +public fun inParamNested(/*0*/ fn1: (fn2: (n: kotlin.Int) -> kotlin.Unit) -> kotlin.Unit): kotlin.Unit +public fun inReturn(): (x: kotlin.Int) -> kotlin.Unit public fun @TypeAnn() A.extFun(/*0*/ @Ann() a: @TypeAnn() A): @TypeAnn() A? public final class A : (kotlin.Int) -> kotlin.Unit { public constructor A() - public final val prop: (kotlin.Int) -> kotlin.Unit + public final val prop: (x: kotlin.Int) -> kotlin.Unit 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 invoke(/*0*/ p1: kotlin.Int): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/annotations/onFunctionParameter.txt b/compiler/testData/diagnostics/tests/annotations/onFunctionParameter.txt index b45c8e56e43..0f431a61686 100644 --- a/compiler/testData/diagnostics/tests/annotations/onFunctionParameter.txt +++ b/compiler/testData/diagnostics/tests/annotations/onFunctionParameter.txt @@ -1,6 +1,6 @@ package -public val bar: (kotlin.Int) -> kotlin.Unit +public val bar: (g: kotlin.Int) -> kotlin.Unit public fun test(/*0*/ @ann() p: kotlin.Int): kotlin.Unit public final annotation class ann : kotlin.Annotation { diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1219.1301.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1219.1301.txt index 48a7345459f..be55bd74771 100644 --- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1219.1301.txt +++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1219.1301.txt @@ -3,5 +3,5 @@ package package kt1219 { public fun foo(): kotlin.Unit public fun kotlin.collections.Iterable.fold(/*0*/ a: R, /*1*/ op: (T, R) -> R): R - public fun kotlin.collections.Iterable.foreach(/*0*/ operation: (T) -> kotlin.Unit): kotlin.Unit + public fun kotlin.collections.Iterable.foreach(/*0*/ operation: (element: T) -> kotlin.Unit): kotlin.Unit } diff --git a/compiler/testData/diagnostics/tests/extensions/kt1875.txt b/compiler/testData/diagnostics/tests/extensions/kt1875.txt index 4f28bc21cb1..cd6f65ea6d0 100644 --- a/compiler/testData/diagnostics/tests/extensions/kt1875.txt +++ b/compiler/testData/diagnostics/tests/extensions/kt1875.txt @@ -6,7 +6,7 @@ package kt1875 { public fun test1(/*0*/ t: kt1875.T?): kotlin.Unit public interface T { - public abstract val f: ((kotlin.Int) -> kotlin.Unit)? + public abstract val f: ((i: kotlin.Int) -> kotlin.Unit)? 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*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/functionAsExpression/MissingParameterTypes.txt b/compiler/testData/diagnostics/tests/functionAsExpression/MissingParameterTypes.txt index 71ed7191524..8686f63d8a0 100644 --- a/compiler/testData/diagnostics/tests/functionAsExpression/MissingParameterTypes.txt +++ b/compiler/testData/diagnostics/tests/functionAsExpression/MissingParameterTypes.txt @@ -1,6 +1,6 @@ package -public val a: (???) -> ??? +public val a: (x: ???) -> ??? public val b: (kotlin.Int) -> kotlin.Int public val c: (kotlin.Int, kotlin.String) -> kotlin.Int public val d: (kotlin.Int, kotlin.String) -> kotlin.Int diff --git a/compiler/testData/diagnostics/tests/functionAsExpression/Parameters.txt b/compiler/testData/diagnostics/tests/functionAsExpression/Parameters.txt index 555163912eb..54974ab1e59 100644 --- a/compiler/testData/diagnostics/tests/functionAsExpression/Parameters.txt +++ b/compiler/testData/diagnostics/tests/functionAsExpression/Parameters.txt @@ -1,7 +1,7 @@ package -public val bar: (kotlin.Int) -> kotlin.Unit -public val bas: (kotlin.IntArray) -> kotlin.Unit -public fun gar(): (kotlin.Int) -> kotlin.Unit -public fun gas(): (kotlin.IntArray) -> kotlin.Unit +public val bar: (p: kotlin.Int) -> kotlin.Unit +public val bas: (p: kotlin.IntArray) -> kotlin.Unit +public fun gar(): (p: kotlin.Int) -> kotlin.Unit +public fun gas(): (p: kotlin.IntArray) -> kotlin.Unit public fun outer(/*0*/ b: kotlin.Any?): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/functionAsExpression/ReturnTypeCheck.txt b/compiler/testData/diagnostics/tests/functionAsExpression/ReturnTypeCheck.txt index 78734d6b2cc..260bc048f79 100644 --- a/compiler/testData/diagnostics/tests/functionAsExpression/ReturnTypeCheck.txt +++ b/compiler/testData/diagnostics/tests/functionAsExpression/ReturnTypeCheck.txt @@ -1,3 +1,3 @@ package -public val foo: (kotlin.Int) -> kotlin.String +public val foo: (a: kotlin.Int) -> kotlin.String diff --git a/compiler/testData/diagnostics/tests/functionAsExpression/WithGenericParameters.txt b/compiler/testData/diagnostics/tests/functionAsExpression/WithGenericParameters.txt index fb81702471f..bb8bb81cedd 100644 --- a/compiler/testData/diagnostics/tests/functionAsExpression/WithGenericParameters.txt +++ b/compiler/testData/diagnostics/tests/functionAsExpression/WithGenericParameters.txt @@ -1,9 +1,9 @@ package -public val extension_generic_fun: T.(T) -> T -public val generic_fun: (T) -> T +public val extension_generic_fun: T.(t: T) -> T +public val generic_fun: (t: T) -> T public fun devNull(/*0*/ a: kotlin.Any?): kotlin.Unit -public fun fun_with_where(): T.(T) -> T +public fun fun_with_where(): T.(t: T) -> T public fun outer(): kotlin.Unit public interface A { diff --git a/compiler/testData/diagnostics/tests/functionAsExpression/WithOuterGeneric.txt b/compiler/testData/diagnostics/tests/functionAsExpression/WithOuterGeneric.txt index a50c552e344..bcf3efc1264 100644 --- a/compiler/testData/diagnostics/tests/functionAsExpression/WithOuterGeneric.txt +++ b/compiler/testData/diagnostics/tests/functionAsExpression/WithOuterGeneric.txt @@ -3,7 +3,7 @@ package public val T.fromVal: () -> T public fun devNull(/*0*/ a: kotlin.Any?): kotlin.Unit public fun outer(): kotlin.Unit -public fun parameter(): (T) -> T +public fun parameter(): (t: T) -> T public fun receiver(): T.() -> T public fun returnType(): () -> T @@ -11,7 +11,7 @@ public final class Outer { public constructor Outer() 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 final fun parameter(): (T) -> T + public final fun parameter(): (t: T) -> T public final fun receiver(): T.() -> T public final fun returnType(): () -> T public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/LambdaWithParameter.txt b/compiler/testData/diagnostics/tests/functionLiterals/return/LambdaWithParameter.txt index 93007d9a393..741450b1eb8 100644 --- a/compiler/testData/diagnostics/tests/functionLiterals/return/LambdaWithParameter.txt +++ b/compiler/testData/diagnostics/tests/functionLiterals/return/LambdaWithParameter.txt @@ -1,6 +1,6 @@ package -public val a: (kotlin.Int) -> kotlin.String +public val a: (i: kotlin.Int) -> kotlin.String public val b: kotlin.String public val flag: kotlin.Boolean = true public fun foo(/*0*/ f: (kotlin.Int) -> T): T diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/SmartCast.txt b/compiler/testData/diagnostics/tests/functionLiterals/return/SmartCast.txt index b949bc46d3e..5e742f13e4f 100644 --- a/compiler/testData/diagnostics/tests/functionLiterals/return/SmartCast.txt +++ b/compiler/testData/diagnostics/tests/functionLiterals/return/SmartCast.txt @@ -1,6 +1,6 @@ package -public val a: (kotlin.Int?) -> kotlin.Int? +public val a: (it: kotlin.Int?) -> kotlin.Int? public val b: kotlin.Int? public val c: kotlin.Int public fun let(/*0*/ f: (kotlin.Int?) -> R): R diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funcitonTypes.txt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funcitonTypes.txt index 7aa1cdcece7..59c834dade1 100644 --- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funcitonTypes.txt +++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funcitonTypes.txt @@ -1,6 +1,6 @@ package -public final class A : ([ERROR : No type element]) -> [ERROR : No type element] { +public final class A : (categoryName: [ERROR : No type element]) -> [ERROR : No type element] { public constructor A() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/typeReferenceError.txt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/typeReferenceError.txt index bc042c02228..7179979e202 100644 --- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/typeReferenceError.txt +++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/typeReferenceError.txt @@ -2,7 +2,7 @@ package package typeReferenceError { - public final class Pair : ([ERROR : No type element]) -> [ERROR : main] { + public final class Pair : (c: [ERROR : No type element]) -> [ERROR : main] { public constructor Pair() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/inference/kt3184.txt b/compiler/testData/diagnostics/tests/inference/kt3184.txt index 9ae904094f0..da83089fe47 100644 --- a/compiler/testData/diagnostics/tests/inference/kt3184.txt +++ b/compiler/testData/diagnostics/tests/inference/kt3184.txt @@ -3,7 +3,7 @@ package package a { public fun main(/*0*/ args: kotlin.Array): kotlin.Unit public fun println(/*0*/ message: kotlin.Any?): kotlin.Unit - private fun test(/*0*/ value: T, /*1*/ extf: kotlin.String.(T) -> kotlin.Unit): kotlin.Unit + private fun test(/*0*/ value: T, /*1*/ extf: kotlin.String.(value: T) -> kotlin.Unit): kotlin.Unit public fun tests(): kotlin.Unit public operator fun kotlin.collections.MutableMap.set(/*0*/ key: K, /*1*/ value: V): V? } diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2841_it.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt2841_it.txt index ec1191fc512..67f8fe73fc5 100644 --- a/compiler/testData/diagnostics/tests/inference/regressions/kt2841_it.txt +++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2841_it.txt @@ -2,7 +2,7 @@ package package a { public fun test(): kotlin.Unit - public inline fun T.use(/*0*/ block: (T) -> R): R + public inline fun T.use(/*0*/ block: (t: T) -> R): R public final class C : a.Closeable { public constructor C() diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt3150.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt3150.txt index 5c1ad0b27da..888168a3bfc 100644 --- a/compiler/testData/diagnostics/tests/inference/regressions/kt3150.txt +++ b/compiler/testData/diagnostics/tests/inference/regressions/kt3150.txt @@ -2,8 +2,8 @@ package package aa { public fun test(): kotlin.Unit - public fun aa.SomeTemplate.query(/*0*/ f: (kotlin.Int) -> kotlin.Unit): (kotlin.Int) -> kotlin.Unit - public fun aa.SomeTemplate.query1(/*0*/ f: (kotlin.Int) -> kotlin.Unit): (kotlin.Int) -> kotlin.Unit + public fun aa.SomeTemplate.query(/*0*/ f: (i: kotlin.Int) -> kotlin.Unit): (i: kotlin.Int) -> kotlin.Unit + public fun aa.SomeTemplate.query1(/*0*/ f: (i: kotlin.Int) -> kotlin.Unit): (i: kotlin.Int) -> kotlin.Unit public final class Some { public constructor Some() diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt832.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt832.txt index 3157c232c6c..1cde1efe1e3 100644 --- a/compiler/testData/diagnostics/tests/inference/regressions/kt832.txt +++ b/compiler/testData/diagnostics/tests/inference/regressions/kt832.txt @@ -1,6 +1,6 @@ package package a { - public fun fooT2(): (T) -> T + public fun fooT2(): (t: T) -> T public fun test(): kotlin.Unit } diff --git a/compiler/testData/diagnostics/tests/inference/substitutions/delegationAndInference.txt b/compiler/testData/diagnostics/tests/inference/substitutions/delegationAndInference.txt index c4cf987b8f0..e57c34285ff 100644 --- a/compiler/testData/diagnostics/tests/inference/substitutions/delegationAndInference.txt +++ b/compiler/testData/diagnostics/tests/inference/substitutions/delegationAndInference.txt @@ -2,7 +2,7 @@ package public operator fun kotlin.collections.MutableMap.getValue(/*0*/ thisRef: kotlin.Any?, /*1*/ property: kotlin.reflect.KProperty<*>): G public operator fun kotlin.collections.MutableMap.setValue(/*0*/ thisRef: kotlin.Any?, /*1*/ property: kotlin.reflect.KProperty<*>, /*2*/ value: S): kotlin.Unit -public fun kotlin.collections.MutableMap.withDefault1(/*0*/ default: (K) -> V): kotlin.collections.MutableMap +public fun kotlin.collections.MutableMap.withDefault1(/*0*/ default: (key: K) -> V): kotlin.collections.MutableMap public final class A { public constructor A(/*0*/ map: kotlin.collections.MutableMap) diff --git a/compiler/testData/diagnostics/tests/inline/assignment.txt b/compiler/testData/diagnostics/tests/inline/assignment.txt index d476368d9e2..f3868522ba7 100644 --- a/compiler/testData/diagnostics/tests/inline/assignment.txt +++ b/compiler/testData/diagnostics/tests/inline/assignment.txt @@ -1,4 +1,4 @@ package -public inline fun inlineFunWithInvoke(/*0*/ s: (kotlin.Int) -> kotlin.Unit, /*1*/ ext: kotlin.Int.(kotlin.Int) -> kotlin.Unit): kotlin.Unit +public inline fun inlineFunWithInvoke(/*0*/ s: (p: kotlin.Int) -> kotlin.Unit, /*1*/ ext: kotlin.Int.(p: kotlin.Int) -> kotlin.Unit): kotlin.Unit public inline fun ((kotlin.Int) -> kotlin.Unit).inlineExt(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/inline/binaryExpressions/andOr.txt b/compiler/testData/diagnostics/tests/inline/binaryExpressions/andOr.txt index d69a9b5d05b..6aec79db467 100644 --- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/andOr.txt +++ b/compiler/testData/diagnostics/tests/inline/binaryExpressions/andOr.txt @@ -1,5 +1,5 @@ package -public inline fun inlineFunWithInvoke(/*0*/ s: (kotlin.Int) -> kotlin.Unit, /*1*/ ext: kotlin.Int.(kotlin.Int) -> kotlin.Unit): kotlin.Unit -public inline fun inlineFunWithInvokeNonInline(/*0*/ noinline s: (kotlin.Int) -> kotlin.Unit, /*1*/ ext: kotlin.Int.(kotlin.Int) -> kotlin.Unit): kotlin.Unit +public inline fun inlineFunWithInvoke(/*0*/ s: (p: kotlin.Int) -> kotlin.Unit, /*1*/ ext: kotlin.Int.(p: kotlin.Int) -> kotlin.Unit): kotlin.Unit +public inline fun inlineFunWithInvokeNonInline(/*0*/ noinline s: (p: kotlin.Int) -> kotlin.Unit, /*1*/ ext: kotlin.Int.(p: kotlin.Int) -> kotlin.Unit): kotlin.Unit public inline fun ((kotlin.Int) -> kotlin.Unit).inlineExt(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/inline/binaryExpressions/arrayAccess.txt b/compiler/testData/diagnostics/tests/inline/binaryExpressions/arrayAccess.txt index 3d7fc398cb8..ebafc28af49 100644 --- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/arrayAccess.txt +++ b/compiler/testData/diagnostics/tests/inline/binaryExpressions/arrayAccess.txt @@ -1,7 +1,7 @@ package -public inline fun inlineFunWithInvoke(/*0*/ s: (T) -> U): kotlin.Unit -public inline fun inlineFunWithInvoke(/*0*/ s: (T, U) -> V, /*1*/ ext: T.(U, V) -> W): kotlin.Unit +public inline fun inlineFunWithInvoke(/*0*/ s: (p: T) -> U): kotlin.Unit +public inline fun inlineFunWithInvoke(/*0*/ s: (p: T, l: U) -> V, /*1*/ ext: T.(p: U, l: V) -> W): kotlin.Unit public operator inline fun ((T) -> U).get(/*0*/ index: kotlin.Int): kotlin.Unit public operator fun ((T, U) -> V).get(/*0*/ index: kotlin.Int): kotlin.Unit public operator fun (T.(U, V) -> W).get(/*0*/ index: kotlin.Int): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/inline/binaryExpressions/assignment.txt b/compiler/testData/diagnostics/tests/inline/binaryExpressions/assignment.txt index 77edfb625a9..a6233a0d5a3 100644 --- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/assignment.txt +++ b/compiler/testData/diagnostics/tests/inline/binaryExpressions/assignment.txt @@ -1,6 +1,6 @@ package -public inline fun inlineFunWithInvoke(/*0*/ s: (T) -> U, /*1*/ ext: T.(U) -> V): kotlin.Unit +public inline fun inlineFunWithInvoke(/*0*/ s: (p: T) -> U, /*1*/ ext: T.(p: U) -> V): kotlin.Unit public operator fun ((T) -> U).minusAssign(/*0*/ p: (T) -> U): kotlin.Unit public operator fun (T.(U) -> V).minusAssign(/*0*/ ext: T.(U) -> V): kotlin.Unit public operator inline fun ((T) -> U).modAssign(/*0*/ p: (T) -> U): () -> kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/inline/binaryExpressions/comparison.txt b/compiler/testData/diagnostics/tests/inline/binaryExpressions/comparison.txt index 944f5a13ef1..fbaf1c64996 100644 --- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/comparison.txt +++ b/compiler/testData/diagnostics/tests/inline/binaryExpressions/comparison.txt @@ -1,7 +1,7 @@ package -public inline fun inlineFunWithInvoke(/*0*/ s: (T) -> U): kotlin.Unit -public inline fun inlineFunWithInvoke(/*0*/ s: (T, U) -> V, /*1*/ ext: T.(U, V) -> W): kotlin.Unit +public inline fun inlineFunWithInvoke(/*0*/ s: (p: T) -> U): kotlin.Unit +public inline fun inlineFunWithInvoke(/*0*/ s: (p: T, l: U) -> V, /*1*/ ext: T.(p: U, l: V) -> W): kotlin.Unit public operator inline fun ((T) -> U).compareTo(/*0*/ p: (T) -> U): kotlin.Int public operator fun ((T, U) -> V).compareTo(/*0*/ index: (T, U) -> V): kotlin.Int public operator fun (T.(U, V) -> W).compareTo(/*0*/ index: T.(U, V) -> W): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/inline/binaryExpressions/componentAccess.txt b/compiler/testData/diagnostics/tests/inline/binaryExpressions/componentAccess.txt index 421418e976e..829f98ad34d 100644 --- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/componentAccess.txt +++ b/compiler/testData/diagnostics/tests/inline/binaryExpressions/componentAccess.txt @@ -1,7 +1,7 @@ package -public inline fun inlineFunWithInvoke(/*0*/ s: (T) -> U): kotlin.Unit -public inline fun inlineFunWithInvoke(/*0*/ s: (T, U) -> V, /*1*/ ext: T.(U, V) -> W): kotlin.Unit +public inline fun inlineFunWithInvoke(/*0*/ s: (p: T) -> U): kotlin.Unit +public inline fun inlineFunWithInvoke(/*0*/ s: (p: T, l: U) -> V, /*1*/ ext: T.(p: U, l: V) -> W): kotlin.Unit public operator inline fun ((T) -> U).component1(): kotlin.Int public operator fun ((T, U) -> V).component1(): kotlin.Int public operator fun (T.(U, V) -> W).component1(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/inline/binaryExpressions/contains.txt b/compiler/testData/diagnostics/tests/inline/binaryExpressions/contains.txt index 7b9ef4de2a2..b2a20795707 100644 --- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/contains.txt +++ b/compiler/testData/diagnostics/tests/inline/binaryExpressions/contains.txt @@ -1,7 +1,7 @@ package -public inline fun inlineFunWithInvoke(/*0*/ s: (T) -> U): kotlin.Unit -public inline fun inlineFunWithInvoke(/*0*/ s: (T, U) -> U, /*1*/ ext: T.(U, U) -> V): kotlin.Unit +public inline fun inlineFunWithInvoke(/*0*/ s: (p: T) -> U): kotlin.Unit +public inline fun inlineFunWithInvoke(/*0*/ s: (p: T, l: U) -> U, /*1*/ ext: T.(p: U, l: U) -> V): kotlin.Unit public operator inline fun ((T) -> U).contains(/*0*/ p: (T) -> U): kotlin.Boolean public operator fun ((T, U) -> V).contains(/*0*/ p: (T, U) -> V): kotlin.Boolean public operator fun (T.(U, V) -> W).contains(/*0*/ ext: T.(U, V) -> W): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/inline/binaryExpressions/mathOperations.txt b/compiler/testData/diagnostics/tests/inline/binaryExpressions/mathOperations.txt index fcc58eaf1ff..af9cd97a876 100644 --- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/mathOperations.txt +++ b/compiler/testData/diagnostics/tests/inline/binaryExpressions/mathOperations.txt @@ -1,10 +1,10 @@ package -public inline fun inlineFunWithInvoke(/*0*/ s: (T) -> U, /*1*/ ext: T.(U) -> V): kotlin.Unit -public inline fun inlineFunWithInvoke(/*0*/ s: (T) -> U, /*1*/ ext: T.(U) -> V): kotlin.Unit +public inline fun inlineFunWithInvoke(/*0*/ s: (p: T) -> U, /*1*/ ext: T.(p: U) -> V): kotlin.Unit +public inline fun inlineFunWithInvoke(/*0*/ s: (p: T) -> U, /*1*/ ext: T.(p: U) -> V): kotlin.Unit public operator fun ((T) -> U).minus(/*0*/ p: (T) -> U): kotlin.Unit -public operator fun (T.(U) -> V).minus(/*0*/ p: T.(U) -> V): kotlin.Unit +public operator fun (T.(U) -> V).minus(/*0*/ p: T.(p: U) -> V): kotlin.Unit public operator inline fun ((T) -> U).plus(/*0*/ p: (T) -> U): kotlin.Unit -public operator inline fun (T.(U) -> V).plus(/*0*/ p: T.(U) -> V): kotlin.Unit +public operator inline fun (T.(U) -> V).plus(/*0*/ p: T.(p: U) -> V): kotlin.Unit public inline fun ((T) -> U).submit(): kotlin.Unit public inline fun (T.(U) -> V).submit(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/inline/binaryExpressions/rangeTo.txt b/compiler/testData/diagnostics/tests/inline/binaryExpressions/rangeTo.txt index 78259c75620..41ecc040f42 100644 --- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/rangeTo.txt +++ b/compiler/testData/diagnostics/tests/inline/binaryExpressions/rangeTo.txt @@ -1,7 +1,7 @@ package -public inline fun inlineFunWithInvoke(/*0*/ s: (T) -> U): kotlin.Unit -public inline fun inlineFunWithInvoke(/*0*/ s: (T, U) -> U, /*1*/ ext: T.(U, U) -> V): kotlin.Unit +public inline fun inlineFunWithInvoke(/*0*/ s: (p: T) -> U): kotlin.Unit +public inline fun inlineFunWithInvoke(/*0*/ s: (p: T, l: U) -> U, /*1*/ ext: T.(p: U, l: U) -> V): kotlin.Unit public operator inline fun ((T) -> U).rangeTo(/*0*/ p: (T) -> U): kotlin.ranges.ClosedRange public operator fun ((T, U) -> V).rangeTo(/*0*/ p: (T, U) -> V): kotlin.ranges.ClosedRange public operator fun (T.(U, V) -> W).rangeTo(/*0*/ ext: T.(U, V) -> W): kotlin.ranges.ClosedRange diff --git a/compiler/testData/diagnostics/tests/inline/capture.txt b/compiler/testData/diagnostics/tests/inline/capture.txt index e432f1c90d3..d25dfed0ea4 100644 --- a/compiler/testData/diagnostics/tests/inline/capture.txt +++ b/compiler/testData/diagnostics/tests/inline/capture.txt @@ -1,9 +1,9 @@ package -public inline fun inlineFunWithInvoke(/*0*/ s: (kotlin.Int) -> kotlin.Unit): kotlin.Unit -public inline fun inlineFunWithInvokeNonInline(/*0*/ noinline s: (kotlin.Int) -> kotlin.Unit): kotlin.Unit -public inline fun inlineFunWrongExtension(/*0*/ s: (kotlin.Int) -> kotlin.Unit): kotlin.Unit -public inline fun testExtension(/*0*/ s: (kotlin.Int) -> kotlin.Unit): kotlin.Unit +public inline fun inlineFunWithInvoke(/*0*/ s: (p: kotlin.Int) -> kotlin.Unit): kotlin.Unit +public inline fun inlineFunWithInvokeNonInline(/*0*/ noinline s: (p: kotlin.Int) -> kotlin.Unit): kotlin.Unit +public inline fun inlineFunWrongExtension(/*0*/ s: (p: kotlin.Int) -> kotlin.Unit): kotlin.Unit +public inline fun testExtension(/*0*/ s: (p: kotlin.Int) -> kotlin.Unit): kotlin.Unit public inline fun ((kotlin.Int) -> kotlin.Unit).inlineExt(): kotlin.Unit public infix inline fun ((kotlin.Int) -> kotlin.Unit).inlineExt2(/*0*/ p: kotlin.Int): kotlin.Unit public infix fun ((kotlin.Int) -> kotlin.Unit).noInlineExt(/*0*/ p: kotlin.Int): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/inline/extensionOnFunction.txt b/compiler/testData/diagnostics/tests/inline/extensionOnFunction.txt index 36ccbc58a07..ff5d167f3a0 100644 --- a/compiler/testData/diagnostics/tests/inline/extensionOnFunction.txt +++ b/compiler/testData/diagnostics/tests/inline/extensionOnFunction.txt @@ -1,8 +1,8 @@ package -public inline fun inlineFunNoInline(/*0*/ noinline s: (kotlin.Int) -> kotlin.Unit): kotlin.Unit -public inline fun inlineFunWrongExtension(/*0*/ s: (kotlin.Int) -> kotlin.Unit): kotlin.Unit -public inline fun testExtension(/*0*/ s: (kotlin.Int) -> kotlin.Unit): kotlin.Unit +public inline fun inlineFunNoInline(/*0*/ noinline s: (p: kotlin.Int) -> kotlin.Unit): kotlin.Unit +public inline fun inlineFunWrongExtension(/*0*/ s: (p: kotlin.Int) -> kotlin.Unit): kotlin.Unit +public inline fun testExtension(/*0*/ s: (p: kotlin.Int) -> kotlin.Unit): kotlin.Unit public inline fun ((kotlin.Int) -> kotlin.Unit).inlineExt(): kotlin.Unit public infix inline fun ((kotlin.Int) -> kotlin.Unit).inlineExt2(/*0*/ p: kotlin.Int): kotlin.Unit public infix fun ((kotlin.Int) -> kotlin.Unit).noInlineExt(/*0*/ p: kotlin.Int): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/inline/functions.txt b/compiler/testData/diagnostics/tests/inline/functions.txt index 024179ccfab..2570c45dbbc 100644 --- a/compiler/testData/diagnostics/tests/inline/functions.txt +++ b/compiler/testData/diagnostics/tests/inline/functions.txt @@ -1,5 +1,5 @@ package -public fun getFun(/*0*/ s: (kotlin.Int) -> kotlin.Unit): (kotlin.Int) -> kotlin.Int -public inline fun getInlineFun(/*0*/ s: (kotlin.Int) -> kotlin.Unit): (kotlin.Int) -> kotlin.Int -public inline fun testExtension(/*0*/ s: (kotlin.Int) -> kotlin.Unit): kotlin.Unit +public fun getFun(/*0*/ s: (p: kotlin.Int) -> kotlin.Unit): (kotlin.Int) -> kotlin.Int +public inline fun getInlineFun(/*0*/ s: (p: kotlin.Int) -> kotlin.Unit): (kotlin.Int) -> kotlin.Int +public inline fun testExtension(/*0*/ s: (p: kotlin.Int) -> kotlin.Unit): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/inline/invoke.txt b/compiler/testData/diagnostics/tests/inline/invoke.txt index d69a9b5d05b..6aec79db467 100644 --- a/compiler/testData/diagnostics/tests/inline/invoke.txt +++ b/compiler/testData/diagnostics/tests/inline/invoke.txt @@ -1,5 +1,5 @@ package -public inline fun inlineFunWithInvoke(/*0*/ s: (kotlin.Int) -> kotlin.Unit, /*1*/ ext: kotlin.Int.(kotlin.Int) -> kotlin.Unit): kotlin.Unit -public inline fun inlineFunWithInvokeNonInline(/*0*/ noinline s: (kotlin.Int) -> kotlin.Unit, /*1*/ ext: kotlin.Int.(kotlin.Int) -> kotlin.Unit): kotlin.Unit +public inline fun inlineFunWithInvoke(/*0*/ s: (p: kotlin.Int) -> kotlin.Unit, /*1*/ ext: kotlin.Int.(p: kotlin.Int) -> kotlin.Unit): kotlin.Unit +public inline fun inlineFunWithInvokeNonInline(/*0*/ noinline s: (p: kotlin.Int) -> kotlin.Unit, /*1*/ ext: kotlin.Int.(p: kotlin.Int) -> kotlin.Unit): kotlin.Unit public inline fun ((kotlin.Int) -> kotlin.Unit).inlineExt(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/inline/parenthesized.txt b/compiler/testData/diagnostics/tests/inline/parenthesized.txt index 87b02cbf604..e835b548f7e 100644 --- a/compiler/testData/diagnostics/tests/inline/parenthesized.txt +++ b/compiler/testData/diagnostics/tests/inline/parenthesized.txt @@ -1,6 +1,6 @@ package -public inline fun inlineFunWithInvoke(/*0*/ s: (kotlin.Int) -> kotlin.Unit): kotlin.Unit -public inline fun inlineFunWithInvoke2(/*0*/ s: (kotlin.Int) -> kotlin.Unit): kotlin.Unit -public inline fun propagation(/*0*/ s: (kotlin.Int) -> kotlin.Unit): kotlin.Unit +public inline fun inlineFunWithInvoke(/*0*/ s: (p: kotlin.Int) -> kotlin.Unit): kotlin.Unit +public inline fun inlineFunWithInvoke2(/*0*/ s: (p: kotlin.Int) -> kotlin.Unit): kotlin.Unit +public inline fun propagation(/*0*/ s: (p: kotlin.Int) -> kotlin.Unit): kotlin.Unit public inline fun ((kotlin.Int) -> kotlin.Unit).inlineExt(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/inline/propagation.txt b/compiler/testData/diagnostics/tests/inline/propagation.txt index 66b28573df1..4f09b714f39 100644 --- a/compiler/testData/diagnostics/tests/inline/propagation.txt +++ b/compiler/testData/diagnostics/tests/inline/propagation.txt @@ -1,10 +1,10 @@ package -public inline fun inlineFunWithInvoke(/*0*/ s: (kotlin.Int) -> kotlin.Unit, /*1*/ ext: kotlin.Int.(kotlin.Int) -> kotlin.Unit): kotlin.Unit -public inline fun inlineFunWithInvokeClosure(/*0*/ s: (kotlin.Int) -> kotlin.Unit, /*1*/ ext: kotlin.Int.(kotlin.Int) -> kotlin.Unit): kotlin.Unit -public inline fun inlineFunWithInvokeClosureNoinline(/*0*/ noinline s: (kotlin.Int) -> kotlin.Unit, /*1*/ noinline ext: kotlin.Int.(kotlin.Int) -> kotlin.Unit): kotlin.Unit -public inline fun inlineFunWithInvokeNonInline(/*0*/ noinline s: (kotlin.Int) -> kotlin.Unit, /*1*/ noinline ext: kotlin.Int.(kotlin.Int) -> kotlin.Unit): kotlin.Unit -public inline fun subInline(/*0*/ s: (kotlin.Int) -> kotlin.Unit, /*1*/ ext: kotlin.Int.(kotlin.Int) -> kotlin.Unit): kotlin.Unit -public fun subNoInline(/*0*/ s: (kotlin.Int) -> kotlin.Unit, /*1*/ ext: kotlin.Int.(kotlin.Int) -> kotlin.Unit): kotlin.Unit -public inline fun ((kotlin.Int) -> kotlin.Unit).inlineExt(/*0*/ ext: kotlin.Int.(kotlin.Int) -> kotlin.Unit): kotlin.Unit -public inline fun ((kotlin.Int) -> kotlin.Unit).inlineExtWithClosure(/*0*/ ext: kotlin.Int.(kotlin.Int) -> kotlin.Unit): kotlin.Unit +public inline fun inlineFunWithInvoke(/*0*/ s: (p: kotlin.Int) -> kotlin.Unit, /*1*/ ext: kotlin.Int.(p: kotlin.Int) -> kotlin.Unit): kotlin.Unit +public inline fun inlineFunWithInvokeClosure(/*0*/ s: (p: kotlin.Int) -> kotlin.Unit, /*1*/ ext: kotlin.Int.(p: kotlin.Int) -> kotlin.Unit): kotlin.Unit +public inline fun inlineFunWithInvokeClosureNoinline(/*0*/ noinline s: (p: kotlin.Int) -> kotlin.Unit, /*1*/ noinline ext: kotlin.Int.(p: kotlin.Int) -> kotlin.Unit): kotlin.Unit +public inline fun inlineFunWithInvokeNonInline(/*0*/ noinline s: (p: kotlin.Int) -> kotlin.Unit, /*1*/ noinline ext: kotlin.Int.(p: kotlin.Int) -> kotlin.Unit): kotlin.Unit +public inline fun subInline(/*0*/ s: (p: kotlin.Int) -> kotlin.Unit, /*1*/ ext: kotlin.Int.(p: kotlin.Int) -> kotlin.Unit): kotlin.Unit +public fun subNoInline(/*0*/ s: (p: kotlin.Int) -> kotlin.Unit, /*1*/ ext: kotlin.Int.(p: kotlin.Int) -> kotlin.Unit): kotlin.Unit +public inline fun ((kotlin.Int) -> kotlin.Unit).inlineExt(/*0*/ ext: kotlin.Int.(p: kotlin.Int) -> kotlin.Unit): kotlin.Unit +public inline fun ((kotlin.Int) -> kotlin.Unit).inlineExtWithClosure(/*0*/ ext: kotlin.Int.(p: kotlin.Int) -> kotlin.Unit): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/inline/property/invoke.txt b/compiler/testData/diagnostics/tests/inline/property/invoke.txt index 95b62a3bf0e..c65ab13d05a 100644 --- a/compiler/testData/diagnostics/tests/inline/property/invoke.txt +++ b/compiler/testData/diagnostics/tests/inline/property/invoke.txt @@ -1,4 +1,4 @@ package -public var value: (kotlin.Int) -> kotlin.String -public var value2: kotlin.Int.(kotlin.Int) -> kotlin.String +public var value: (p: kotlin.Int) -> kotlin.String +public var value2: kotlin.Int.(p: kotlin.Int) -> kotlin.String diff --git a/compiler/testData/diagnostics/tests/inline/recursion.txt b/compiler/testData/diagnostics/tests/inline/recursion.txt index 0cb5df06f7b..958e7cff68d 100644 --- a/compiler/testData/diagnostics/tests/inline/recursion.txt +++ b/compiler/testData/diagnostics/tests/inline/recursion.txt @@ -1,6 +1,6 @@ package -public inline fun inlineFun(/*0*/ s: (kotlin.Int) -> kotlin.Unit): kotlin.Unit +public inline fun inlineFun(/*0*/ s: (p: kotlin.Int) -> kotlin.Unit): kotlin.Unit public inline fun inlineFun(/*0*/ s: T): kotlin.Unit public operator inline fun ((T) -> V).inc(): (T) -> V public inline fun (() -> T).inlineExt(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/inline/regressions/kt4341.txt b/compiler/testData/diagnostics/tests/inline/regressions/kt4341.txt index 8f643494ff7..8e715f812f5 100644 --- a/compiler/testData/diagnostics/tests/inline/regressions/kt4341.txt +++ b/compiler/testData/diagnostics/tests/inline/regressions/kt4341.txt @@ -1,5 +1,5 @@ package package g { - public inline fun inlineFunWithInvoke(/*0*/ s: (T) -> U): kotlin.Unit + public inline fun inlineFunWithInvoke(/*0*/ s: (p: T) -> U): kotlin.Unit } diff --git a/compiler/testData/diagnostics/tests/inline/returns.txt b/compiler/testData/diagnostics/tests/inline/returns.txt index 77b823a216f..e0eb52e9109 100644 --- a/compiler/testData/diagnostics/tests/inline/returns.txt +++ b/compiler/testData/diagnostics/tests/inline/returns.txt @@ -1,8 +1,8 @@ package -public inline fun inlineFun(/*0*/ s: (kotlin.Int) -> kotlin.Unit): (kotlin.Int) -> kotlin.Unit -public inline fun inlineFun2(/*0*/ s: (kotlin.Int) -> kotlin.Unit): (kotlin.Int) -> kotlin.Unit -public inline fun inlineFunWithExt(/*0*/ ext: kotlin.Int.(kotlin.Int) -> kotlin.Unit): kotlin.Int.(kotlin.Int) -> kotlin.Unit -public inline fun inlineFunWithExt2(/*0*/ ext: kotlin.Int.(kotlin.Int) -> kotlin.Unit): kotlin.Int.(kotlin.Int) -> kotlin.Unit +public inline fun inlineFun(/*0*/ s: (p: kotlin.Int) -> kotlin.Unit): (p: kotlin.Int) -> kotlin.Unit +public inline fun inlineFun2(/*0*/ s: (p: kotlin.Int) -> kotlin.Unit): (p: kotlin.Int) -> kotlin.Unit +public inline fun inlineFunWithExt(/*0*/ ext: kotlin.Int.(p: kotlin.Int) -> kotlin.Unit): kotlin.Int.(p: kotlin.Int) -> kotlin.Unit +public inline fun inlineFunWithExt2(/*0*/ ext: kotlin.Int.(p: kotlin.Int) -> kotlin.Unit): kotlin.Int.(p: kotlin.Int) -> kotlin.Unit public inline fun ((kotlin.Int) -> kotlin.Unit).inlineExt(): (kotlin.Int) -> kotlin.Unit public inline fun ((kotlin.Int) -> kotlin.Unit).inlineExt2(): (kotlin.Int) -> kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/inline/sam.txt b/compiler/testData/diagnostics/tests/inline/sam.txt index ba76e24e598..2fc5a59187a 100644 --- a/compiler/testData/diagnostics/tests/inline/sam.txt +++ b/compiler/testData/diagnostics/tests/inline/sam.txt @@ -1,8 +1,8 @@ package public /*synthesized*/ fun Run(/*0*/ function: () -> kotlin.Int): Run -public inline fun inlineFunWithInvoke(/*0*/ s: (kotlin.Int) -> kotlin.Unit, /*1*/ ext: kotlin.Int.(kotlin.Int) -> kotlin.Unit): kotlin.Unit -public inline fun inlineFunWithInvokeNonInline(/*0*/ noinline s: (kotlin.Int) -> kotlin.Unit, /*1*/ ext: kotlin.Int.(kotlin.Int) -> kotlin.Unit): kotlin.Unit +public inline fun inlineFunWithInvoke(/*0*/ s: (p: kotlin.Int) -> kotlin.Unit, /*1*/ ext: kotlin.Int.(p: kotlin.Int) -> kotlin.Unit): kotlin.Unit +public inline fun inlineFunWithInvokeNonInline(/*0*/ noinline s: (p: kotlin.Int) -> kotlin.Unit, /*1*/ ext: kotlin.Int.(p: kotlin.Int) -> kotlin.Unit): kotlin.Unit public inline fun ((kotlin.Int) -> kotlin.Unit).inlineExt(): kotlin.Unit public interface Run { diff --git a/compiler/testData/diagnostics/tests/inline/unaryExpressions/mathOperation.txt b/compiler/testData/diagnostics/tests/inline/unaryExpressions/mathOperation.txt index 3da1e18c32a..185ee28a77b 100644 --- a/compiler/testData/diagnostics/tests/inline/unaryExpressions/mathOperation.txt +++ b/compiler/testData/diagnostics/tests/inline/unaryExpressions/mathOperation.txt @@ -1,6 +1,6 @@ package -public inline fun inlineFunWithInvoke(/*0*/ s: (T) -> V, /*1*/ ext: T.(T) -> V): kotlin.Unit +public inline fun inlineFunWithInvoke(/*0*/ s: (p: T) -> V, /*1*/ ext: T.(p: T) -> V): kotlin.Unit public operator fun ((T) -> V).dec(): (T) -> V public operator fun (T.(T) -> V).dec(): T.(T) -> V public operator inline fun ((T) -> V).inc(): (T) -> V diff --git a/compiler/testData/diagnostics/tests/inline/unaryExpressions/notOperation.txt b/compiler/testData/diagnostics/tests/inline/unaryExpressions/notOperation.txt index efb0f65421d..484d5d818b4 100644 --- a/compiler/testData/diagnostics/tests/inline/unaryExpressions/notOperation.txt +++ b/compiler/testData/diagnostics/tests/inline/unaryExpressions/notOperation.txt @@ -1,7 +1,7 @@ package -public inline fun inlineFunWithInvoke(/*0*/ s: (T) -> V): kotlin.Unit -public inline fun inlineFunWithInvoke(/*0*/ s: (T, U) -> V, /*1*/ ext: T.(T, U) -> V): kotlin.Unit +public inline fun inlineFunWithInvoke(/*0*/ s: (p: T) -> V): kotlin.Unit +public inline fun inlineFunWithInvoke(/*0*/ s: (p: T, l: U) -> V, /*1*/ ext: T.(p: T, l: U) -> V): kotlin.Unit public operator inline fun ((T) -> V).not(): kotlin.Boolean public operator fun ((T, U) -> V).not(): kotlin.Boolean public operator fun (T.(U, V) -> W).not(): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/inline/vararg.txt b/compiler/testData/diagnostics/tests/inline/vararg.txt index ef21f011607..6124ca0e16e 100644 --- a/compiler/testData/diagnostics/tests/inline/vararg.txt +++ b/compiler/testData/diagnostics/tests/inline/vararg.txt @@ -1,6 +1,6 @@ package -public inline fun inlineFun(/*0*/ s: (kotlin.Int) -> kotlin.Unit, /*1*/ noinline b: (kotlin.Int) -> kotlin.Unit): kotlin.Unit -public inline fun subInline(/*0*/ vararg s: (kotlin.Int) -> kotlin.Unit /*kotlin.Array kotlin.Unit>*/): kotlin.Unit -public fun subNoInline(/*0*/ vararg s: (kotlin.Int) -> kotlin.Unit /*kotlin.Array kotlin.Unit>*/): kotlin.Unit -public inline fun ((kotlin.Int) -> kotlin.Unit).inlineExt(/*0*/ s: (kotlin.Int) -> kotlin.Unit, /*1*/ noinline b: (kotlin.Int) -> kotlin.Unit): kotlin.Unit +public inline fun inlineFun(/*0*/ s: (p: kotlin.Int) -> kotlin.Unit, /*1*/ noinline b: (p: kotlin.Int) -> kotlin.Unit): kotlin.Unit +public inline fun subInline(/*0*/ vararg s: (p: kotlin.Int) -> kotlin.Unit /*kotlin.Array kotlin.Unit>*/): kotlin.Unit +public fun subNoInline(/*0*/ vararg s: (p: kotlin.Int) -> kotlin.Unit /*kotlin.Array kotlin.Unit>*/): kotlin.Unit +public inline fun ((kotlin.Int) -> kotlin.Unit).inlineExt(/*0*/ s: (p: kotlin.Int) -> kotlin.Unit, /*1*/ noinline b: (p: kotlin.Int) -> kotlin.Unit): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/inline/wrongUsage.txt b/compiler/testData/diagnostics/tests/inline/wrongUsage.txt index 1d46ec36454..14f4dd69db4 100644 --- a/compiler/testData/diagnostics/tests/inline/wrongUsage.txt +++ b/compiler/testData/diagnostics/tests/inline/wrongUsage.txt @@ -1,8 +1,8 @@ package -public inline fun inlineFunNoInline(/*0*/ noinline s: (kotlin.Int) -> kotlin.Unit): kotlin.Unit -public inline fun inlineFunNoInline(/*0*/ noinline ext: kotlin.Int.(kotlin.Int) -> kotlin.Unit): kotlin.Unit -public inline fun inlineFunWrongUsage(/*0*/ s: (kotlin.Int) -> kotlin.Unit): kotlin.Unit -public inline fun inlineFunWrongUsageExt(/*0*/ ext: kotlin.Int.(kotlin.Int) -> kotlin.Unit): kotlin.Unit -public inline fun inlineFunWrongUsageInClosure(/*0*/ s: (kotlin.Int) -> kotlin.Unit): kotlin.Unit -public inline fun inlineFunWrongUsageInClosureExt(/*0*/ ext: kotlin.Int.(kotlin.Int) -> kotlin.Unit): kotlin.Unit +public inline fun inlineFunNoInline(/*0*/ noinline s: (p: kotlin.Int) -> kotlin.Unit): kotlin.Unit +public inline fun inlineFunNoInline(/*0*/ noinline ext: kotlin.Int.(p: kotlin.Int) -> kotlin.Unit): kotlin.Unit +public inline fun inlineFunWrongUsage(/*0*/ s: (p: kotlin.Int) -> kotlin.Unit): kotlin.Unit +public inline fun inlineFunWrongUsageExt(/*0*/ ext: kotlin.Int.(p: kotlin.Int) -> kotlin.Unit): kotlin.Unit +public inline fun inlineFunWrongUsageInClosure(/*0*/ s: (p: kotlin.Int) -> kotlin.Unit): kotlin.Unit +public inline fun inlineFunWrongUsageInClosureExt(/*0*/ ext: kotlin.Int.(p: kotlin.Int) -> kotlin.Unit): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/j+k/inheritAbstractSamAdapter.txt b/compiler/testData/diagnostics/tests/j+k/inheritAbstractSamAdapter.txt index 8f32884daed..9b3e9d32357 100644 --- a/compiler/testData/diagnostics/tests/j+k/inheritAbstractSamAdapter.txt +++ b/compiler/testData/diagnostics/tests/j+k/inheritAbstractSamAdapter.txt @@ -1,6 +1,6 @@ package -public /*synthesized*/ fun A(/*0*/ function: (java.lang.Runnable!) -> kotlin.Unit): A +public /*synthesized*/ fun A(/*0*/ function: (r: java.lang.Runnable!) -> kotlin.Unit): A public interface A { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/j+k/overrideRawType.txt b/compiler/testData/diagnostics/tests/j+k/overrideRawType.txt index 4cbd4716d94..ca158fb7cbc 100644 --- a/compiler/testData/diagnostics/tests/j+k/overrideRawType.txt +++ b/compiler/testData/diagnostics/tests/j+k/overrideRawType.txt @@ -1,6 +1,6 @@ package -public /*synthesized*/ fun Bar(/*0*/ function: (Foo<(raw) kotlin.CharSequence!>!) -> kotlin.Unit): Bar +public /*synthesized*/ fun Bar(/*0*/ function: (f: Foo<(raw) kotlin.CharSequence!>!) -> kotlin.Unit): Bar public interface Bar { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/j+k/overrideWithSamAndTypeParameter.txt b/compiler/testData/diagnostics/tests/j+k/overrideWithSamAndTypeParameter.txt index 0704b087e70..13fce86be17 100644 --- a/compiler/testData/diagnostics/tests/j+k/overrideWithSamAndTypeParameter.txt +++ b/compiler/testData/diagnostics/tests/j+k/overrideWithSamAndTypeParameter.txt @@ -1,7 +1,7 @@ package public /*synthesized*/ fun A(/*0*/ function: (K!, MyFunc!) -> K!): A -public /*synthesized*/ fun MyFunc(/*0*/ function: (kotlin.String!) -> kotlin.String!): MyFunc +public /*synthesized*/ fun MyFunc(/*0*/ function: (x: kotlin.String!) -> kotlin.String!): MyFunc public fun main(): kotlin.Unit public interface A { diff --git a/compiler/testData/diagnostics/tests/j+k/sam/enhancedSamConstructor.txt b/compiler/testData/diagnostics/tests/j+k/sam/enhancedSamConstructor.txt index 7be6a24e1a5..55693c67856 100644 --- a/compiler/testData/diagnostics/tests/j+k/sam/enhancedSamConstructor.txt +++ b/compiler/testData/diagnostics/tests/j+k/sam/enhancedSamConstructor.txt @@ -1,7 +1,7 @@ package -public /*synthesized*/ fun J(/*0*/ function: (kotlin.String?) -> kotlin.String): J -public /*synthesized*/ fun J2(/*0*/ function: (kotlin.String?) -> kotlin.String): J2 +public /*synthesized*/ fun J(/*0*/ function: (x: kotlin.String?) -> kotlin.String): J +public /*synthesized*/ fun J2(/*0*/ function: (x: kotlin.String?) -> kotlin.String): J2 public fun main(): kotlin.Unit public interface J { diff --git a/compiler/testData/diagnostics/tests/modifiers/modifierOnParameterInFunctionType.txt b/compiler/testData/diagnostics/tests/modifiers/modifierOnParameterInFunctionType.txt index 94ed5d88f43..57daa24c58b 100644 --- a/compiler/testData/diagnostics/tests/modifiers/modifierOnParameterInFunctionType.txt +++ b/compiler/testData/diagnostics/tests/modifiers/modifierOnParameterInFunctionType.txt @@ -1,17 +1,17 @@ package -public val allProhibited: (kotlin.Int) -> kotlin.Unit -public val inVal: (kotlin.Int) -> kotlin.Unit -public val valProhibited: (kotlin.Int) -> kotlin.Unit -public val varProhibited: (kotlin.Int) -> kotlin.Unit +public val allProhibited: (x: kotlin.Int) -> kotlin.Unit +public val inVal: (x: kotlin.Int) -> kotlin.Unit +public val valProhibited: (x: kotlin.Int) -> kotlin.Unit +public val varProhibited: (x: kotlin.Int) -> kotlin.Unit public fun f(/*0*/ vararg x: kotlin.Int /*kotlin.IntArray*/): kotlin.Unit -public fun inParam(/*0*/ fn: (kotlin.Int) -> kotlin.Unit): kotlin.Unit -public fun inParamNested(/*0*/ fn1: ((kotlin.Int) -> kotlin.Unit) -> kotlin.Unit): kotlin.Unit -public fun inReturn(): (kotlin.Int) -> kotlin.Unit +public fun inParam(/*0*/ fn: (x: kotlin.Int) -> kotlin.Unit): kotlin.Unit +public fun inParamNested(/*0*/ fn1: (fn2: (n: kotlin.Int) -> kotlin.Unit) -> kotlin.Unit): kotlin.Unit +public fun inReturn(): (x: kotlin.Int) -> kotlin.Unit public final class A : (kotlin.Int) -> kotlin.Unit { public constructor A() - public final val prop: (kotlin.Int) -> kotlin.Unit + public final val prop: (x: kotlin.Int) -> kotlin.Unit 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 invoke(/*0*/ p1: kotlin.Int): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/override/parameterNames/jjkHierarchy.txt b/compiler/testData/diagnostics/tests/override/parameterNames/jjkHierarchy.txt index 231283f73b7..81a3f49faa4 100644 --- a/compiler/testData/diagnostics/tests/override/parameterNames/jjkHierarchy.txt +++ b/compiler/testData/diagnostics/tests/override/parameterNames/jjkHierarchy.txt @@ -1,7 +1,7 @@ package -public/*package*/ /*synthesized*/ fun Sub(/*0*/ function: (kotlin.Long) -> kotlin.Unit): Sub -public/*package*/ /*synthesized*/ fun Super(/*0*/ function: (kotlin.Long) -> kotlin.Unit): Super +public/*package*/ /*synthesized*/ fun Sub(/*0*/ function: (superName: kotlin.Long) -> kotlin.Unit): Sub +public/*package*/ /*synthesized*/ fun Super(/*0*/ function: (superName: kotlin.Long) -> kotlin.Unit): Super public/*package*/ interface Sub : Super { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/override/parameterNames/kjkHierarchy.txt b/compiler/testData/diagnostics/tests/override/parameterNames/kjkHierarchy.txt index eac7d2e7335..c2b7cbbad61 100644 --- a/compiler/testData/diagnostics/tests/override/parameterNames/kjkHierarchy.txt +++ b/compiler/testData/diagnostics/tests/override/parameterNames/kjkHierarchy.txt @@ -1,6 +1,6 @@ package -public/*package*/ /*synthesized*/ fun Sub(/*0*/ function: (kotlin.Int) -> kotlin.Unit): Sub +public/*package*/ /*synthesized*/ fun Sub(/*0*/ function: (superName: kotlin.Int) -> kotlin.Unit): Sub public/*package*/ interface Sub : Super { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/override/parameterNames/kjkWithSeveralSupers.txt b/compiler/testData/diagnostics/tests/override/parameterNames/kjkWithSeveralSupers.txt index 26bb2f60c3f..f15ad239136 100644 --- a/compiler/testData/diagnostics/tests/override/parameterNames/kjkWithSeveralSupers.txt +++ b/compiler/testData/diagnostics/tests/override/parameterNames/kjkWithSeveralSupers.txt @@ -1,10 +1,10 @@ package -public/*package*/ /*synthesized*/ fun JSuper1(/*0*/ function: (kotlin.Int) -> kotlin.Unit): JSuper1 -public/*package*/ /*synthesized*/ fun JSuper2(/*0*/ function: (kotlin.Int) -> kotlin.Unit): JSuper2 -public/*package*/ /*synthesized*/ fun Sub1(/*0*/ function: (kotlin.Int) -> kotlin.Unit): Sub1 -public/*package*/ /*synthesized*/ fun Sub2(/*0*/ function: (kotlin.Int) -> kotlin.Unit): Sub2 -public/*package*/ /*synthesized*/ fun Sub3(/*0*/ function: (kotlin.Int) -> kotlin.Unit): Sub3 +public/*package*/ /*synthesized*/ fun JSuper1(/*0*/ function: (jsuper1Name: kotlin.Int) -> kotlin.Unit): JSuper1 +public/*package*/ /*synthesized*/ fun JSuper2(/*0*/ function: (jsuper2Name: kotlin.Int) -> kotlin.Unit): JSuper2 +public/*package*/ /*synthesized*/ fun Sub1(/*0*/ function: (ksuperName: kotlin.Int) -> kotlin.Unit): Sub1 +public/*package*/ /*synthesized*/ fun Sub2(/*0*/ function: (ksuperName: kotlin.Int) -> kotlin.Unit): Sub2 +public/*package*/ /*synthesized*/ fun Sub3(/*0*/ function: (ksuperName: kotlin.Int) -> kotlin.Unit): Sub3 public/*package*/ interface JSuper1 { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/override/parameterNames/kotlinInheritsBothJavaAndKotlin.txt b/compiler/testData/diagnostics/tests/override/parameterNames/kotlinInheritsBothJavaAndKotlin.txt index 66c283c9e30..967559200fa 100644 --- a/compiler/testData/diagnostics/tests/override/parameterNames/kotlinInheritsBothJavaAndKotlin.txt +++ b/compiler/testData/diagnostics/tests/override/parameterNames/kotlinInheritsBothJavaAndKotlin.txt @@ -1,6 +1,6 @@ package -public/*package*/ /*synthesized*/ fun JavaInterface(/*0*/ function: (kotlin.Int) -> kotlin.Unit): JavaInterface +public/*package*/ /*synthesized*/ fun JavaInterface(/*0*/ function: (javaName: kotlin.Int) -> kotlin.Unit): JavaInterface public final class BothTraitsSubclass : JavaInterface, KotlinTrait { public constructor BothTraitsSubclass() diff --git a/compiler/testData/diagnostics/tests/override/parameterNames/kotlinInheritsJava.txt b/compiler/testData/diagnostics/tests/override/parameterNames/kotlinInheritsJava.txt index bacefabb772..5c091661dfa 100644 --- a/compiler/testData/diagnostics/tests/override/parameterNames/kotlinInheritsJava.txt +++ b/compiler/testData/diagnostics/tests/override/parameterNames/kotlinInheritsJava.txt @@ -1,6 +1,6 @@ package -public /*synthesized*/ fun JavaInterface(/*0*/ function: (kotlin.Int) -> kotlin.Unit): JavaInterface +public /*synthesized*/ fun JavaInterface(/*0*/ function: (javaName: kotlin.Int) -> kotlin.Unit): JavaInterface public interface JavaInterface { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/platformTypes/rawOverrides.txt b/compiler/testData/diagnostics/tests/platformTypes/rawOverrides.txt index c4470096b0d..a6665c1418b 100644 --- a/compiler/testData/diagnostics/tests/platformTypes/rawOverrides.txt +++ b/compiler/testData/diagnostics/tests/platformTypes/rawOverrides.txt @@ -1,6 +1,6 @@ package -public /*synthesized*/ fun B(/*0*/ function: (kotlin.Any!, kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!) -> kotlin.String!): B +public /*synthesized*/ fun B(/*0*/ function: (x: kotlin.Any!, y: kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!) -> kotlin.String!): B public interface A { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/saveAnnotationAfterSubstitution.txt b/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/saveAnnotationAfterSubstitution.txt index 4a40a46df32..755ec5bd8c4 100644 --- a/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/saveAnnotationAfterSubstitution.txt +++ b/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/saveAnnotationAfterSubstitution.txt @@ -1,9 +1,9 @@ package public /*synthesized*/ fun A(/*0*/ function: (T, T?) -> kotlin.Unit): A -public /*synthesized*/ fun B1(/*0*/ function: (kotlin.String, kotlin.String?) -> kotlin.Unit): B1 -public /*synthesized*/ fun B2(/*0*/ function: (kotlin.String, kotlin.String?) -> kotlin.Unit): B2 -public /*synthesized*/ fun B3(/*0*/ function: (kotlin.String!, kotlin.String!) -> kotlin.Unit): B3 +public /*synthesized*/ fun B1(/*0*/ function: (x: kotlin.String, y: kotlin.String?) -> kotlin.Unit): B1 +public /*synthesized*/ fun B2(/*0*/ function: (x: kotlin.String, y: kotlin.String?) -> kotlin.Unit): B2 +public /*synthesized*/ fun B3(/*0*/ function: (x: kotlin.String!, y: kotlin.String!) -> kotlin.Unit): B3 public interface A { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/supertypeDifferentParameterNullability.txt b/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/supertypeDifferentParameterNullability.txt index 5f1871f76fb..3eb7a2793b7 100644 --- a/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/supertypeDifferentParameterNullability.txt +++ b/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/supertypeDifferentParameterNullability.txt @@ -1,7 +1,7 @@ package -public /*synthesized*/ fun A(/*0*/ function: (kotlin.String?) -> kotlin.Unit): A -public /*synthesized*/ fun B(/*0*/ function: (kotlin.String) -> kotlin.Unit): B +public /*synthesized*/ fun A(/*0*/ function: (x: kotlin.String?) -> kotlin.Unit): A +public /*synthesized*/ fun B(/*0*/ function: (x: kotlin.String) -> kotlin.Unit): B public interface A { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/regressions/UnavaliableQualifiedThis.txt b/compiler/testData/diagnostics/tests/regressions/UnavaliableQualifiedThis.txt index 0adf148ba20..eccafebc8f7 100644 --- a/compiler/testData/diagnostics/tests/regressions/UnavaliableQualifiedThis.txt +++ b/compiler/testData/diagnostics/tests/regressions/UnavaliableQualifiedThis.txt @@ -4,7 +4,7 @@ public interface Iterator { public abstract val hasNext: kotlin.Boolean 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 fun map(/*0*/ transform: (T) -> R): Iterator + public open fun map(/*0*/ transform: (element: T) -> R): Iterator public abstract fun next(): T public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/regressions/kt385.109.441.txt b/compiler/testData/diagnostics/tests/regressions/kt385.109.441.txt index cd6090a152f..2b4ff5594b0 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt385.109.441.txt +++ b/compiler/testData/diagnostics/tests/regressions/kt385.109.441.txt @@ -5,7 +5,7 @@ public fun generic_invoker(/*0*/ gen: () -> T): T public fun main(/*0*/ args: kotlin.Array): kotlin.Unit public fun println(/*0*/ message: kotlin.Int): kotlin.Unit public fun println(/*0*/ message: kotlin.Long): kotlin.Unit -public fun kotlin.collections.Iterable.foreach(/*0*/ operation: (T) -> kotlin.Unit): kotlin.Unit -public fun kotlin.collections.Iterable.foreach(/*0*/ operation: (kotlin.Int, T) -> kotlin.Unit): kotlin.Unit -public infix fun kotlin.collections.Iterator.foreach(/*0*/ operation: (T) -> kotlin.Unit): kotlin.Unit -public infix fun kotlin.collections.Iterator.foreach(/*0*/ operation: (kotlin.Int, T) -> kotlin.Unit): kotlin.Unit +public fun kotlin.collections.Iterable.foreach(/*0*/ operation: (element: T) -> kotlin.Unit): kotlin.Unit +public fun kotlin.collections.Iterable.foreach(/*0*/ operation: (index: kotlin.Int, element: T) -> kotlin.Unit): kotlin.Unit +public infix fun kotlin.collections.Iterator.foreach(/*0*/ operation: (element: T) -> kotlin.Unit): kotlin.Unit +public infix fun kotlin.collections.Iterator.foreach(/*0*/ operation: (index: kotlin.Int, element: T) -> kotlin.Unit): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/regressions/kt398.txt b/compiler/testData/diagnostics/tests/regressions/kt398.txt index 2bedb075e16..a0647250fbc 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt398.txt +++ b/compiler/testData/diagnostics/tests/regressions/kt398.txt @@ -4,7 +4,7 @@ public fun box(): kotlin.String public final class X { public constructor X() - public final val check: (kotlin.Any) -> kotlin.Boolean + public final val check: (a: kotlin.Any) -> kotlin.Boolean 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*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/regressions/kt442.txt b/compiler/testData/diagnostics/tests/regressions/kt442.txt index 25db33cd53e..a5602dcb162 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt442.txt +++ b/compiler/testData/diagnostics/tests/regressions/kt442.txt @@ -2,7 +2,7 @@ package public fun box(): kotlin.String public fun funny(/*0*/ f: () -> T): T -public fun funny2(/*0*/ f: (T) -> T): T +public fun funny2(/*0*/ f: (t: T) -> T): T public fun generic_invoker(/*0*/ gen: (kotlin.String) -> T): T public fun main(/*0*/ args: kotlin.Array): kotlin.Unit public fun testFunny(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/smartCasts/variables/inPropertySam.txt b/compiler/testData/diagnostics/tests/smartCasts/variables/inPropertySam.txt index 1c1810c19c8..d15db914bef 100644 --- a/compiler/testData/diagnostics/tests/smartCasts/variables/inPropertySam.txt +++ b/compiler/testData/diagnostics/tests/smartCasts/variables/inPropertySam.txt @@ -1,6 +1,6 @@ package -public /*synthesized*/ fun My(/*0*/ function: (kotlin.String!) -> kotlin.String!): My +public /*synthesized*/ fun My(/*0*/ function: (arg: kotlin.String!) -> kotlin.String!): My public interface My { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varCapturedInInlineClosure.txt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varCapturedInInlineClosure.txt index 869a22b4ca7..c8b61d7bcfd 100644 --- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varCapturedInInlineClosure.txt +++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varCapturedInInlineClosure.txt @@ -1,4 +1,4 @@ package public fun max(/*0*/ a: kotlin.IntArray): kotlin.Int? -public fun kotlin.IntArray.forEachIndexed(/*0*/ op: (kotlin.Int, kotlin.Int) -> kotlin.Unit): kotlin.Unit +public fun kotlin.IntArray.forEachIndexed(/*0*/ op: (i: kotlin.Int, value: kotlin.Int) -> kotlin.Unit): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/KotlinOverridesJava2.txt b/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/KotlinOverridesJava2.txt index a541dd838da..b33050604c4 100644 --- a/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/KotlinOverridesJava2.txt +++ b/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/KotlinOverridesJava2.txt @@ -1,7 +1,7 @@ package public /*synthesized*/ fun JavaInterface1(/*0*/ function: () -> kotlin.String!): JavaInterface1 -public /*synthesized*/ fun JavaInterface2(/*0*/ function: (kotlin.Int) -> kotlin.Unit): JavaInterface2 +public /*synthesized*/ fun JavaInterface2(/*0*/ function: (value: kotlin.Int) -> kotlin.Unit): JavaInterface2 public fun foo(/*0*/ k: KotlinClass): kotlin.Unit public fun useString(/*0*/ i: kotlin.String): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/KotlinOverridesJava3.txt b/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/KotlinOverridesJava3.txt index 003b6fa0946..d220142d8fe 100644 --- a/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/KotlinOverridesJava3.txt +++ b/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/KotlinOverridesJava3.txt @@ -1,7 +1,7 @@ package public /*synthesized*/ fun JavaInterface1(/*0*/ function: () -> kotlin.String!): JavaInterface1 -public /*synthesized*/ fun JavaInterface2(/*0*/ function: (kotlin.String!) -> kotlin.Unit): JavaInterface2 +public /*synthesized*/ fun JavaInterface2(/*0*/ function: (value: kotlin.String!) -> kotlin.Unit): JavaInterface2 public fun foo(/*0*/ k: KotlinClass): kotlin.Unit public fun useString(/*0*/ i: kotlin.String): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/KotlinOverridesJava4.txt b/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/KotlinOverridesJava4.txt index 57fcc0dc201..ad0d862eb71 100644 --- a/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/KotlinOverridesJava4.txt +++ b/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/KotlinOverridesJava4.txt @@ -1,7 +1,7 @@ package public /*synthesized*/ fun JavaInterface1(/*0*/ function: () -> kotlin.String!): JavaInterface1 -public /*synthesized*/ fun JavaInterface2(/*0*/ function: (kotlin.String!) -> kotlin.Unit): JavaInterface2 +public /*synthesized*/ fun JavaInterface2(/*0*/ function: (value: kotlin.String!) -> kotlin.Unit): JavaInterface2 public fun foo(/*0*/ k: KotlinClass): kotlin.Unit public fun useString(/*0*/ i: kotlin.String): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/ParameterTypeAnnotation.txt b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/ParameterTypeAnnotation.txt index b7e62da3057..24871cb0da7 100644 --- a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/ParameterTypeAnnotation.txt +++ b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/ParameterTypeAnnotation.txt @@ -1,6 +1,6 @@ package -public /*synthesized*/ fun JavaInterface(/*0*/ function: (kotlin.String, java.lang.Runnable) -> kotlin.Unit): JavaInterface +public /*synthesized*/ fun JavaInterface(/*0*/ function: (s: kotlin.String, runnable: java.lang.Runnable) -> kotlin.Unit): JavaInterface public fun foo(/*0*/ javaInterface: JavaInterface): kotlin.Unit public interface JavaInterface { diff --git a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/PassNull.txt b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/PassNull.txt index 4d226516b73..ff2b7a03df2 100644 --- a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/PassNull.txt +++ b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/PassNull.txt @@ -1,6 +1,6 @@ package -public /*synthesized*/ fun JavaInterface(/*0*/ function: (kotlin.String!, java.lang.Runnable!, java.lang.Runnable!) -> kotlin.Unit): JavaInterface +public /*synthesized*/ fun JavaInterface(/*0*/ function: (s: kotlin.String!, runnable1: java.lang.Runnable!, runnable2: java.lang.Runnable!) -> kotlin.Unit): JavaInterface public fun foo(/*0*/ javaInterface: JavaInterface): kotlin.Unit public interface JavaInterface { diff --git a/compiler/testData/diagnostics/tests/typeParameters/extFunctionTypeAsUpperBound.txt b/compiler/testData/diagnostics/tests/typeParameters/extFunctionTypeAsUpperBound.txt index 126d6bad704..dc7b03c48bb 100644 --- a/compiler/testData/diagnostics/tests/typeParameters/extFunctionTypeAsUpperBound.txt +++ b/compiler/testData/diagnostics/tests/typeParameters/extFunctionTypeAsUpperBound.txt @@ -1,6 +1,6 @@ package -public val kotlin.String> bar: (kotlin.Int) -> kotlin.String +public val kotlin.String> bar: (x: kotlin.Int) -> kotlin.String public fun kotlin.String> foo(): kotlin.Unit public final class A kotlin.Unit> { diff --git a/compiler/testData/diagnostics/tests/typeParameters/functionTypeAsUpperBound.txt b/compiler/testData/diagnostics/tests/typeParameters/functionTypeAsUpperBound.txt index 7245929a337..9a36eeb9e54 100644 --- a/compiler/testData/diagnostics/tests/typeParameters/functionTypeAsUpperBound.txt +++ b/compiler/testData/diagnostics/tests/typeParameters/functionTypeAsUpperBound.txt @@ -1,6 +1,6 @@ package -public val kotlin.String> bar: (kotlin.Int) -> kotlin.String +public val kotlin.String> bar: (x: kotlin.Int) -> kotlin.String public fun kotlin.String> foo(): kotlin.Unit public final class A kotlin.Unit, /*1*/ U : (kotlin.Int) -> kotlin.Double, /*2*/ V : (T, U) -> U> { diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicCallsWithLambdas.dynamic.txt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicCallsWithLambdas.dynamic.txt index 9cb618d1b4b..aa481886a10 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicCallsWithLambdas.dynamic.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicCallsWithLambdas.dynamic.txt @@ -1,15 +1,15 @@ public final fun foo(/*0*/ p0: () -> dynamic): dynamic public final fun foo(/*0*/ p0: () -> dynamic): dynamic -public final fun foo(/*0*/ p0: (dynamic) -> dynamic): dynamic -public final fun foo(/*0*/ p0: (dynamic) -> dynamic): dynamic -public final fun foo(/*0*/ p0: (dynamic, dynamic) -> dynamic): dynamic -public final fun foo(/*0*/ p0: (dynamic, dynamic) -> dynamic): dynamic -public final fun foo(/*0*/ p0: (dynamic, dynamic) -> dynamic): dynamic +public final fun foo(/*0*/ p0: (x: dynamic) -> dynamic): dynamic +public final fun foo(/*0*/ p0: (x: dynamic) -> dynamic): dynamic +public final fun foo(/*0*/ p0: (x: dynamic, y: dynamic) -> dynamic): dynamic +public final fun foo(/*0*/ p0: (x: dynamic, y: dynamic) -> dynamic): dynamic +public final fun foo(/*0*/ p0: (x: dynamic, y: dynamic) -> dynamic): dynamic public final fun foo(/*0*/ p0: () -> dynamic): dynamic -public final fun foo(/*0*/ p0: (dynamic) -> dynamic): dynamic +public final fun foo(/*0*/ p0: (x: dynamic) -> dynamic): dynamic public final fun foo(/*0*/ p0: dynamic): dynamic -public final fun foo(/*0*/ p0: (dynamic) -> dynamic): dynamic -public final fun foo(/*0*/ p0: (dynamic, dynamic) -> dynamic): dynamic -public final fun foo(/*0*/ p0: (dynamic, dynamic) -> dynamic): dynamic -public final fun foo(/*0*/ p0: (dynamic) -> dynamic): dynamic -public final fun foo(/*0*/ p0: (dynamic) -> dynamic): dynamic +public final fun foo(/*0*/ p0: (x: dynamic) -> dynamic): dynamic +public final fun foo(/*0*/ p0: (x: dynamic, y: dynamic) -> dynamic): dynamic +public final fun foo(/*0*/ p0: (x: dynamic, y: dynamic) -> dynamic): dynamic +public final fun foo(/*0*/ p0: (x: dynamic) -> dynamic): dynamic +public final fun foo(/*0*/ p0: (x: dynamic) -> dynamic): dynamic diff --git a/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.txt b/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.txt index 9bbc88c9ac4..78631241226 100644 --- a/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.txt +++ b/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.txt @@ -1,6 +1,6 @@ package test -public /*synthesized*/ fun SubstitutedSamInterfaceSubclassOfBuiltin(/*0*/ function: (test.SubstitutedSamInterfaceSubclassOfBuiltin!) -> kotlin.Int): test.SubstitutedSamInterfaceSubclassOfBuiltin +public /*synthesized*/ fun SubstitutedSamInterfaceSubclassOfBuiltin(/*0*/ function: (other: test.SubstitutedSamInterfaceSubclassOfBuiltin!) -> kotlin.Int): test.SubstitutedSamInterfaceSubclassOfBuiltin public interface SubstitutedSamInterfaceSubclassOfBuiltin : kotlin.Comparable { public abstract override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.SubstitutedSamInterfaceSubclassOfBuiltin!): kotlin.Int diff --git a/compiler/testData/renderer/FunctionTypes.kt b/compiler/testData/renderer/FunctionTypes.kt index 5e88d258255..c7d185556bf 100644 --- a/compiler/testData/renderer/FunctionTypes.kt +++ b/compiler/testData/renderer/FunctionTypes.kt @@ -1,8 +1,8 @@ -var v1: () -> Unit -var v2: (Int) -> Int -var v3: (Int, String) -> String -var v4: Function1 -var v4: (() -> Int, (String) -> Unit) -> String +var v0: () -> Unit +var v1: (Int) -> Int +var v2: (number: Int, String) -> String +var v3: Function1 +var v4: (() -> Int, (s: String) -> Unit) -> String var v5: Int.() -> Int var v6 : Int.(String, Int) -> Unit var v7 : @ExtensionFunctionType Function2 @@ -22,11 +22,11 @@ var v11: GEF var v12: (() -> Unit).() -> Unit var v13: (() -> Unit)?.() -> Unit -//public var v1: () -> kotlin.Unit defined in root package -//public var v2: (kotlin.Int) -> kotlin.Int defined in root package -//public var v3: (kotlin.Int, kotlin.String) -> kotlin.String defined in root package -//public var v4: (kotlin.Int) -> kotlin.String defined in root package -//public var v4: (() -> kotlin.Int, (kotlin.String) -> kotlin.Unit) -> kotlin.String defined in root package +//public var v0: () -> kotlin.Unit defined in root package +//public var v1: (kotlin.Int) -> kotlin.Int defined in root package +//public var v2: (number: kotlin.Int, kotlin.String) -> kotlin.String defined in root package +//public var v3: (kotlin.Int) -> kotlin.String defined in root package +//public var v4: (() -> kotlin.Int, (s: kotlin.String) -> kotlin.Unit) -> kotlin.String defined in root package //public var v5: kotlin.Int.() -> kotlin.Int defined in root package //public var v6: kotlin.Int.(kotlin.String, kotlin.Int) -> kotlin.Unit defined in root package //public var v7: kotlin.Int.(kotlin.String) -> kotlin.Boolean defined in root package diff --git a/compiler/testData/renderer/FunctionTypesInSignature.kt b/compiler/testData/renderer/FunctionTypesInSignature.kt index 28f8515174a..9d4b5dfe48b 100644 --- a/compiler/testData/renderer/FunctionTypesInSignature.kt +++ b/compiler/testData/renderer/FunctionTypesInSignature.kt @@ -18,7 +18,7 @@ fun Function0<(() -> Unit) -> (() -> Unit)>.f5() { fun Function0<(() -> Unit) -> (() -> Unit)>?.f6() { } -fun ((Int) -> Unit)?.f7() { +fun ((p: Int) -> Unit)?.f7() { } fun (T.(Int) -> Unit).f8() { @@ -36,7 +36,7 @@ val Function0<(() -> Unit) -> (() -> Unit)>.p: Unit = Unit //value-parameter f: (() -> kotlin.Unit, () -> kotlin.Unit) -> kotlin.Unit defined in test.f4 //public fun (() -> (() -> kotlin.Unit) -> () -> kotlin.Unit).f5(): kotlin.Unit defined in test //public fun (() -> (() -> kotlin.Unit) -> () -> kotlin.Unit)?.f6(): kotlin.Unit defined in test -//public fun ((kotlin.Int) -> kotlin.Unit)?.f7(): kotlin.Unit defined in test +//public fun ((p: kotlin.Int) -> kotlin.Unit)?.f7(): kotlin.Unit defined in test //public fun (T.(kotlin.Int) -> kotlin.Unit).f8(): kotlin.Unit defined in test // defined in test.f8 //public val (() -> (() -> kotlin.Unit) -> () -> kotlin.Unit).p: kotlin.Unit defined in test \ No newline at end of file diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt index 93bababea61..390b23d491f 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt @@ -309,7 +309,23 @@ internal class DescriptorRendererImpl( } append("(") - appendTypeProjections(getValueParameterTypesFromFunctionType(type)) + val parameterTypes = getValueParameterTypesFromFunctionType(type) + val parameterNames = type.getParameterNamesFromFunctionType() ?: parameterTypes.map { SpecialNames.NO_NAME_PROVIDED } + assert(parameterNames.size == parameterTypes.size) + + for (index in parameterTypes.indices) { + val typeProjection = parameterTypes[index] + val name = parameterNames[index] + + if (index > 0) append(", ") + + if (!name.isSpecial) { + append(renderName(name)) + append(": ") + } + append(renderTypeProjection(typeProjection)) + } + append(") ").append(arrow()).append(" ") renderNormalizedType(getReturnTypeFromFunctionType(type)) diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/SpecialTypes.kt b/core/descriptors/src/org/jetbrains/kotlin/types/SpecialTypes.kt index 677c120f537..89a6986939c 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/SpecialTypes.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/types/SpecialTypes.kt @@ -66,7 +66,7 @@ class FunctionType( override val isError: Boolean get() = false } -fun KotlinType.getFunctionTypeParameterNames(): List? = (unwrap() as? FunctionType)?.parameterNames +fun KotlinType.getParameterNamesFromFunctionType(): List? = (unwrap() as? FunctionType)?.parameterNames class LazyWrappedType(storageManager: StorageManager, computation: () -> KotlinType): WrappedType() { private val lazyValue = storageManager.createLazyValue(computation) diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/handlers/GenerateLambda.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/handlers/GenerateLambda.kt index 62726853ce4..535cd0e6ae9 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/handlers/GenerateLambda.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/handlers/GenerateLambda.kt @@ -42,7 +42,7 @@ import org.jetbrains.kotlin.resolve.calls.util.getValueParametersCountFromFuncti import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.TypeProjection -import org.jetbrains.kotlin.types.getFunctionTypeParameterNames +import org.jetbrains.kotlin.types.getParameterNamesFromFunctionType import org.jetbrains.kotlin.utils.addToStdlib.check fun insertLambdaTemplate(context: InsertionContext, placeholderRange: TextRange, lambdaType: KotlinType) { @@ -150,7 +150,7 @@ private fun buildTemplate(lambdaType: KotlinType, explicitParameterTypes: Boolea private fun functionParameterTypesAndNames(functionType: KotlinType): Pair, List> { val types = getValueParameterTypesFromFunctionType(functionType).map(TypeProjection::getType) - val names = functionType.getFunctionTypeParameterNames() ?: types.map { SpecialNames.NO_NAME_PROVIDED } + val names = functionType.getParameterNamesFromFunctionType() ?: types.map { SpecialNames.NO_NAME_PROVIDED } assert(names.size == types.size) return types to names } diff --git a/idea/testData/diagnosticMessage/functionPlaceholder2.html b/idea/testData/diagnosticMessage/functionPlaceholder2.html index f93271a6173..18d50d13845 100644 --- a/idea/testData/diagnosticMessage/functionPlaceholder2.html +++ b/idea/testData/diagnosticMessage/functionPlaceholder2.html @@ -18,7 +18,7 @@ Type inference failed: ( - (???) → ??? + (x: ???) → ??? ) diff --git a/idea/testData/diagnosticMessage/functionPlaceholder3.html b/idea/testData/diagnosticMessage/functionPlaceholder3.html index 74dccbbc138..1a00945dded 100644 --- a/idea/testData/diagnosticMessage/functionPlaceholder3.html +++ b/idea/testData/diagnosticMessage/functionPlaceholder3.html @@ -18,7 +18,7 @@ Type inference failed: ( - (Int) → Int + (x: Int) → Int ) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/kt10983.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/kt10983.kt index fe1b697b5e2..7f6266325bf 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/kt10983.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/kt10983.kt @@ -9,8 +9,8 @@ // ACTION: Rename reference // ERROR: A 'return' expression required in a function with a block body ('{...}') // ERROR: The expression cannot be a selector (occur after a dot) -// ERROR: Type inference failed: inline fun Iterable.firstOrNull(predicate: (T) -> Boolean): T?
cannot be applied to
receiver: Collection> arguments: ((List) -> () -> Boolean)
-// ERROR: Type mismatch: inferred type is (List) -> () -> Boolean but (List) -> Boolean was expected +// ERROR: Type inference failed: inline fun Iterable.firstOrNull(predicate: (T) -> Boolean): T?
cannot be applied to
receiver: Collection> arguments: ((group: List) -> () -> Boolean)
+// ERROR: Type mismatch: inferred type is (group: List) -> () -> Boolean but (List) -> Boolean was expected // ERROR: Unresolved reference: maximumSizeOfGroup fun doSomethingStrangeWithCollection(collection: Collection): Collection? { diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/dontChangeFunctionReturnTypeToErrorType.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/dontChangeFunctionReturnTypeToErrorType.kt index 7b7de07d7e7..4b6515e52f8 100644 --- a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/dontChangeFunctionReturnTypeToErrorType.kt +++ b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/dontChangeFunctionReturnTypeToErrorType.kt @@ -1,4 +1,4 @@ -// "Change 'foo' function return type to '([ERROR : NoSuchType]) -> Int'" "false" +// "Change 'foo' function return type to '(x: [ERROR : NoSuchType]) -> Int'" "false" // ACTION: Create annotation 'NoSuchType' // ACTION: Create class 'NoSuchType' // ACTION: Create enum 'NoSuchType' @@ -6,7 +6,7 @@ // ACTION: Create type alias 'NoSuchType' // ACTION: Remove explicit lambda parameter types (may break code) // ACTION: Create type parameter 'NoSuchType' in function 'foo' -// ERROR: Type mismatch: inferred type is ([ERROR : NoSuchType]) -> Int but Int was expected +// ERROR: Type mismatch: inferred type is (x: [ERROR : NoSuchType]) -> Int but Int was expected // ERROR: Unresolved reference: NoSuchType fun foo(): Int { diff --git a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/deeplyLocalFun.kt b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/deeplyLocalFun.kt index 1203a5861dc..b7c5f54310e 100644 --- a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/deeplyLocalFun.kt +++ b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/deeplyLocalFun.kt @@ -1,7 +1,7 @@ // OPTIONS: true, false, false, false, true, false // PARAM_DESCRIPTOR: local final fun baz(m: kotlin.Int): kotlin.Int defined in foo.bar // PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo -// PARAM_TYPES: (kotlin.Int) -> kotlin.Int +// PARAM_TYPES: (m: kotlin.Int) -> kotlin.Int // PARAM_TYPES: kotlin.Int // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/deeplyLocalFun.kt.after b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/deeplyLocalFun.kt.after index eae8c1b1173..4152e56abf6 100644 --- a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/deeplyLocalFun.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/deeplyLocalFun.kt.after @@ -1,7 +1,7 @@ // OPTIONS: true, false, false, false, true, false // PARAM_DESCRIPTOR: local final fun baz(m: kotlin.Int): kotlin.Int defined in foo.bar // PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo -// PARAM_TYPES: (kotlin.Int) -> kotlin.Int +// PARAM_TYPES: (m: kotlin.Int) -> kotlin.Int // PARAM_TYPES: kotlin.Int // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFun.kt b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFun.kt index c6025c81add..d697bb1b68c 100644 --- a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFun.kt +++ b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFun.kt @@ -1,7 +1,7 @@ // OPTIONS: true, false, false, false, true, false // PARAM_DESCRIPTOR: local final fun kotlin.Int.bar(m: kotlin.Int): kotlin.Int defined in foo // PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo -// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> kotlin.Int +// PARAM_TYPES: kotlin.Int.(m: kotlin.Int) -> kotlin.Int // PARAM_TYPES: kotlin.Int fun foo(n: Int): Int { fun Int.bar(m: Int) = this * m * n diff --git a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFun.kt.after b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFun.kt.after index 8bffcd717b5..46b76e45a7c 100644 --- a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFun.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFun.kt.after @@ -1,7 +1,7 @@ // OPTIONS: true, false, false, false, true, false // PARAM_DESCRIPTOR: local final fun kotlin.Int.bar(m: kotlin.Int): kotlin.Int defined in foo // PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo -// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> kotlin.Int +// PARAM_TYPES: kotlin.Int.(m: kotlin.Int) -> kotlin.Int // PARAM_TYPES: kotlin.Int fun foo(n: Int): Int { fun Int.bar(m: Int) = this * m * n diff --git a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunChainedCalls.kt b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunChainedCalls.kt index 11b27028696..781d5a4dc61 100644 --- a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunChainedCalls.kt +++ b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunChainedCalls.kt @@ -2,8 +2,8 @@ // PARAM_DESCRIPTOR: local final fun kotlin.Int.bar1(m: kotlin.Int): kotlin.Int defined in foo // PARAM_DESCRIPTOR: local final fun kotlin.Int.bar2(m: kotlin.Int): kotlin.Int defined in foo // PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo -// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> kotlin.Int -// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> kotlin.Int +// PARAM_TYPES: kotlin.Int.(m: kotlin.Int) -> kotlin.Int +// PARAM_TYPES: kotlin.Int.(m: kotlin.Int) -> kotlin.Int // PARAM_TYPES: kotlin.Int fun foo(n: Int): Int { fun Int.bar1(m: Int) = this + m + n diff --git a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunChainedCalls.kt.after b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunChainedCalls.kt.after index 456437fd651..e490a1ecb7e 100644 --- a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunChainedCalls.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunChainedCalls.kt.after @@ -2,8 +2,8 @@ // PARAM_DESCRIPTOR: local final fun kotlin.Int.bar1(m: kotlin.Int): kotlin.Int defined in foo // PARAM_DESCRIPTOR: local final fun kotlin.Int.bar2(m: kotlin.Int): kotlin.Int defined in foo // PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo -// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> kotlin.Int -// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> kotlin.Int +// PARAM_TYPES: kotlin.Int.(m: kotlin.Int) -> kotlin.Int +// PARAM_TYPES: kotlin.Int.(m: kotlin.Int) -> kotlin.Int // PARAM_TYPES: kotlin.Int fun foo(n: Int): Int { fun Int.bar1(m: Int) = this + m + n diff --git a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunInfixCall.kt b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunInfixCall.kt index a450f9ea46b..d3134b8daa0 100644 --- a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunInfixCall.kt +++ b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunInfixCall.kt @@ -1,7 +1,7 @@ // OPTIONS: true, false, false, false, true, false // PARAM_DESCRIPTOR: local final fun kotlin.Int.bar(m: kotlin.Int): kotlin.Int defined in foo // PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo -// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> kotlin.Int +// PARAM_TYPES: kotlin.Int.(m: kotlin.Int) -> kotlin.Int // PARAM_TYPES: kotlin.Int fun foo(n: Int): Int { fun Int.bar(m: Int) = this * m * n diff --git a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunInfixCall.kt.after b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunInfixCall.kt.after index 5aceb00d383..879dde1632e 100644 --- a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunInfixCall.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunInfixCall.kt.after @@ -1,7 +1,7 @@ // OPTIONS: true, false, false, false, true, false // PARAM_DESCRIPTOR: local final fun kotlin.Int.bar(m: kotlin.Int): kotlin.Int defined in foo // PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo -// PARAM_TYPES: kotlin.Int.(kotlin.Int) -> kotlin.Int +// PARAM_TYPES: kotlin.Int.(m: kotlin.Int) -> kotlin.Int // PARAM_TYPES: kotlin.Int fun foo(n: Int): Int { fun Int.bar(m: Int) = this * m * n diff --git a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localFun.kt b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localFun.kt index 4a9c510955e..0ebb67a78ca 100644 --- a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localFun.kt +++ b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localFun.kt @@ -1,7 +1,7 @@ // OPTIONS: true, false, false, false, true, false // PARAM_DESCRIPTOR: local final fun bar(m: kotlin.Int): kotlin.Int defined in foo // PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo -// PARAM_TYPES: (kotlin.Int) -> kotlin.Int +// PARAM_TYPES: (m: kotlin.Int) -> kotlin.Int // PARAM_TYPES: kotlin.Int fun foo(n: Int): Int { fun bar(m: Int) = m * n diff --git a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localFun.kt.after b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localFun.kt.after index cbf616099f1..903fb54a5f1 100644 --- a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localFun.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localFun.kt.after @@ -1,7 +1,7 @@ // OPTIONS: true, false, false, false, true, false // PARAM_DESCRIPTOR: local final fun bar(m: kotlin.Int): kotlin.Int defined in foo // PARAM_DESCRIPTOR: value-parameter n: kotlin.Int defined in foo -// PARAM_TYPES: (kotlin.Int) -> kotlin.Int +// PARAM_TYPES: (m: kotlin.Int) -> kotlin.Int // PARAM_TYPES: kotlin.Int fun foo(n: Int): Int { fun bar(m: Int) = m * n