Skip to content

Commit

Permalink
Container presentation in slicer tree: limit number of parameters sho…
Browse files Browse the repository at this point in the history 
…wn by 2
  • Loading branch information
@valentinkip
valentinkip committed Apr 17, 2020
1 parent 3e5820e commit 2ee776a
Show file tree
Hide file tree
Showing 51 changed files with 270 additions and 219 deletions.
41 changes: 41 additions & 0 deletions idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceUsageCellRenderer.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
Expand All @@ -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) {
Expand Down Expand Up @@ -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(", ")
}
}
}
}
}
8 changes: 4 additions & 4 deletions idea/testData/slicer/inflow/diamondHierarchyJKMiddleClassFun.leafGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
4 override fun foo() = <bold>2</bold> (in B.foo())
9 val <bold>y = b.foo()</bold> (in test(A, B, C, D))
9 val y = <bold>b.foo()</bold> (in test(A, B, C, D))
9 val <bold>y = b.foo()</bold> (in test(A, B,…))
9 val y = <bold>b.foo()</bold> (in test(A, B,…))
4 override fun <bold>foo() = 2</bold> (in B)
4 override fun foo() = <bold>2</bold> (in B.foo())

11 return <bold>4</bold>;
9 val <bold>y = b.foo()</bold> (in test(A, B, C, D))
9 val y = <bold>b.foo()</bold> (in test(A, B, C, D))
9 val <bold>y = b.foo()</bold> (in test(A, B,…))
9 val y = <bold>b.foo()</bold> (in test(A, B,…))
11 return <bold>4</bold>;
5 changes: 3 additions & 2 deletions idea/testData/slicer/inflow/diamondHierarchyJKMiddleClassFun.nullnessGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[NotNull Values]
9 val <bold>y = b.foo()</bold> (in test(A, B, C, D))
9 val <bold>y = b.foo()</bold> (in test(A, B, C, D))
9 val <bold>y = b.foo()</bold> (in test(A, B,…))
9 val <bold>y = b.foo()</bold> (in test(A, B,…))

4 changes: 2 additions & 2 deletions idea/testData/slicer/inflow/diamondHierarchyJKMiddleClassFun.results.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
9 val <bold>y = b.foo()</bold> (in test(A, B, C, D))
9 val y = <bold>b.foo()</bold> (in test(A, B, C, D))
9 val <bold>y = b.foo()</bold> (in test(A, B,…))
9 val y = <bold>b.foo()</bold> (in test(A, B,…))
4 override fun <bold>foo() = 2</bold> (in B)
4 override fun foo() = <bold>2</bold> (in B.foo())
11 return <bold>4</bold>;
8 changes: 4 additions & 4 deletions idea/testData/slicer/inflow/diamondHierarchyJKMiddleInterfaceFun.leafGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
4 override fun foo() = <bold>3</bold> (in C.foo())
10 val <bold>z = c.foo()</bold> (in test(A, B, C, D))
10 val z = <bold>c.foo()</bold> (in test(A, B, C, D))
10 val <bold>z = c.foo()</bold> (in test(A, B,…))
10 val z = <bold>c.foo()</bold> (in test(A, B,…))
4 override fun <bold>foo() = 3</bold> (in C)
4 override fun foo() = <bold>3</bold> (in C.foo())

13 return <bold>4</bold>;
10 val <bold>z = c.foo()</bold> (in test(A, B, C, D))
10 val z = <bold>c.foo()</bold> (in test(A, B, C, D))
10 val <bold>z = c.foo()</bold> (in test(A, B,…))
10 val z = <bold>c.foo()</bold> (in test(A, B,…))
13 return <bold>4</bold>;
5 changes: 3 additions & 2 deletions idea/testData/slicer/inflow/diamondHierarchyJKMiddleInterfaceFun.nullnessGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[NotNull Values]
10 val <bold>z = c.foo()</bold> (in test(A, B, C, D))
10 val <bold>z = c.foo()</bold> (in test(A, B, C, D))
10 val <bold>z = c.foo()</bold> (in test(A, B,…))
10 val <bold>z = c.foo()</bold> (in test(A, B,…))

