Skip to content

Commit

Permalink
Added container text into slicer tests output
Browse files Browse the repository at this point in the history
  • Loading branch information
@valentinkip
valentinkip committed Apr 17, 2020
1 parent 2d2d933 commit 23ead3c
Show file tree
Hide file tree
Showing 313 changed files with 2,253 additions and 2,331 deletions.
2 changes: 1 addition & 1 deletion idea/resources/messages/KotlinBundle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,7 @@ test.integration.message.text.create.test.in.the.same.source.root=Create test in
test.integration.message.text.kotlin.class=Kotlin class ''{0}'' already exists. Do you want to update it?
test.integration.title.no.test.roots.found=No Test Roots Found

slicer.text.in=\ in {0}
slicer.text.in=in
slicer.text.tracking.enclosing.lambda=\ (Tracking enclosing lambda)
slicer.text.tracking.lambda.calls=\ (Tracking lambda calls)
slicer.text.tracking.lambda.argument=\ (Tracking lambda parameter)
Expand Down
30 changes: 20 additions & 10 deletions idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceUsageCellRenderer.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,26 +47,36 @@ object KotlinSliceUsageCellRenderer : SliceUsageCellRendererBase() {
append(behaviour.slicePresentationPrefix, SimpleTextAttributes.REGULAR_BOLD_ATTRIBUTES)
}

containerSuffix(sliceUsage)?.let {
append(" ")
append(it, SimpleTextAttributes.GRAY_ATTRIBUTES)
}
}

fun containerSuffix(sliceUsage: SliceUsage): String? {
val declaration = sliceUsage.element?.parents?.firstOrNull {
it is KtClass ||
it is KtObjectDeclaration && !it.isObjectLiteral() ||
it is KtNamedFunction && !it.isLocal ||
it is KtProperty && !it.isLocal ||
it is KtConstructor<*>
} as? KtDeclaration ?: return
} as? KtDeclaration ?: return null

append(KotlinBundle.message("slicer.text.in", ""), SimpleTextAttributes.GRAY_ATTRIBUTES)
return buildString {
append(KotlinBundle.message("slicer.text.in", ""))
append(" ")

val descriptor = declaration.unsafeResolveToDescriptor()
val descriptor = declaration.unsafeResolveToDescriptor()

if (!descriptor.isExtension && descriptor !is ConstructorDescriptor && !descriptor.isCompanionObject()) {
val containingClassifier = descriptor.containingDeclaration as? ClassifierDescriptor
if (containingClassifier != null) {
append(descriptorRenderer.render(containingClassifier), SimpleTextAttributes.GRAY_ATTRIBUTES)
append(".", SimpleTextAttributes.GRAY_ATTRIBUTES)
if (!descriptor.isExtension && descriptor !is ConstructorDescriptor && !descriptor.isCompanionObject()) {
val containingClassifier = descriptor.containingDeclaration as? ClassifierDescriptor
if (containingClassifier != null) {
append(descriptorRenderer.render(containingClassifier))
append(".")
}
}
}

append(descriptorRenderer.render(descriptor), SimpleTextAttributes.GRAY_ATTRIBUTES)
append(descriptorRenderer.render(descriptor))
}
}
}
13 changes: 6 additions & 7 deletions idea/testData/slicer/inflow/abstractFun.leafGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
12 foo(<bold>1</bold>)
4 fun foo(<bold>p: Int</bold>)
12 foo(<bold>1</bold>)

17 i.foo(<bold>2</bold>)
4 fun foo(<bold>p: Int</bold>)
17 i.foo(<bold>2</bold>)
12 foo(<bold>1</bold>) (in C.f())
4 fun foo(<bold>p: Int</bold>) (in I.foo(Int))
12 foo(<bold>1</bold>) (in C.f())

