diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaCallsBehaviour.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaCallsBehaviour.kt index e35ca309feb..ead09c8685f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaCallsBehaviour.kt +++ b/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaCallsBehaviour.kt @@ -38,5 +38,5 @@ data class LambdaCallsBehaviour( get() = KotlinBundle.message("slicer.text.tracking.lambda.calls") override val testPresentationPrefix: String - get() = "[LAMBDA OUT] " + get() = "[LAMBDA CALLS] " } \ No newline at end of file diff --git a/idea/testData/slicer/inflow/anonymousFunBodyExpression.leafGroups.txt b/idea/testData/slicer/inflow/anonymousFunBodyExpression.leafGroups.txt index 4a1658ae8e3..684e3af93f6 100644 --- a/idea/testData/slicer/inflow/anonymousFunBodyExpression.leafGroups.txt +++ b/idea/testData/slicer/inflow/anonymousFunBodyExpression.leafGroups.txt @@ -9,7 +9,7 @@ 8 val x = foo(fun(n: Int) = n) 8 val x = foo(fun(n: Int) = n) 8 val x = foo(fun(n: Int) = n) -8 [LAMBDA OUT] val x = foo(fun(n: Int) = n) -3 [LAMBDA OUT] fun foo(f: (Int) -> Int): Int { +8 [LAMBDA CALLS] val x = foo(fun(n: Int) = n) +3 [LAMBDA CALLS] fun foo(f: (Int) -> Int): Int { 4 return f(1) diff --git a/idea/testData/slicer/inflow/anonymousFunBodyExpression.results.txt b/idea/testData/slicer/inflow/anonymousFunBodyExpression.results.txt index 129a5aad95a..6cda09e4fa1 100644 --- a/idea/testData/slicer/inflow/anonymousFunBodyExpression.results.txt +++ b/idea/testData/slicer/inflow/anonymousFunBodyExpression.results.txt @@ -8,6 +8,6 @@ 8 val x = foo(fun(n: Int) = n) 8 val x = foo(fun(n: Int) = n) 8 val x = foo(fun(n: Int) = n) -8 [LAMBDA OUT] val x = foo(fun(n: Int) = n) -3 [LAMBDA OUT] fun foo(f: (Int) -> Int): Int { +8 [LAMBDA CALLS] val x = foo(fun(n: Int) = n) +3 [LAMBDA CALLS] fun foo(f: (Int) -> Int): Int { 4 return f(1) diff --git a/idea/testData/slicer/inflow/anonymousFunReturnExpression.leafGroups.txt b/idea/testData/slicer/inflow/anonymousFunReturnExpression.leafGroups.txt index 49256ba313b..64453afb1f1 100644 --- a/idea/testData/slicer/inflow/anonymousFunReturnExpression.leafGroups.txt +++ b/idea/testData/slicer/inflow/anonymousFunReturnExpression.leafGroups.txt @@ -9,7 +9,7 @@ 8 val x = foo(fun(n: Int): Int { return n }) 8 val x = foo(fun(n: Int): Int { return n }) 8 val x = foo(fun(n: Int): Int { return n }) -8 [LAMBDA OUT] val x = foo(fun(n: Int): Int { return n }) -3 [LAMBDA OUT] fun foo(f: (Int) -> Int): Int { +8 [LAMBDA CALLS] val x = foo(fun(n: Int): Int { return n }) +3 [LAMBDA CALLS] fun foo(f: (Int) -> Int): Int { 4 return f(1) diff --git a/idea/testData/slicer/inflow/anonymousFunReturnExpression.results.txt b/idea/testData/slicer/inflow/anonymousFunReturnExpression.results.txt index 5176b36b614..95ba8dfb5db 100644 --- a/idea/testData/slicer/inflow/anonymousFunReturnExpression.results.txt +++ b/idea/testData/slicer/inflow/anonymousFunReturnExpression.results.txt @@ -8,6 +8,6 @@ 8 val x = foo(fun(n: Int): Int { return n }) 8 val x = foo(fun(n: Int): Int { return n }) 8 val x = foo(fun(n: Int): Int { return n }) -8 [LAMBDA OUT] val x = foo(fun(n: Int): Int { return n }) -3 [LAMBDA OUT] fun foo(f: (Int) -> Int): Int { +8 [LAMBDA CALLS] val x = foo(fun(n: Int): Int { return n }) +3 [LAMBDA CALLS] fun foo(f: (Int) -> Int): Int { 4 return f(1) diff --git a/idea/testData/slicer/inflow/anonymousFunctionParameter.leafGroups.txt b/idea/testData/slicer/inflow/anonymousFunctionParameter.leafGroups.txt index 9829d72ec76..ed09a376a8e 100644 --- a/idea/testData/slicer/inflow/anonymousFunctionParameter.leafGroups.txt +++ b/idea/testData/slicer/inflow/anonymousFunctionParameter.leafGroups.txt @@ -2,7 +2,7 @@ 9 val v = value 9 val v = value 8 foo(fun(value: Int) { -8 [LAMBDA OUT] foo(fun(value: Int) { -3 [LAMBDA OUT] fun foo(f: (Int) -> Unit) { +8 [LAMBDA CALLS] foo(fun(value: Int) { +3 [LAMBDA CALLS] fun foo(f: (Int) -> Unit) { 4 f(1) diff --git a/idea/testData/slicer/inflow/anonymousFunctionParameter.results.txt b/idea/testData/slicer/inflow/anonymousFunctionParameter.results.txt index a377af065e9..527b2743a3c 100644 --- a/idea/testData/slicer/inflow/anonymousFunctionParameter.results.txt +++ b/idea/testData/slicer/inflow/anonymousFunctionParameter.results.txt @@ -1,6 +1,6 @@ 9 val v = value 9 val v = value 8 foo(fun(value: Int) { -8 [LAMBDA OUT] foo(fun(value: Int) { -3 [LAMBDA OUT] fun foo(f: (Int) -> Unit) { +8 [LAMBDA CALLS] foo(fun(value: Int) { +3 [LAMBDA CALLS] fun foo(f: (Int) -> Unit) { 4 f(1) diff --git a/idea/testData/slicer/inflow/doubleLambdaResult.leafGroups.txt b/idea/testData/slicer/inflow/doubleLambdaResult.leafGroups.txt index 167d71f7fdd..9d92db5af74 100644 --- a/idea/testData/slicer/inflow/doubleLambdaResult.leafGroups.txt +++ b/idea/testData/slicer/inflow/doubleLambdaResult.leafGroups.txt @@ -11,11 +11,11 @@ 8 [LAMBDA IN] val x = foo(1, 2) { { it } } 8 val x = foo(1, 2) { { it } } 8 val x = foo(1, 2) { { it } } -8 [LAMBDA OUT] val x = foo(1, 2) { { it } } -8 [LAMBDA OUT] val x = foo(1, 2) { { it } } -8 [LAMBDA OUT] [LAMBDA OUT] val x = foo(1, 2) { { it } } -3 [LAMBDA OUT] [LAMBDA OUT] fun foo(a: Int, b: Int, f: (Int) -> (Int) -> Int): Int { -4 [LAMBDA OUT] return f(a)(b) +8 [LAMBDA CALLS] val x = foo(1, 2) { { it } } +8 [LAMBDA CALLS] val x = foo(1, 2) { { it } } +8 [LAMBDA CALLS] [LAMBDA CALLS] val x = foo(1, 2) { { it } } +3 [LAMBDA CALLS] [LAMBDA CALLS] fun foo(a: Int, b: Int, f: (Int) -> (Int) -> Int): Int { +4 [LAMBDA CALLS] return f(a)(b) 4 return f(a)(b) 3 fun foo(a: Int, b: Int, f: (Int) -> (Int) -> Int): Int { 8 val x = foo(1, 2) { { it } } diff --git a/idea/testData/slicer/inflow/doubleLambdaResult.results.txt b/idea/testData/slicer/inflow/doubleLambdaResult.results.txt index e2f47571e41..f086bb14828 100644 --- a/idea/testData/slicer/inflow/doubleLambdaResult.results.txt +++ b/idea/testData/slicer/inflow/doubleLambdaResult.results.txt @@ -10,11 +10,11 @@ 8 [LAMBDA IN] val x = foo(1, 2) { { it } } 8 val x = foo(1, 2) { { it } } 8 val x = foo(1, 2) { { it } } -8 [LAMBDA OUT] val x = foo(1, 2) { { it } } -8 [LAMBDA OUT] val x = foo(1, 2) { { it } } -8 [LAMBDA OUT] [LAMBDA OUT] val x = foo(1, 2) { { it } } -3 [LAMBDA OUT] [LAMBDA OUT] fun foo(a: Int, b: Int, f: (Int) -> (Int) -> Int): Int { -4 [LAMBDA OUT] return f(a)(b) +8 [LAMBDA CALLS] val x = foo(1, 2) { { it } } +8 [LAMBDA CALLS] val x = foo(1, 2) { { it } } +8 [LAMBDA CALLS] [LAMBDA CALLS] val x = foo(1, 2) { { it } } +3 [LAMBDA CALLS] [LAMBDA CALLS] fun foo(a: Int, b: Int, f: (Int) -> (Int) -> Int): Int { +4 [LAMBDA CALLS] return f(a)(b) 4 return f(a)(b) 3 fun foo(a: Int, b: Int, f: (Int) -> (Int) -> Int): Int { 8 val x = foo(1, 2) { { it } } diff --git a/idea/testData/slicer/inflow/extensionLambdaImplicitParameter.leafGroups.txt b/idea/testData/slicer/inflow/extensionLambdaImplicitParameter.leafGroups.txt index d0367eedca1..bc76f815561 100644 --- a/idea/testData/slicer/inflow/extensionLambdaImplicitParameter.leafGroups.txt +++ b/idea/testData/slicer/inflow/extensionLambdaImplicitParameter.leafGroups.txt @@ -1,18 +1,18 @@ 4 f("", 1) 15 val v = it -14 [LAMBDA OUT] foo { -3 [LAMBDA OUT] fun foo(f: String.(Int) -> Unit) { +14 [LAMBDA CALLS] foo { +3 [LAMBDA CALLS] fun foo(f: String.(Int) -> Unit) { 4 f("", 1) 6 "".f(2) 15 val v = it -14 [LAMBDA OUT] foo { -3 [LAMBDA OUT] fun foo(f: String.(Int) -> Unit) { +14 [LAMBDA CALLS] foo { +3 [LAMBDA CALLS] fun foo(f: String.(Int) -> Unit) { 6 "".f(2) 9 f(3) 15 val v = it -14 [LAMBDA OUT] foo { -3 [LAMBDA OUT] fun foo(f: String.(Int) -> Unit) { +14 [LAMBDA CALLS] foo { +3 [LAMBDA CALLS] fun foo(f: String.(Int) -> Unit) { 9 f(3) diff --git a/idea/testData/slicer/inflow/extensionLambdaImplicitParameter.results.txt b/idea/testData/slicer/inflow/extensionLambdaImplicitParameter.results.txt index d3156e6033b..0afcb0bf3fa 100644 --- a/idea/testData/slicer/inflow/extensionLambdaImplicitParameter.results.txt +++ b/idea/testData/slicer/inflow/extensionLambdaImplicitParameter.results.txt @@ -1,6 +1,6 @@ 15 val v = it -14 [LAMBDA OUT] foo { -3 [LAMBDA OUT] fun foo(f: String.(Int) -> Unit) { +14 [LAMBDA CALLS] foo { +3 [LAMBDA CALLS] fun foo(f: String.(Int) -> Unit) { 4 f("", 1) 6 "".f(2) 9 f(3) diff --git a/idea/testData/slicer/inflow/extensionLambdaParameter.leafGroups.txt b/idea/testData/slicer/inflow/extensionLambdaParameter.leafGroups.txt index 664005b2e02..9f625c5ca9f 100644 --- a/idea/testData/slicer/inflow/extensionLambdaParameter.leafGroups.txt +++ b/idea/testData/slicer/inflow/extensionLambdaParameter.leafGroups.txt @@ -1,21 +1,21 @@ 4 f("", 1) 15 val v = i 14 foo { i -> -14 [LAMBDA OUT] foo { i -> -3 [LAMBDA OUT] fun foo(f: String.(Int) -> Unit) { +14 [LAMBDA CALLS] foo { i -> +3 [LAMBDA CALLS] fun foo(f: String.(Int) -> Unit) { 4 f("", 1) 6 "".f(2) 15 val v = i 14 foo { i -> -14 [LAMBDA OUT] foo { i -> -3 [LAMBDA OUT] fun foo(f: String.(Int) -> Unit) { +14 [LAMBDA CALLS] foo { i -> +3 [LAMBDA CALLS] fun foo(f: String.(Int) -> Unit) { 6 "".f(2) 9 f(3) 15 val v = i 14 foo { i -> -14 [LAMBDA OUT] foo { i -> -3 [LAMBDA OUT] fun foo(f: String.(Int) -> Unit) { +14 [LAMBDA CALLS] foo { i -> +3 [LAMBDA CALLS] fun foo(f: String.(Int) -> Unit) { 9 f(3) diff --git a/idea/testData/slicer/inflow/extensionLambdaParameter.results.txt b/idea/testData/slicer/inflow/extensionLambdaParameter.results.txt index 1550b384c4d..f87457e46a3 100644 --- a/idea/testData/slicer/inflow/extensionLambdaParameter.results.txt +++ b/idea/testData/slicer/inflow/extensionLambdaParameter.results.txt @@ -1,7 +1,7 @@ 15 val v = i 14 foo { i -> -14 [LAMBDA OUT] foo { i -> -3 [LAMBDA OUT] fun foo(f: String.(Int) -> Unit) { +14 [LAMBDA CALLS] foo { i -> +3 [LAMBDA CALLS] fun foo(f: String.(Int) -> Unit) { 4 f("", 1) 6 "".f(2) 9 f(3) diff --git a/idea/testData/slicer/inflow/extensionLambdaReceiver.leafGroups.txt b/idea/testData/slicer/inflow/extensionLambdaReceiver.leafGroups.txt index 75aca85c673..99e59179879 100644 --- a/idea/testData/slicer/inflow/extensionLambdaReceiver.leafGroups.txt +++ b/idea/testData/slicer/inflow/extensionLambdaReceiver.leafGroups.txt @@ -1,8 +1,8 @@ 4 with("A") { 5 val v = this 5 val v = this -4 [LAMBDA OUT] with("A") { -9 [LAMBDA OUT] inline fun with(receiver: T, block: T.() -> R): R { +4 [LAMBDA CALLS] with("A") { +9 [LAMBDA CALLS] inline fun with(receiver: T, block: T.() -> R): R { 10 return receiver.block() 9 inline fun with(receiver: T, block: T.() -> R): R { 4 with("A") { diff --git a/idea/testData/slicer/inflow/extensionLambdaReceiver.results.txt b/idea/testData/slicer/inflow/extensionLambdaReceiver.results.txt index f3336d584b3..577782e74cf 100644 --- a/idea/testData/slicer/inflow/extensionLambdaReceiver.results.txt +++ b/idea/testData/slicer/inflow/extensionLambdaReceiver.results.txt @@ -1,7 +1,7 @@ 5 val v = this 5 val v = this -4 [LAMBDA OUT] with("A") { -9 [LAMBDA OUT] inline fun with(receiver: T, block: T.() -> R): R { +4 [LAMBDA CALLS] with("A") { +9 [LAMBDA CALLS] inline fun with(receiver: T, block: T.() -> R): R { 10 return receiver.block() 9 inline fun with(receiver: T, block: T.() -> R): R { 4 with("A") { diff --git a/idea/testData/slicer/inflow/lambdaImplicitParameter.leafGroups.txt b/idea/testData/slicer/inflow/lambdaImplicitParameter.leafGroups.txt index f119c129634..74c485a47ec 100644 --- a/idea/testData/slicer/inflow/lambdaImplicitParameter.leafGroups.txt +++ b/idea/testData/slicer/inflow/lambdaImplicitParameter.leafGroups.txt @@ -1,6 +1,6 @@ 4 f(1) 9 val v = it -8 [LAMBDA OUT] foo { -3 [LAMBDA OUT] fun foo(f: (Int) -> Unit) { +8 [LAMBDA CALLS] foo { +3 [LAMBDA CALLS] fun foo(f: (Int) -> Unit) { 4 f(1) diff --git a/idea/testData/slicer/inflow/lambdaImplicitParameter.results.txt b/idea/testData/slicer/inflow/lambdaImplicitParameter.results.txt index 0ee8ed4de5d..29383bcc54e 100644 --- a/idea/testData/slicer/inflow/lambdaImplicitParameter.results.txt +++ b/idea/testData/slicer/inflow/lambdaImplicitParameter.results.txt @@ -1,4 +1,4 @@ 9 val v = it -8 [LAMBDA OUT] foo { -3 [LAMBDA OUT] fun foo(f: (Int) -> Unit) { +8 [LAMBDA CALLS] foo { +3 [LAMBDA CALLS] fun foo(f: (Int) -> Unit) { 4 f(1) diff --git a/idea/testData/slicer/inflow/lambdaParameter.leafGroups.txt b/idea/testData/slicer/inflow/lambdaParameter.leafGroups.txt index 8223b489327..a8566b9388e 100644 --- a/idea/testData/slicer/inflow/lambdaParameter.leafGroups.txt +++ b/idea/testData/slicer/inflow/lambdaParameter.leafGroups.txt @@ -1,7 +1,7 @@ 4 f(1) 9 val v = value 8 foo { value -> -8 [LAMBDA OUT] foo { value -> -3 [LAMBDA OUT] fun foo(f: (Int) -> Unit) { +8 [LAMBDA CALLS] foo { value -> +3 [LAMBDA CALLS] fun foo(f: (Int) -> Unit) { 4 f(1) diff --git a/idea/testData/slicer/inflow/lambdaParameter.results.txt b/idea/testData/slicer/inflow/lambdaParameter.results.txt index 5baff0fc17c..310aec04650 100644 --- a/idea/testData/slicer/inflow/lambdaParameter.results.txt +++ b/idea/testData/slicer/inflow/lambdaParameter.results.txt @@ -1,5 +1,5 @@ 9 val v = value 8 foo { value -> -8 [LAMBDA OUT] foo { value -> -3 [LAMBDA OUT] fun foo(f: (Int) -> Unit) { +8 [LAMBDA CALLS] foo { value -> +3 [LAMBDA CALLS] fun foo(f: (Int) -> Unit) { 4 f(1) diff --git a/idea/testData/slicer/inflow/lambdaResult.leafGroups.txt b/idea/testData/slicer/inflow/lambdaResult.leafGroups.txt index dbb18f5b28b..e4f7a3b07fa 100644 --- a/idea/testData/slicer/inflow/lambdaResult.leafGroups.txt +++ b/idea/testData/slicer/inflow/lambdaResult.leafGroups.txt @@ -8,7 +8,7 @@ 8 [LAMBDA IN] val x = foo { it } 8 val x = foo { it } 8 val x = foo { it } -8 [LAMBDA OUT] val x = foo { it } -3 [LAMBDA OUT] fun foo(f: (Int) -> Int): Int { +8 [LAMBDA CALLS] val x = foo { it } +3 [LAMBDA CALLS] fun foo(f: (Int) -> Int): Int { 4 return f(1) diff --git a/idea/testData/slicer/inflow/lambdaResult.results.txt b/idea/testData/slicer/inflow/lambdaResult.results.txt index ffe6c322d19..b6bc949f447 100644 --- a/idea/testData/slicer/inflow/lambdaResult.results.txt +++ b/idea/testData/slicer/inflow/lambdaResult.results.txt @@ -7,6 +7,6 @@ 8 [LAMBDA IN] val x = foo { it } 8 val x = foo { it } 8 val x = foo { it } -8 [LAMBDA OUT] val x = foo { it } -3 [LAMBDA OUT] fun foo(f: (Int) -> Int): Int { +8 [LAMBDA CALLS] val x = foo { it } +3 [LAMBDA CALLS] fun foo(f: (Int) -> Int): Int { 4 return f(1) diff --git a/idea/testData/slicer/inflow/lambdaResultWithAssignments.leafGroups.txt b/idea/testData/slicer/inflow/lambdaResultWithAssignments.leafGroups.txt index b795c1da72f..00573786d78 100644 --- a/idea/testData/slicer/inflow/lambdaResultWithAssignments.leafGroups.txt +++ b/idea/testData/slicer/inflow/lambdaResultWithAssignments.leafGroups.txt @@ -10,9 +10,9 @@ 9 [LAMBDA IN] val y = foo { it } 9 val y = foo { it } 9 val y = foo { it } -9 [LAMBDA OUT] val y = foo { it } -3 [LAMBDA OUT] fun foo(f: (Int) -> Int): Int { -4 [LAMBDA OUT] val x = f -4 [LAMBDA OUT] val x = f +9 [LAMBDA CALLS] val y = foo { it } +3 [LAMBDA CALLS] fun foo(f: (Int) -> Int): Int { +4 [LAMBDA CALLS] val x = f +4 [LAMBDA CALLS] val x = f 5 return x(1) diff --git a/idea/testData/slicer/inflow/lambdaResultWithAssignments.results.txt b/idea/testData/slicer/inflow/lambdaResultWithAssignments.results.txt index 8be29433395..e37ef26d967 100644 --- a/idea/testData/slicer/inflow/lambdaResultWithAssignments.results.txt +++ b/idea/testData/slicer/inflow/lambdaResultWithAssignments.results.txt @@ -9,8 +9,8 @@ 9 [LAMBDA IN] val y = foo { it } 9 val y = foo { it } 9 val y = foo { it } -9 [LAMBDA OUT] val y = foo { it } -3 [LAMBDA OUT] fun foo(f: (Int) -> Int): Int { -4 [LAMBDA OUT] val x = f -4 [LAMBDA OUT] val x = f +9 [LAMBDA CALLS] val y = foo { it } +3 [LAMBDA CALLS] fun foo(f: (Int) -> Int): Int { +4 [LAMBDA CALLS] val x = f +4 [LAMBDA CALLS] val x = f 5 return x(1) diff --git a/idea/testData/slicer/inflow/nonLocalReturn.leafGroups.txt b/idea/testData/slicer/inflow/nonLocalReturn.leafGroups.txt index 603e3acb2ea..05c32a16759 100644 --- a/idea/testData/slicer/inflow/nonLocalReturn.leafGroups.txt +++ b/idea/testData/slicer/inflow/nonLocalReturn.leafGroups.txt @@ -9,8 +9,8 @@ 5 fun bar(a: Int): Int = foo(a) { if (it > 0) it else return 0 } 5 fun bar(a: Int): Int = foo(a) { if (it > 0) it else return 0 } 5 fun bar(a: Int): Int = foo(a) { if (it > 0) it else return 0 } -5 [LAMBDA OUT] fun bar(a: Int): Int = foo(a) { if (it > 0) it else return 0 } -3 [LAMBDA OUT] inline fun foo(a: Int, f: (Int) -> Int) = f(a) +5 [LAMBDA CALLS] fun bar(a: Int): Int = foo(a) { if (it > 0) it else return 0 } +3 [LAMBDA CALLS] inline fun foo(a: Int, f: (Int) -> Int) = f(a) 3 inline fun foo(a: Int, f: (Int) -> Int) = f(a) 3 inline fun foo(a: Int, f: (Int) -> Int) = f(a) 5 fun bar(a: Int): Int = foo(a) { if (it > 0) it else return 0 } diff --git a/idea/testData/slicer/inflow/nonLocalReturn.results.txt b/idea/testData/slicer/inflow/nonLocalReturn.results.txt index 5b236f615bd..15d63ef1f0b 100644 --- a/idea/testData/slicer/inflow/nonLocalReturn.results.txt +++ b/idea/testData/slicer/inflow/nonLocalReturn.results.txt @@ -8,8 +8,8 @@ 5 fun bar(a: Int): Int = foo(a) { if (it > 0) it else return 0 } 5 fun bar(a: Int): Int = foo(a) { if (it > 0) it else return 0 } 5 fun bar(a: Int): Int = foo(a) { if (it > 0) it else return 0 } -5 [LAMBDA OUT] fun bar(a: Int): Int = foo(a) { if (it > 0) it else return 0 } -3 [LAMBDA OUT] inline fun foo(a: Int, f: (Int) -> Int) = f(a) +5 [LAMBDA CALLS] fun bar(a: Int): Int = foo(a) { if (it > 0) it else return 0 } +3 [LAMBDA CALLS] inline fun foo(a: Int, f: (Int) -> Int) = f(a) 3 inline fun foo(a: Int, f: (Int) -> Int) = f(a) 3 inline fun foo(a: Int, f: (Int) -> Int) = f(a) 5 fun bar(a: Int): Int = foo(a) { if (it > 0) it else return 0 } diff --git a/idea/testData/slicer/outflow/anonymousFunBodyExpression.results.txt b/idea/testData/slicer/outflow/anonymousFunBodyExpression.results.txt index a2e798b0e7e..189f13ba43a 100644 --- a/idea/testData/slicer/outflow/anonymousFunBodyExpression.results.txt +++ b/idea/testData/slicer/outflow/anonymousFunBodyExpression.results.txt @@ -1,7 +1,7 @@ 8 val x = foo(fun(n: Int) = n) 8 val x = foo(fun(n: Int) = n) -8 [LAMBDA OUT] val x = foo(fun(n: Int) = n) -3 [LAMBDA OUT] fun foo(f: (Int) -> Int): Int { +8 [LAMBDA CALLS] val x = foo(fun(n: Int) = n) +3 [LAMBDA CALLS] fun foo(f: (Int) -> Int): Int { 4 return f(1) 3 fun foo(f: (Int) -> Int): Int { 8 val x = foo(fun(n: Int) = n) diff --git a/idea/testData/slicer/outflow/anonymousFunReturnExpression.results.txt b/idea/testData/slicer/outflow/anonymousFunReturnExpression.results.txt index ad2e54c77d3..bd116b369d6 100644 --- a/idea/testData/slicer/outflow/anonymousFunReturnExpression.results.txt +++ b/idea/testData/slicer/outflow/anonymousFunReturnExpression.results.txt @@ -1,7 +1,7 @@ 8 val x = foo(fun(n: Int): Int { return n }) 8 val x = foo(fun(n: Int): Int { return n }) -8 [LAMBDA OUT] val x = foo(fun(n: Int): Int { return n }) -3 [LAMBDA OUT] fun foo(f: (Int) -> Int): Int { +8 [LAMBDA CALLS] val x = foo(fun(n: Int): Int { return n }) +3 [LAMBDA CALLS] fun foo(f: (Int) -> Int): Int { 4 return f(1) 3 fun foo(f: (Int) -> Int): Int { 8 val x = foo(fun(n: Int): Int { return n }) diff --git a/idea/testData/slicer/outflow/doubleLambdaResult.results.txt b/idea/testData/slicer/outflow/doubleLambdaResult.results.txt index f41e955590d..00967a6bfe0 100644 --- a/idea/testData/slicer/outflow/doubleLambdaResult.results.txt +++ b/idea/testData/slicer/outflow/doubleLambdaResult.results.txt @@ -1,10 +1,10 @@ 8 val x = foo(1, 2) { { it } } 8 val x = foo(1, 2) { { it } } -8 [LAMBDA OUT] val x = foo(1, 2) { { it } } -8 [LAMBDA OUT] val x = foo(1, 2) { { it } } -8 [LAMBDA OUT] [LAMBDA OUT] val x = foo(1, 2) { { it } } -3 [LAMBDA OUT] [LAMBDA OUT] fun foo(a: Int, b: Int, f: (Int) -> (Int) -> Int): Int { -4 [LAMBDA OUT] return f(a)(b) +8 [LAMBDA CALLS] val x = foo(1, 2) { { it } } +8 [LAMBDA CALLS] val x = foo(1, 2) { { it } } +8 [LAMBDA CALLS] [LAMBDA CALLS] val x = foo(1, 2) { { it } } +3 [LAMBDA CALLS] [LAMBDA CALLS] fun foo(a: Int, b: Int, f: (Int) -> (Int) -> Int): Int { +4 [LAMBDA CALLS] return f(a)(b) 4 return f(a)(b) 3 fun foo(a: Int, b: Int, f: (Int) -> (Int) -> Int): Int { 8 val x = foo(1, 2) { { it } } diff --git a/idea/testData/slicer/outflow/explicitLambdaReturnExpression.results.txt b/idea/testData/slicer/outflow/explicitLambdaReturnExpression.results.txt index 447527aa060..ed4acab1211 100644 --- a/idea/testData/slicer/outflow/explicitLambdaReturnExpression.results.txt +++ b/idea/testData/slicer/outflow/explicitLambdaReturnExpression.results.txt @@ -1,7 +1,7 @@ 9 if (it < 0) return@foo 0 8 val x = foo { -8 [LAMBDA OUT] val x = foo { -3 [LAMBDA OUT] fun foo(f: (Int) -> Int): Int { +8 [LAMBDA CALLS] val x = foo { +3 [LAMBDA CALLS] fun foo(f: (Int) -> Int): Int { 4 return f(1) 3 fun foo(f: (Int) -> Int): Int { 8 val x = foo { diff --git a/idea/testData/slicer/outflow/funResultViaCallableRef.results.txt b/idea/testData/slicer/outflow/funResultViaCallableRef.results.txt index e273977d12c..9c2d2b67643 100644 --- a/idea/testData/slicer/outflow/funResultViaCallableRef.results.txt +++ b/idea/testData/slicer/outflow/funResultViaCallableRef.results.txt @@ -1,7 +1,7 @@ 8 fun bar(n: Int) = n 8 fun bar(n: Int) = n -9 [LAMBDA OUT] val x = foo(::bar) -3 [LAMBDA OUT] fun foo(f: (Int) -> Int): Int { +9 [LAMBDA CALLS] val x = foo(::bar) +3 [LAMBDA CALLS] fun foo(f: (Int) -> Int): Int { 4 return f(1) 3 fun foo(f: (Int) -> Int): Int { 9 val x = foo(::bar) diff --git a/idea/testData/slicer/outflow/funResultViaCallableRefWithAssignment.results.txt b/idea/testData/slicer/outflow/funResultViaCallableRefWithAssignment.results.txt index 8471a4c9190..a43f3051cf8 100644 --- a/idea/testData/slicer/outflow/funResultViaCallableRefWithAssignment.results.txt +++ b/idea/testData/slicer/outflow/funResultViaCallableRefWithAssignment.results.txt @@ -1,9 +1,9 @@ 8 fun bar(n: Int) = n 8 fun bar(n: Int) = n -9 [LAMBDA OUT] val f = ::bar -9 [LAMBDA OUT] val f = ::bar -10 [LAMBDA OUT] val x = foo(f) -3 [LAMBDA OUT] fun foo(f: (Int) -> Int): Int { +9 [LAMBDA CALLS] val f = ::bar +9 [LAMBDA CALLS] val f = ::bar +10 [LAMBDA CALLS] val x = foo(f) +3 [LAMBDA CALLS] fun foo(f: (Int) -> Int): Int { 4 return f(1) 3 fun foo(f: (Int) -> Int): Int { 10 val x = foo(f) diff --git a/idea/testData/slicer/outflow/funResultViaCallableRefWithDirectCall.results.txt b/idea/testData/slicer/outflow/funResultViaCallableRefWithDirectCall.results.txt index 7436c84abfe..7bad596ae18 100644 --- a/idea/testData/slicer/outflow/funResultViaCallableRefWithDirectCall.results.txt +++ b/idea/testData/slicer/outflow/funResultViaCallableRefWithDirectCall.results.txt @@ -1,5 +1,5 @@ 4 fun bar(n: Int) = n 4 fun bar(n: Int) = n -5 [LAMBDA OUT] val x = (::bar)(1) +5 [LAMBDA CALLS] val x = (::bar)(1) 5 val x = (::bar)(1) 5 val x = (::bar)(1) diff --git a/idea/testData/slicer/outflow/lambdaResult.results.txt b/idea/testData/slicer/outflow/lambdaResult.results.txt index 214a4773fdf..77350258f10 100644 --- a/idea/testData/slicer/outflow/lambdaResult.results.txt +++ b/idea/testData/slicer/outflow/lambdaResult.results.txt @@ -1,7 +1,7 @@ 8 val x = foo { it } 8 val x = foo { it } -8 [LAMBDA OUT] val x = foo { it } -3 [LAMBDA OUT] fun foo(f: (Int) -> Int): Int { +8 [LAMBDA CALLS] val x = foo { it } +3 [LAMBDA CALLS] fun foo(f: (Int) -> Int): Int { 4 return f(1) 3 fun foo(f: (Int) -> Int): Int { 8 val x = foo { it } diff --git a/idea/testData/slicer/outflow/lambdaResultWithAssignments.results.txt b/idea/testData/slicer/outflow/lambdaResultWithAssignments.results.txt index 32396c374b2..84511e2460a 100644 --- a/idea/testData/slicer/outflow/lambdaResultWithAssignments.results.txt +++ b/idea/testData/slicer/outflow/lambdaResultWithAssignments.results.txt @@ -1,9 +1,9 @@ 9 val y = foo { it } 9 val y = foo { it } -9 [LAMBDA OUT] val y = foo { it } -3 [LAMBDA OUT] fun foo(f: (Int) -> Int): Int { -4 [LAMBDA OUT] val x = f -4 [LAMBDA OUT] val x = f +9 [LAMBDA CALLS] val y = foo { it } +3 [LAMBDA CALLS] fun foo(f: (Int) -> Int): Int { +4 [LAMBDA CALLS] val x = f +4 [LAMBDA CALLS] val x = f 5 return x(1) 3 fun foo(f: (Int) -> Int): Int { 9 val y = foo { it } diff --git a/idea/testData/slicer/outflow/lambdaResultWithDirectCall.results.txt b/idea/testData/slicer/outflow/lambdaResultWithDirectCall.results.txt index d01c1b5df7d..814a232a5ce 100644 --- a/idea/testData/slicer/outflow/lambdaResultWithDirectCall.results.txt +++ b/idea/testData/slicer/outflow/lambdaResultWithDirectCall.results.txt @@ -1,5 +1,5 @@ 4 val x = { 1 }() 4 val x = { 1 }() -4 [LAMBDA OUT] val x = { 1 }() +4 [LAMBDA CALLS] val x = { 1 }() 4 val x = { 1 }() 4 val x = { 1 }() diff --git a/idea/testData/slicer/outflow/lambdaResultWithDirectCallViaAssignment.results.txt b/idea/testData/slicer/outflow/lambdaResultWithDirectCallViaAssignment.results.txt index 7246ec58ee7..ccdd7eba5c0 100644 --- a/idea/testData/slicer/outflow/lambdaResultWithDirectCallViaAssignment.results.txt +++ b/idea/testData/slicer/outflow/lambdaResultWithDirectCallViaAssignment.results.txt @@ -1,6 +1,6 @@ 4 val f = { 1 } 4 val f = { 1 } -4 [LAMBDA OUT] val f = { 1 } -4 [LAMBDA OUT] val f = { 1 } +4 [LAMBDA CALLS] val f = { 1 } +4 [LAMBDA CALLS] val f = { 1 } 5 val x = f() 5 val x = f()