Migrate testdata to new lambda syntax

This commit is contained in:
Stanislav Erokhin
2015-04-03 13:40:07 +03:00
parent b703f59e04
commit 3de0dff575
134 changed files with 263 additions and 277 deletions
@@ -2,11 +2,11 @@ package test
class FunctionTypes {
public fun<IP, R, P1> Function1<IP, R>.compose(f: (P1) -> IP): (P1) -> R {
return {(p1: P1) -> this(f(p1)) }
return { p1: P1 -> this(f(p1)) }
}
public fun<IP, R, P1> ((IP) -> R).compose2(f: (P1) -> IP) : (P1) -> R {
return {(p1: P1) -> this(f(p1)) }
return { p1: P1 -> this(f(p1)) }
}
public fun <A> (A.(A) -> A).foo() {
@@ -1,6 +1,6 @@
// IS_APPLICABLE: false
val foo = {(<caret>s: String, n: Int) -> s.length() - n/2 > 1 }
val foo = { <caret>s: String, n: Int -> s.length() - n/2 > 1 }
fun test() {
foo("1", 2)
@@ -4,5 +4,5 @@ class Mocha() {
}
fun main() {
val mocha = Mocha()
val testing = mocha<caret>(1, "fire"){ (x: Int) -> "hello world" }
val testing = mocha<caret>(1, "fire"){ x: Int -> "hello world" }
}
@@ -4,5 +4,5 @@ class Mocha() {
}
fun main() {
val mocha = Mocha()
val testing = mocha.invoke(1, "fire"){ (x: Int) -> "hello world" }
val testing = mocha.invoke(1, "fire"){ x: Int -> "hello world" }
}
@@ -3,5 +3,5 @@ class Mocha() {
}
fun main() {
val mocha = Mocha()
val testing = mocha<caret>{ (x: Int) -> "hello world" }
val testing = mocha<caret>{ x: Int -> "hello world" }
}
@@ -3,5 +3,5 @@ class Mocha() {
}
fun main() {
val mocha = Mocha()
val testing = mocha.invoke{ (x: Int) -> "hello world" }
val testing = mocha.invoke{ x: Int -> "hello world" }
}
@@ -1,6 +1,6 @@
// WITH_RUNTIME
// IS_APPLICABLE: false
fun foo() {
val bar = { (x: Int) -> x + 1 }
val bar = { x: Int -> x + 1 }
val incremented = listOf(1, 2, 3).<caret>map(bar)
}
@@ -1,6 +1,6 @@
// IS_APPLICABLE: true
fun foo() {
bar<caret><(Int) -> Int> { (it: Int) -> it }
bar<caret><(Int) -> Int> { it: Int -> it }
}
fun bar<T>(t: T): Int = 1
@@ -1,6 +1,6 @@
// IS_APPLICABLE: true
fun foo() {
bar { (it: Int) -> it }
bar { it: Int -> it }
}
fun bar<T>(t: T): Int = 1
@@ -1,6 +1,6 @@
// IS_APPLICABLE: false
val foo = { (x: Int) ->
val foo = { x: Int ->
class Inner() {
fun temp(<caret>y: Int) : Int { return x + y }
}
@@ -1,2 +1,2 @@
// IS_APPLICABLE: false
val incr = { (<caret>x: Int) -> x + 1}
val incr = { <caret>x: Int -> x + 1}
@@ -1 +1 @@
val x<caret> = { (a: Int) -> ""}
val x<caret> = { a: Int -> ""}
@@ -1 +1 @@
val x: (Int) -> String = { (a: Int) -> ""}
val x: (Int) -> String = { a: Int -> ""}
@@ -6,6 +6,6 @@ import java.util.Comparator
fun foo() {
Collections.sort(
ArrayList<Int>(),
<caret>Comparator {(x: Int, y: Int) -> x - y }
<caret>Comparator { x: Int, y: Int -> x - y }
)
}
@@ -5,6 +5,6 @@ import java.util.ArrayList
fun foo() {
Collections.sort(
ArrayList<Int>(),
<caret>Comparator {(x: Int, y: Int) -> x - y }
<caret>Comparator { x: Int, y: Int -> x - y }
)
}
@@ -1,7 +1,7 @@
// "Create class 'Foo'" "true"
fun test() {
val a = Foo(2, "2") { (p: Int) -> p + 1 }
val a = Foo(2, "2") { p: Int -> p + 1 }
}
class Foo(i: Int, s: String, function: Function1<Int, Int>) {
@@ -1,7 +1,7 @@
// "Create class 'Foo'" "true"
fun test() {
val a = Foo { (p: Int) -> p + 1 }
val a = Foo { p: Int -> p + 1 }
}
class Foo(function: Function1<Int, Int>) {
@@ -1,5 +1,5 @@
// "Create class 'Foo'" "true"
fun test() {
val a = <caret>Foo(2, "2") { (p: Int) -> p + 1 }
val a = <caret>Foo(2, "2") { p: Int -> p + 1 }
}
@@ -1,5 +1,5 @@
// "Create class 'Foo'" "true"
fun test() {
val a = <caret>Foo { (p: Int) -> p + 1 }
val a = <caret>Foo { p: Int -> p + 1 }
}
@@ -8,5 +8,5 @@ class A<T>(val n: T) {
}
fun test() {
val a: A<Int> = A(1).foo(2, "2") { (p: Int) -> p + 1 }
val a: A<Int> = A(1).foo(2, "2") { p: Int -> p + 1 }
}
@@ -8,5 +8,5 @@ class A<T>(val n: T) {
}
fun test() {
val a: A<Int> = A(1).foo { (p: Int) -> p + 1 }
val a: A<Int> = A(1).foo { p: Int -> p + 1 }
}
@@ -5,5 +5,5 @@ class A<T>(val n: T) {
}
fun test() {
val a: A<Int> = A(1).<caret>foo(2, "2") { (p: Int) -> p + 1 }
val a: A<Int> = A(1).<caret>foo(2, "2") { p: Int -> p + 1 }
}
@@ -5,5 +5,5 @@ class A<T>(val n: T) {
}
fun test() {
val a: A<Int> = A(1).<caret>foo { (p: Int) -> p + 1 }
val a: A<Int> = A(1).<caret>foo { p: Int -> p + 1 }
}
@@ -2,7 +2,7 @@
// ACTION: Create parameter 'foo'
fun test(n: Int) {
val f: (Int, Int) -> Int = { (a, b) ->
val f: (Int, Int) -> Int = { a, b ->
val foo = 0
foo
}
@@ -2,7 +2,7 @@
// ACTION: Create parameter 'foo'
fun test(n: Int) {
val f: (Int, Int) -> Int = { (a, b) ->
val f: (Int, Int) -> Int = { a, b ->
val foo = 0
foo
}
@@ -2,5 +2,5 @@
// ACTION: Create parameter 'foo'
fun test(n: Int) {
val f: (Int, Int) -> Int = { (a, b) -> <caret>foo }
val f: (Int, Int) -> Int = { a, b -> <caret>foo }
}
@@ -2,7 +2,7 @@
// ACTION: Create parameter 'foo'
fun test(n: Int) {
val f: (Int, Int) -> Int = { (a, b) ->
val f: (Int, Int) -> Int = { a, b ->
<caret>foo
}
}
@@ -2,5 +2,5 @@
// ACTION: Create local variable 'foo'
fun test(n: Int, foo: Int) {
val f: (Int, Int) -> Int = { (a, b) -> foo }
val f: (Int, Int) -> Int = { a, b -> foo }
}
@@ -2,5 +2,5 @@
// ACTION: Create local variable 'foo'
fun test(n: Int, foo: Any) {
val f = { (a: Int, b: Int) -> foo }
val f = { a: Int, b: Int -> foo }
}
@@ -2,5 +2,5 @@
// ACTION: Create local variable 'foo'
fun test(n: Int) {
val f: (Int, Int) -> Int = { (a, b) -> <caret>foo }
val f: (Int, Int) -> Int = { a, b -> <caret>foo }
}
@@ -2,5 +2,5 @@
// ACTION: Create local variable 'foo'
fun test(n: Int) {
val f = { (a: Int, b: Int) -> <caret>foo }
val f = { a: Int, b: Int -> <caret>foo }
}
@@ -1,5 +1,5 @@
// "Change parameter 'x' type of function 'bar.foo' to '(String) -> Int'" "true"
package bar
fun foo(w: Int = 0, x: (String) -> Int, y: Int = 0, z: (Int) -> Int = {42}) {
foo(1, {(a: String) -> 42}<caret>, 1)
foo(1, { a: String -> 42}<caret>, 1)
}
@@ -4,5 +4,5 @@ package bar
import kotlin.modules.Module
fun foo(w: Int = 0, x: (Module) -> Int, y: Int = 0, z: (Int) -> Int = {42}) {
foo(1, {(a: kotlin.modules.Module) -> 42}<caret>, 1)
foo(1, { a: kotlin.modules.Module -> 42}<caret>, 1)
}
@@ -1,5 +1,5 @@
// "Change parameter 'x' type of function 'bar.foo' to '(String) -> Int'" "true"
package bar
fun foo(w: Int = 0, x: Int, y: Int = 0, z: (Int) -> Int = {42}) {
foo(1, {(a: String) -> 42}<caret>, 1)
foo(1, { a: String -> 42}<caret>, 1)
}
@@ -1,5 +1,5 @@
// "Change parameter 'x' type of function 'bar.foo' to '(Module) -> Int'" "true"
package bar
fun foo(w: Int = 0, x: Int, y: Int = 0, z: (Int) -> Int = {42}) {
foo(1, {(a: kotlin.modules.Module) -> 42}<caret>, 1)
foo(1, { a: kotlin.modules.Module -> 42}<caret>, 1)
}
@@ -4,6 +4,6 @@ import java.util.ArrayList
fun foo() {
Collections.sort(
ArrayList<Int>(),
<selection>java.util.Comparator</selection> {(x: Int, y: Int) -> x - y }
<selection>java.util.Comparator</selection> { x: Int, y: Int -> x - y }
)
}
@@ -5,6 +5,6 @@ import java.util.Comparator
fun foo() {
Collections.sort(
ArrayList<Int>(),
Comparator {(x: Int, y: Int) -> x - y }
Comparator { x: Int, y: Int -> x - y }
)
}
@@ -1,23 +1,23 @@
fun foo(f: (Int) -> Unit) {
<selection>{ (n: Int, s: String) ->
<selection>{ n: Int, s: String ->
val a = n + 1
println(s)
f(a)
}</selection>
{ (s: String, n: Int) ->
{ s: String, n: Int ->
val a = n + 1
println(s)
f(a)
}
{ (m: Int, r: String) ->
{ m: Int, r: String ->
val b = m + 1
println(r)
f(b)
}
val g: (Int, String) -> Unit = { (a, b) ->
val g: (Int, String) -> Unit = { a, b ->
val m = a + 1
println(b)
f(m)
@@ -1,16 +1,16 @@
{ (n: Int, s: String) ->
{ n: Int, s: String ->
val a = n + 1
println(s)
f(a)
}
{ (m: Int, r: String) ->
{ m: Int, r: String ->
val b = m + 1
println(r)
f(b)
}
{ (a, b) ->
{ a, b ->
val m = a + 1
println(b)
f(m)
@@ -1,5 +1,5 @@
fun foo(f: (Int) -> Unit) {
<selection>{ (n: Int) ->
<selection>{ n: Int ->
val a = n + 1
f(a)
}</selection>
@@ -9,7 +9,7 @@ fun foo(f: (Int) -> Unit) {
f(a)
}
{ (m: Int) ->
{ m: Int ->
val b = m + 1
f(b)
}
@@ -1,4 +1,4 @@
{ (n: Int) ->
{ n: Int ->
val a = n + 1
f(a)
}
@@ -8,7 +8,7 @@
f(a)
}
{ (m: Int) ->
{ m: Int ->
val b = m + 1
f(b)
}
@@ -1,11 +1,11 @@
val a: Function2<Any, Int, String> = { (a, b) -> "" }
val b: kotlin.Function2<kotlin.Any, kotlin.Int, kotlin.String> = { (a, b) -> "" }
val c: <selection>(Any, Int) -> String</selection> = { (a, b) -> "" }
val d: (a: Any, n: Int) -> kotlin.String = { (a, b) -> "" }
val a: Function2<Any, Int, String> = { a, b -> "" }
val b: kotlin.Function2<kotlin.Any, kotlin.Int, kotlin.String> = { a, b -> "" }
val c: <selection>(Any, Int) -> String</selection> = { a, b -> "" }
val d: (a: Any, n: Int) -> kotlin.String = { a, b -> "" }
val e: (String) -> Int = { 0 }
val f: () -> Int = { 0 }
val g: Any.(Int) -> String = { "" }
val h: Int.(Any) -> String = { "" }
val i: ExtensionFunction2<Any, Any, Int, String> = { (a, b) -> "" }
val j: (t: Any, u: Int) -> kotlin.String = {(a, b) -> "" }
val i: ExtensionFunction2<Any, Any, Int, String> = { a, b -> "" }
val j: (t: Any, u: Int) -> kotlin.String = { a, b -> "" }
val k: ExtensionFunction1<Any, Int, String> = { "" }