4 changes: 2 additions & 2 deletions idea/testData/slicer/inflow/diamondHierarchyJKMiddleInterfaceFun.results.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
10 val <bold>z = c.foo()</bold> (in test(A, B, C, D))
10 val z = <bold>c.foo()</bold> (in test(A, B, C, D))
10 val <bold>z = c.foo()</bold> (in test(A, B,…))
10 val z = <bold>c.foo()</bold> (in test(A, B,…))
4 override fun <bold>foo() = 3</bold> (in C)
4 override fun foo() = <bold>3</bold> (in C.foo())
13 return <bold>4</bold>;
12 changes: 6 additions & 6 deletions idea/testData/slicer/inflow/diamondHierarchyJKRootInterfaceFun.leafGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
4 fun foo() = <bold>1</bold> (in A.foo())
8 val <bold>x = a.foo()</bold> (in test(A, B, C, D))
8 val x = <bold>a.foo()</bold> (in test(A, B, C, D))
8 val <bold>x = a.foo()</bold> (in test(A, B,…))
8 val x = <bold>a.foo()</bold> (in test(A, B,…))
4 fun <bold>foo() = 1</bold> (in A)
4 fun foo() = <bold>1</bold> (in A.foo())

3 return <bold>2</bold>;
8 val <bold>x = a.foo()</bold> (in test(A, B, C, D))
8 val x = <bold>a.foo()</bold> (in test(A, B, C, D))
8 val <bold>x = a.foo()</bold> (in test(A, B,…))
8 val x = <bold>a.foo()</bold> (in test(A, B,…))
3 return <bold>2</bold>;

13 return <bold>4</bold>;
8 val <bold>x = a.foo()</bold> (in test(A, B, C, D))
8 val x = <bold>a.foo()</bold> (in test(A, B, C, D))
8 val <bold>x = a.foo()</bold> (in test(A, B,…))
8 val x = <bold>a.foo()</bold> (in test(A, B,…))
13 return <bold>4</bold>;
5 changes: 3 additions & 2 deletions idea/testData/slicer/inflow/diamondHierarchyJKRootInterfaceFun.nullnessGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[NotNull Values]
8 val <bold>x = a.foo()</bold> (in test(A, B, C, D))
8 val <bold>x = a.foo()</bold> (in test(A, B, C, D))
8 val <bold>x = a.foo()</bold> (in test(A, B,…))
8 val <bold>x = a.foo()</bold> (in test(A, B,…))

4 changes: 2 additions & 2 deletions idea/testData/slicer/inflow/diamondHierarchyJKRootInterfaceFun.results.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
8 val <bold>x = a.foo()</bold> (in test(A, B, C, D))
8 val x = <bold>a.foo()</bold> (in test(A, B, C, D))
8 val <bold>x = a.foo()</bold> (in test(A, B,…))
8 val x = <bold>a.foo()</bold> (in test(A, B,…))
4 fun <bold>foo() = 1</bold> (in A)
4 fun foo() = <bold>1</bold> (in A.foo())
3 return <bold>2</bold>;
Expand Down
8 changes: 4 additions & 4 deletions idea/testData/slicer/inflow/diamondHierarchyMiddleClassFun.leafGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
8 override fun foo() = <bold>2</bold> (in B.foo())
21 val <bold>y = b.foo()</bold> (in test(A, B, C, D))
21 val y = <bold>b.foo()</bold> (in test(A, B, C, D))
21 val <bold>y = b.foo()</bold> (in test(A, B,…))
21 val y = <bold>b.foo()</bold> (in test(A, B,…))
8 override fun <bold>foo() = 2</bold> (in B)
8 override fun foo() = <bold>2</bold> (in B.foo())

16 override fun foo() = <bold>4</bold> (in D.foo())
21 val <bold>y = b.foo()</bold> (in test(A, B, C, D))
21 val y = <bold>b.foo()</bold> (in test(A, B, C, D))
21 val <bold>y = b.foo()</bold> (in test(A, B,…))
21 val y = <bold>b.foo()</bold> (in test(A, B,…))
16 override fun <bold>foo() = 4</bold> (in D)
16 override fun foo() = <bold>4</bold> (in D.foo())
5 changes: 3 additions & 2 deletions idea/testData/slicer/inflow/diamondHierarchyMiddleClassFun.nullnessGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[NotNull Values]
21 val <bold>y = b.foo()</bold> (in test(A, B, C, D))
21 val <bold>y = b.foo()</bold> (in test(A, B, C, D))
21 val <bold>y = b.foo()</bold> (in test(A, B,…))
21 val <bold>y = b.foo()</bold> (in test(A, B,…))

