diff --git a/idea/testData/slicer/inflow/compositeAssignments.leafGroups.txt b/idea/testData/slicer/inflow/compositeAssignments.leafGroups.txt index 56ccce0b5fc..44bcb87c57f 100644 --- a/idea/testData/slicer/inflow/compositeAssignments.leafGroups.txt +++ b/idea/testData/slicer/inflow/compositeAssignments.leafGroups.txt @@ -1,9 +1,3 @@ -7 --result (in assignmentWithSum(Int)) -3 fun assignmentWithSum(n: Int): Int { -8 return result (in assignmentWithSum(Int)) -4 var result = 0 (in assignmentWithSum(Int)) -7 --result (in assignmentWithSum(Int)) - 4 var result = 0 (in assignmentWithSum(Int)) 3 fun assignmentWithSum(n: Int): Int { 8 return result (in assignmentWithSum(Int)) @@ -15,3 +9,10 @@ 8 return result (in assignmentWithSum(Int)) 4 var result = 0 (in assignmentWithSum(Int)) 5 result += n (in assignmentWithSum(Int)) + +7 --result (in assignmentWithSum(Int)) +3 fun assignmentWithSum(n: Int): Int { +8 return result (in assignmentWithSum(Int)) +4 var result = 0 (in assignmentWithSum(Int)) +7 --result (in assignmentWithSum(Int)) + diff --git a/idea/testData/slicer/inflow/defaultGetterFieldInSetter.leafGroups.txt b/idea/testData/slicer/inflow/defaultGetterFieldInSetter.leafGroups.txt index 319e2720667..e1156d4337d 100644 --- a/idea/testData/slicer/inflow/defaultGetterFieldInSetter.leafGroups.txt +++ b/idea/testData/slicer/inflow/defaultGetterFieldInSetter.leafGroups.txt @@ -1,8 +1,3 @@ -4 var foo: Int = 0 (in A.foo) -10 val x = foo (in A.test()) -4 var foo: Int = 0 (in A) -4 var foo: Int = 0 (in A.foo) - 11 foo = 1 (in A.test()) 10 val x = foo (in A.test()) 4 var foo: Int = 0 (in A) @@ -10,3 +5,9 @@ 6 field = if (b) value else 0 (in A.foo.set) 5 set(value) { (in A.foo.set) 11 foo = 1 (in A.test()) + +4 var foo: Int = 0 (in A.foo) +10 val x = foo (in A.test()) +4 var foo: Int = 0 (in A) +4 var foo: Int = 0 (in A.foo) + diff --git a/idea/testData/slicer/inflow/diamondHierarchyJKMiddleClassFun.leafGroups.txt b/idea/testData/slicer/inflow/diamondHierarchyJKMiddleClassFun.leafGroups.txt index 8fa08b5e125..9efc80eaff6 100644 --- a/idea/testData/slicer/inflow/diamondHierarchyJKMiddleClassFun.leafGroups.txt +++ b/idea/testData/slicer/inflow/diamondHierarchyJKMiddleClassFun.leafGroups.txt @@ -1,10 +1,11 @@ +11 return 4; +9 val y = b.foo() (in test(A, B,…)) +9 val y = b.foo() (in test(A, B,…)) +11 return 4; + 4 override fun foo() = 2 (in B.foo()) 9 val y = b.foo() (in test(A, B,…)) 9 val y = b.foo() (in test(A, B,…)) 4 override fun foo() = 2 (in B) 4 override fun foo() = 2 (in B.foo()) -11 return 4; -9 val y = b.foo() (in test(A, B,…)) -9 val y = b.foo() (in test(A, B,…)) -11 return 4; diff --git a/idea/testData/slicer/inflow/diamondHierarchyJKMiddleInterfaceFun.leafGroups.txt b/idea/testData/slicer/inflow/diamondHierarchyJKMiddleInterfaceFun.leafGroups.txt index 642514a9c47..b2921ca3726 100644 --- a/idea/testData/slicer/inflow/diamondHierarchyJKMiddleInterfaceFun.leafGroups.txt +++ b/idea/testData/slicer/inflow/diamondHierarchyJKMiddleInterfaceFun.leafGroups.txt @@ -1,10 +1,11 @@ +13 return 4; +10 val z = c.foo() (in test(A, B,…)) +10 val z = c.foo() (in test(A, B,…)) +13 return 4; + 4 override fun foo() = 3 (in C.foo()) 10 val z = c.foo() (in test(A, B,…)) 10 val z = c.foo() (in test(A, B,…)) 4 override fun foo() = 3 (in C) 4 override fun foo() = 3 (in C.foo()) -13 return 4; -10 val z = c.foo() (in test(A, B,…)) -10 val z = c.foo() (in test(A, B,…)) -13 return 4; diff --git a/idea/testData/slicer/inflow/diamondHierarchyJKRootInterfaceFun.leafGroups.txt b/idea/testData/slicer/inflow/diamondHierarchyJKRootInterfaceFun.leafGroups.txt index e6e598fad99..f903ee51d51 100644 --- a/idea/testData/slicer/inflow/diamondHierarchyJKRootInterfaceFun.leafGroups.txt +++ b/idea/testData/slicer/inflow/diamondHierarchyJKRootInterfaceFun.leafGroups.txt @@ -1,15 +1,16 @@ -4 fun foo() = 1 (in A.foo()) +13 return 4; 8 val x = a.foo() (in test(A, B,…)) 8 val x = a.foo() (in test(A, B,…)) -4 fun foo() = 1 (in A) -4 fun foo() = 1 (in A.foo()) +13 return 4; 3 return 2; 8 val x = a.foo() (in test(A, B,…)) 8 val x = a.foo() (in test(A, B,…)) 3 return 2; -13 return 4; +4 fun foo() = 1 (in A.foo()) 8 val x = a.foo() (in test(A, B,…)) 8 val x = a.foo() (in test(A, B,…)) -13 return 4; +4 fun foo() = 1 (in A) +4 fun foo() = 1 (in A.foo()) + diff --git a/idea/testData/slicer/inflow/diamondHierarchyMiddleClassFun.leafGroups.txt b/idea/testData/slicer/inflow/diamondHierarchyMiddleClassFun.leafGroups.txt index e4261d9c6d5..ba2c297be6d 100644 --- a/idea/testData/slicer/inflow/diamondHierarchyMiddleClassFun.leafGroups.txt +++ b/idea/testData/slicer/inflow/diamondHierarchyMiddleClassFun.leafGroups.txt @@ -1,11 +1,12 @@ +16 override fun foo() = 4 (in D.foo()) +21 val y = b.foo() (in test(A, B,…)) +21 val y = b.foo() (in test(A, B,…)) +16 override fun foo() = 4 (in D) +16 override fun foo() = 4 (in D.foo()) + 8 override fun foo() = 2 (in B.foo()) 21 val y = b.foo() (in test(A, B,…)) 21 val y = b.foo() (in test(A, B,…)) 8 override fun foo() = 2 (in B) 8 override fun foo() = 2 (in B.foo()) -16 override fun foo() = 4 (in D.foo()) -21 val y = b.foo() (in test(A, B,…)) -21 val y = b.foo() (in test(A, B,…)) -16 override fun foo() = 4 (in D) -16 override fun foo() = 4 (in D.foo()) diff --git a/idea/testData/slicer/inflow/diamondHierarchyRootInterfaceFun.leafGroups.txt b/idea/testData/slicer/inflow/diamondHierarchyRootInterfaceFun.leafGroups.txt index c024dcf9d03..94881b14217 100644 --- a/idea/testData/slicer/inflow/diamondHierarchyRootInterfaceFun.leafGroups.txt +++ b/idea/testData/slicer/inflow/diamondHierarchyRootInterfaceFun.leafGroups.txt @@ -1,3 +1,15 @@ +12 override fun foo() = 3 (in C.foo()) +20 val x = a.foo() (in test(A, B,…)) +20 val x = a.foo() (in test(A, B,…)) +12 override fun foo() = 3 (in C) +12 override fun foo() = 3 (in C.foo()) + +16 override fun foo() = 4 (in D.foo()) +20 val x = a.foo() (in test(A, B,…)) +20 val x = a.foo() (in test(A, B,…)) +16 override fun foo() = 4 (in D) +16 override fun foo() = 4 (in D.foo()) + 4 fun foo() = 1 (in A.foo()) 20 val x = a.foo() (in test(A, B,…)) 20 val x = a.foo() (in test(A, B,…)) @@ -10,14 +22,3 @@ 8 override fun foo() = 2 (in B) 8 override fun foo() = 2 (in B.foo()) -12 override fun foo() = 3 (in C.foo()) -20 val x = a.foo() (in test(A, B,…)) -20 val x = a.foo() (in test(A, B,…)) -12 override fun foo() = 3 (in C) -12 override fun foo() = 3 (in C.foo()) - -16 override fun foo() = 4 (in D.foo()) -20 val x = a.foo() (in test(A, B,…)) -20 val x = a.foo() (in test(A, B,…)) -16 override fun foo() = 4 (in D) -16 override fun foo() = 4 (in D.foo()) diff --git a/idea/testData/slicer/inflow/extensionLambdaImplicitParameter.leafGroups.txt b/idea/testData/slicer/inflow/extensionLambdaImplicitParameter.leafGroups.txt index a219f561317..f8774e13c20 100644 --- a/idea/testData/slicer/inflow/extensionLambdaImplicitParameter.leafGroups.txt +++ b/idea/testData/slicer/inflow/extensionLambdaImplicitParameter.leafGroups.txt @@ -1,3 +1,9 @@ +10 f(3) (in foo(String.(Int) -> Unit)) +16 val v = it (in test()) +15 [LAMBDA CALLS ARGUMENT #0 EXTENSION] foo { (in test()) +4 [LAMBDA CALLS ARGUMENT #0 EXTENSION] fun foo(f: String.(Int) -> Unit) { (in foo(String.(Int) -> Unit)) +10 f(3) (in foo(String.(Int) -> Unit)) + 5 f("", 1) (in foo(String.(Int) -> Unit)) 16 val v = it (in test()) 15 [LAMBDA CALLS ARGUMENT #0 EXTENSION] foo { (in test()) @@ -10,8 +16,3 @@ 4 [LAMBDA CALLS ARGUMENT #0 EXTENSION] fun foo(f: String.(Int) -> Unit) { (in foo(String.(Int) -> Unit)) 7 "".f(2) (in foo(String.(Int) -> Unit)) -10 f(3) (in foo(String.(Int) -> Unit)) -16 val v = it (in test()) -15 [LAMBDA CALLS ARGUMENT #0 EXTENSION] foo { (in test()) -4 [LAMBDA CALLS ARGUMENT #0 EXTENSION] fun foo(f: String.(Int) -> Unit) { (in foo(String.(Int) -> Unit)) -10 f(3) (in foo(String.(Int) -> Unit)) diff --git a/idea/testData/slicer/inflow/extensionLambdaParameter.leafGroups.txt b/idea/testData/slicer/inflow/extensionLambdaParameter.leafGroups.txt index e266fe18dd9..6556c9e0c55 100644 --- a/idea/testData/slicer/inflow/extensionLambdaParameter.leafGroups.txt +++ b/idea/testData/slicer/inflow/extensionLambdaParameter.leafGroups.txt @@ -1,3 +1,10 @@ +10 f(3) (in foo(String.(Int) -> Unit)) +16 val v = i (in test()) +15 foo { i -> (in test()) +15 [LAMBDA CALLS ARGUMENT #0 EXTENSION] foo { i -> (in test()) +4 [LAMBDA CALLS ARGUMENT #0 EXTENSION] fun foo(f: String.(Int) -> Unit) { (in foo(String.(Int) -> Unit)) +10 f(3) (in foo(String.(Int) -> Unit)) + 5 f("", 1) (in foo(String.(Int) -> Unit)) 16 val v = i (in test()) 15 foo { i -> (in test()) @@ -12,9 +19,3 @@ 4 [LAMBDA CALLS ARGUMENT #0 EXTENSION] fun foo(f: String.(Int) -> Unit) { (in foo(String.(Int) -> Unit)) 7 "".f(2) (in foo(String.(Int) -> Unit)) -10 f(3) (in foo(String.(Int) -> Unit)) -16 val v = i (in test()) -15 foo { i -> (in test()) -15 [LAMBDA CALLS ARGUMENT #0 EXTENSION] foo { i -> (in test()) -4 [LAMBDA CALLS ARGUMENT #0 EXTENSION] fun foo(f: String.(Int) -> Unit) { (in foo(String.(Int) -> Unit)) -10 f(3) (in foo(String.(Int) -> Unit)) diff --git a/idea/testData/slicer/inflow/funParamerer.leafGroups.txt b/idea/testData/slicer/inflow/funParamerer.leafGroups.txt index 05805d05af2..819e0a0408d 100644 --- a/idea/testData/slicer/inflow/funParamerer.leafGroups.txt +++ b/idea/testData/slicer/inflow/funParamerer.leafGroups.txt @@ -1,7 +1,8 @@ +10 foo(1) (in test()) +5 fun foo(n: Int, s: String = "???") { (in foo(Int, String = ...)) +10 foo(1) (in test()) + 3 FunParamererKt.foo(1); 5 fun foo(n: Int, s: String = "???") { (in foo(Int, String = ...)) 3 FunParamererKt.foo(1); -10 foo(1) (in test()) -5 fun foo(n: Int, s: String = "???") { (in foo(Int, String = ...)) -10 foo(1) (in test()) diff --git a/idea/testData/slicer/inflow/funParamererWithDefault.leafGroups.txt b/idea/testData/slicer/inflow/funParamererWithDefault.leafGroups.txt index 8388db2f0e4..44ccd811054 100644 --- a/idea/testData/slicer/inflow/funParamererWithDefault.leafGroups.txt +++ b/idea/testData/slicer/inflow/funParamererWithDefault.leafGroups.txt @@ -1,11 +1,12 @@ -4 FunParamererWithDefaultKt.foo(1, "2"); -5 fun foo(n: Int, s: String = "???") { (in foo(Int, String = ...)) -4 FunParamererWithDefaultKt.foo(1, "2"); - 11 foo(1, "2") (in test()) 5 fun foo(n: Int, s: String = "???") { (in foo(Int, String = ...)) 11 foo(1, "2") (in test()) +4 FunParamererWithDefaultKt.foo(1, "2"); +5 fun foo(n: Int, s: String = "???") { (in foo(Int, String = ...)) +4 FunParamererWithDefaultKt.foo(1, "2"); + 5 fun foo(n: Int, s: String = "???") { (in foo(Int, String = ...)) 5 fun foo(n: Int, s: String = "???") { (in foo(Int, String = ...)) 5 fun foo(n: Int, s: String = "???") { (in foo(Int, String = ...)) + diff --git a/idea/testData/slicer/inflow/funWithReturnExpressions.leafGroups.txt b/idea/testData/slicer/inflow/funWithReturnExpressions.leafGroups.txt index f3104916940..5b62c136419 100644 --- a/idea/testData/slicer/inflow/funWithReturnExpressions.leafGroups.txt +++ b/idea/testData/slicer/inflow/funWithReturnExpressions.leafGroups.txt @@ -1,8 +1,9 @@ -5 return -n (in foo(Int)) -3 fun foo(n: Int): Int { -5 return -n (in foo(Int)) - 3 fun foo(n: Int): Int { (in foo(Int)) 3 fun foo(n: Int): Int { 4 if (n > 0) return n (in foo(Int)) 3 fun foo(n: Int): Int { (in foo(Int)) + +5 return -n (in foo(Int)) +3 fun foo(n: Int): Int { +5 return -n (in foo(Int)) + diff --git a/idea/testData/slicer/inflow/getterAndSetterUsingField.leafGroups.txt b/idea/testData/slicer/inflow/getterAndSetterUsingField.leafGroups.txt index 208a73358d8..2d78373fc10 100644 --- a/idea/testData/slicer/inflow/getterAndSetterUsingField.leafGroups.txt +++ b/idea/testData/slicer/inflow/getterAndSetterUsingField.leafGroups.txt @@ -1,3 +1,13 @@ +12 foo = 1 (in A.test()) +11 val x = foo (in A.test()) +4 var foo: Int = -1 (in A) +5 get() = if (b) field else 0 (in A.foo.get) +5 get() = if (b) field else 0 (in A.foo.get) +7 field = if (b) value else 0 (in A.foo.set) +7 field = if (b) value else 0 (in A.foo.set) +6 set(value) { (in A.foo.set) +12 foo = 1 (in A.test()) + 4 var foo: Int = -1 (in A.foo) 11 val x = foo (in A.test()) 4 var foo: Int = -1 (in A) @@ -11,12 +21,3 @@ 7 field = if (b) value else 0 (in A.foo.set) 7 field = if (b) value else 0 (in A.foo.set) -12 foo = 1 (in A.test()) -11 val x = foo (in A.test()) -4 var foo: Int = -1 (in A) -5 get() = if (b) field else 0 (in A.foo.get) -5 get() = if (b) field else 0 (in A.foo.get) -7 field = if (b) value else 0 (in A.foo.set) -7 field = if (b) value else 0 (in A.foo.set) -6 set(value) { (in A.foo.set) -12 foo = 1 (in A.test()) diff --git a/idea/testData/slicer/inflow/inlineFunctionManyCalls.leafGroups.txt b/idea/testData/slicer/inflow/inlineFunctionManyCalls.leafGroups.txt index c859a4887a9..c58d4c8e9f1 100644 --- a/idea/testData/slicer/inflow/inlineFunctionManyCalls.leafGroups.txt +++ b/idea/testData/slicer/inflow/inlineFunctionManyCalls.leafGroups.txt @@ -1,3 +1,37 @@ +12 with(456) { (in foo() on String) +4 fun Any.extensionFun() { (in extensionFun() on Any) +13 this.extensionFun() (in foo() on String) +12 [LAMBDA CALLS RECEIVER] with(456) { (in foo() on String) +45 (INLINE CALL with) [LAMBDA CALLS RECEIVER] inline fun with(receiver: T, block: T.() -> R): R { (in with(T, T.() -> R)) +46 (INLINE CALL with) val result = receiver.block() (in with(T, T.() -> R)) +45 (INLINE CALL with) inline fun with(receiver: T, block: T.() -> R): R { (in with(T, T.() -> R)) +12 with(456) { (in foo() on String) + +20 withNoInline(1) { (in foo() on String) +4 fun Any.extensionFun() { (in extensionFun() on Any) +20 [LAMBDA CALLS RECEIVER] withNoInline(1) { (in foo() on String) +50 [LAMBDA CALLS RECEIVER] fun withNoInline(receiver: T, block: T.() -> R): R { (in withNoInline(T, T.() -> R)) +51 val result = receiver.block() (in withNoInline(T, T.() -> R)) +50 fun withNoInline(receiver: T, block: T.() -> R): R { (in withNoInline(T, T.() -> R)) +20 withNoInline(1) { (in foo() on String) + +24 withNoInline(2) { (in foo() on String) +4 fun Any.extensionFun() { (in extensionFun() on Any) +20 [LAMBDA CALLS RECEIVER] withNoInline(1) { (in foo() on String) +50 [LAMBDA CALLS RECEIVER] fun withNoInline(receiver: T, block: T.() -> R): R { (in withNoInline(T, T.() -> R)) +51 val result = receiver.block() (in withNoInline(T, T.() -> R)) +50 fun withNoInline(receiver: T, block: T.() -> R): R { (in withNoInline(T, T.() -> R)) +24 withNoInline(2) { (in foo() on String) + +28 "A".let { (in foo() on String) +4 fun Any.extensionFun() { (in extensionFun() on Any) +29 it.extensionFun() (in foo() on String) +28 [LAMBDA CALLS ARGUMENT #0] "A".let { (in foo() on String) +LIB (INLINE CALL let) [LAMBDA CALLS ARGUMENT #0] public inline fun T.let(block: (T) -> R): R { (in let((T) -> R) on T) +LIB (INLINE CALL let) return block(this) (in let((T) -> R) on T) +LIB (INLINE CALL let) public inline fun T.let(block: (T) -> R): R { (in let((T) -> R) on T) +28 "A".let { (in foo() on String) + 36 "D".letNoInline { (in foo() on String) 4 fun Any.extensionFun() { (in extensionFun() on Any) 37 it.extensionFun() (in foo() on String) @@ -16,23 +50,6 @@ 55 fun T.letNoInline(block: (T) -> R): R { (in letNoInline((T) -> R) on T) 40 "C".letNoInline { (in foo() on String) -28 "A".let { (in foo() on String) -4 fun Any.extensionFun() { (in extensionFun() on Any) -29 it.extensionFun() (in foo() on String) -28 [LAMBDA CALLS ARGUMENT #0] "A".let { (in foo() on String) -LIB (INLINE CALL let) [LAMBDA CALLS ARGUMENT #0] public inline fun T.let(block: (T) -> R): R { (in let((T) -> R) on T) -LIB (INLINE CALL let) return block(this) (in let((T) -> R) on T) -LIB (INLINE CALL let) public inline fun T.let(block: (T) -> R): R { (in let((T) -> R) on T) -28 "A".let { (in foo() on String) - -20 withNoInline(1) { (in foo() on String) -4 fun Any.extensionFun() { (in extensionFun() on Any) -20 [LAMBDA CALLS RECEIVER] withNoInline(1) { (in foo() on String) -50 [LAMBDA CALLS RECEIVER] fun withNoInline(receiver: T, block: T.() -> R): R { (in withNoInline(T, T.() -> R)) -51 val result = receiver.block() (in withNoInline(T, T.() -> R)) -50 fun withNoInline(receiver: T, block: T.() -> R): R { (in withNoInline(T, T.() -> R)) -20 withNoInline(1) { (in foo() on String) - 8 with(123) { (in foo() on String) 4 fun Any.extensionFun() { (in extensionFun() on Any) 8 [LAMBDA CALLS RECEIVER] with(123) { (in foo() on String) @@ -41,19 +58,3 @@ LIB (INLINE CALL let) public inline fun T.let(block: ( 45 (INLINE CALL with) inline fun with(receiver: T, block: T.() -> R): R { (in with(T, T.() -> R)) 8 with(123) { (in foo() on String) -24 withNoInline(2) { (in foo() on String) -4 fun Any.extensionFun() { (in extensionFun() on Any) -20 [LAMBDA CALLS RECEIVER] withNoInline(1) { (in foo() on String) -50 [LAMBDA CALLS RECEIVER] fun withNoInline(receiver: T, block: T.() -> R): R { (in withNoInline(T, T.() -> R)) -51 val result = receiver.block() (in withNoInline(T, T.() -> R)) -50 fun withNoInline(receiver: T, block: T.() -> R): R { (in withNoInline(T, T.() -> R)) -24 withNoInline(2) { (in foo() on String) - -12 with(456) { (in foo() on String) -4 fun Any.extensionFun() { (in extensionFun() on Any) -13 this.extensionFun() (in foo() on String) -12 [LAMBDA CALLS RECEIVER] with(456) { (in foo() on String) -45 (INLINE CALL with) [LAMBDA CALLS RECEIVER] inline fun with(receiver: T, block: T.() -> R): R { (in with(T, T.() -> R)) -46 (INLINE CALL with) val result = receiver.block() (in with(T, T.() -> R)) -45 (INLINE CALL with) inline fun with(receiver: T, block: T.() -> R): R { (in with(T, T.() -> R)) -12 with(456) { (in foo() on String) diff --git a/idea/testData/slicer/inflow/memberVarWithSplitInitializer.leafGroups.txt b/idea/testData/slicer/inflow/memberVarWithSplitInitializer.leafGroups.txt index 48f83de1570..1928fbcaaa5 100644 --- a/idea/testData/slicer/inflow/memberVarWithSplitInitializer.leafGroups.txt +++ b/idea/testData/slicer/inflow/memberVarWithSplitInitializer.leafGroups.txt @@ -1,7 +1,8 @@ +14 x = 2 (in A.test()) +4 var x: Int (in A) +14 x = 2 (in A.test()) + 7 x = 1 (in A) 4 var x: Int (in A) 7 x = 1 (in A) -14 x = 2 (in A.test()) -4 var x: Int (in A) -14 x = 2 (in A.test()) diff --git a/idea/testData/slicer/inflow/nullsAndNotNulls.leafGroups.txt b/idea/testData/slicer/inflow/nullsAndNotNulls.leafGroups.txt index 870ffafa80d..2dcc1d7d95c 100644 --- a/idea/testData/slicer/inflow/nullsAndNotNulls.leafGroups.txt +++ b/idea/testData/slicer/inflow/nullsAndNotNulls.leafGroups.txt @@ -1,8 +1,8 @@ -7 else -> null (in test(Int)) +5 n > 0 -> "+" (in test(Int)) 9 return s (in test(Int)) 4 var s = when { (in test(Int)) 4 var s = when { (in test(Int)) -7 else -> null (in test(Int)) +5 n > 0 -> "+" (in test(Int)) 6 n < 0 -> "-" (in test(Int)) 9 return s (in test(Int)) @@ -10,8 +10,9 @@ 4 var s = when { (in test(Int)) 6 n < 0 -> "-" (in test(Int)) -5 n > 0 -> "+" (in test(Int)) +7 else -> null (in test(Int)) 9 return s (in test(Int)) 4 var s = when { (in test(Int)) 4 var s = when { (in test(Int)) -5 n > 0 -> "+" (in test(Int)) +7 else -> null (in test(Int)) + diff --git a/idea/testData/slicer/inflow/onFunctionReceiverType.leafGroups.txt b/idea/testData/slicer/inflow/onFunctionReceiverType.leafGroups.txt index 995decfd2e8..737e08361d8 100644 --- a/idea/testData/slicer/inflow/onFunctionReceiverType.leafGroups.txt +++ b/idea/testData/slicer/inflow/onFunctionReceiverType.leafGroups.txt @@ -2,15 +2,6 @@ 8 fun Any.extensionFun() { (in extensionFun() on Any) 12 "".extensionFun() (in foo() on String) -24 "A".foo() (in main()) -8 fun Any.extensionFun() { (in extensionFun() on Any) -11 fun String.foo() { (in foo() on String) -24 "A".foo() (in main()) - -3 KotlinUtil.extensionFun("x"); -8 fun Any.extensionFun() { (in extensionFun() on Any) -3 KotlinUtil.extensionFun("x"); - 14 1.extensionFun() (in foo() on String) 8 fun Any.extensionFun() { (in extensionFun() on Any) 14 1.extensionFun() (in foo() on String) @@ -22,3 +13,13 @@ LIB (INLINE CALL with) [LAMBDA CALLS RECEIVER] public inline fun with( LIB (INLINE CALL with) return receiver.block() (in with(T, T.() -> R)) LIB (INLINE CALL with) public inline fun with(receiver: T, block: T.() -> R): R { (in with(T, T.() -> R)) 18 with(123) { (in foo() on String) + +24 "A".foo() (in main()) +8 fun Any.extensionFun() { (in extensionFun() on Any) +11 fun String.foo() { (in foo() on String) +24 "A".foo() (in main()) + +3 KotlinUtil.extensionFun("x"); +8 fun Any.extensionFun() { (in extensionFun() on Any) +3 KotlinUtil.extensionFun("x"); + diff --git a/idea/testData/slicer/inflow/onPropertyReceiverType.leafGroups.txt b/idea/testData/slicer/inflow/onPropertyReceiverType.leafGroups.txt index 1c98a054318..16024dc895a 100644 --- a/idea/testData/slicer/inflow/onPropertyReceiverType.leafGroups.txt +++ b/idea/testData/slicer/inflow/onPropertyReceiverType.leafGroups.txt @@ -1,7 +1,8 @@ +8 val v = "a".property (in foo()) +3 var Any.property: Int (in property on Any) +8 val v = "a".property (in foo()) + 9 "b".property = 2 (in foo()) 3 var Any.property: Int (in property on Any) 9 "b".property = 2 (in foo()) -8 val v = "a".property (in foo()) -3 var Any.property: Int (in property on Any) -8 val v = "a".property (in foo()) diff --git a/idea/testData/slicer/inflow/openFunInvokeOnParameter.leafGroups.txt b/idea/testData/slicer/inflow/openFunInvokeOnParameter.leafGroups.txt index c93cb5da4dd..35990b43e49 100644 --- a/idea/testData/slicer/inflow/openFunInvokeOnParameter.leafGroups.txt +++ b/idea/testData/slicer/inflow/openFunInvokeOnParameter.leafGroups.txt @@ -1,7 +1,8 @@ +22 other?.bar(p + 3) (in D.foo(Int)) +12 open fun bar(p: Int) { (in C.bar(Int)) +22 other?.bar(p + 3) (in D.foo(Int)) + 9 other?.bar(p + 1) (in C.foo(Int)) 12 open fun bar(p: Int) { (in C.bar(Int)) 9 other?.bar(p + 1) (in C.foo(Int)) -22 other?.bar(p + 3) (in D.foo(Int)) -12 open fun bar(p: Int) { (in C.bar(Int)) -22 other?.bar(p + 3) (in D.foo(Int)) diff --git a/idea/testData/slicer/inflow/overrideExtension2.leafGroups.txt b/idea/testData/slicer/inflow/overrideExtension2.leafGroups.txt index 0edfe29cb36..767525ee6d7 100644 --- a/idea/testData/slicer/inflow/overrideExtension2.leafGroups.txt +++ b/idea/testData/slicer/inflow/overrideExtension2.leafGroups.txt @@ -1,7 +1,8 @@ +18 2.extensionFun() (in Derived.derivedF()) +4 open fun Int.extensionFun() { (in extensionFun() on Int) +18 2.extensionFun() (in Derived.derivedF()) + 9 1.extensionFun() (in Base.baseF()) 4 open fun Int.extensionFun() { (in extensionFun() on Int) 9 1.extensionFun() (in Base.baseF()) -18 2.extensionFun() (in Derived.derivedF()) -4 open fun Int.extensionFun() { (in extensionFun() on Int) -18 2.extensionFun() (in Derived.derivedF()) diff --git a/idea/testData/slicer/inflow/overrideFun.leafGroups.txt b/idea/testData/slicer/inflow/overrideFun.leafGroups.txt index 485e7fd8ff7..b7899d6269e 100644 --- a/idea/testData/slicer/inflow/overrideFun.leafGroups.txt +++ b/idea/testData/slicer/inflow/overrideFun.leafGroups.txt @@ -1,9 +1,3 @@ -22 i.foo(3) (in g(JavaInterface)) -9 val v = p (in C.foo(Int)) -8 override fun foo(p: Int) { (in C.foo(Int)) -2 void foo(int p); -22 i.foo(3) (in g(JavaInterface)) - 13 foo(1) (in C.f()) 9 val v = p (in C.foo(Int)) 8 override fun foo(p: Int) { (in C.foo(Int)) @@ -13,3 +7,10 @@ 9 val v = p (in C.foo(Int)) 8 override fun foo(p: Int) { (in C.foo(Int)) 18 i.foo(2) (in f(I)) + +22 i.foo(3) (in g(JavaInterface)) +9 val v = p (in C.foo(Int)) +8 override fun foo(p: Int) { (in C.foo(Int)) +2 void foo(int p); +22 i.foo(3) (in g(JavaInterface)) + diff --git a/idea/testData/slicer/inflow/overrideProperty.leafGroups.txt b/idea/testData/slicer/inflow/overrideProperty.leafGroups.txt index 62f37c94945..a940b1d5213 100644 --- a/idea/testData/slicer/inflow/overrideProperty.leafGroups.txt +++ b/idea/testData/slicer/inflow/overrideProperty.leafGroups.txt @@ -1,11 +1,12 @@ +12 b.prop = 10 (in foo(Base, Derived)) +13 val v = d.prop (in foo(Base, Derived)) +13 val v = d.prop (in foo(Base, Derived)) +8 override var prop: Int = 1 (in Derived) +12 b.prop = 10 (in foo(Base, Derived)) + 8 override var prop: Int = 1 (in Derived.prop) 13 val v = d.prop (in foo(Base, Derived)) 13 val v = d.prop (in foo(Base, Derived)) 8 override var prop: Int = 1 (in Derived) 8 override var prop: Int = 1 (in Derived.prop) -12 b.prop = 10 (in foo(Base, Derived)) -13 val v = d.prop (in foo(Base, Derived)) -13 val v = d.prop (in foo(Base, Derived)) -8 override var prop: Int = 1 (in Derived) -12 b.prop = 10 (in foo(Base, Derived)) diff --git a/idea/testData/slicer/inflow/overridingFunctionResult.leafGroups.txt b/idea/testData/slicer/inflow/overridingFunctionResult.leafGroups.txt index 87a5db00723..70600657580 100644 --- a/idea/testData/slicer/inflow/overridingFunctionResult.leafGroups.txt +++ b/idea/testData/slicer/inflow/overridingFunctionResult.leafGroups.txt @@ -1,9 +1,3 @@ -8 override fun foo() = 2 (in B.foo()) -17 val y = b.foo() (in test(A, B,…)) -17 val y = b.foo() (in test(A, B,…)) -8 override fun foo() = 2 (in B) -8 override fun foo() = 2 (in B.foo()) - 12 override fun foo() = 3 (in C.foo()) 17 val y = b.foo() (in test(A, B,…)) 17 val y = b.foo() (in test(A, B,…)) @@ -14,3 +8,10 @@ 17 val y = b.foo() (in test(A, B,…)) 17 val y = b.foo() (in test(A, B,…)) 3 return 5; + +8 override fun foo() = 2 (in B.foo()) +17 val y = b.foo() (in test(A, B,…)) +17 val y = b.foo() (in test(A, B,…)) +8 override fun foo() = 2 (in B) +8 override fun foo() = 2 (in B.foo()) + diff --git a/idea/testData/slicer/inflow/overridingParameter.leafGroups.txt b/idea/testData/slicer/inflow/overridingParameter.leafGroups.txt index ec5ddbdf3ef..139d3954cc8 100644 --- a/idea/testData/slicer/inflow/overridingParameter.leafGroups.txt +++ b/idea/testData/slicer/inflow/overridingParameter.leafGroups.txt @@ -1,22 +1,23 @@ -9 class C : B(1) { (in C) -15 val y = b.foo (in test(A, B,…)) -15 val y = b.foo (in test(A, B,…)) -7 open class B(override val foo: Int) : A() (in B) -9 class C : B(1) { (in C) - 10 override val foo = 3 (in C.foo) 15 val y = b.foo (in test(A, B,…)) 15 val y = b.foo (in test(A, B,…)) 10 override val foo = 3 (in C) 10 override val foo = 3 (in C.foo) -7 return 5; -15 val y = b.foo (in test(A, B,…)) -15 val y = b.foo (in test(A, B,…)) -7 return 5; - 3 super(10); 15 val y = b.foo (in test(A, B,…)) 15 val y = b.foo (in test(A, B,…)) 7 open class B(override val foo: Int) : A() (in B) 3 super(10); + +7 return 5; +15 val y = b.foo (in test(A, B,…)) +15 val y = b.foo (in test(A, B,…)) +7 return 5; + +9 class C : B(1) { (in C) +15 val y = b.foo (in test(A, B,…)) +15 val y = b.foo (in test(A, B,…)) +7 open class B(override val foo: Int) : A() (in B) +9 class C : B(1) { (in C) + diff --git a/idea/testData/slicer/inflow/overridingPropertyResult.leafGroups.txt b/idea/testData/slicer/inflow/overridingPropertyResult.leafGroups.txt index 1979b05fda7..11390519f5e 100644 --- a/idea/testData/slicer/inflow/overridingPropertyResult.leafGroups.txt +++ b/idea/testData/slicer/inflow/overridingPropertyResult.leafGroups.txt @@ -1,9 +1,3 @@ -8 override val foo = 2 (in B.foo) -17 val y = b.foo (in test(A, B,…)) -17 val y = b.foo (in test(A, B,…)) -8 override val foo = 2 (in B) -8 override val foo = 2 (in B.foo) - 12 override val foo = 3 (in C.foo) 17 val y = b.foo (in test(A, B,…)) 17 val y = b.foo (in test(A, B,…)) @@ -14,3 +8,10 @@ 17 val y = b.foo (in test(A, B,…)) 17 val y = b.foo (in test(A, B,…)) 3 return 5; + +8 override val foo = 2 (in B.foo) +17 val y = b.foo (in test(A, B,…)) +17 val y = b.foo (in test(A, B,…)) +8 override val foo = 2 (in B) +8 override val foo = 2 (in B.foo) + diff --git a/idea/testData/slicer/inflow/primaryConstructorParameter.leafGroups.txt b/idea/testData/slicer/inflow/primaryConstructorParameter.leafGroups.txt index c3b6b1f502d..8682fc88c06 100644 --- a/idea/testData/slicer/inflow/primaryConstructorParameter.leafGroups.txt +++ b/idea/testData/slicer/inflow/primaryConstructorParameter.leafGroups.txt @@ -1,3 +1,7 @@ +11 new A(1); +4 open class A @JvmOverloads constructor(n: Int, s: String = "???") (in A(Int, String = ...)) +11 new A(1); + 2 D(int n, String s) { 4 open class A @JvmOverloads constructor(n: Int, s: String = "???") (in A(Int, String = ...)) 3 super(n, s); @@ -7,6 +11,3 @@ 4 open class A @JvmOverloads constructor(n: Int, s: String = "???") (in A(Int, String = ...)) 6 class B1: A(1) (in B1) -11 new A(1); -4 open class A @JvmOverloads constructor(n: Int, s: String = "???") (in A(Int, String = ...)) -11 new A(1); diff --git a/idea/testData/slicer/inflow/primaryConstructorParameterWithDefault.leafGroups.txt b/idea/testData/slicer/inflow/primaryConstructorParameterWithDefault.leafGroups.txt index 42c842f3368..0fab4fd0ac1 100644 --- a/idea/testData/slicer/inflow/primaryConstructorParameterWithDefault.leafGroups.txt +++ b/idea/testData/slicer/inflow/primaryConstructorParameterWithDefault.leafGroups.txt @@ -1,7 +1,3 @@ -7 class B2: A(1, "2") (in B2) -4 open class A @JvmOverloads constructor(n: Int, s: String = "???") (in A(Int, String = ...)) -7 class B2: A(1, "2") (in B2) - 12 new A(1, "2"); 4 open class A @JvmOverloads constructor(n: Int, s: String = "???") (in A(Int, String = ...)) 12 new A(1, "2"); @@ -14,3 +10,8 @@ 4 open class A @JvmOverloads constructor(n: Int, s: String = "???") (in A(Int, String = ...)) 4 open class A @JvmOverloads constructor(n: Int, s: String = "???") (in A(Int, String = ...)) 4 open class A @JvmOverloads constructor(n: Int, s: String = "???") (in A(Int, String = ...)) + +7 class B2: A(1, "2") (in B2) +4 open class A @JvmOverloads constructor(n: Int, s: String = "???") (in A(Int, String = ...)) +7 class B2: A(1, "2") (in B2) + diff --git a/idea/testData/slicer/inflow/propertyInInterface.leafGroups.txt b/idea/testData/slicer/inflow/propertyInInterface.leafGroups.txt index 9693f858f0a..c4d0925de42 100644 --- a/idea/testData/slicer/inflow/propertyInInterface.leafGroups.txt +++ b/idea/testData/slicer/inflow/propertyInInterface.leafGroups.txt @@ -1,11 +1,12 @@ +12 i.prop = 10 (in foo(I, C)) +13 val v = c.prop (in foo(I, C)) +13 val v = c.prop (in foo(I, C)) +8 override var prop: Int = 0 (in C) +12 i.prop = 10 (in foo(I, C)) + 8 override var prop: Int = 0 (in C.prop) 13 val v = c.prop (in foo(I, C)) 13 val v = c.prop (in foo(I, C)) 8 override var prop: Int = 0 (in C) 8 override var prop: Int = 0 (in C.prop) -12 i.prop = 10 (in foo(I, C)) -13 val v = c.prop (in foo(I, C)) -13 val v = c.prop (in foo(I, C)) -8 override var prop: Int = 0 (in C) -12 i.prop = 10 (in foo(I, C)) diff --git a/idea/testData/slicer/inflow/secondaryConstructorParameter.leafGroups.txt b/idea/testData/slicer/inflow/secondaryConstructorParameter.leafGroups.txt index c884c576426..6e0e456914f 100644 --- a/idea/testData/slicer/inflow/secondaryConstructorParameter.leafGroups.txt +++ b/idea/testData/slicer/inflow/secondaryConstructorParameter.leafGroups.txt @@ -1,3 +1,7 @@ +11 new A(1); +5 @JvmOverloads constructor(n: Int, s: String = "???") (in constructor A(Int, String = ...)) +11 new A(1); + 2 D(int n, String s) { 5 @JvmOverloads constructor(n: Int, s: String = "???") (in constructor A(Int, String = ...)) 3 super(n, s); @@ -7,6 +11,3 @@ 5 @JvmOverloads constructor(n: Int, s: String = "???") (in constructor A(Int, String = ...)) 8 class B1: A(1) (in B1) -11 new A(1); -5 @JvmOverloads constructor(n: Int, s: String = "???") (in constructor A(Int, String = ...)) -11 new A(1); diff --git a/idea/testData/slicer/inflow/secondaryConstructorParameterWithDefault.leafGroups.txt b/idea/testData/slicer/inflow/secondaryConstructorParameterWithDefault.leafGroups.txt index 6dcd0f6a63c..5c60cdc41bf 100644 --- a/idea/testData/slicer/inflow/secondaryConstructorParameterWithDefault.leafGroups.txt +++ b/idea/testData/slicer/inflow/secondaryConstructorParameterWithDefault.leafGroups.txt @@ -1,7 +1,3 @@ -9 class B2: A(1, "2") (in B2) -5 @JvmOverloads constructor(n: Int, s: String = "???") (in constructor A(Int, String = ...)) -9 class B2: A(1, "2") (in B2) - 12 new A(1, "2"); 5 @JvmOverloads constructor(n: Int, s: String = "???") (in constructor A(Int, String = ...)) 12 new A(1, "2"); @@ -14,3 +10,8 @@ 5 @JvmOverloads constructor(n: Int, s: String = "???") (in constructor A(Int, String = ...)) 5 @JvmOverloads constructor(n: Int, s: String = "???") (in constructor A(Int, String = ...)) 5 @JvmOverloads constructor(n: Int, s: String = "???") (in constructor A(Int, String = ...)) + +9 class B2: A(1, "2") (in B2) +5 @JvmOverloads constructor(n: Int, s: String = "???") (in constructor A(Int, String = ...)) +9 class B2: A(1, "2") (in B2) + diff --git a/idea/testData/slicer/inflow/settersViaDelegateForQualifiedRef.leafGroups.txt b/idea/testData/slicer/inflow/settersViaDelegateForQualifiedRef.leafGroups.txt index d4830a31b74..ea98a410c81 100644 --- a/idea/testData/slicer/inflow/settersViaDelegateForQualifiedRef.leafGroups.txt +++ b/idea/testData/slicer/inflow/settersViaDelegateForQualifiedRef.leafGroups.txt @@ -1,11 +1,3 @@ -6 private var _value: String = "" (in Delegate._value) -27 println("My name is '${a.name}'") (in main(Array)) -14 var name by Delegate() (in AClass) -7 operator fun getValue(thisRef: Any?, property: KProperty<*>) = _value (in Delegate) -7 operator fun getValue(thisRef: Any?, property: KProperty<*>) = _value (in Delegate.getValue(Any?, KProperty<*>)) -6 private var _value: String = "" (in Delegate) -6 private var _value: String = "" (in Delegate._value) - 20 name = "bye" (in AClass.uses()) 27 println("My name is '${a.name}'") (in main(Array)) 14 var name by Delegate() (in AClass) @@ -27,3 +19,12 @@ 16 name = name1 (in AClass) 13 class AClass(name1: String){ (in AClass(String)) 26 val a = AClass("hello") (in main(Array)) + +6 private var _value: String = "" (in Delegate._value) +27 println("My name is '${a.name}'") (in main(Array)) +14 var name by Delegate() (in AClass) +7 operator fun getValue(thisRef: Any?, property: KProperty<*>) = _value (in Delegate) +7 operator fun getValue(thisRef: Any?, property: KProperty<*>) = _value (in Delegate.getValue(Any?, KProperty<*>)) +6 private var _value: String = "" (in Delegate) +6 private var _value: String = "" (in Delegate._value) + diff --git a/idea/testData/slicer/inflow/settersViaDelegateForSimpleRef.leafGroups.txt b/idea/testData/slicer/inflow/settersViaDelegateForSimpleRef.leafGroups.txt index 73578b34490..99285502bc5 100644 --- a/idea/testData/slicer/inflow/settersViaDelegateForSimpleRef.leafGroups.txt +++ b/idea/testData/slicer/inflow/settersViaDelegateForSimpleRef.leafGroups.txt @@ -1,11 +1,3 @@ -7 private var _value: String = "" (in Delegate._value) -22 println("Now my name is '$name'") (in AClass.uses()) -15 var name by Delegate() (in AClass) -8 operator fun getValue(thisRef: Any?, property: KProperty<*>) = _value (in Delegate) -8 operator fun getValue(thisRef: Any?, property: KProperty<*>) = _value (in Delegate.getValue(Any?, KProperty<*>)) -7 private var _value: String = "" (in Delegate) -7 private var _value: String = "" (in Delegate._value) - 21 name = "bye" (in AClass.uses()) 22 println("Now my name is '$name'") (in AClass.uses()) 15 var name by Delegate() (in AClass) @@ -27,3 +19,12 @@ 17 name = name1 (in AClass) 14 class AClass(name1: String){ (in AClass(String)) 27 val a = AClass("hello") (in main(Array)) + +7 private var _value: String = "" (in Delegate._value) +22 println("Now my name is '$name'") (in AClass.uses()) +15 var name by Delegate() (in AClass) +8 operator fun getValue(thisRef: Any?, property: KProperty<*>) = _value (in Delegate) +8 operator fun getValue(thisRef: Any?, property: KProperty<*>) = _value (in Delegate.getValue(Any?, KProperty<*>)) +7 private var _value: String = "" (in Delegate) +7 private var _value: String = "" (in Delegate._value) + diff --git a/idea/testData/slicer/inflow/settersViaJavaDelegate.leafGroups.txt b/idea/testData/slicer/inflow/settersViaJavaDelegate.leafGroups.txt index 1e0aaa793ed..13de3aac89e 100644 --- a/idea/testData/slicer/inflow/settersViaJavaDelegate.leafGroups.txt +++ b/idea/testData/slicer/inflow/settersViaJavaDelegate.leafGroups.txt @@ -1,9 +1,3 @@ -6 private String _value = ""; -12 println("Now my name is '$name'") (in AClass.uses()) -5 var name by D() (in AClass) -9 return _value; -6 private String _value = ""; - 5 var name by D() (in AClass.name) 12 println("Now my name is '$name'") (in AClass.uses()) 5 var name by D() (in AClass) @@ -11,3 +5,10 @@ 13 _value = value; 12 void setValue(@Nullable Object thisRef, @NotNull KProperty property, @NotNull String value) { 5 var name by D() (in AClass.name) + +6 private String _value = ""; +12 println("Now my name is '$name'") (in AClass.uses()) +5 var name by D() (in AClass) +9 return _value; +6 private String _value = ""; + diff --git a/idea/testData/slicer/inflow/topLevelVar.leafGroups.txt b/idea/testData/slicer/inflow/topLevelVar.leafGroups.txt index 9925a5c5526..788f10691db 100644 --- a/idea/testData/slicer/inflow/topLevelVar.leafGroups.txt +++ b/idea/testData/slicer/inflow/topLevelVar.leafGroups.txt @@ -2,10 +2,11 @@ 3 var foo: Int = 1 3 var foo: Int = 1 (in foo) +4 TopLevelVarKt.setFoo(3); +3 var foo: Int = 1 +4 TopLevelVarKt.setFoo(3); + 7 foo = 2 (in test()) 3 var foo: Int = 1 7 foo = 2 (in test()) -4 TopLevelVarKt.setFoo(3); -3 var foo: Int = 1 -4 TopLevelVarKt.setFoo(3); diff --git a/idea/testData/slicer/inflow/valParameter.leafGroups.txt b/idea/testData/slicer/inflow/valParameter.leafGroups.txt index 3c3a0121e02..513f4f032d9 100644 --- a/idea/testData/slicer/inflow/valParameter.leafGroups.txt +++ b/idea/testData/slicer/inflow/valParameter.leafGroups.txt @@ -7,10 +7,11 @@ 3 open class A(val n: Int) (in A) 5 class B : A(1) (in B) +7 A a = new A(3); +3 open class A(val n: Int) (in A) +7 A a = new A(3); + 8 val z = A(2).n (in test()) 3 open class A(val n: Int) (in A) 8 val z = A(2).n (in test()) -7 A a = new A(3); -3 open class A(val n: Int) (in A) -7 A a = new A(3); diff --git a/idea/testData/slicer/inflow/whenExpression.leafGroups.txt b/idea/testData/slicer/inflow/whenExpression.leafGroups.txt index f797208837b..4e55ff2a598 100644 --- a/idea/testData/slicer/inflow/whenExpression.leafGroups.txt +++ b/idea/testData/slicer/inflow/whenExpression.leafGroups.txt @@ -4,12 +4,13 @@ 6 2 -> n (in test(Int, Int)) 3 fun test(m: Int, n: Int) { (in test(Int, Int)) +5 1 -> 1 (in test(Int, Int)) +4 val x = when (m) { (in test(Int, Int)) +4 val x = when (m) { (in test(Int, Int)) +5 1 -> 1 (in test(Int, Int)) + 7 else -> 0 (in test(Int, Int)) 4 val x = when (m) { (in test(Int, Int)) 4 val x = when (m) { (in test(Int, Int)) 7 else -> 0 (in test(Int, Int)) -5 1 -> 1 (in test(Int, Int)) -4 val x = when (m) { (in test(Int, Int)) -4 val x = when (m) { (in test(Int, Int)) -5 1 -> 1 (in test(Int, Int)) diff --git a/idea/tests/org/jetbrains/kotlin/idea/slicer/AbstractSlicerLeafGroupingTest.kt b/idea/tests/org/jetbrains/kotlin/idea/slicer/AbstractSlicerLeafGroupingTest.kt index 2d83bbbb7af..dbea880bb9b 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/slicer/AbstractSlicerLeafGroupingTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/slicer/AbstractSlicerLeafGroupingTest.kt @@ -17,8 +17,8 @@ abstract class AbstractSlicerLeafGroupingTest : AbstractSlicerTest() { val leafExpressions = analyzer.calcLeafExpressions(rootNode, treeStructure, possibleElementsByNode) val newRootNode = analyzer.createTreeGroupedByValues(leafExpressions, rootNode, possibleElementsByNode) val renderedForest = buildString { - for (groupRootNode in newRootNode.children) { - append(buildTreeRepresentation(groupRootNode)) + newRootNode.children.map { groupRootNode -> buildTreeRepresentation(groupRootNode) }.sorted().forEach { + append(it) append("\n") } }