From 7f0063013c44da44f9815fad9032b849d255d561 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Thu, 15 Sep 2016 22:24:52 +0300 Subject: [PATCH] Corrected test data --- .../diagnostics/tests/FunctionParameterWithoutType.txt | 4 ++-- .../tests/functionAsExpression/MissingParameterTypes.txt | 2 +- .../diagnostics/tests/functionLiterals/kt11733_1.txt | 2 +- .../diagnosticWithSyntaxError/funcitonTypes.txt | 4 ++-- .../diagnosticWithSyntaxError/typeReferenceError.txt | 4 ++-- .../diagnostics/tests/j+k/computeIfAbsentConcurrent.txt | 4 ++-- .../tests/j+k/overrideWithSamAndTypeParameter.txt | 2 +- .../tests/j+k/samByProjectedType/genericInReturnType.txt | 6 +++--- .../j+k/samByProjectedType/genericInValueParameter.txt | 6 +++--- .../tests/j+k/samByProjectedType/genericSuperWildcard.txt | 4 ++-- .../noAdapterBecuaseOfRecursiveUpperBound.txt | 2 +- .../samByProjectedType/starProjectionComplexUpperBound.txt | 4 ++-- .../tests/platformTypes/noAnnotationInClassPath.txt | 4 ++-- .../notNullTypeParameter/enhancementFromAnnotation.txt | 2 +- .../diagnostics/tests/platformTypes/rawTypes/samRaw.txt | 2 +- .../typeEnhancement/saveAnnotationAfterSubstitution.txt | 2 +- .../syntheticExtensions/samAdapters/InnerClassInGeneric.txt | 2 +- .../diagnostics/tests/typealias/typeAliasNotNull.txt | 4 ++-- .../parameters/capturedFunctions/deeplyLocalFun.kt.after | 2 +- .../parameters/capturedFunctions/localExtensionFun.kt.after | 2 +- .../localExtensionFunChainedCalls.kt.after | 2 +- .../capturedFunctions/localExtensionFunInfixCall.kt.after | 2 +- .../parameters/capturedFunctions/localFun.kt.after | 2 +- 23 files changed, 35 insertions(+), 35 deletions(-) diff --git a/compiler/testData/diagnostics/tests/FunctionParameterWithoutType.txt b/compiler/testData/diagnostics/tests/FunctionParameterWithoutType.txt index 8b688e318d6..5221f303765 100644 --- a/compiler/testData/diagnostics/tests/FunctionParameterWithoutType.txt +++ b/compiler/testData/diagnostics/tests/FunctionParameterWithoutType.txt @@ -1,7 +1,7 @@ package -public val bar: (a: ???) -> kotlin.Unit -public val la: (a: ???) -> kotlin.Unit +public val bar: (???) -> kotlin.Unit +public val la: (???) -> 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 diff --git a/compiler/testData/diagnostics/tests/functionAsExpression/MissingParameterTypes.txt b/compiler/testData/diagnostics/tests/functionAsExpression/MissingParameterTypes.txt index 8686f63d8a0..71ed7191524 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: (x: ???) -> ??? +public val a: (???) -> ??? 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/functionLiterals/kt11733_1.txt b/compiler/testData/diagnostics/tests/functionLiterals/kt11733_1.txt index 438c7c3362b..489de746eb3 100644 --- a/compiler/testData/diagnostics/tests/functionLiterals/kt11733_1.txt +++ b/compiler/testData/diagnostics/tests/functionLiterals/kt11733_1.txt @@ -1,6 +1,6 @@ package -public /*synthesized*/ fun Predicate(/*0*/ function: (t: @kotlin.ParameterName(name = "t") T) -> kotlin.Boolean): Predicate +public /*synthesized*/ fun Predicate(/*0*/ function: (t: T) -> kotlin.Boolean): Predicate public fun main(/*0*/ args: kotlin.Array): kotlin.Unit public fun process(/*0*/ x: Predicate): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funcitonTypes.txt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funcitonTypes.txt index 9bccfbba559..7aa1cdcece7 100644 --- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funcitonTypes.txt +++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funcitonTypes.txt @@ -1,9 +1,9 @@ package -public final class A : (categoryName: [ERROR : No type element]) -> [ERROR : No type element] { +public final class A : ([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 - public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ categoryName: [ERROR : No type element]): [ERROR : No type element] + public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: [ERROR : No type element]): [ERROR : No type element] public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/typeReferenceError.txt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/typeReferenceError.txt index 97e4554e8e1..bc042c02228 100644 --- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/typeReferenceError.txt +++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/typeReferenceError.txt @@ -2,11 +2,11 @@ package package typeReferenceError { - public final class Pair : (c: [ERROR : No type element]) -> [ERROR : main] { + public final class Pair : ([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 - public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ c: [ERROR : No type element]): [ERROR : main] + public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: [ERROR : No type element]): [ERROR : main] public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } } diff --git a/compiler/testData/diagnostics/tests/j+k/computeIfAbsentConcurrent.txt b/compiler/testData/diagnostics/tests/j+k/computeIfAbsentConcurrent.txt index 507ef116c71..f8e3bf0547c 100644 --- a/compiler/testData/diagnostics/tests/j+k/computeIfAbsentConcurrent.txt +++ b/compiler/testData/diagnostics/tests/j+k/computeIfAbsentConcurrent.txt @@ -1,7 +1,7 @@ package -public /*synthesized*/ fun ConcMap(/*0*/ function: (key: @kotlin.ParameterName(name = "key") K!, MyFunc!) -> V!): ConcMap -public /*synthesized*/ fun MyFunc(/*0*/ function: (String: @kotlin.ParameterName(name = "String") K!) -> V!): MyFunc +public /*synthesized*/ fun ConcMap(/*0*/ function: (key: K!, mappingFunction: MyFunc!) -> V!): ConcMap +public /*synthesized*/ fun MyFunc(/*0*/ function: (String: K!) -> V!): MyFunc public fun concurrentMap(): kotlin.Unit public open class ConcHashMap : ConcMap { diff --git a/compiler/testData/diagnostics/tests/j+k/overrideWithSamAndTypeParameter.txt b/compiler/testData/diagnostics/tests/j+k/overrideWithSamAndTypeParameter.txt index 4a615dbe8a0..f69f21d5053 100644 --- a/compiler/testData/diagnostics/tests/j+k/overrideWithSamAndTypeParameter.txt +++ b/compiler/testData/diagnostics/tests/j+k/overrideWithSamAndTypeParameter.txt @@ -1,6 +1,6 @@ package -public /*synthesized*/ fun A(/*0*/ function: (key: @kotlin.ParameterName(name = "key") K!, MyFunc!) -> K!): A +public /*synthesized*/ fun A(/*0*/ function: (key: K!, f: MyFunc!) -> K!): A public /*synthesized*/ fun MyFunc(/*0*/ function: (x: kotlin.String!) -> kotlin.String!): MyFunc public fun main(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/j+k/samByProjectedType/genericInReturnType.txt b/compiler/testData/diagnostics/tests/j+k/samByProjectedType/genericInReturnType.txt index 0ad00294c80..f0e60980aa2 100644 --- a/compiler/testData/diagnostics/tests/j+k/samByProjectedType/genericInReturnType.txt +++ b/compiler/testData/diagnostics/tests/j+k/samByProjectedType/genericInReturnType.txt @@ -1,6 +1,6 @@ package -public /*synthesized*/ fun EventListener(/*0*/ function: (kotlin.String!) -> E!): EventListener +public /*synthesized*/ fun EventListener(/*0*/ function: (x: kotlin.String!) -> E!): EventListener public fun main(): kotlin.Unit public open class A { @@ -11,9 +11,9 @@ public open class A { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members - public final /*synthesized*/ fun bar(/*0*/ l: ((kotlin.String!) -> kotlin.Any!)!): kotlin.Unit + public final /*synthesized*/ fun bar(/*0*/ l: ((x: kotlin.String!) -> kotlin.Any!)!): kotlin.Unit public open fun bar(/*0*/ l: EventListener<*>!): kotlin.Unit - public final /*synthesized*/ fun baz(/*0*/ l: ((kotlin.String!) -> kotlin.CharSequence!)!): kotlin.Unit + public final /*synthesized*/ fun baz(/*0*/ l: ((x: kotlin.String!) -> kotlin.CharSequence!)!): kotlin.Unit public open fun baz(/*0*/ l: EventListener!): kotlin.Unit } diff --git a/compiler/testData/diagnostics/tests/j+k/samByProjectedType/genericInValueParameter.txt b/compiler/testData/diagnostics/tests/j+k/samByProjectedType/genericInValueParameter.txt index 1320cc0ea42..b269406c1a9 100644 --- a/compiler/testData/diagnostics/tests/j+k/samByProjectedType/genericInValueParameter.txt +++ b/compiler/testData/diagnostics/tests/j+k/samByProjectedType/genericInValueParameter.txt @@ -1,6 +1,6 @@ package -public /*synthesized*/ fun EventListener(/*0*/ function: (e: @kotlin.ParameterName(name = "e") E!) -> kotlin.Unit): EventListener +public /*synthesized*/ fun EventListener(/*0*/ function: (e: E!) -> kotlin.Unit): EventListener public fun main(): kotlin.Unit public open class A { @@ -11,9 +11,9 @@ public open class A { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members - public final /*synthesized*/ fun bar(/*0*/ l: ((e: @kotlin.ParameterName(name = "e") kotlin.Any!) -> kotlin.Unit)!): kotlin.Unit + public final /*synthesized*/ fun bar(/*0*/ l: ((e: kotlin.Any!) -> kotlin.Unit)!): kotlin.Unit public open fun bar(/*0*/ l: EventListener<*>!): kotlin.Unit - public final /*synthesized*/ fun baz(/*0*/ l: ((e: @kotlin.ParameterName(name = "e") kotlin.CharSequence!) -> kotlin.Unit)!): kotlin.Unit + public final /*synthesized*/ fun baz(/*0*/ l: ((e: kotlin.CharSequence!) -> kotlin.Unit)!): kotlin.Unit public open fun baz(/*0*/ l: EventListener!): kotlin.Unit } diff --git a/compiler/testData/diagnostics/tests/j+k/samByProjectedType/genericSuperWildcard.txt b/compiler/testData/diagnostics/tests/j+k/samByProjectedType/genericSuperWildcard.txt index c05b1a7629c..e5675b5a629 100644 --- a/compiler/testData/diagnostics/tests/j+k/samByProjectedType/genericSuperWildcard.txt +++ b/compiler/testData/diagnostics/tests/j+k/samByProjectedType/genericSuperWildcard.txt @@ -1,6 +1,6 @@ package -public /*synthesized*/ fun EventListener(/*0*/ function: (e: @kotlin.ParameterName(name = "e") E!) -> kotlin.Unit): EventListener +public /*synthesized*/ fun EventListener(/*0*/ function: (e: E!) -> kotlin.Unit): EventListener public fun main(): kotlin.Unit public open class A { @@ -11,7 +11,7 @@ public open class A { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members - public final /*synthesized*/ fun bar(/*0*/ l: ((e: @kotlin.ParameterName(name = "e") kotlin.String!) -> kotlin.Unit)!): kotlin.Unit + public final /*synthesized*/ fun bar(/*0*/ l: ((e: kotlin.String!) -> kotlin.Unit)!): kotlin.Unit public open fun bar(/*0*/ l: EventListener!): kotlin.Unit } diff --git a/compiler/testData/diagnostics/tests/j+k/samByProjectedType/noAdapterBecuaseOfRecursiveUpperBound.txt b/compiler/testData/diagnostics/tests/j+k/samByProjectedType/noAdapterBecuaseOfRecursiveUpperBound.txt index b74a97bbaf4..b62786caa6f 100644 --- a/compiler/testData/diagnostics/tests/j+k/samByProjectedType/noAdapterBecuaseOfRecursiveUpperBound.txt +++ b/compiler/testData/diagnostics/tests/j+k/samByProjectedType/noAdapterBecuaseOfRecursiveUpperBound.txt @@ -1,6 +1,6 @@ package -public /*synthesized*/ fun !> Function(/*0*/ function: (f: @kotlin.ParameterName(name = "f") F!) -> E!): Function +public /*synthesized*/ fun !> Function(/*0*/ function: (f: F!) -> E!): Function public fun main(): kotlin.Unit public open class A { diff --git a/compiler/testData/diagnostics/tests/j+k/samByProjectedType/starProjectionComplexUpperBound.txt b/compiler/testData/diagnostics/tests/j+k/samByProjectedType/starProjectionComplexUpperBound.txt index 743e37dd352..351d461d23b 100644 --- a/compiler/testData/diagnostics/tests/j+k/samByProjectedType/starProjectionComplexUpperBound.txt +++ b/compiler/testData/diagnostics/tests/j+k/samByProjectedType/starProjectionComplexUpperBound.txt @@ -1,6 +1,6 @@ package -public /*synthesized*/ fun !, /*1*/ F : kotlin.CharSequence!> Function(/*0*/ function: (e: @kotlin.ParameterName(name = "e") E!) -> F!): Function +public /*synthesized*/ fun !, /*1*/ F : kotlin.CharSequence!> Function(/*0*/ function: (e: E!) -> F!): Function public fun main(): kotlin.Unit public open class A { @@ -11,7 +11,7 @@ public open class A { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members - public final /*synthesized*/ fun bar(/*0*/ l: ((e: (@kotlin.ParameterName(name = "e") kotlin.collections.MutableMap..@kotlin.ParameterName(name = "e") kotlin.collections.Map?)) -> kotlin.CharSequence!)!): kotlin.Unit + public final /*synthesized*/ fun bar(/*0*/ l: ((e: kotlin.collections.(Mutable)Map!) -> kotlin.CharSequence!)!): kotlin.Unit public open fun bar(/*0*/ l: Function<*, *>!): kotlin.Unit } diff --git a/compiler/testData/diagnostics/tests/platformTypes/noAnnotationInClassPath.txt b/compiler/testData/diagnostics/tests/platformTypes/noAnnotationInClassPath.txt index 417db12bd4d..bc1b522b3f0 100644 --- a/compiler/testData/diagnostics/tests/platformTypes/noAnnotationInClassPath.txt +++ b/compiler/testData/diagnostics/tests/platformTypes/noAnnotationInClassPath.txt @@ -1,6 +1,6 @@ package -public /*synthesized*/ fun A(/*0*/ function: (y: @kotlin.ParameterName(name = "y") T?) -> kotlin.Boolean): A +public /*synthesized*/ fun A(/*0*/ function: (y: T?) -> kotlin.Boolean): A public fun test(): kotlin.Unit public interface A { @@ -17,6 +17,6 @@ public open class B { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members - public final /*synthesized*/ fun bar(/*0*/ y: ((y: @kotlin.ParameterName(name = "y") kotlin.String?) -> kotlin.Boolean)!): kotlin.Unit + public final /*synthesized*/ fun bar(/*0*/ y: ((y: kotlin.String?) -> kotlin.Boolean)!): kotlin.Unit public open fun bar(/*0*/ y: A!): kotlin.Unit } diff --git a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/enhancementFromAnnotation.txt b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/enhancementFromAnnotation.txt index 40ae7acd99f..700b5808e8e 100644 --- a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/enhancementFromAnnotation.txt +++ b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/enhancementFromAnnotation.txt @@ -1,6 +1,6 @@ package -public /*synthesized*/ fun A(/*0*/ function: (x: @kotlin.ParameterName(name = "x") T) -> kotlin.Unit): A +public /*synthesized*/ fun A(/*0*/ function: (x: T) -> kotlin.Unit): A public fun test(): kotlin.Unit public interface A { diff --git a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/samRaw.txt b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/samRaw.txt index 53f25a7d165..bc93a7ab0fa 100644 --- a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/samRaw.txt +++ b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/samRaw.txt @@ -1,6 +1,6 @@ package -public /*synthesized*/ fun A(/*0*/ function: (t: @kotlin.ParameterName(name = "t") T!) -> kotlin.Boolean): A +public /*synthesized*/ fun A(/*0*/ function: (t: T!) -> kotlin.Boolean): A public fun main(): kotlin.Unit public interface A { diff --git a/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/saveAnnotationAfterSubstitution.txt b/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/saveAnnotationAfterSubstitution.txt index 3cc0621fb0c..a34199dac09 100644 --- a/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/saveAnnotationAfterSubstitution.txt +++ b/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/saveAnnotationAfterSubstitution.txt @@ -1,6 +1,6 @@ package -public /*synthesized*/ fun A(/*0*/ function: (x: @kotlin.ParameterName(name = "x") T, y: @kotlin.ParameterName(name = "y") T?) -> kotlin.Unit): A +public /*synthesized*/ fun A(/*0*/ function: (x: T, y: T?) -> kotlin.Unit): A 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 diff --git a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/InnerClassInGeneric.txt b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/InnerClassInGeneric.txt index 4df33c56b7a..e963c4cec3b 100644 --- a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/InnerClassInGeneric.txt +++ b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/InnerClassInGeneric.txt @@ -17,5 +17,5 @@ public open class JavaClass { } // Static members - public final /*synthesized*/ fun Inner(/*0*/ function: (t: T!, x: @kotlin.ParameterName(name = "x") X!, java.lang.Runnable!) -> T!): JavaClass.Inner + public final /*synthesized*/ fun Inner(/*0*/ function: (t: T!, x: X!, runnable: java.lang.Runnable!) -> T!): JavaClass.Inner } diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasNotNull.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasNotNull.txt index 825cc83f9bb..15f524f63e6 100644 --- a/compiler/testData/diagnostics/tests/typealias/typeAliasNotNull.txt +++ b/compiler/testData/diagnostics/tests/typealias/typeAliasNotNull.txt @@ -1,5 +1,5 @@ package -public fun x(/*0*/ handler: Handler /* = (kotlin.String) -> Processor? /* = ((kotlin.Int) -> kotlin.Unit)? */ */): kotlin.Unit +public fun x(/*0*/ handler: Handler /* = (kotlin.String) -> Processor? /* = ((number: kotlin.Int) -> kotlin.Unit)? */ */): kotlin.Unit public typealias Handler = (kotlin.String) -> Processor? -public typealias Processor = (kotlin.Int) -> kotlin.Unit +public typealias Processor = (number: kotlin.Int) -> kotlin.Unit diff --git a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/deeplyLocalFun.kt.after b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/deeplyLocalFun.kt.after index 4152e56abf6..1c80f2bdaa3 100644 --- a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/deeplyLocalFun.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/deeplyLocalFun.kt.after @@ -15,4 +15,4 @@ fun foo(n: Int): Int { return bar() } -private fun i(baz: (Int) -> Int, n: Int) = baz(n + 1) \ No newline at end of file +private fun i(baz: (m: Int) -> Int, n: Int) = baz(n + 1) \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFun.kt.after b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFun.kt.after index 46b76e45a7c..34c521c84c6 100644 --- a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFun.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFun.kt.after @@ -9,4 +9,4 @@ fun foo(n: Int): Int { return i(Int::bar, n) } -private fun i(bar: Int.(Int) -> Int, n: Int) = n.bar(n + 1) \ No newline at end of file +private fun i(bar: Int.(m: Int) -> Int, n: Int) = n.bar(n + 1) \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunChainedCalls.kt.after b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunChainedCalls.kt.after index e490a1ecb7e..4fd6934045c 100644 --- a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunChainedCalls.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunChainedCalls.kt.after @@ -12,4 +12,4 @@ fun foo(n: Int): Int { return i(Int::bar1, Int::bar2, n) } -private fun i(bar1: Int.(Int) -> Int, bar2: Int.(Int) -> Int, n: Int) = n.bar1(n + 1).bar2(n + 2) \ No newline at end of file +private fun i(bar1: Int.(m: Int) -> Int, bar2: Int.(m: Int) -> Int, n: Int) = n.bar1(n + 1).bar2(n + 2) \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunInfixCall.kt.after b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunInfixCall.kt.after index 879dde1632e..31f3c38e2e8 100644 --- a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunInfixCall.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunInfixCall.kt.after @@ -9,4 +9,4 @@ fun foo(n: Int): Int { return i(Int::bar, n) } -private fun i(bar: Int.(Int) -> Int, n: Int) = n bar (n + 1) \ No newline at end of file +private fun i(bar: Int.(m: Int) -> Int, n: Int) = n bar (n + 1) \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localFun.kt.after b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localFun.kt.after index 903fb54a5f1..802abc4db4f 100644 --- a/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localFun.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localFun.kt.after @@ -9,4 +9,4 @@ fun foo(n: Int): Int { return i(::bar, n) } -private fun i(bar: (Int) -> Int, n: Int) = bar(n + 1) \ No newline at end of file +private fun i(bar: (m: Int) -> Int, n: Int) = bar(n + 1) \ No newline at end of file