4 changes: 2 additions & 2 deletions idea/testData/slicer/inflow/diamondHierarchyMiddleClassFun.results.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
21 val <bold>y = b.foo()</bold> (in test(A, B, C, D))
21 val y = <bold>b.foo()</bold> (in test(A, B, C, D))
21 val <bold>y = b.foo()</bold> (in test(A, B,…))
21 val y = <bold>b.foo()</bold> (in test(A, B,…))
8 override fun <bold>foo() = 2</bold> (in B)
8 override fun foo() = <bold>2</bold> (in B.foo())
16 override fun <bold>foo() = 4</bold> (in D)
Expand Down
8 changes: 4 additions & 4 deletions idea/testData/slicer/inflow/diamondHierarchyMiddleInterfaceFun.leafGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
12 override fun foo() = <bold>3</bold> (in C.foo())
22 val <bold>z = c.foo()</bold> (in test(A, B, C, D))
22 val z = <bold>c.foo()</bold> (in test(A, B, C, D))
22 val <bold>z = c.foo()</bold> (in test(A, B,…))
22 val z = <bold>c.foo()</bold> (in test(A, B,…))
12 override fun <bold>foo() = 3</bold> (in C)
12 override fun foo() = <bold>3</bold> (in C.foo())

16 override fun foo() = <bold>4</bold> (in D.foo())
22 val <bold>z = c.foo()</bold> (in test(A, B, C, D))
22 val z = <bold>c.foo()</bold> (in test(A, B, C, D))
22 val <bold>z = c.foo()</bold> (in test(A, B,…))
22 val z = <bold>c.foo()</bold> (in test(A, B,…))
16 override fun <bold>foo() = 4</bold> (in D)
16 override fun foo() = <bold>4</bold> (in D.foo())
5 changes: 3 additions & 2 deletions idea/testData/slicer/inflow/diamondHierarchyMiddleInterfaceFun.nullnessGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[NotNull Values]
22 val <bold>z = c.foo()</bold> (in test(A, B, C, D))
22 val <bold>z = c.foo()</bold> (in test(A, B, C, D))
22 val <bold>z = c.foo()</bold> (in test(A, B,…))
22 val <bold>z = c.foo()</bold> (in test(A, B,…))

4 changes: 2 additions & 2 deletions idea/testData/slicer/inflow/diamondHierarchyMiddleInterfaceFun.results.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
22 val <bold>z = c.foo()</bold> (in test(A, B, C, D))
22 val z = <bold>c.foo()</bold> (in test(A, B, C, D))
22 val <bold>z = c.foo()</bold> (in test(A, B,…))
22 val z = <bold>c.foo()</bold> (in test(A, B,…))
12 override fun <bold>foo() = 3</bold> (in C)
12 override fun foo() = <bold>3</bold> (in C.foo())
16 override fun <bold>foo() = 4</bold> (in D)
Expand Down
16 changes: 8 additions & 8 deletions idea/testData/slicer/inflow/diamondHierarchyRootInterfaceFun.leafGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
4 fun foo() = <bold>1</bold> (in A.foo())
20 val <bold>x = a.foo()</bold> (in test(A, B, C, D))
20 val x = <bold>a.foo()</bold> (in test(A, B, C, D))
20 val <bold>x = a.foo()</bold> (in test(A, B,…))
20 val x = <bold>a.foo()</bold> (in test(A, B,…))
4 fun <bold>foo() = 1</bold> (in A)
4 fun foo() = <bold>1</bold> (in A.foo())

8 override fun foo() = <bold>2</bold> (in B.foo())
20 val <bold>x = a.foo()</bold> (in test(A, B, C, D))
20 val x = <bold>a.foo()</bold> (in test(A, B, C, D))
20 val <bold>x = a.foo()</bold> (in test(A, B,…))
20 val x = <bold>a.foo()</bold> (in test(A, B,…))
8 override fun <bold>foo() = 2</bold> (in B)
8 override fun foo() = <bold>2</bold> (in B.foo())

12 override fun foo() = <bold>3</bold> (in C.foo())
20 val <bold>x = a.foo()</bold> (in test(A, B, C, D))
20 val x = <bold>a.foo()</bold> (in test(A, B, C, D))
20 val <bold>x = a.foo()</bold> (in test(A, B,…))
20 val x = <bold>a.foo()</bold> (in test(A, B,…))
12 override fun <bold>foo() = 3</bold> (in C)
12 override fun foo() = <bold>3</bold> (in C.foo())