17 i.foo(<bold>2</bold>) (in f(I))
4 fun foo(<bold>p: Int</bold>) (in I.foo(Int))
17 i.foo(<bold>2</bold>) (in f(I))
4 changes: 2 additions & 2 deletions idea/testData/slicer/inflow/abstractFun.nullnessGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[NotNull Values]
4 fun foo(<bold>p: Int</bold>)
4 fun foo(<bold>p: Int</bold>)
4 fun foo(<bold>p: Int</bold>) (in I.foo(Int))
4 fun foo(<bold>p: Int</bold>) (in I.foo(Int))
6 changes: 3 additions & 3 deletions idea/testData/slicer/inflow/abstractFun.results.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
4 fun foo(<bold>p: Int</bold>)
12 foo(<bold>1</bold>)
17 i.foo(<bold>2</bold>)
4 fun foo(<bold>p: Int</bold>) (in I.foo(Int))
12 foo(<bold>1</bold>) (in C.f())
17 i.foo(<bold>2</bold>) (in f(I))
27 changes: 13 additions & 14 deletions idea/testData/slicer/inflow/anonymousFunBodyExpression.leafGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
4 return f(<bold>1</bold>)
8 val <bold>x = foo(fun(n: Int) = n)</bold>
8 val x = <bold>foo(fun(n: Int) = n)</bold>
4 return f(<bold>1</bold>) (in foo((Int) -> Int))
8 val <bold>x = foo(fun(n: Int) = n)</bold> (in test())
8 val x = <bold>foo(fun(n: Int) = n)</bold> (in test())
3 fun <bold>foo(f: (Int) -> Int): Int {</bold>
4 return <bold>f(1)</bold>
4 [LAMBDA IN] return <bold>f</bold>(1)
3 [LAMBDA IN] fun foo(<bold>f: (Int) -> Int</bold>): Int {
8 [LAMBDA IN] val x = foo(<bold>fun(n: Int) = n</bold>)
8 val x = foo(<bold>fun(n: Int) = n</bold>)
8 val x = foo(fun(n: Int) = <bold>n</bold>)
8 val x = foo(fun(<bold>n: Int</bold>) = n)
8 [LAMBDA CALLS ARGUMENT #0] val x = foo(<bold>fun(n: Int) = n</bold>)
3 [LAMBDA CALLS ARGUMENT #0] fun foo(<bold>f: (Int) -> Int</bold>): Int {
4 return f(<bold>1</bold>)

4 return <bold>f(1)</bold> (in foo((Int) -> Int))
4 [LAMBDA IN] return <bold>f</bold>(1) (in foo((Int) -> Int))
3 [LAMBDA IN] fun foo(<bold>f: (Int) -> Int</bold>): Int { (in foo((Int) -> Int))
8 [LAMBDA IN] val x = foo(<bold>fun(n: Int) = n</bold>) (in test())
8 val x = foo(<bold>fun(n: Int) = n</bold>) (in test())
8 val x = foo(fun(n: Int) = <bold>n</bold>) (in test())
8 val x = foo(fun(<bold>n: Int</bold>) = n) (in test())
8 [LAMBDA CALLS ARGUMENT #0] val x = foo(<bold>fun(n: Int) = n</bold>) (in test())
3 [LAMBDA CALLS ARGUMENT #0] fun foo(<bold>f: (Int) -> Int</bold>): Int { (in foo((Int) -> Int))
4 return f(<bold>1</bold>) (in foo((Int) -> Int))
4 changes: 2 additions & 2 deletions idea/testData/slicer/inflow/anonymousFunBodyExpression.nullnessGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[NotNull Values]
8 val <bold>x = foo(fun(n: Int) = n)</bold>
8 val <bold>x = foo(fun(n: Int) = n)</bold>
8 val <bold>x = foo(fun(n: Int) = n)</bold> (in test())
8 val <bold>x = foo(fun(n: Int) = n)</bold> (in test())
24 changes: 12 additions & 12 deletions idea/testData/slicer/inflow/anonymousFunBodyExpression.results.txt
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
8 val <bold>x = foo(fun(n: Int) = n)</bold>
8 val x = <bold>foo(fun(n: Int) = n)</bold>
8 val <bold>x = foo(fun(n: Int) = n)</bold> (in test())
8 val x = <bold>foo(fun(n: Int) = n)</bold> (in test())
3 fun <bold>foo(f: (Int) -> Int): Int {</bold>
4 return <bold>f(1)</bold>
4 [LAMBDA IN] return <bold>f</bold>(1)
3 [LAMBDA IN] fun foo(<bold>f: (Int) -> Int</bold>): Int {
8 [LAMBDA IN] val x = foo(<bold>fun(n: Int) = n</bold>)
8 val x = foo(<bold>fun(n: Int) = n</bold>)
8 val x = foo(fun(n: Int) = <bold>n</bold>)
8 val x = foo(fun(<bold>n: Int</bold>) = n)
8 [LAMBDA CALLS ARGUMENT #0] val x = foo(<bold>fun(n: Int) = n</bold>)
3 [LAMBDA CALLS ARGUMENT #0] fun foo(<bold>f: (Int) -> Int</bold>): Int {
4 return f(<bold>1</bold>)
4 return <bold>f(1)</bold> (in foo((Int) -> Int))
4 [LAMBDA IN] return <bold>f</bold>(1) (in foo((Int) -> Int))
3 [LAMBDA IN] fun foo(<bold>f: (Int) -> Int</bold>): Int { (in foo((Int) -> Int))
8 [LAMBDA IN] val x = foo(<bold>fun(n: Int) = n</bold>) (in test())
8 val x = foo(<bold>fun(n: Int) = n</bold>) (in test())
8 val x = foo(fun(n: Int) = <bold>n</bold>) (in test())
8 val x = foo(fun(<bold>n: Int</bold>) = n) (in test())
8 [LAMBDA CALLS ARGUMENT #0] val x = foo(<bold>fun(n: Int) = n</bold>) (in test())
3 [LAMBDA CALLS ARGUMENT #0] fun foo(<bold>f: (Int) -> Int</bold>): Int { (in foo((Int) -> Int))
4 return f(<bold>1</bold>) (in foo((Int) -> Int))
27 changes: 13 additions & 14 deletions idea/testData/slicer/inflow/anonymousFunReturnExpression.leafGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
4 return f(<bold>1</bold>)
8 val <bold>x = foo(fun(n: Int): Int { return n })</bold>
8 val x = <bold>foo(fun(n: Int): Int { return n })</bold>
4 return f(<bold>1</bold>) (in foo((Int) -> Int))
8 val <bold>x = foo(fun(n: Int): Int { return n })</bold> (in test())
8 val x = <bold>foo(fun(n: Int): Int { return n })</bold> (in test())
3 fun <bold>foo(f: (Int) -> Int): Int {</bold>
4 return <bold>f(1)</bold>
4 [LAMBDA IN] return <bold>f</bold>(1)
3 [LAMBDA IN] fun foo(<bold>f: (Int) -> Int</bold>): Int {
8 [LAMBDA IN] val x = foo(<bold>fun(n: Int): Int { return n }</bold>)
8 val x = foo(<bold>fun(n: Int): Int { return n }</bold>)
8 val x = foo(fun(n: Int): Int { return <bold>n</bold> })
8 val x = foo(fun(<bold>n: Int</bold>): Int { return n })
8 [LAMBDA CALLS ARGUMENT #0] val x = foo(<bold>fun(n: Int): Int { return n }</bold>)
3 [LAMBDA CALLS ARGUMENT #0] fun foo(<bold>f: (Int) -> Int</bold>): Int {
4 return f(<bold>1</bold>)

4 return <bold>f(1)</bold> (in foo((Int) -> Int))
4 [LAMBDA IN] return <bold>f</bold>(1) (in foo((Int) -> Int))
3 [LAMBDA IN] fun foo(<bold>f: (Int) -> Int</bold>): Int { (in foo((Int) -> Int))
8 [LAMBDA IN] val x = foo(<bold>fun(n: Int): Int { return n }</bold>) (in test())
8 val x = foo(<bold>fun(n: Int): Int { return n }</bold>) (in test())
8 val x = foo(fun(n: Int): Int { return <bold>n</bold> }) (in test())
8 val x = foo(fun(<bold>n: Int</bold>): Int { return n }) (in test())
8 [LAMBDA CALLS ARGUMENT #0] val x = foo(<bold>fun(n: Int): Int { return n }</bold>) (in test())
3 [LAMBDA CALLS ARGUMENT #0] fun foo(<bold>f: (Int) -> Int</bold>): Int { (in foo((Int) -> Int))
4 return f(<bold>1</bold>) (in foo((Int) -> Int))
4 changes: 2 additions & 2 deletions idea/testData/slicer/inflow/anonymousFunReturnExpression.nullnessGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[NotNull Values]
8 val <bold>x = foo(fun(n: Int): Int { return n })</bold>
8 val <bold>x = foo(fun(n: Int): Int { return n })</bold>
8 val <bold>x = foo(fun(n: Int): Int { return n })</bold> (in test())
8 val <bold>x = foo(fun(n: Int): Int { return n })</bold> (in test())
24 changes: 12 additions & 12 deletions idea/testData/slicer/inflow/anonymousFunReturnExpression.results.txt
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
8 val <bold>x = foo(fun(n: Int): Int { return n })</bold>
8 val x = <bold>foo(fun(n: Int): Int { return n })</bold>
8 val <bold>x = foo(fun(n: Int): Int { return n })</bold> (in test())
8 val x = <bold>foo(fun(n: Int): Int { return n })</bold> (in test())
3 fun <bold>foo(f: (Int) -> Int): Int {</bold>
4 return <bold>f(1)</bold>
4 [LAMBDA IN] return <bold>f</bold>(1)
3 [LAMBDA IN] fun foo(<bold>f: (Int) -> Int</bold>): Int {
8 [LAMBDA IN] val x = foo(<bold>fun(n: Int): Int { return n }</bold>)
8 val x = foo(<bold>fun(n: Int): Int { return n }</bold>)
8 val x = foo(fun(n: Int): Int { return <bold>n</bold> })
8 val x = foo(fun(<bold>n: Int</bold>): Int { return n })
8 [LAMBDA CALLS ARGUMENT #0] val x = foo(<bold>fun(n: Int): Int { return n }</bold>)
3 [LAMBDA CALLS ARGUMENT #0] fun foo(<bold>f: (Int) -> Int</bold>): Int {
4 return f(<bold>1</bold>)
4 return <bold>f(1)</bold> (in foo((Int) -> Int))
4 [LAMBDA IN] return <bold>f</bold>(1) (in foo((Int) -> Int))
3 [LAMBDA IN] fun foo(<bold>f: (Int) -> Int</bold>): Int { (in foo((Int) -> Int))
8 [LAMBDA IN] val x = foo(<bold>fun(n: Int): Int { return n }</bold>) (in test())
8 val x = foo(<bold>fun(n: Int): Int { return n }</bold>) (in test())
8 val x = foo(fun(n: Int): Int { return <bold>n</bold> }) (in test())
8 val x = foo(fun(<bold>n: Int</bold>): Int { return n }) (in test())
8 [LAMBDA CALLS ARGUMENT #0] val x = foo(<bold>fun(n: Int): Int { return n }</bold>) (in test())
3 [LAMBDA CALLS ARGUMENT #0] fun foo(<bold>f: (Int) -> Int</bold>): Int { (in foo((Int) -> Int))
4 return f(<bold>1</bold>) (in foo((Int) -> Int))
15 changes: 7 additions & 8 deletions idea/testData/slicer/inflow/anonymousFunctionParameter.leafGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
4 f(<bold>1</bold>)
9 val <bold>v = value</bold>
9 val v = <bold>value</bold>
8 foo(fun(<bold>value: Int</bold>) {
8 [LAMBDA CALLS ARGUMENT #0] foo(<bold>fun(value: Int) {</bold>
3 [LAMBDA CALLS ARGUMENT #0] fun foo(<bold>f: (Int) -> Unit</bold>) {
4 f(<bold>1</bold>)

4 f(<bold>1</bold>) (in foo((Int) -> Unit))
9 val <bold>v = value</bold> (in test())
9 val v = <bold>value</bold> (in test())
8 foo(fun(<bold>value: Int</bold>) { (in test())
8 [LAMBDA CALLS ARGUMENT #0] foo(<bold>fun(value: Int) {</bold> (in test())
3 [LAMBDA CALLS ARGUMENT #0] fun foo(<bold>f: (Int) -> Unit</bold>) { (in foo((Int) -> Unit))
4 f(<bold>1</bold>) (in foo((Int) -> Unit))
4 changes: 2 additions & 2 deletions idea/testData/slicer/inflow/anonymousFunctionParameter.nullnessGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[NotNull Values]
9 val <bold>v = value</bold>
9 val <bold>v = value</bold>
9 val <bold>v = value</bold> (in test())
9 val <bold>v = value</bold> (in test())
12 changes: 6 additions & 6 deletions idea/testData/slicer/inflow/anonymousFunctionParameter.results.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
9 val <bold>v = value</bold>
9 val v = <bold>value</bold>
8 foo(fun(<bold>value: Int</bold>) {
8 [LAMBDA CALLS ARGUMENT #0] foo(<bold>fun(value: Int) {</bold>
3 [LAMBDA CALLS ARGUMENT #0] fun foo(<bold>f: (Int) -> Unit</bold>) {
4 f(<bold>1</bold>)
9 val <bold>v = value</bold> (in test())
9 val v = <bold>value</bold> (in test())
8 foo(fun(<bold>value: Int</bold>) { (in test())
8 [LAMBDA CALLS ARGUMENT #0] foo(<bold>fun(value: Int) {</bold> (in test())
3 [LAMBDA CALLS ARGUMENT #0] fun foo(<bold>f: (Int) -> Unit</bold>) { (in foo((Int) -> Unit))
4 f(<bold>1</bold>) (in foo((Int) -> Unit))
11 changes: 5 additions & 6 deletions idea/testData/slicer/inflow/cast.leafGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
3 fun test(<bold>o: Any</bold>) {
4 val <bold>x = o as String</bold>
4 val x = <bold>o as String</bold>
4 val x = <bold>o</bold> as String
3 fun test(<bold>o: Any</bold>) {

3 fun test(<bold>o: Any</bold>) { (in test(Any))
4 val <bold>x = o as String</bold> (in test(Any))
4 val x = <bold>o as String</bold> (in test(Any))
4 val x = <bold>o</bold> as String (in test(Any))
3 fun test(<bold>o: Any</bold>) { (in test(Any))
5 changes: 2 additions & 3 deletions idea/testData/slicer/inflow/cast.nullnessGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
[NotNull Values]
4 val <bold>x = o as String</bold>
4 val <bold>x = o as String</bold>

4 val <bold>x = o as String</bold> (in test(Any))
4 val <bold>x = o as String</bold> (in test(Any))
8 changes: 4 additions & 4 deletions idea/testData/slicer/inflow/cast.results.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
4 val <bold>x = o as String</bold>
4 val x = <bold>o as String</bold>
4 val x = <bold>o</bold> as String
3 fun test(<bold>o: Any</bold>) {
4 val <bold>x = o as String</bold> (in test(Any))
4 val x = <bold>o as String</bold> (in test(Any))
4 val x = <bold>o</bold> as String (in test(Any))
3 fun test(<bold>o: Any</bold>) { (in test(Any))
24 changes: 12 additions & 12 deletions idea/testData/slicer/inflow/compositeAssignments.leafGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
7 <bold>--result</bold>
7 <bold>--result</bold> (in assignmentWithSum(Int))
3 fun <bold>assignmentWithSum(n: Int): Int {</bold>
8 return <bold>result</bold>
4 var <bold>result = 0</bold>
7 <bold>--result</bold>
8 return <bold>result</bold> (in assignmentWithSum(Int))
4 var <bold>result = 0</bold> (in assignmentWithSum(Int))
7 <bold>--result</bold> (in assignmentWithSum(Int))

4 var result = <bold>0</bold>
4 var result = <bold>0</bold> (in assignmentWithSum(Int))
3 fun <bold>assignmentWithSum(n: Int): Int {</bold>
8 return <bold>result</bold>
4 var <bold>result = 0</bold>
4 var result = <bold>0</bold>
8 return <bold>result</bold> (in assignmentWithSum(Int))
4 var <bold>result = 0</bold> (in assignmentWithSum(Int))
4 var result = <bold>0</bold> (in assignmentWithSum(Int))

5 <bold>result += n</bold>
5 <bold>result += n</bold> (in assignmentWithSum(Int))
3 fun <bold>assignmentWithSum(n: Int): Int {</bold>
8 return <bold>result</bold>
4 var <bold>result = 0</bold>
5 <bold>result += n</bold>
8 return <bold>result</bold> (in assignmentWithSum(Int))
4 var <bold>result = 0</bold> (in assignmentWithSum(Int))
5 <bold>result += n</bold> (in assignmentWithSum(Int))
14 changes: 7 additions & 7 deletions idea/testData/slicer/inflow/compositeAssignments.results.txt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
3 fun <bold>assignmentWithSum(n: Int): Int {</bold>
8 return <bold>result</bold>
4 var <bold>result = 0</bold>
4 var result = <bold>0</bold>
5 <bold>result += n</bold>
6 <bold>result++</bold>
4 DUPLICATE: var <bold>result = 0</bold>
7 <bold>--result</bold>
8 return <bold>result</bold> (in assignmentWithSum(Int))
4 var <bold>result = 0</bold> (in assignmentWithSum(Int))
4 var result = <bold>0</bold> (in assignmentWithSum(Int))
5 <bold>result += n</bold> (in assignmentWithSum(Int))
6 <bold>result++</bold> (in assignmentWithSum(Int))
4 DUPLICATE: var <bold>result = 0</bold> (in assignmentWithSum(Int))
7 <bold>--result</bold> (in assignmentWithSum(Int))
23 changes: 11 additions & 12 deletions idea/testData/slicer/inflow/defaultGetterFieldInSetter.leafGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
4 var foo: Int = <bold>0</bold>
10 val x = <bold>foo</bold>
4 var <bold>foo: Int = 0</bold>
4 var foo: Int = <bold>0</bold>

11 foo = <bold>1</bold>
10 val x = <bold>foo</bold>
4 var <bold>foo: Int = 0</bold>
6 field = <bold>if (b) value else 0</bold>
6 field = if (b) <bold>value</bold> else 0
5 set(<bold>value</bold>) {
11 foo = <bold>1</bold>
4 var foo: Int = <bold>0</bold> (in A.foo: Int)
10 val x = <bold>foo</bold> (in A.test())
4 var <bold>foo: Int = 0</bold> (in A)
4 var foo: Int = <bold>0</bold> (in A.foo: Int)

11 foo = <bold>1</bold> (in A.test())
10 val x = <bold>foo</bold> (in A.test())
4 var <bold>foo: Int = 0</bold> (in A)
6 field = <bold>if (b) value else 0</bold> (in A.foo: Int)
6 field = if (b) <bold>value</bold> else 0 (in A.foo: Int)
5 set(<bold>value</bold>) { (in A.foo: Int)
11 foo = <bold>1</bold> (in A.test())
4 changes: 2 additions & 2 deletions idea/testData/slicer/inflow/defaultGetterFieldInSetter.nullnessGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[NotNull Values]
10 val x = <bold>foo</bold>
10 val x = <bold>foo</bold>
10 val x = <bold>foo</bold> (in A.test())
10 val x = <bold>foo</bold> (in A.test())
16 changes: 8 additions & 8 deletions idea/testData/slicer/inflow/defaultGetterFieldInSetter.results.txt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
10 val x = <bold>foo</bold>
4 var <bold>foo: Int = 0</bold>
4 var foo: Int = <bold>0</bold>
6 field = <bold>if (b) value else 0</bold>
6 field = if (b) <bold>value</bold> else 0
5 set(<bold>value</bold>) {
11 foo = <bold>1</bold>
6 field = if (b) value else <bold>0</bold>
10 val x = <bold>foo</bold> (in A.test())
4 var <bold>foo: Int = 0</bold> (in A)
4 var foo: Int = <bold>0</bold> (in A.foo: Int)
6 field = <bold>if (b) value else 0</bold> (in A.foo: Int)
6 field = if (b) <bold>value</bold> else 0 (in A.foo: Int)
5 set(<bold>value</bold>) { (in A.foo: Int)
11 foo = <bold>1</bold> (in A.test())
6 field = if (b) value else <bold>0</bold> (in A.foo: Int)
11 changes: 5 additions & 6 deletions idea/testData/slicer/inflow/delegateGetter.leafGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
6 operator fun getValue(thisRef: Any?, property: KProperty<*>) = <bold>1</bold>
12 val <bold>x = foo</bold>
12 val x = <bold>foo</bold>
6 operator fun getValue(thisRef: Any?, property: KProperty<*>) = <bold>1</bold> (in D.getValue(Any?, KProperty<*>))
12 val <bold>x = foo</bold> (in test())
12 val x = <bold>foo</bold> (in test())
9 val <bold>foo: Int by D</bold>
6 operator fun <bold>getValue(thisRef: Any?, property: KProperty<*>) = 1</bold>
6 operator fun getValue(thisRef: Any?, property: KProperty<*>) = <bold>1</bold>

6 operator fun <bold>getValue(thisRef: Any?, property: KProperty<*>) = 1</bold> (in D)
6 operator fun getValue(thisRef: Any?, property: KProperty<*>) = <bold>1</bold> (in D.getValue(Any?, KProperty<*>))
4 changes: 2 additions & 2 deletions idea/testData/slicer/inflow/delegateGetter.nullnessGroups.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[NotNull Values]
12 val <bold>x = foo</bold>
12 val <bold>x = foo</bold>
12 val <bold>x = foo</bold> (in test())
12 val <bold>x = foo</bold> (in test())
8 changes: 4 additions & 4 deletions idea/testData/slicer/inflow/delegateGetter.results.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
12 val <bold>x = foo</bold>
12 val x = <bold>foo</bold>
12 val <bold>x = foo</bold> (in test())
12 val x = <bold>foo</bold> (in test())
9 val <bold>foo: Int by D</bold>
6 operator fun <bold>getValue(thisRef: Any?, property: KProperty<*>) = 1</bold>
6 operator fun getValue(thisRef: Any?, property: KProperty<*>) = <bold>1</bold>
6 operator fun <bold>getValue(thisRef: Any?, property: KProperty<*>) = 1</bold> (in D)
6 operator fun getValue(thisRef: Any?, property: KProperty<*>) = <bold>1</bold> (in D.getValue(Any?, KProperty<*>))
Loading

0 comments on commit 23ead3c

Please sign in to comment.