diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceUsageCellRenderer.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceUsageCellRenderer.kt index 1a5425acaea..2fc17e8de76 100644 --- a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceUsageCellRenderer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceUsageCellRenderer.kt @@ -12,6 +12,7 @@ import com.intellij.ui.SimpleTextAttributes import com.intellij.util.FontUtil import org.jetbrains.kotlin.descriptors.ClassifierDescriptor import org.jetbrains.kotlin.descriptors.ConstructorDescriptor +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.caches.resolve.unsafeResolveToDescriptor import org.jetbrains.kotlin.psi.* @@ -26,6 +27,7 @@ object KotlinSliceUsageCellRenderer : SliceUsageCellRendererBase() { private val descriptorRenderer = DescriptorRenderer.ONLY_NAMES_WITH_SHORT_TYPES.withOptions { withoutReturnType = true renderConstructorKeyword = false + valueParametersHandler = TruncatedValueParametersHandler(maxParameters = 2) } override fun customizeCellRendererFor(sliceUsage: SliceUsage) { @@ -86,4 +88,43 @@ object KotlinSliceUsageCellRenderer : SliceUsageCellRendererBase() { append(descriptorRenderer.render(descriptor)) } } + + private class TruncatedValueParametersHandler(private val maxParameters: Int) : DescriptorRenderer.ValueParametersHandler { + private var truncateLength = -1 + + override fun appendBeforeValueParameters(parameterCount: Int, builder: StringBuilder) { + builder.append("(") + } + + override fun appendAfterValueParameters(parameterCount: Int, builder: StringBuilder) { + if (parameterCount > maxParameters) { + builder.setLength(truncateLength) + builder.append(",${Typography.ellipsis}") + } + builder.append(")") + } + + override fun appendBeforeValueParameter( + parameter: ValueParameterDescriptor, + parameterIndex: Int, + parameterCount: Int, + builder: StringBuilder + ) { + } + + override fun appendAfterValueParameter( + parameter: ValueParameterDescriptor, + parameterIndex: Int, + parameterCount: Int, + builder: StringBuilder + ) { + if (parameterIndex < parameterCount - 1) { + if (parameterIndex == maxParameters - 1) { + truncateLength = builder.length + } else { + builder.append(", ") + } + } + } + } } \ No newline at end of file diff --git a/idea/testData/slicer/inflow/diamondHierarchyJKMiddleClassFun.leafGroups.txt b/idea/testData/slicer/inflow/diamondHierarchyJKMiddleClassFun.leafGroups.txt index aa6a42f1678..d0f79018da2 100644 --- a/idea/testData/slicer/inflow/diamondHierarchyJKMiddleClassFun.leafGroups.txt +++ b/idea/testData/slicer/inflow/diamondHierarchyJKMiddleClassFun.leafGroups.txt @@ -1,10 +1,10 @@ 4 override fun foo() = 2 (in B.foo()) -9 val y = b.foo() (in test(A, B, C, D)) -9 val y = b.foo() (in test(A, B, C, D)) +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, C, D)) -9 val y = b.foo() (in test(A, B, C, D)) +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/diamondHierarchyJKMiddleClassFun.nullnessGroups.txt b/idea/testData/slicer/inflow/diamondHierarchyJKMiddleClassFun.nullnessGroups.txt index 8de1578f4b7..bcec0624ec0 100644 --- a/idea/testData/slicer/inflow/diamondHierarchyJKMiddleClassFun.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/diamondHierarchyJKMiddleClassFun.nullnessGroups.txt @@ -1,3 +1,4 @@ [NotNull Values] -9 val y = b.foo() (in test(A, B, C, D)) -9 val y = b.foo() (in test(A, B, C, D)) +9 val y = b.foo() (in test(A, B,…)) +9 val y = b.foo() (in test(A, B,…)) + diff --git a/idea/testData/slicer/inflow/diamondHierarchyJKMiddleClassFun.results.txt b/idea/testData/slicer/inflow/diamondHierarchyJKMiddleClassFun.results.txt index dc76795cbe8..0e6bd3b0c9e 100644 --- a/idea/testData/slicer/inflow/diamondHierarchyJKMiddleClassFun.results.txt +++ b/idea/testData/slicer/inflow/diamondHierarchyJKMiddleClassFun.results.txt @@ -1,5 +1,5 @@ -9 val y = b.foo() (in test(A, B, C, D)) -9 val y = b.foo() (in test(A, B, C, D)) +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; diff --git a/idea/testData/slicer/inflow/diamondHierarchyJKMiddleInterfaceFun.leafGroups.txt b/idea/testData/slicer/inflow/diamondHierarchyJKMiddleInterfaceFun.leafGroups.txt index 9cff8485bbc..ed4d4273964 100644 --- a/idea/testData/slicer/inflow/diamondHierarchyJKMiddleInterfaceFun.leafGroups.txt +++ b/idea/testData/slicer/inflow/diamondHierarchyJKMiddleInterfaceFun.leafGroups.txt @@ -1,10 +1,10 @@ 4 override fun foo() = 3 (in C.foo()) -10 val z = c.foo() (in test(A, B, C, D)) -10 val z = c.foo() (in test(A, B, C, D)) +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, C, D)) -10 val z = c.foo() (in test(A, B, C, D)) +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/diamondHierarchyJKMiddleInterfaceFun.nullnessGroups.txt b/idea/testData/slicer/inflow/diamondHierarchyJKMiddleInterfaceFun.nullnessGroups.txt index a24b4c114d9..d7a322e6263 100644 --- a/idea/testData/slicer/inflow/diamondHierarchyJKMiddleInterfaceFun.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/diamondHierarchyJKMiddleInterfaceFun.nullnessGroups.txt @@ -1,3 +1,4 @@ [NotNull Values] -10 val z = c.foo() (in test(A, B, C, D)) -10 val z = c.foo() (in test(A, B, C, D)) +10 val z = c.foo() (in test(A, B,…)) +10 val z = c.foo() (in test(A, B,…)) + diff --git a/idea/testData/slicer/inflow/diamondHierarchyJKMiddleInterfaceFun.results.txt b/idea/testData/slicer/inflow/diamondHierarchyJKMiddleInterfaceFun.results.txt index 7fa8f07ed06..c2221d89ff7 100644 --- a/idea/testData/slicer/inflow/diamondHierarchyJKMiddleInterfaceFun.results.txt +++ b/idea/testData/slicer/inflow/diamondHierarchyJKMiddleInterfaceFun.results.txt @@ -1,5 +1,5 @@ -10 val z = c.foo() (in test(A, B, C, D)) -10 val z = c.foo() (in test(A, B, C, D)) +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; diff --git a/idea/testData/slicer/inflow/diamondHierarchyJKRootInterfaceFun.leafGroups.txt b/idea/testData/slicer/inflow/diamondHierarchyJKRootInterfaceFun.leafGroups.txt index 1b3f6d32168..fa306190d4c 100644 --- a/idea/testData/slicer/inflow/diamondHierarchyJKRootInterfaceFun.leafGroups.txt +++ b/idea/testData/slicer/inflow/diamondHierarchyJKRootInterfaceFun.leafGroups.txt @@ -1,15 +1,15 @@ 4 fun foo() = 1 (in A.foo()) -8 val x = a.foo() (in test(A, B, C, D)) -8 val x = a.foo() (in test(A, B, C, D)) +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()) 3 return 2; -8 val x = a.foo() (in test(A, B, C, D)) -8 val x = a.foo() (in test(A, B, C, D)) +8 val x = a.foo() (in test(A, B,…)) +8 val x = a.foo() (in test(A, B,…)) 3 return 2; 13 return 4; -8 val x = a.foo() (in test(A, B, C, D)) -8 val x = a.foo() (in test(A, B, C, D)) +8 val x = a.foo() (in test(A, B,…)) +8 val x = a.foo() (in test(A, B,…)) 13 return 4; diff --git a/idea/testData/slicer/inflow/diamondHierarchyJKRootInterfaceFun.nullnessGroups.txt b/idea/testData/slicer/inflow/diamondHierarchyJKRootInterfaceFun.nullnessGroups.txt index 70cb91d4bc3..271fe91e2f7 100644 --- a/idea/testData/slicer/inflow/diamondHierarchyJKRootInterfaceFun.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/diamondHierarchyJKRootInterfaceFun.nullnessGroups.txt @@ -1,3 +1,4 @@ [NotNull Values] -8 val x = a.foo() (in test(A, B, C, D)) -8 val x = a.foo() (in test(A, B, C, D)) +8 val x = a.foo() (in test(A, B,…)) +8 val x = a.foo() (in test(A, B,…)) + diff --git a/idea/testData/slicer/inflow/diamondHierarchyJKRootInterfaceFun.results.txt b/idea/testData/slicer/inflow/diamondHierarchyJKRootInterfaceFun.results.txt index b8b6db6b39a..ed8030dc28e 100644 --- a/idea/testData/slicer/inflow/diamondHierarchyJKRootInterfaceFun.results.txt +++ b/idea/testData/slicer/inflow/diamondHierarchyJKRootInterfaceFun.results.txt @@ -1,5 +1,5 @@ -8 val x = a.foo() (in test(A, B, C, D)) -8 val x = a.foo() (in test(A, B, C, D)) +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()) 3 return 2; diff --git a/idea/testData/slicer/inflow/diamondHierarchyMiddleClassFun.leafGroups.txt b/idea/testData/slicer/inflow/diamondHierarchyMiddleClassFun.leafGroups.txt index c02a6cad00a..63877bc11c1 100644 --- a/idea/testData/slicer/inflow/diamondHierarchyMiddleClassFun.leafGroups.txt +++ b/idea/testData/slicer/inflow/diamondHierarchyMiddleClassFun.leafGroups.txt @@ -1,11 +1,11 @@ 8 override fun foo() = 2 (in B.foo()) -21 val y = b.foo() (in test(A, B, C, D)) -21 val y = b.foo() (in test(A, B, C, D)) +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, C, D)) -21 val y = b.foo() (in test(A, B, C, D)) +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/diamondHierarchyMiddleClassFun.nullnessGroups.txt b/idea/testData/slicer/inflow/diamondHierarchyMiddleClassFun.nullnessGroups.txt index 6ce47a0f200..77728322e23 100644 --- a/idea/testData/slicer/inflow/diamondHierarchyMiddleClassFun.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/diamondHierarchyMiddleClassFun.nullnessGroups.txt @@ -1,3 +1,4 @@ [NotNull Values] -21 val y = b.foo() (in test(A, B, C, D)) -21 val y = b.foo() (in test(A, B, C, D)) +21 val y = b.foo() (in test(A, B,…)) +21 val y = b.foo() (in test(A, B,…)) + diff --git a/idea/testData/slicer/inflow/diamondHierarchyMiddleClassFun.results.txt b/idea/testData/slicer/inflow/diamondHierarchyMiddleClassFun.results.txt index 0343f6ce8db..d4fcb30cee4 100644 --- a/idea/testData/slicer/inflow/diamondHierarchyMiddleClassFun.results.txt +++ b/idea/testData/slicer/inflow/diamondHierarchyMiddleClassFun.results.txt @@ -1,5 +1,5 @@ -21 val y = b.foo() (in test(A, B, C, D)) -21 val y = b.foo() (in test(A, B, C, D)) +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) diff --git a/idea/testData/slicer/inflow/diamondHierarchyMiddleInterfaceFun.leafGroups.txt b/idea/testData/slicer/inflow/diamondHierarchyMiddleInterfaceFun.leafGroups.txt index f6e10d4eac2..2609387dc28 100644 --- a/idea/testData/slicer/inflow/diamondHierarchyMiddleInterfaceFun.leafGroups.txt +++ b/idea/testData/slicer/inflow/diamondHierarchyMiddleInterfaceFun.leafGroups.txt @@ -1,11 +1,11 @@ 12 override fun foo() = 3 (in C.foo()) -22 val z = c.foo() (in test(A, B, C, D)) -22 val z = c.foo() (in test(A, B, C, D)) +22 val z = c.foo() (in test(A, B,…)) +22 val z = c.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()) -22 val z = c.foo() (in test(A, B, C, D)) -22 val z = c.foo() (in test(A, B, C, D)) +22 val z = c.foo() (in test(A, B,…)) +22 val z = c.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/diamondHierarchyMiddleInterfaceFun.nullnessGroups.txt b/idea/testData/slicer/inflow/diamondHierarchyMiddleInterfaceFun.nullnessGroups.txt index 38365deb18c..2a9b3a5f5c7 100644 --- a/idea/testData/slicer/inflow/diamondHierarchyMiddleInterfaceFun.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/diamondHierarchyMiddleInterfaceFun.nullnessGroups.txt @@ -1,3 +1,4 @@ [NotNull Values] -22 val z = c.foo() (in test(A, B, C, D)) -22 val z = c.foo() (in test(A, B, C, D)) +22 val z = c.foo() (in test(A, B,…)) +22 val z = c.foo() (in test(A, B,…)) + diff --git a/idea/testData/slicer/inflow/diamondHierarchyMiddleInterfaceFun.results.txt b/idea/testData/slicer/inflow/diamondHierarchyMiddleInterfaceFun.results.txt index 72de5345351..acce4374eb6 100644 --- a/idea/testData/slicer/inflow/diamondHierarchyMiddleInterfaceFun.results.txt +++ b/idea/testData/slicer/inflow/diamondHierarchyMiddleInterfaceFun.results.txt @@ -1,5 +1,5 @@ -22 val z = c.foo() (in test(A, B, C, D)) -22 val z = c.foo() (in test(A, B, C, D)) +22 val z = c.foo() (in test(A, B,…)) +22 val z = c.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) diff --git a/idea/testData/slicer/inflow/diamondHierarchyRootInterfaceFun.leafGroups.txt b/idea/testData/slicer/inflow/diamondHierarchyRootInterfaceFun.leafGroups.txt index 81b76d04421..376792c982e 100644 --- a/idea/testData/slicer/inflow/diamondHierarchyRootInterfaceFun.leafGroups.txt +++ b/idea/testData/slicer/inflow/diamondHierarchyRootInterfaceFun.leafGroups.txt @@ -1,23 +1,23 @@ 4 fun foo() = 1 (in A.foo()) -20 val x = a.foo() (in test(A, B, C, D)) -20 val x = a.foo() (in test(A, B, C, D)) +20 val x = a.foo() (in test(A, B,…)) +20 val x = a.foo() (in test(A, B,…)) 4 fun foo() = 1 (in A) 4 fun foo() = 1 (in A.foo()) 8 override fun foo() = 2 (in B.foo()) -20 val x = a.foo() (in test(A, B, C, D)) -20 val x = a.foo() (in test(A, B, C, D)) +20 val x = a.foo() (in test(A, B,…)) +20 val x = a.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()) -20 val x = a.foo() (in test(A, B, C, D)) -20 val x = a.foo() (in test(A, B, C, D)) +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, C, D)) -20 val x = a.foo() (in test(A, B, C, D)) +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/diamondHierarchyRootInterfaceFun.nullnessGroups.txt b/idea/testData/slicer/inflow/diamondHierarchyRootInterfaceFun.nullnessGroups.txt index 94a1813a1e6..97ca0152440 100644 --- a/idea/testData/slicer/inflow/diamondHierarchyRootInterfaceFun.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/diamondHierarchyRootInterfaceFun.nullnessGroups.txt @@ -1,3 +1,4 @@ [NotNull Values] -20 val x = a.foo() (in test(A, B, C, D)) -20 val x = a.foo() (in test(A, B, C, D)) +20 val x = a.foo() (in test(A, B,…)) +20 val x = a.foo() (in test(A, B,…)) + diff --git a/idea/testData/slicer/inflow/diamondHierarchyRootInterfaceFun.results.txt b/idea/testData/slicer/inflow/diamondHierarchyRootInterfaceFun.results.txt index 3658e2afedd..e76e329df56 100644 --- a/idea/testData/slicer/inflow/diamondHierarchyRootInterfaceFun.results.txt +++ b/idea/testData/slicer/inflow/diamondHierarchyRootInterfaceFun.results.txt @@ -1,5 +1,5 @@ -20 val x = a.foo() (in test(A, B, C, D)) -20 val x = a.foo() (in test(A, B, C, D)) +20 val x = a.foo() (in test(A, B,…)) +20 val x = a.foo() (in test(A, B,…)) 4 fun foo() = 1 (in A) 4 fun foo() = 1 (in A.foo()) 8 override fun foo() = 2 (in B) diff --git a/idea/testData/slicer/inflow/doubleLambdaResult.leafGroups.txt b/idea/testData/slicer/inflow/doubleLambdaResult.leafGroups.txt index fa349b25201..763b28b44bb 100644 --- a/idea/testData/slicer/inflow/doubleLambdaResult.leafGroups.txt +++ b/idea/testData/slicer/inflow/doubleLambdaResult.leafGroups.txt @@ -2,10 +2,10 @@ 8 val x = foo(1, 2) { { it } } (in test()) 8 val x = foo(1, 2) { { it } } (in test()) 3 fun foo(a: Int, b: Int, f: (Int) -> (Int) -> Int): Int { -4 return f(a)(b) (in foo(Int, Int, (Int) -> (Int) -> Int)) -4 [LAMBDA IN] return f(a)(b) (in foo(Int, Int, (Int) -> (Int) -> Int)) -4 [LAMBDA IN] [LAMBDA IN] return f(a)(b) (in foo(Int, Int, (Int) -> (Int) -> Int)) -3 [LAMBDA IN] [LAMBDA IN] fun foo(a: Int, b: Int, f: (Int) -> (Int) -> Int): Int { (in foo(Int, Int, (Int) -> (Int) -> Int)) +4 return f(a)(b) (in foo(Int, Int,…)) +4 [LAMBDA IN] return f(a)(b) (in foo(Int, Int,…)) +4 [LAMBDA IN] [LAMBDA IN] return f(a)(b) (in foo(Int, Int,…)) +3 [LAMBDA IN] [LAMBDA IN] fun foo(a: Int, b: Int, f: (Int) -> (Int) -> Int): Int { (in foo(Int, Int,…)) 8 [LAMBDA IN] [LAMBDA IN] val x = foo(1, 2) { { it } } (in test()) 8 [LAMBDA IN] val x = foo(1, 2) { { it } } (in test()) 8 [LAMBDA IN] val x = foo(1, 2) { { it } } (in test()) @@ -14,8 +14,8 @@ 8 [LAMBDA CALLS ARGUMENT #0] val x = foo(1, 2) { { it } } (in test()) 8 [LAMBDA CALLS ARGUMENT #0] val x = foo(1, 2) { { it } } (in test()) 8 [LAMBDA CALLS] [LAMBDA CALLS ARGUMENT #0] val x = foo(1, 2) { { it } } (in test()) -3 [LAMBDA CALLS] [LAMBDA CALLS ARGUMENT #0] fun foo(a: Int, b: Int, f: (Int) -> (Int) -> Int): Int { (in foo(Int, Int, (Int) -> (Int) -> Int)) -4 [LAMBDA CALLS ARGUMENT #0] return f(a)(b) (in foo(Int, Int, (Int) -> (Int) -> Int)) -4 return f(a)(b) (in foo(Int, Int, (Int) -> (Int) -> Int)) -3 fun foo(a: Int, b: Int, f: (Int) -> (Int) -> Int): Int { (in foo(Int, Int, (Int) -> (Int) -> Int)) +3 [LAMBDA CALLS] [LAMBDA CALLS ARGUMENT #0] fun foo(a: Int, b: Int, f: (Int) -> (Int) -> Int): Int { (in foo(Int, Int,…)) +4 [LAMBDA CALLS ARGUMENT #0] return f(a)(b) (in foo(Int, Int,…)) +4 return f(a)(b) (in foo(Int, Int,…)) +3 fun foo(a: Int, b: Int, f: (Int) -> (Int) -> Int): Int { (in foo(Int, Int,…)) 8 val x = foo(1, 2) { { it } } (in test()) diff --git a/idea/testData/slicer/inflow/doubleLambdaResult.results.txt b/idea/testData/slicer/inflow/doubleLambdaResult.results.txt index b7a591db73e..4cc74aa2a0d 100644 --- a/idea/testData/slicer/inflow/doubleLambdaResult.results.txt +++ b/idea/testData/slicer/inflow/doubleLambdaResult.results.txt @@ -1,10 +1,10 @@ 8 val x = foo(1, 2) { { it } } (in test()) 8 val x = foo(1, 2) { { it } } (in test()) 3 fun foo(a: Int, b: Int, f: (Int) -> (Int) -> Int): Int { -4 return f(a)(b) (in foo(Int, Int, (Int) -> (Int) -> Int)) -4 [LAMBDA IN] return f(a)(b) (in foo(Int, Int, (Int) -> (Int) -> Int)) -4 [LAMBDA IN] [LAMBDA IN] return f(a)(b) (in foo(Int, Int, (Int) -> (Int) -> Int)) -3 [LAMBDA IN] [LAMBDA IN] fun foo(a: Int, b: Int, f: (Int) -> (Int) -> Int): Int { (in foo(Int, Int, (Int) -> (Int) -> Int)) +4 return f(a)(b) (in foo(Int, Int,…)) +4 [LAMBDA IN] return f(a)(b) (in foo(Int, Int,…)) +4 [LAMBDA IN] [LAMBDA IN] return f(a)(b) (in foo(Int, Int,…)) +3 [LAMBDA IN] [LAMBDA IN] fun foo(a: Int, b: Int, f: (Int) -> (Int) -> Int): Int { (in foo(Int, Int,…)) 8 [LAMBDA IN] [LAMBDA IN] val x = foo(1, 2) { { it } } (in test()) 8 [LAMBDA IN] val x = foo(1, 2) { { it } } (in test()) 8 [LAMBDA IN] val x = foo(1, 2) { { it } } (in test()) @@ -13,8 +13,8 @@ 8 [LAMBDA CALLS ARGUMENT #0] val x = foo(1, 2) { { it } } (in test()) 8 [LAMBDA CALLS ARGUMENT #0] val x = foo(1, 2) { { it } } (in test()) 8 [LAMBDA CALLS] [LAMBDA CALLS ARGUMENT #0] val x = foo(1, 2) { { it } } (in test()) -3 [LAMBDA CALLS] [LAMBDA CALLS ARGUMENT #0] fun foo(a: Int, b: Int, f: (Int) -> (Int) -> Int): Int { (in foo(Int, Int, (Int) -> (Int) -> Int)) -4 [LAMBDA CALLS ARGUMENT #0] return f(a)(b) (in foo(Int, Int, (Int) -> (Int) -> Int)) -4 return f(a)(b) (in foo(Int, Int, (Int) -> (Int) -> Int)) -3 fun foo(a: Int, b: Int, f: (Int) -> (Int) -> Int): Int { (in foo(Int, Int, (Int) -> (Int) -> Int)) +3 [LAMBDA CALLS] [LAMBDA CALLS ARGUMENT #0] fun foo(a: Int, b: Int, f: (Int) -> (Int) -> Int): Int { (in foo(Int, Int,…)) +4 [LAMBDA CALLS ARGUMENT #0] return f(a)(b) (in foo(Int, Int,…)) +4 return f(a)(b) (in foo(Int, Int,…)) +3 fun foo(a: Int, b: Int, f: (Int) -> (Int) -> Int): Int { (in foo(Int, Int,…)) 8 val x = foo(1, 2) { { it } } (in test()) diff --git a/idea/testData/slicer/inflow/overridingFunctionResult.leafGroups.txt b/idea/testData/slicer/inflow/overridingFunctionResult.leafGroups.txt index ec5595b82aa..4261f084cae 100644 --- a/idea/testData/slicer/inflow/overridingFunctionResult.leafGroups.txt +++ b/idea/testData/slicer/inflow/overridingFunctionResult.leafGroups.txt @@ -1,16 +1,16 @@ 8 override fun foo() = 2 (in B.foo()) -17 val y = b.foo() (in test(A, B, C)) -17 val y = b.foo() (in test(A, B, C)) +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, C)) -17 val y = b.foo() (in test(A, B, C)) +17 val y = b.foo() (in test(A, B,…)) +17 val y = b.foo() (in test(A, B,…)) 12 override fun foo() = 3 (in C) 12 override fun foo() = 3 (in C.foo()) 3 return 5; -17 val y = b.foo() (in test(A, B, C)) -17 val y = b.foo() (in test(A, B, C)) +17 val y = b.foo() (in test(A, B,…)) +17 val y = b.foo() (in test(A, B,…)) 3 return 5; diff --git a/idea/testData/slicer/inflow/overridingFunctionResult.nullnessGroups.txt b/idea/testData/slicer/inflow/overridingFunctionResult.nullnessGroups.txt index 55a1f71430d..c0622cf6c5b 100644 --- a/idea/testData/slicer/inflow/overridingFunctionResult.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/overridingFunctionResult.nullnessGroups.txt @@ -1,3 +1,4 @@ [NotNull Values] -17 val y = b.foo() (in test(A, B, C)) -17 val y = b.foo() (in test(A, B, C)) +17 val y = b.foo() (in test(A, B,…)) +17 val y = b.foo() (in test(A, B,…)) + diff --git a/idea/testData/slicer/inflow/overridingFunctionResult.results.txt b/idea/testData/slicer/inflow/overridingFunctionResult.results.txt index b170f95b8fb..920088fbad8 100644 --- a/idea/testData/slicer/inflow/overridingFunctionResult.results.txt +++ b/idea/testData/slicer/inflow/overridingFunctionResult.results.txt @@ -1,5 +1,5 @@ -17 val y = b.foo() (in test(A, B, C)) -17 val y = b.foo() (in test(A, B, C)) +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) 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 a07802ff63a..a72b9d43759 100644 --- a/idea/testData/slicer/inflow/overridingParameter.leafGroups.txt +++ b/idea/testData/slicer/inflow/overridingParameter.leafGroups.txt @@ -1,22 +1,22 @@ 9 class C : B(1) { (in C) -15 val y = b.foo (in test(A, B, C)) -15 val y = b.foo (in test(A, B, 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: Int) -15 val y = b.foo (in test(A, B, C)) -15 val y = b.foo (in test(A, B, C)) +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: Int) 7 return 5; -15 val y = b.foo (in test(A, B, C)) -15 val y = b.foo (in test(A, B, C)) +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, C)) -15 val y = b.foo (in test(A, B, 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) 3 super(10); diff --git a/idea/testData/slicer/inflow/overridingParameter.nullnessGroups.txt b/idea/testData/slicer/inflow/overridingParameter.nullnessGroups.txt index 1b3961a6349..ba477ebfe11 100644 --- a/idea/testData/slicer/inflow/overridingParameter.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/overridingParameter.nullnessGroups.txt @@ -1,3 +1,4 @@ [NotNull Values] -15 val y = b.foo (in test(A, B, C)) -15 val y = b.foo (in test(A, B, C)) +15 val y = b.foo (in test(A, B,…)) +15 val y = b.foo (in test(A, B,…)) + diff --git a/idea/testData/slicer/inflow/overridingParameter.results.txt b/idea/testData/slicer/inflow/overridingParameter.results.txt index c9c5af56e7f..bdf248020df 100644 --- a/idea/testData/slicer/inflow/overridingParameter.results.txt +++ b/idea/testData/slicer/inflow/overridingParameter.results.txt @@ -1,5 +1,5 @@ -15 val y = b.foo (in test(A, B, C)) -15 val y = b.foo (in test(A, B, 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) 3 super(10); 9 class C : B(1) { (in C) diff --git a/idea/testData/slicer/inflow/overridingPropertyGetterResult.leafGroups.txt b/idea/testData/slicer/inflow/overridingPropertyGetterResult.leafGroups.txt index 33ab39e0ec1..5294acf1c1e 100644 --- a/idea/testData/slicer/inflow/overridingPropertyGetterResult.leafGroups.txt +++ b/idea/testData/slicer/inflow/overridingPropertyGetterResult.leafGroups.txt @@ -1,16 +1,16 @@ 10 get() = 2 (in B.foo: Int) -20 val y = b.foo (in test(A, B, C)) -20 val y = b.foo (in test(A, B, C)) +20 val y = b.foo (in test(A, B,…)) +20 val y = b.foo (in test(A, B,…)) 9 override val foo: Int (in B) 10 get() = 2 (in B.foo: Int) 15 get() = 3 (in C.foo: Int) -20 val y = b.foo (in test(A, B, C)) -20 val y = b.foo (in test(A, B, C)) +20 val y = b.foo (in test(A, B,…)) +20 val y = b.foo (in test(A, B,…)) 14 override val foo: Int (in C) 15 get() = 3 (in C.foo: Int) 3 return 5; -20 val y = b.foo (in test(A, B, C)) -20 val y = b.foo (in test(A, B, C)) +20 val y = b.foo (in test(A, B,…)) +20 val y = b.foo (in test(A, B,…)) 3 return 5; diff --git a/idea/testData/slicer/inflow/overridingPropertyGetterResult.nullnessGroups.txt b/idea/testData/slicer/inflow/overridingPropertyGetterResult.nullnessGroups.txt index 4a09fdafcf4..cc96943e5db 100644 --- a/idea/testData/slicer/inflow/overridingPropertyGetterResult.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/overridingPropertyGetterResult.nullnessGroups.txt @@ -1,3 +1,4 @@ [NotNull Values] -20 val y = b.foo (in test(A, B, C)) -20 val y = b.foo (in test(A, B, C)) +20 val y = b.foo (in test(A, B,…)) +20 val y = b.foo (in test(A, B,…)) + diff --git a/idea/testData/slicer/inflow/overridingPropertyGetterResult.results.txt b/idea/testData/slicer/inflow/overridingPropertyGetterResult.results.txt index 40b7b8036a0..b49e8b21cd7 100644 --- a/idea/testData/slicer/inflow/overridingPropertyGetterResult.results.txt +++ b/idea/testData/slicer/inflow/overridingPropertyGetterResult.results.txt @@ -1,5 +1,5 @@ -20 val y = b.foo (in test(A, B, C)) -20 val y = b.foo (in test(A, B, C)) +20 val y = b.foo (in test(A, B,…)) +20 val y = b.foo (in test(A, B,…)) 3 return 5; 9 override val foo: Int (in B) 10 get() = 2 (in B.foo: Int) diff --git a/idea/testData/slicer/inflow/overridingPropertyResult.leafGroups.txt b/idea/testData/slicer/inflow/overridingPropertyResult.leafGroups.txt index 4b6a2035835..e7d7e712719 100644 --- a/idea/testData/slicer/inflow/overridingPropertyResult.leafGroups.txt +++ b/idea/testData/slicer/inflow/overridingPropertyResult.leafGroups.txt @@ -1,16 +1,16 @@ 8 override val foo = 2 (in B.foo: Int) -17 val y = b.foo (in test(A, B, C)) -17 val y = b.foo (in test(A, B, C)) +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: Int) 12 override val foo = 3 (in C.foo: Int) -17 val y = b.foo (in test(A, B, C)) -17 val y = b.foo (in test(A, B, C)) +17 val y = b.foo (in test(A, B,…)) +17 val y = b.foo (in test(A, B,…)) 12 override val foo = 3 (in C) 12 override val foo = 3 (in C.foo: Int) 3 return 5; -17 val y = b.foo (in test(A, B, C)) -17 val y = b.foo (in test(A, B, C)) +17 val y = b.foo (in test(A, B,…)) +17 val y = b.foo (in test(A, B,…)) 3 return 5; diff --git a/idea/testData/slicer/inflow/overridingPropertyResult.nullnessGroups.txt b/idea/testData/slicer/inflow/overridingPropertyResult.nullnessGroups.txt index 69c3fedf21f..8a2a15e18c6 100644 --- a/idea/testData/slicer/inflow/overridingPropertyResult.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/overridingPropertyResult.nullnessGroups.txt @@ -1,3 +1,4 @@ [NotNull Values] -17 val y = b.foo (in test(A, B, C)) -17 val y = b.foo (in test(A, B, C)) +17 val y = b.foo (in test(A, B,…)) +17 val y = b.foo (in test(A, B,…)) + diff --git a/idea/testData/slicer/inflow/overridingPropertyResult.results.txt b/idea/testData/slicer/inflow/overridingPropertyResult.results.txt index 6617650b676..63fc1659335 100644 --- a/idea/testData/slicer/inflow/overridingPropertyResult.results.txt +++ b/idea/testData/slicer/inflow/overridingPropertyResult.results.txt @@ -1,5 +1,5 @@ -17 val y = b.foo (in test(A, B, C)) -17 val y = b.foo (in test(A, B, C)) +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) 8 override val foo = 2 (in B.foo: Int) diff --git a/idea/testData/slicer/inflow/settersViaDelegateForQualifiedRef.leafGroups.txt b/idea/testData/slicer/inflow/settersViaDelegateForQualifiedRef.leafGroups.txt index 536cdbab422..ed45db13185 100644 --- a/idea/testData/slicer/inflow/settersViaDelegateForQualifiedRef.leafGroups.txt +++ b/idea/testData/slicer/inflow/settersViaDelegateForQualifiedRef.leafGroups.txt @@ -12,8 +12,8 @@ 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) -9 _value = value (in Delegate.setValue(Any?, KProperty<*>, String)) -8 operator fun setValue(thisRef: Any?, property: KProperty<*>, value: String) { (in Delegate.setValue(Any?, KProperty<*>, String)) +9 _value = value (in Delegate.setValue(Any?, KProperty<*>,…)) +8 operator fun setValue(thisRef: Any?, property: KProperty<*>, value: String) { (in Delegate.setValue(Any?, KProperty<*>,…)) 20 name = "bye" (in AClass.uses()) 26 val a = AClass("hello") (in main(Array)) @@ -22,8 +22,8 @@ 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) -9 _value = value (in Delegate.setValue(Any?, KProperty<*>, String)) -8 operator fun setValue(thisRef: Any?, property: KProperty<*>, value: String) { (in Delegate.setValue(Any?, KProperty<*>, String)) +9 _value = value (in Delegate.setValue(Any?, KProperty<*>,…)) +8 operator fun setValue(thisRef: Any?, property: KProperty<*>, value: String) { (in Delegate.setValue(Any?, KProperty<*>,…)) 16 name = name1 (in AClass) 13 class AClass(name1: String){ (in AClass(String)) 26 val a = AClass("hello") (in main(Array)) diff --git a/idea/testData/slicer/inflow/settersViaDelegateForQualifiedRef.results.txt b/idea/testData/slicer/inflow/settersViaDelegateForQualifiedRef.results.txt index 70d521b84c5..7f1bca40470 100644 --- a/idea/testData/slicer/inflow/settersViaDelegateForQualifiedRef.results.txt +++ b/idea/testData/slicer/inflow/settersViaDelegateForQualifiedRef.results.txt @@ -4,8 +4,8 @@ 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: String) -9 _value = value (in Delegate.setValue(Any?, KProperty<*>, String)) -8 operator fun setValue(thisRef: Any?, property: KProperty<*>, value: String) { (in Delegate.setValue(Any?, KProperty<*>, String)) +9 _value = value (in Delegate.setValue(Any?, KProperty<*>,…)) +8 operator fun setValue(thisRef: Any?, property: KProperty<*>, value: String) { (in Delegate.setValue(Any?, KProperty<*>,…)) 16 name = name1 (in AClass) 13 class AClass(name1: String){ (in AClass(String)) 26 val a = AClass("hello") (in main(Array)) diff --git a/idea/testData/slicer/inflow/settersViaDelegateForSimpleRef.leafGroups.txt b/idea/testData/slicer/inflow/settersViaDelegateForSimpleRef.leafGroups.txt index 9ef577d26cb..dcf9a1212ea 100644 --- a/idea/testData/slicer/inflow/settersViaDelegateForSimpleRef.leafGroups.txt +++ b/idea/testData/slicer/inflow/settersViaDelegateForSimpleRef.leafGroups.txt @@ -12,8 +12,8 @@ 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) -10 _value = value (in Delegate.setValue(Any?, KProperty<*>, String)) -9 operator fun setValue(thisRef: Any?, property: KProperty<*>, value: String) { (in Delegate.setValue(Any?, KProperty<*>, String)) +10 _value = value (in Delegate.setValue(Any?, KProperty<*>,…)) +9 operator fun setValue(thisRef: Any?, property: KProperty<*>, value: String) { (in Delegate.setValue(Any?, KProperty<*>,…)) 21 name = "bye" (in AClass.uses()) 27 val a = AClass("hello") (in main(Array)) @@ -22,8 +22,8 @@ 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) -10 _value = value (in Delegate.setValue(Any?, KProperty<*>, String)) -9 operator fun setValue(thisRef: Any?, property: KProperty<*>, value: String) { (in Delegate.setValue(Any?, KProperty<*>, String)) +10 _value = value (in Delegate.setValue(Any?, KProperty<*>,…)) +9 operator fun setValue(thisRef: Any?, property: KProperty<*>, value: String) { (in Delegate.setValue(Any?, KProperty<*>,…)) 17 name = name1 (in AClass) 14 class AClass(name1: String){ (in AClass(String)) 27 val a = AClass("hello") (in main(Array)) diff --git a/idea/testData/slicer/inflow/settersViaDelegateForSimpleRef.results.txt b/idea/testData/slicer/inflow/settersViaDelegateForSimpleRef.results.txt index cbe0884da82..0e0236e119d 100644 --- a/idea/testData/slicer/inflow/settersViaDelegateForSimpleRef.results.txt +++ b/idea/testData/slicer/inflow/settersViaDelegateForSimpleRef.results.txt @@ -4,8 +4,8 @@ 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: String) -10 _value = value (in Delegate.setValue(Any?, KProperty<*>, String)) -9 operator fun setValue(thisRef: Any?, property: KProperty<*>, value: String) { (in Delegate.setValue(Any?, KProperty<*>, String)) +10 _value = value (in Delegate.setValue(Any?, KProperty<*>,…)) +9 operator fun setValue(thisRef: Any?, property: KProperty<*>, value: String) { (in Delegate.setValue(Any?, KProperty<*>,…)) 17 name = name1 (in AClass) 14 class AClass(name1: String){ (in AClass(String)) 27 val a = AClass("hello") (in main(Array)) diff --git a/idea/testData/slicer/outflow/diamondHierarchyJKLeafClassFun.results.txt b/idea/testData/slicer/outflow/diamondHierarchyJKLeafClassFun.results.txt index ca16c40511e..4f8337235d2 100644 --- a/idea/testData/slicer/outflow/diamondHierarchyJKLeafClassFun.results.txt +++ b/idea/testData/slicer/outflow/diamondHierarchyJKLeafClassFun.results.txt @@ -1,22 +1,22 @@ 4 override fun foo() = 4 (in D.foo()) 4 override fun foo() = 4 (in D) 2 public int foo(); -8 val x = a.foo() (in test(A, B, C, D)) -8 val x = a.foo() (in test(A, B, C, D)) -9 val y = b.foo() (in test(A, B, C, D)) -9 val y = b.foo() (in test(A, B, C, D)) -10 val z = c.foo() (in test(A, B, C, D)) -10 val z = c.foo() (in test(A, B, C, D)) -11 val u = d.foo() (in test(A, B, C, D)) -11 val u = d.foo() (in test(A, B, C, D)) +8 val x = a.foo() (in test(A, B,…)) +8 val x = a.foo() (in test(A, B,…)) +9 val y = b.foo() (in test(A, B,…)) +9 val y = b.foo() (in test(A, B,…)) +10 val z = c.foo() (in test(A, B,…)) +10 val z = c.foo() (in test(A, B,…)) +11 val u = d.foo() (in test(A, B,…)) +11 val u = d.foo() (in test(A, B,…)) 6 public int foo() { -8 DUPLICATE: val x = a.foo() (in test(A, B, C, D)) -9 DUPLICATE: val y = b.foo() (in test(A, B, C, D)) -10 DUPLICATE: val z = c.foo() (in test(A, B, C, D)) -11 DUPLICATE: val u = d.foo() (in test(A, B, C, D)) +8 DUPLICATE: val x = a.foo() (in test(A, B,…)) +9 DUPLICATE: val y = b.foo() (in test(A, B,…)) +10 DUPLICATE: val z = c.foo() (in test(A, B,…)) +11 DUPLICATE: val u = d.foo() (in test(A, B,…)) 12 public int foo(); -8 DUPLICATE: val x = a.foo() (in test(A, B, C, D)) -9 DUPLICATE: val y = b.foo() (in test(A, B, C, D)) -10 DUPLICATE: val z = c.foo() (in test(A, B, C, D)) -11 DUPLICATE: val u = d.foo() (in test(A, B, C, D)) -11 DUPLICATE: val u = d.foo() (in test(A, B, C, D)) +8 DUPLICATE: val x = a.foo() (in test(A, B,…)) +9 DUPLICATE: val y = b.foo() (in test(A, B,…)) +10 DUPLICATE: val z = c.foo() (in test(A, B,…)) +11 DUPLICATE: val u = d.foo() (in test(A, B,…)) +11 DUPLICATE: val u = d.foo() (in test(A, B,…)) diff --git a/idea/testData/slicer/outflow/diamondHierarchyJKMiddleClassFun.results.txt b/idea/testData/slicer/outflow/diamondHierarchyJKMiddleClassFun.results.txt index 6aadb7ca398..fc2ddeb325f 100644 --- a/idea/testData/slicer/outflow/diamondHierarchyJKMiddleClassFun.results.txt +++ b/idea/testData/slicer/outflow/diamondHierarchyJKMiddleClassFun.results.txt @@ -1,12 +1,12 @@ 4 override fun foo() = 2 (in B.foo()) 4 override fun foo() = 2 (in B) 2 public int foo(); -8 val x = a.foo() (in test(A, B, C, D)) -8 val x = a.foo() (in test(A, B, C, D)) -9 val y = b.foo() (in test(A, B, C, D)) -9 val y = b.foo() (in test(A, B, C, D)) -10 val z = c.foo() (in test(A, B, C, D)) -10 val z = c.foo() (in test(A, B, C, D)) -11 val u = d.foo() (in test(A, B, C, D)) -11 val u = d.foo() (in test(A, B, C, D)) -9 DUPLICATE: val y = b.foo() (in test(A, B, C, D)) +8 val x = a.foo() (in test(A, B,…)) +8 val x = a.foo() (in test(A, B,…)) +9 val y = b.foo() (in test(A, B,…)) +9 val y = b.foo() (in test(A, B,…)) +10 val z = c.foo() (in test(A, B,…)) +10 val z = c.foo() (in test(A, B,…)) +11 val u = d.foo() (in test(A, B,…)) +11 val u = d.foo() (in test(A, B,…)) +9 DUPLICATE: val y = b.foo() (in test(A, B,…)) diff --git a/idea/testData/slicer/outflow/diamondHierarchyJKMiddleInterfaceFun.results.txt b/idea/testData/slicer/outflow/diamondHierarchyJKMiddleInterfaceFun.results.txt index e6ebaa63209..5bbfcb2fbcb 100644 --- a/idea/testData/slicer/outflow/diamondHierarchyJKMiddleInterfaceFun.results.txt +++ b/idea/testData/slicer/outflow/diamondHierarchyJKMiddleInterfaceFun.results.txt @@ -1,12 +1,12 @@ 4 override fun foo() = 3 (in C.foo()) 4 override fun foo() = 3 (in C) 2 public int foo(); -8 val x = a.foo() (in test(A, B, C, D)) -8 val x = a.foo() (in test(A, B, C, D)) -9 val y = b.foo() (in test(A, B, C, D)) -9 val y = b.foo() (in test(A, B, C, D)) -10 val z = c.foo() (in test(A, B, C, D)) -10 val z = c.foo() (in test(A, B, C, D)) -11 val u = d.foo() (in test(A, B, C, D)) -11 val u = d.foo() (in test(A, B, C, D)) -10 DUPLICATE: val z = c.foo() (in test(A, B, C, D)) +8 val x = a.foo() (in test(A, B,…)) +8 val x = a.foo() (in test(A, B,…)) +9 val y = b.foo() (in test(A, B,…)) +9 val y = b.foo() (in test(A, B,…)) +10 val z = c.foo() (in test(A, B,…)) +10 val z = c.foo() (in test(A, B,…)) +11 val u = d.foo() (in test(A, B,…)) +11 val u = d.foo() (in test(A, B,…)) +10 DUPLICATE: val z = c.foo() (in test(A, B,…)) diff --git a/idea/testData/slicer/outflow/diamondHierarchyLeafClassFun.results.txt b/idea/testData/slicer/outflow/diamondHierarchyLeafClassFun.results.txt index 963497f3db0..031b43f6b1e 100644 --- a/idea/testData/slicer/outflow/diamondHierarchyLeafClassFun.results.txt +++ b/idea/testData/slicer/outflow/diamondHierarchyLeafClassFun.results.txt @@ -1,10 +1,10 @@ 16 override fun foo() = 4 (in D.foo()) 16 override fun foo() = 4 (in D) -20 val x = a.foo() (in test(A, B, C, D)) -20 val x = a.foo() (in test(A, B, C, D)) -21 val y = b.foo() (in test(A, B, C, D)) -21 val y = b.foo() (in test(A, B, C, D)) -22 val z = c.foo() (in test(A, B, C, D)) -22 val z = c.foo() (in test(A, B, C, D)) -23 val u = d.foo() (in test(A, B, C, D)) -23 val u = d.foo() (in test(A, B, C, D)) +20 val x = a.foo() (in test(A, B,…)) +20 val x = a.foo() (in test(A, B,…)) +21 val y = b.foo() (in test(A, B,…)) +21 val y = b.foo() (in test(A, B,…)) +22 val z = c.foo() (in test(A, B,…)) +22 val z = c.foo() (in test(A, B,…)) +23 val u = d.foo() (in test(A, B,…)) +23 val u = d.foo() (in test(A, B,…)) diff --git a/idea/testData/slicer/outflow/diamondHierarchyMiddleClassFun.results.txt b/idea/testData/slicer/outflow/diamondHierarchyMiddleClassFun.results.txt index 4bfea009d1a..16a902e3ff8 100644 --- a/idea/testData/slicer/outflow/diamondHierarchyMiddleClassFun.results.txt +++ b/idea/testData/slicer/outflow/diamondHierarchyMiddleClassFun.results.txt @@ -1,6 +1,6 @@ 8 override fun foo() = 2 (in B.foo()) 8 override fun foo() = 2 (in B) -20 val x = a.foo() (in test(A, B, C, D)) -20 val x = a.foo() (in test(A, B, C, D)) -21 val y = b.foo() (in test(A, B, C, D)) -21 val y = b.foo() (in test(A, B, C, D)) +20 val x = a.foo() (in test(A, B,…)) +20 val x = a.foo() (in test(A, B,…)) +21 val y = b.foo() (in test(A, B,…)) +21 val y = b.foo() (in test(A, B,…)) diff --git a/idea/testData/slicer/outflow/diamondHierarchyMiddleInterfaceFun.results.txt b/idea/testData/slicer/outflow/diamondHierarchyMiddleInterfaceFun.results.txt index 2cccff232b6..be5c4a1de82 100644 --- a/idea/testData/slicer/outflow/diamondHierarchyMiddleInterfaceFun.results.txt +++ b/idea/testData/slicer/outflow/diamondHierarchyMiddleInterfaceFun.results.txt @@ -1,6 +1,6 @@ 12 override fun foo() = 3 (in C.foo()) 12 override fun foo() = 3 (in C) -20 val x = a.foo() (in test(A, B, C, D)) -20 val x = a.foo() (in test(A, B, C, D)) -22 val z = c.foo() (in test(A, B, C, D)) -22 val z = c.foo() (in test(A, B, C, D)) +20 val x = a.foo() (in test(A, B,…)) +20 val x = a.foo() (in test(A, B,…)) +22 val z = c.foo() (in test(A, B,…)) +22 val z = c.foo() (in test(A, B,…)) diff --git a/idea/testData/slicer/outflow/doubleLambdaResult.results.txt b/idea/testData/slicer/outflow/doubleLambdaResult.results.txt index 839241bb8ea..b82afc1944c 100644 --- a/idea/testData/slicer/outflow/doubleLambdaResult.results.txt +++ b/idea/testData/slicer/outflow/doubleLambdaResult.results.txt @@ -3,9 +3,9 @@ 8 [LAMBDA CALLS] val x = foo(1, 2) { { it } } (in test()) 8 [LAMBDA CALLS] val x = foo(1, 2) { { it } } (in test()) 8 [LAMBDA CALLS] [LAMBDA CALLS] val x = foo(1, 2) { { it } } (in test()) -3 [LAMBDA CALLS] [LAMBDA CALLS] fun foo(a: Int, b: Int, f: (Int) -> (Int) -> Int): Int { (in foo(Int, Int, (Int) -> (Int) -> Int)) -4 [LAMBDA CALLS] return f(a)(b) (in foo(Int, Int, (Int) -> (Int) -> Int)) -4 return f(a)(b) (in foo(Int, Int, (Int) -> (Int) -> Int)) +3 [LAMBDA CALLS] [LAMBDA CALLS] fun foo(a: Int, b: Int, f: (Int) -> (Int) -> Int): Int { (in foo(Int, Int,…)) +4 [LAMBDA CALLS] return f(a)(b) (in foo(Int, Int,…)) +4 return f(a)(b) (in foo(Int, Int,…)) 3 fun foo(a: Int, b: Int, f: (Int) -> (Int) -> Int): Int { 8 val x = foo(1, 2) { { it } } (in test()) 8 val x = foo(1, 2) { { it } } (in test()) diff --git a/idea/testData/slicer/outflow/invokeExtensionLambda.results.txt b/idea/testData/slicer/outflow/invokeExtensionLambda.results.txt index 476a56d1f66..f5e70476d7b 100644 --- a/idea/testData/slicer/outflow/invokeExtensionLambda.results.txt +++ b/idea/testData/slicer/outflow/invokeExtensionLambda.results.txt @@ -15,18 +15,18 @@ 4 val v1 = f(p, { this }) (in foo(String) on String) 4 val v1 = f(p, { this }) (in foo(String) on String) 6 val v2 = g("a", "b", p, { p1, p2 -> p2 }) (in foo(String) on String) -15 fun g(a: String, b: String, c: String, lambda: String.(String, String) -> String): String { (in g(String, String, String, String.(String, String) -> String)) -16 return lambda.invoke(a, b, c) (in g(String, String, String, String.(String, String) -> String)) -16 [LAMBDA PARAMETER #1] return lambda.invoke(a, b, c) (in g(String, String, String, String.(String, String) -> String)) -15 [LAMBDA PARAMETER #1] fun g(a: String, b: String, c: String, lambda: String.(String, String) -> String): String { (in g(String, String, String, String.(String, String) -> String)) +15 fun g(a: String, b: String, c: String, lambda: String.(String, String) -> String): String { (in g(String, String,…)) +16 return lambda.invoke(a, b, c) (in g(String, String,…)) +16 [LAMBDA PARAMETER #1] return lambda.invoke(a, b, c) (in g(String, String,…)) +15 [LAMBDA PARAMETER #1] fun g(a: String, b: String, c: String, lambda: String.(String, String) -> String): String { (in g(String, String,…)) 6 [LAMBDA PARAMETER #1] val v2 = g("a", "b", p, { p1, p2 -> p2 }) (in foo(String) on String) 6 val v2 = g("a", "b", p, { p1, p2 -> p2 }) (in foo(String) on String) 6 val v2 = g("a", "b", p, { p1, p2 -> p2 }) (in foo(String) on String) 6 val v2 = g("a", "b", p, { p1, p2 -> p2 }) (in foo(String) on String) 6 [LAMBDA CALLS] val v2 = g("a", "b", p, { p1, p2 -> p2 }) (in foo(String) on String) -15 [LAMBDA CALLS] fun g(a: String, b: String, c: String, lambda: String.(String, String) -> String): String { (in g(String, String, String, String.(String, String) -> String)) -16 [LAMBDA CALLS] return lambda.invoke(a, b, c) (in g(String, String, String, String.(String, String) -> String)) -16 return lambda.invoke(a, b, c) (in g(String, String, String, String.(String, String) -> String)) +15 [LAMBDA CALLS] fun g(a: String, b: String, c: String, lambda: String.(String, String) -> String): String { (in g(String, String,…)) +16 [LAMBDA CALLS] return lambda.invoke(a, b, c) (in g(String, String,…)) +16 return lambda.invoke(a, b, c) (in g(String, String,…)) 15 fun g(a: String, b: String, c: String, lambda: String.(String, String) -> String): String { 6 val v2 = g("a", "b", p, { p1, p2 -> p2 }) (in foo(String) on String) 6 val v2 = g("a", "b", p, { p1, p2 -> p2 }) (in foo(String) on String) diff --git a/idea/testData/slicer/outflow/nullableLambda.results.txt b/idea/testData/slicer/outflow/nullableLambda.results.txt index a35b6a2055c..2993d8ddfc6 100644 --- a/idea/testData/slicer/outflow/nullableLambda.results.txt +++ b/idea/testData/slicer/outflow/nullableLambda.results.txt @@ -1,18 +1,18 @@ 3 fun String.foo(p: String) { (in foo(String) on String) 4 val v = bar(p, true, { this }) (in foo(String) on String) -7 fun bar(receiver: String, b: Boolean, lambda: (String.() -> String)?): String { (in bar(String, Boolean, (String.() -> String)?)) -8 return if (b) lambda!!.invoke(receiver) else "" (in bar(String, Boolean, (String.() -> String)?)) -8 [LAMBDA RECEIVER] return if (b) lambda!!.invoke(receiver) else "" (in bar(String, Boolean, (String.() -> String)?)) -8 [LAMBDA RECEIVER] return if (b) lambda!!.invoke(receiver) else "" (in bar(String, Boolean, (String.() -> String)?)) -7 [LAMBDA RECEIVER] fun bar(receiver: String, b: Boolean, lambda: (String.() -> String)?): String { (in bar(String, Boolean, (String.() -> String)?)) +7 fun bar(receiver: String, b: Boolean, lambda: (String.() -> String)?): String { (in bar(String, Boolean,…)) +8 return if (b) lambda!!.invoke(receiver) else "" (in bar(String, Boolean,…)) +8 [LAMBDA RECEIVER] return if (b) lambda!!.invoke(receiver) else "" (in bar(String, Boolean,…)) +8 [LAMBDA RECEIVER] return if (b) lambda!!.invoke(receiver) else "" (in bar(String, Boolean,…)) +7 [LAMBDA RECEIVER] fun bar(receiver: String, b: Boolean, lambda: (String.() -> String)?): String { (in bar(String, Boolean,…)) 4 [LAMBDA RECEIVER] val v = bar(p, true, { this }) (in foo(String) on String) 4 val v = bar(p, true, { this }) (in foo(String) on String) 4 val v = bar(p, true, { this }) (in foo(String) on String) 4 [LAMBDA CALLS] val v = bar(p, true, { this }) (in foo(String) on String) -7 [LAMBDA CALLS] fun bar(receiver: String, b: Boolean, lambda: (String.() -> String)?): String { (in bar(String, Boolean, (String.() -> String)?)) -8 [LAMBDA CALLS] return if (b) lambda!!.invoke(receiver) else "" (in bar(String, Boolean, (String.() -> String)?)) -8 [LAMBDA CALLS] return if (b) lambda!!.invoke(receiver) else "" (in bar(String, Boolean, (String.() -> String)?)) -8 return if (b) lambda!!.invoke(receiver) else "" (in bar(String, Boolean, (String.() -> String)?)) +7 [LAMBDA CALLS] fun bar(receiver: String, b: Boolean, lambda: (String.() -> String)?): String { (in bar(String, Boolean,…)) +8 [LAMBDA CALLS] return if (b) lambda!!.invoke(receiver) else "" (in bar(String, Boolean,…)) +8 [LAMBDA CALLS] return if (b) lambda!!.invoke(receiver) else "" (in bar(String, Boolean,…)) +8 return if (b) lambda!!.invoke(receiver) else "" (in bar(String, Boolean,…)) 7 fun bar(receiver: String, b: Boolean, lambda: (String.() -> String)?): String { 4 val v = bar(p, true, { this }) (in foo(String) on String) 4 val v = bar(p, true, { this }) (in foo(String) on String) diff --git a/idea/testData/slicer/outflow/overridingFunctionResult.results.txt b/idea/testData/slicer/outflow/overridingFunctionResult.results.txt index 0fa1d15fd05..61ed59c613d 100644 --- a/idea/testData/slicer/outflow/overridingFunctionResult.results.txt +++ b/idea/testData/slicer/outflow/overridingFunctionResult.results.txt @@ -1,6 +1,6 @@ 8 override fun foo() = 2 (in B.foo()) 8 override fun foo() = 2 (in B) -16 val x = a.foo() (in test(A, B, C)) -16 val x = a.foo() (in test(A, B, C)) -17 val y = b.foo() (in test(A, B, C)) -17 val y = b.foo() (in test(A, B, C)) +16 val x = a.foo() (in test(A, B,…)) +16 val x = a.foo() (in test(A, B,…)) +17 val y = b.foo() (in test(A, B,…)) +17 val y = b.foo() (in test(A, B,…)) diff --git a/idea/testData/slicer/outflow/overridingFunctionResultWithJava.results.txt b/idea/testData/slicer/outflow/overridingFunctionResultWithJava.results.txt index 162e9dad04f..040a679392a 100644 --- a/idea/testData/slicer/outflow/overridingFunctionResultWithJava.results.txt +++ b/idea/testData/slicer/outflow/overridingFunctionResultWithJava.results.txt @@ -1,10 +1,10 @@ 4 override fun foo() = 2 (in B.foo()) 4 override fun foo() = 2 (in B) 2 public int foo() { -8 val x = a.foo() (in test(A, B, C)) -8 val x = a.foo() (in test(A, B, C)) -9 val y = b.foo() (in test(A, B, C)) -9 val y = b.foo() (in test(A, B, C)) -10 val z = c.foo() (in test(A, B, C)) -10 val z = c.foo() (in test(A, B, C)) -9 DUPLICATE: val y = b.foo() (in test(A, B, C)) +8 val x = a.foo() (in test(A, B,…)) +8 val x = a.foo() (in test(A, B,…)) +9 val y = b.foo() (in test(A, B,…)) +9 val y = b.foo() (in test(A, B,…)) +10 val z = c.foo() (in test(A, B,…)) +10 val z = c.foo() (in test(A, B,…)) +9 DUPLICATE: val y = b.foo() (in test(A, B,…)) diff --git a/idea/testData/slicer/outflow/overridingParameter.results.txt b/idea/testData/slicer/outflow/overridingParameter.results.txt index f7e19cc886c..459477a2526 100644 --- a/idea/testData/slicer/outflow/overridingParameter.results.txt +++ b/idea/testData/slicer/outflow/overridingParameter.results.txt @@ -1,8 +1,8 @@ 10 override val foo = 3 (in C.foo: Int) 10 override val foo = 3 (in C) -14 val x = a.foo (in test(A, B, C)) -14 val x = a.foo (in test(A, B, C)) -15 val y = b.foo (in test(A, B, C)) -15 val y = b.foo (in test(A, B, C)) -16 val z = c.foo (in test(A, B, C)) -16 val z = c.foo (in test(A, B, C)) +14 val x = a.foo (in test(A, B,…)) +14 val x = a.foo (in test(A, B,…)) +15 val y = b.foo (in test(A, B,…)) +15 val y = b.foo (in test(A, B,…)) +16 val z = c.foo (in test(A, B,…)) +16 val z = c.foo (in test(A, B,…)) diff --git a/idea/testData/slicer/outflow/overridingPropertyGetterResult.results.txt b/idea/testData/slicer/outflow/overridingPropertyGetterResult.results.txt index c53763122c5..0599e5374c9 100644 --- a/idea/testData/slicer/outflow/overridingPropertyGetterResult.results.txt +++ b/idea/testData/slicer/outflow/overridingPropertyGetterResult.results.txt @@ -1,6 +1,6 @@ 10 get() = 2 (in B.foo: Int) 10 get() = 2 (in B.foo: Int) -19 val x = a.foo (in test(A, B, C)) -19 val x = a.foo (in test(A, B, C)) -20 val y = b.foo (in test(A, B, C)) -20 val y = b.foo (in test(A, B, C)) +19 val x = a.foo (in test(A, B,…)) +19 val x = a.foo (in test(A, B,…)) +20 val y = b.foo (in test(A, B,…)) +20 val y = b.foo (in test(A, B,…)) diff --git a/idea/testData/slicer/outflow/overridingPropertyResult.results.txt b/idea/testData/slicer/outflow/overridingPropertyResult.results.txt index 10923466cdf..a42adb9cc2e 100644 --- a/idea/testData/slicer/outflow/overridingPropertyResult.results.txt +++ b/idea/testData/slicer/outflow/overridingPropertyResult.results.txt @@ -1,6 +1,6 @@ 8 override val foo = 2 (in B.foo: Int) 8 override val foo = 2 (in B) -16 val x = a.foo (in test(A, B, C)) -16 val x = a.foo (in test(A, B, C)) -17 val y = b.foo (in test(A, B, C)) -17 val y = b.foo (in test(A, B, C)) +16 val x = a.foo (in test(A, B,…)) +16 val x = a.foo (in test(A, B,…)) +17 val y = b.foo (in test(A, B,…)) +17 val y = b.foo (in test(A, B,…))