16 override fun foo() = <bold>4</bold> (in D.foo())
20 val <bold>x = a.foo()</bold> (in test(A, B, C, D))
20 val x = <bold>a.foo()</bold> (in test(A, B, C, D))
20 val <bold>x = a.foo()</bold> (in test(A, B,…))
20 val x = <bold>a.foo()</bold> (in test(A, B,…))
16 override fun <bold>foo() = 4</bold> (in D)
16 override fun foo() = <bold>4</bold> (in D.foo())
5 changes: 3 additions & 2 deletions idea/testData/slicer/inflow/diamondHierarchyRootInterfaceFun.nullnessGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[NotNull Values]
20 val <bold>x = a.foo()</bold> (in test(A, B, C, D))
20 val <bold>x = a.foo()</bold> (in test(A, B, C, D))
20 val <bold>x = a.foo()</bold> (in test(A, B,…))
20 val <bold>x = a.foo()</bold> (in test(A, B,…))

4 changes: 2 additions & 2 deletions idea/testData/slicer/inflow/diamondHierarchyRootInterfaceFun.results.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
20 val <bold>x = a.foo()</bold> (in test(A, B, C, D))
20 val x = <bold>a.foo()</bold> (in test(A, B, C, D))
20 val <bold>x = a.foo()</bold> (in test(A, B,…))
20 val x = <bold>a.foo()</bold> (in test(A, B,…))
4 fun <bold>foo() = 1</bold> (in A)
4 fun foo() = <bold>1</bold> (in A.foo())
8 override fun <bold>foo() = 2</bold> (in B)
Expand Down
16 changes: 8 additions & 8 deletions idea/testData/slicer/inflow/doubleLambdaResult.leafGroups.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
8 val <bold>x = foo(1, 2) { { it } }</bold> (in test())
8 val x = <bold>foo(1, 2) { { it } }</bold> (in test())
3 fun <bold>foo(a: Int, b: Int, f: (Int) -> (Int) -> Int): Int {</bold>
4 return <bold>f(a)(b)</bold> (in foo(Int, Int, (Int) -> (Int) -> Int))
4 [LAMBDA IN] return <bold>f(a)</bold>(b) (in foo(Int, Int, (Int) -> (Int) -> Int))
4 [LAMBDA IN] [LAMBDA IN] return <bold>f</bold>(a)(b) (in foo(Int, Int, (Int) -> (Int) -> Int))
3 [LAMBDA IN] [LAMBDA IN] fun foo(a: Int, b: Int, <bold>f: (Int) -> (Int) -> Int</bold>): Int { (in foo(Int, Int, (Int) -> (Int) -> Int))
4 return <bold>f(a)(b)</bold> (in foo(Int, Int,…))
4 [LAMBDA IN] return <bold>f(a)</bold>(b) (in foo(Int, Int,…))
4 [LAMBDA IN] [LAMBDA IN] return <bold>f</bold>(a)(b) (in foo(Int, Int,…))
3 [LAMBDA IN] [LAMBDA IN] fun foo(a: Int, b: Int, <bold>f: (Int) -> (Int) -> Int</bold>): Int { (in foo(Int, Int,…))
8 [LAMBDA IN] [LAMBDA IN] val x = foo(1, 2) <bold>{ { it } }</bold> (in test())
8 [LAMBDA IN] val x = foo(1, 2) <bold>{ { it } }</bold> (in test())
8 [LAMBDA IN] val x = foo(1, 2) { <bold>{ it }</bold> } (in test())
Expand All @@ -14,8 +14,8 @@
8 [LAMBDA CALLS ARGUMENT #0] val x = foo(1, 2) { <bold>{ it }</bold> } (in test())
8 [LAMBDA CALLS ARGUMENT #0] val x = foo(1, 2) <bold>{ { it } }</bold> (in test())
8 [LAMBDA CALLS] [LAMBDA CALLS ARGUMENT #0] val x = foo(1, 2) <bold>{ { it } }</bold> (in test())
3 [LAMBDA CALLS] [LAMBDA CALLS ARGUMENT #0] fun foo(a: Int, b: Int, <bold>f: (Int) -> (Int) -> Int</bold>): Int { (in foo(Int, Int, (Int) -> (Int) -> Int))
4 [LAMBDA CALLS ARGUMENT #0] return <bold>f(a)</bold>(b) (in foo(Int, Int, (Int) -> (Int) -> Int))
4 return f(a)(<bold>b</bold>) (in foo(Int, Int, (Int) -> (Int) -> Int))
3 fun foo(a: Int, <bold>b: Int</bold>, 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, <bold>f: (Int) -> (Int) -> Int</bold>): Int { (in foo(Int, Int,…))
4 [LAMBDA CALLS ARGUMENT #0] return <bold>f(a)</bold>(b) (in foo(Int, Int,…))
4 return f(a)(<bold>b</bold>) (in foo(Int, Int,…))
3 fun foo(a: Int, <bold>b: Int</bold>, f: (Int) -> (Int) -> Int): Int { (in foo(Int, Int,…))
8 val x = foo(1, <bold>2</bold>) { { it } } (in test())
16 changes: 8 additions & 8 deletions idea/testData/slicer/inflow/doubleLambdaResult.results.txt
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
8 val <bold>x = foo(1, 2) { { it } }</bold> (in test())
8 val x = <bold>foo(1, 2) { { it } }</bold> (in test())
3 fun <bold>foo(a: Int, b: Int, f: (Int) -> (Int) -> Int): Int {</bold>
4 return <bold>f(a)(b)</bold> (in foo(Int, Int, (Int) -> (Int) -> Int))
4 [LAMBDA IN] return <bold>f(a)</bold>(b) (in foo(Int, Int, (Int) -> (Int) -> Int))
4 [LAMBDA IN] [LAMBDA IN] return <bold>f</bold>(a)(b) (in foo(Int, Int, (Int) -> (Int) -> Int))
3 [LAMBDA IN] [LAMBDA IN] fun foo(a: Int, b: Int, <bold>f: (Int) -> (Int) -> Int</bold>): Int { (in foo(Int, Int, (Int) -> (Int) -> Int))
4 return <bold>f(a)(b)</bold> (in foo(Int, Int,…))
4 [LAMBDA IN] return <bold>f(a)</bold>(b) (in foo(Int, Int,…))
4 [LAMBDA IN] [LAMBDA IN] return <bold>f</bold>(a)(b) (in foo(Int, Int,…))
3 [LAMBDA IN] [LAMBDA IN] fun foo(a: Int, b: Int, <bold>f: (Int) -> (Int) -> Int</bold>): Int { (in foo(Int, Int,…))
8 [LAMBDA IN] [LAMBDA IN] val x = foo(1, 2) <bold>{ { it } }</bold> (in test())
8 [LAMBDA IN] val x = foo(1, 2) <bold>{ { it } }</bold> (in test())
8 [LAMBDA IN] val x = foo(1, 2) { <bold>{ it }</bold> } (in test())
Expand All @@ -13,8 +13,8 @@
8 [LAMBDA CALLS ARGUMENT #0] val x = foo(1, 2) { <bold>{ it }</bold> } (in test())
8 [LAMBDA CALLS ARGUMENT #0] val x = foo(1, 2) <bold>{ { it } }</bold> (in test())
8 [LAMBDA CALLS] [LAMBDA CALLS ARGUMENT #0] val x = foo(1, 2) <bold>{ { it } }</bold> (in test())
3 [LAMBDA CALLS] [LAMBDA CALLS ARGUMENT #0] fun foo(a: Int, b: Int, <bold>f: (Int) -> (Int) -> Int</bold>): Int { (in foo(Int, Int, (Int) -> (Int) -> Int))
4 [LAMBDA CALLS ARGUMENT #0] return <bold>f(a)</bold>(b) (in foo(Int, Int, (Int) -> (Int) -> Int))
4 return f(a)(<bold>b</bold>) (in foo(Int, Int, (Int) -> (Int) -> Int))
3 fun foo(a: Int, <bold>b: Int</bold>, 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, <bold>f: (Int) -> (Int) -> Int</bold>): Int { (in foo(Int, Int,…))
4 [LAMBDA CALLS ARGUMENT #0] return <bold>f(a)</bold>(b) (in foo(Int, Int,…))
4 return f(a)(<bold>b</bold>) (in foo(Int, Int,…))
3 fun foo(a: Int, <bold>b: Int</bold>, f: (Int) -> (Int) -> Int): Int { (in foo(Int, Int,…))
8 val x = foo(1, <bold>2</bold>) { { it } } (in test())
12 changes: 6 additions & 6 deletions idea/testData/slicer/inflow/overridingFunctionResult.leafGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
8 override fun foo() = <bold>2</bold> (in B.foo())
17 val <bold>y = b.foo()</bold> (in test(A, B, C))
17 val y = <bold>b.foo()</bold> (in test(A, B, C))
17 val <bold>y = b.foo()</bold> (in test(A, B,…))
17 val y = <bold>b.foo()</bold> (in test(A, B,…))
8 override fun <bold>foo() = 2</bold> (in B)
8 override fun foo() = <bold>2</bold> (in B.foo())

12 override fun foo() = <bold>3</bold> (in C.foo())
17 val <bold>y = b.foo()</bold> (in test(A, B, C))
17 val y = <bold>b.foo()</bold> (in test(A, B, C))
17 val <bold>y = b.foo()</bold> (in test(A, B,…))
17 val y = <bold>b.foo()</bold> (in test(A, B,…))
12 override fun <bold>foo() = 3</bold> (in C)
12 override fun foo() = <bold>3</bold> (in C.foo())

3 return <bold>5</bold>;
17 val <bold>y = b.foo()</bold> (in test(A, B, C))
17 val y = <bold>b.foo()</bold> (in test(A, B, C))
17 val <bold>y = b.foo()</bold> (in test(A, B,…))
17 val y = <bold>b.foo()</bold> (in test(A, B,…))
3 return <bold>5</bold>;
5 changes: 3 additions & 2 deletions idea/testData/slicer/inflow/overridingFunctionResult.nullnessGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[NotNull Values]
17 val <bold>y = b.foo()</bold> (in test(A, B, C))
17 val <bold>y = b.foo()</bold> (in test(A, B, C))
17 val <bold>y = b.foo()</bold> (in test(A, B,…))
17 val <bold>y = b.foo()</bold> (in test(A, B,…))

4 changes: 2 additions & 2 deletions idea/testData/slicer/inflow/overridingFunctionResult.results.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
17 val <bold>y = b.foo()</bold> (in test(A, B, C))
17 val y = <bold>b.foo()</bold> (in test(A, B, C))
17 val <bold>y = b.foo()</bold> (in test(A, B,…))
17 val y = <bold>b.foo()</bold> (in test(A, B,…))
3 return <bold>5</bold>;
8 override fun <bold>foo() = 2</bold> (in B)
8 override fun foo() = <bold>2</bold> (in B.foo())
Expand Down
16 changes: 8 additions & 8 deletions idea/testData/slicer/inflow/overridingParameter.leafGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
9 class C : B(<bold>1</bold>) { (in C)
15 val <bold>y = b.foo</bold> (in test(A, B, C))
15 val y = <bold>b.foo</bold> (in test(A, B, C))
15 val <bold>y = b.foo</bold> (in test(A, B,…))
15 val y = <bold>b.foo</bold> (in test(A, B,…))
7 open class B(override val <bold>foo: Int</bold>) : A() (in B)
9 class C : B(<bold>1</bold>) { (in C)

10 override val foo = <bold>3</bold> (in C.foo: Int)
15 val <bold>y = b.foo</bold> (in test(A, B, C))
15 val y = <bold>b.foo</bold> (in test(A, B, C))
15 val <bold>y = b.foo</bold> (in test(A, B,…))
15 val y = <bold>b.foo</bold> (in test(A, B,…))
10 override val <bold>foo = 3</bold> (in C)
10 override val foo = <bold>3</bold> (in C.foo: Int)

7 return <bold>5</bold>;
15 val <bold>y = b.foo</bold> (in test(A, B, C))
15 val y = <bold>b.foo</bold> (in test(A, B, C))
15 val <bold>y = b.foo</bold> (in test(A, B,…))
15 val y = <bold>b.foo</bold> (in test(A, B,…))
7 return <bold>5</bold>;

3 super(<bold>10</bold>);
15 val <bold>y = b.foo</bold> (in test(A, B, C))
15 val y = <bold>b.foo</bold> (in test(A, B, C))
15 val <bold>y = b.foo</bold> (in test(A, B,…))
15 val y = <bold>b.foo</bold> (in test(A, B,…))
7 open class B(override val <bold>foo: Int</bold>) : A() (in B)
3 super(<bold>10</bold>);
5 changes: 3 additions & 2 deletions idea/testData/slicer/inflow/overridingParameter.nullnessGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[NotNull Values]
15 val <bold>y = b.foo</bold> (in test(A, B, C))
15 val <bold>y = b.foo</bold> (in test(A, B, C))
15 val <bold>y = b.foo</bold> (in test(A, B,…))
15 val <bold>y = b.foo</bold> (in test(A, B,…))

Loading

0 comments on commit 2ee776a

Please sign in to comment.