diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceUsageCellRenderer.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceUsageCellRenderer.kt index 2fc17e8de76..5a9164e4171 100644 --- a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceUsageCellRenderer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceUsageCellRenderer.kt @@ -10,15 +10,14 @@ import com.intellij.slicer.SliceUsageCellRendererBase import com.intellij.ui.JBColor 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.descriptors.* import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.caches.resolve.unsafeResolveToDescriptor import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject import org.jetbrains.kotlin.psi.psiUtil.parents import org.jetbrains.kotlin.renderer.DescriptorRenderer +import org.jetbrains.kotlin.renderer.render import org.jetbrains.kotlin.resolve.descriptorUtil.isCompanionObject import org.jetbrains.kotlin.resolve.descriptorUtil.isExtension @@ -63,6 +62,7 @@ object KotlinSliceUsageCellRenderer : SliceUsageCellRendererBase() { it is KtObjectDeclaration && !it.isObjectLiteral() || it is KtNamedFunction && !it.isLocal || it is KtProperty && !it.isLocal || + it is KtPropertyAccessor || it is KtConstructor<*> } as? KtDeclaration ?: return null @@ -85,7 +85,30 @@ object KotlinSliceUsageCellRenderer : SliceUsageCellRendererBase() { } } - append(descriptorRenderer.render(descriptor)) + when (descriptor) { + is PropertyDescriptor -> { + renderPropertyOrAccessor(descriptor) + } + + is PropertyAccessorDescriptor -> { + val property = descriptor.correspondingProperty + renderPropertyOrAccessor(property, if (descriptor is PropertyGetterDescriptor) ".get" else ".set") + } + + else -> { + append(descriptorRenderer.render(descriptor)) + } + } + } + } + + private fun StringBuilder.renderPropertyOrAccessor(propertyDescriptor: PropertyDescriptor, accessorSuffix: String = "") { + append(propertyDescriptor.name.render()) + append(accessorSuffix) + val receiverType = propertyDescriptor.extensionReceiverParameter?.type + if (receiverType != null) { + append(" on ") + append(descriptorRenderer.renderType(receiverType)) } } diff --git a/idea/testData/slicer/inflow/defaultGetterFieldInSetter.leafGroups.txt b/idea/testData/slicer/inflow/defaultGetterFieldInSetter.leafGroups.txt index ee52c2aceb9..a07d9729e71 100644 --- a/idea/testData/slicer/inflow/defaultGetterFieldInSetter.leafGroups.txt +++ b/idea/testData/slicer/inflow/defaultGetterFieldInSetter.leafGroups.txt @@ -1,12 +1,12 @@ -4 var foo: Int = 0 (in A.foo: Int) +4 var foo: Int = 0 (in A.foo) 10 val x = foo (in A.test()) 4 var foo: Int = 0 (in A) -4 var foo: Int = 0 (in A.foo: Int) +4 var foo: Int = 0 (in A.foo) 11 foo = 1 (in A.test()) 10 val x = foo (in A.test()) 4 var foo: Int = 0 (in A) -6 field = if (b) value else 0 (in A.foo: Int) -6 field = if (b) value else 0 (in A.foo: Int) -5 set(value) { (in A.foo: Int) +6 field = if (b) value else 0 (in A.foo.set) +6 field = if (b) value else 0 (in A.foo.set) +5 set(value) { (in A.foo.set) 11 foo = 1 (in A.test()) diff --git a/idea/testData/slicer/inflow/defaultGetterFieldInSetter.results.txt b/idea/testData/slicer/inflow/defaultGetterFieldInSetter.results.txt index 31fbab97d61..affbc37f27b 100644 --- a/idea/testData/slicer/inflow/defaultGetterFieldInSetter.results.txt +++ b/idea/testData/slicer/inflow/defaultGetterFieldInSetter.results.txt @@ -1,8 +1,8 @@ 10 val x = foo (in A.test()) 4 var foo: Int = 0 (in A) -4 var foo: Int = 0 (in A.foo: Int) -6 field = if (b) value else 0 (in A.foo: Int) -6 field = if (b) value else 0 (in A.foo: Int) -5 set(value) { (in A.foo: Int) +4 var foo: Int = 0 (in A.foo) +6 field = if (b) value else 0 (in A.foo.set) +6 field = if (b) value else 0 (in A.foo.set) +5 set(value) { (in A.foo.set) 11 foo = 1 (in A.test()) -6 field = if (b) value else 0 (in A.foo: Int) +6 field = if (b) value else 0 (in A.foo.set) diff --git a/idea/testData/slicer/inflow/getterAndSetterUsingField.leafGroups.txt b/idea/testData/slicer/inflow/getterAndSetterUsingField.leafGroups.txt index 549c33f2742..1161cc6235e 100644 --- a/idea/testData/slicer/inflow/getterAndSetterUsingField.leafGroups.txt +++ b/idea/testData/slicer/inflow/getterAndSetterUsingField.leafGroups.txt @@ -1,22 +1,22 @@ -4 var foo: Int = -1 (in A.foo: Int) +4 var foo: Int = -1 (in A.foo) 11 val x = foo (in A.test()) 4 var foo: Int = -1 (in A) -4 var foo: Int = -1 (in A.foo: Int) +4 var foo: Int = -1 (in A.foo) -7 field = if (b) value else 0 (in A.foo: Int) +7 field = if (b) value else 0 (in A.foo.set) 11 val x = foo (in A.test()) 4 var foo: Int = -1 (in A) -5 get() = if (b) field else 0 (in A.foo: Int) -5 get() = if (b) field else 0 (in A.foo: Int) -7 field = if (b) value else 0 (in A.foo: Int) -7 field = if (b) value else 0 (in A.foo: Int) +5 get() = if (b) field else 0 (in A.foo.get) +5 get() = if (b) field else 0 (in A.foo.get) +7 field = if (b) value else 0 (in A.foo.set) +7 field = if (b) value else 0 (in A.foo.set) 12 foo = 1 (in A.test()) 11 val x = foo (in A.test()) 4 var foo: Int = -1 (in A) -5 get() = if (b) field else 0 (in A.foo: Int) -5 get() = if (b) field else 0 (in A.foo: Int) -7 field = if (b) value else 0 (in A.foo: Int) -7 field = if (b) value else 0 (in A.foo: Int) -6 set(value) { (in A.foo: Int) +5 get() = if (b) field else 0 (in A.foo.get) +5 get() = if (b) field else 0 (in A.foo.get) +7 field = if (b) value else 0 (in A.foo.set) +7 field = if (b) value else 0 (in A.foo.set) +6 set(value) { (in A.foo.set) 12 foo = 1 (in A.test()) diff --git a/idea/testData/slicer/inflow/getterAndSetterUsingField.results.txt b/idea/testData/slicer/inflow/getterAndSetterUsingField.results.txt index 1b95a6de7d0..11779d4f1fc 100644 --- a/idea/testData/slicer/inflow/getterAndSetterUsingField.results.txt +++ b/idea/testData/slicer/inflow/getterAndSetterUsingField.results.txt @@ -1,11 +1,11 @@ 11 val x = foo (in A.test()) 4 var foo: Int = -1 (in A) -4 var foo: Int = -1 (in A.foo: Int) -5 get() = if (b) field else 0 (in A.foo: Int) -5 get() = if (b) field else 0 (in A.foo: Int) -7 field = if (b) value else 0 (in A.foo: Int) -7 field = if (b) value else 0 (in A.foo: Int) -6 set(value) { (in A.foo: Int) +4 var foo: Int = -1 (in A.foo) +5 get() = if (b) field else 0 (in A.foo.get) +5 get() = if (b) field else 0 (in A.foo.get) +7 field = if (b) value else 0 (in A.foo.set) +7 field = if (b) value else 0 (in A.foo.set) +6 set(value) { (in A.foo.set) 12 foo = 1 (in A.test()) -7 field = if (b) value else 0 (in A.foo: Int) -5 get() = if (b) field else 0 (in A.foo: Int) +7 field = if (b) value else 0 (in A.foo.set) +5 get() = if (b) field else 0 (in A.foo.get) diff --git a/idea/testData/slicer/inflow/getterExpressionBody.leafGroups.txt b/idea/testData/slicer/inflow/getterExpressionBody.leafGroups.txt index d12ee6d9832..c8af9f380e6 100644 --- a/idea/testData/slicer/inflow/getterExpressionBody.leafGroups.txt +++ b/idea/testData/slicer/inflow/getterExpressionBody.leafGroups.txt @@ -1,5 +1,6 @@ -4 get() = 0 (in foo: Int) +4 get() = 0 (in foo.get) 7 val x = foo (in test()) 7 val x = foo (in test()) 3 val foo: Int -4 get() = 0 (in foo: Int) +4 get() = 0 (in foo.get) + diff --git a/idea/testData/slicer/inflow/getterExpressionBody.results.txt b/idea/testData/slicer/inflow/getterExpressionBody.results.txt index 35ccc7dbb7d..e50670fc688 100644 --- a/idea/testData/slicer/inflow/getterExpressionBody.results.txt +++ b/idea/testData/slicer/inflow/getterExpressionBody.results.txt @@ -1,4 +1,4 @@ 7 val x = foo (in test()) 7 val x = foo (in test()) 3 val foo: Int -4 get() = 0 (in foo: Int) +4 get() = 0 (in foo.get) diff --git a/idea/testData/slicer/inflow/getterReturnExpression.leafGroups.txt b/idea/testData/slicer/inflow/getterReturnExpression.leafGroups.txt index 218770a1e97..58730bc0608 100644 --- a/idea/testData/slicer/inflow/getterReturnExpression.leafGroups.txt +++ b/idea/testData/slicer/inflow/getterReturnExpression.leafGroups.txt @@ -1,5 +1,6 @@ -5 return 0 (in foo: Int) +5 return 0 (in foo.get) 9 val x = foo (in test()) 9 val x = foo (in test()) 3 val foo: Int -5 return 0 (in foo: Int) +5 return 0 (in foo.get) + diff --git a/idea/testData/slicer/inflow/getterReturnExpression.results.txt b/idea/testData/slicer/inflow/getterReturnExpression.results.txt index 7ba85ffbfd1..b0f96a4d1b9 100644 --- a/idea/testData/slicer/inflow/getterReturnExpression.results.txt +++ b/idea/testData/slicer/inflow/getterReturnExpression.results.txt @@ -1,4 +1,4 @@ 9 val x = foo (in test()) 9 val x = foo (in test()) 3 val foo: Int -5 return 0 (in foo: Int) +5 return 0 (in foo.get) diff --git a/idea/testData/slicer/inflow/memberValWithInitializer.leafGroups.txt b/idea/testData/slicer/inflow/memberValWithInitializer.leafGroups.txt index ff3fe78aef5..36a3a035d14 100644 --- a/idea/testData/slicer/inflow/memberValWithInitializer.leafGroups.txt +++ b/idea/testData/slicer/inflow/memberValWithInitializer.leafGroups.txt @@ -1,3 +1,4 @@ -4 val x: Int = 1 (in A.x: Int) +4 val x: Int = 1 (in A.x) 4 val x: Int = 1 (in A) -4 val x: Int = 1 (in A.x: Int) +4 val x: Int = 1 (in A.x) + diff --git a/idea/testData/slicer/inflow/memberValWithInitializer.results.txt b/idea/testData/slicer/inflow/memberValWithInitializer.results.txt index 2159189f312..50d3a3f25a3 100644 --- a/idea/testData/slicer/inflow/memberValWithInitializer.results.txt +++ b/idea/testData/slicer/inflow/memberValWithInitializer.results.txt @@ -1,2 +1,2 @@ 4 val x: Int = 1 (in A) -4 val x: Int = 1 (in A.x: Int) +4 val x: Int = 1 (in A.x) diff --git a/idea/testData/slicer/inflow/memberVarWithInitializer.leafGroups.txt b/idea/testData/slicer/inflow/memberVarWithInitializer.leafGroups.txt index 216d7631413..c8b7abb31c4 100644 --- a/idea/testData/slicer/inflow/memberVarWithInitializer.leafGroups.txt +++ b/idea/testData/slicer/inflow/memberVarWithInitializer.leafGroups.txt @@ -1,6 +1,6 @@ -4 var x: Int = 1 (in A.x: Int) +4 var x: Int = 1 (in A.x) 4 var x: Int = 1 (in A) -4 var x: Int = 1 (in A.x: Int) +4 var x: Int = 1 (in A.x) 9 x = 2 (in A.test()) 4 var x: Int = 1 (in A) diff --git a/idea/testData/slicer/inflow/memberVarWithInitializer.results.txt b/idea/testData/slicer/inflow/memberVarWithInitializer.results.txt index c703b322067..cc9320367ae 100644 --- a/idea/testData/slicer/inflow/memberVarWithInitializer.results.txt +++ b/idea/testData/slicer/inflow/memberVarWithInitializer.results.txt @@ -1,3 +1,3 @@ 4 var x: Int = 1 (in A) -4 var x: Int = 1 (in A.x: Int) +4 var x: Int = 1 (in A.x) 9 x = 2 (in A.test()) diff --git a/idea/testData/slicer/inflow/noFieldInGetter.leafGroups.txt b/idea/testData/slicer/inflow/noFieldInGetter.leafGroups.txt index 91e228440d2..6737348b735 100644 --- a/idea/testData/slicer/inflow/noFieldInGetter.leafGroups.txt +++ b/idea/testData/slicer/inflow/noFieldInGetter.leafGroups.txt @@ -1,9 +1,10 @@ -4 var foo: Int = 0 (in A.foo: Int) +4 var foo: Int = 0 (in A.foo) 11 val x = foo (in A.test()) 4 var foo: Int = 0 (in A) -4 var foo: Int = 0 (in A.foo: Int) +4 var foo: Int = 0 (in A.foo) -5 get() = 1 (in A.foo: Int) +5 get() = 1 (in A.foo.get) 11 val x = foo (in A.test()) 4 var foo: Int = 0 (in A) -5 get() = 1 (in A.foo: Int) +5 get() = 1 (in A.foo.get) + diff --git a/idea/testData/slicer/inflow/noFieldInGetter.results.txt b/idea/testData/slicer/inflow/noFieldInGetter.results.txt index d2bd58459e5..e93eb3b7ec2 100644 --- a/idea/testData/slicer/inflow/noFieldInGetter.results.txt +++ b/idea/testData/slicer/inflow/noFieldInGetter.results.txt @@ -1,4 +1,4 @@ 11 val x = foo (in A.test()) 4 var foo: Int = 0 (in A) -4 var foo: Int = 0 (in A.foo: Int) -5 get() = 1 (in A.foo: Int) +4 var foo: Int = 0 (in A.foo) +5 get() = 1 (in A.foo.get) diff --git a/idea/testData/slicer/inflow/onPropertyReceiverType.leafGroups.txt b/idea/testData/slicer/inflow/onPropertyReceiverType.leafGroups.txt index 149b4b89c6e..1c98a054318 100644 --- a/idea/testData/slicer/inflow/onPropertyReceiverType.leafGroups.txt +++ b/idea/testData/slicer/inflow/onPropertyReceiverType.leafGroups.txt @@ -1,7 +1,7 @@ 9 "b".property = 2 (in foo()) -3 var Any.property: Int (in property: Int on Any) +3 var Any.property: Int (in property on Any) 9 "b".property = 2 (in foo()) 8 val v = "a".property (in foo()) -3 var Any.property: Int (in property: Int on Any) +3 var Any.property: Int (in property on Any) 8 val v = "a".property (in foo()) diff --git a/idea/testData/slicer/inflow/onPropertyReceiverType.nullnessGroups.txt b/idea/testData/slicer/inflow/onPropertyReceiverType.nullnessGroups.txt index 984d505d40f..a0a2cacc5f0 100644 --- a/idea/testData/slicer/inflow/onPropertyReceiverType.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/onPropertyReceiverType.nullnessGroups.txt @@ -1,7 +1,7 @@ [NotNull Values] 8 val v = "a".property (in foo()) -3 var Any.property: Int (in property: Int on Any) +3 var Any.property: Int (in property on Any) 8 val v = "a".property (in foo()) 9 "b".property = 2 (in foo()) -3 var Any.property: Int (in property: Int on Any) +3 var Any.property: Int (in property on Any) 9 "b".property = 2 (in foo()) diff --git a/idea/testData/slicer/inflow/onPropertyReceiverType.results.txt b/idea/testData/slicer/inflow/onPropertyReceiverType.results.txt index 573d684cdc5..fbbf5c84301 100644 --- a/idea/testData/slicer/inflow/onPropertyReceiverType.results.txt +++ b/idea/testData/slicer/inflow/onPropertyReceiverType.results.txt @@ -1,3 +1,3 @@ -3 var Any.property: Int (in property: Int on Any) +3 var Any.property: Int (in property on Any) 8 val v = "a".property (in foo()) 9 "b".property = 2 (in foo()) diff --git a/idea/testData/slicer/inflow/overrideProperty.leafGroups.txt b/idea/testData/slicer/inflow/overrideProperty.leafGroups.txt index e04f8bbca8f..7d948878957 100644 --- a/idea/testData/slicer/inflow/overrideProperty.leafGroups.txt +++ b/idea/testData/slicer/inflow/overrideProperty.leafGroups.txt @@ -1,8 +1,8 @@ -8 override var prop: Int = 1 (in Derived.prop: Int) +8 override var prop: Int = 1 (in Derived.prop) 13 val v = d.prop (in foo(Base, Derived)) 13 val v = d.prop (in foo(Base, Derived)) 8 override var prop: Int = 1 (in Derived) -8 override var prop: Int = 1 (in Derived.prop: Int) +8 override var prop: Int = 1 (in Derived.prop) 12 b.prop = 10 (in foo(Base, Derived)) 13 val v = d.prop (in foo(Base, Derived)) diff --git a/idea/testData/slicer/inflow/overrideProperty.results.txt b/idea/testData/slicer/inflow/overrideProperty.results.txt index e7ea48f7dde..894088f8a40 100644 --- a/idea/testData/slicer/inflow/overrideProperty.results.txt +++ b/idea/testData/slicer/inflow/overrideProperty.results.txt @@ -1,5 +1,5 @@ 13 val v = d.prop (in foo(Base, Derived)) 13 val v = d.prop (in foo(Base, Derived)) 8 override var prop: Int = 1 (in Derived) -8 override var prop: Int = 1 (in Derived.prop: Int) +8 override var prop: Int = 1 (in Derived.prop) 12 b.prop = 10 (in foo(Base, Derived)) diff --git a/idea/testData/slicer/inflow/overridingParameter.leafGroups.txt b/idea/testData/slicer/inflow/overridingParameter.leafGroups.txt index a72b9d43759..de3ff91135e 100644 --- a/idea/testData/slicer/inflow/overridingParameter.leafGroups.txt +++ b/idea/testData/slicer/inflow/overridingParameter.leafGroups.txt @@ -4,11 +4,11 @@ 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) +10 override val foo = 3 (in C.foo) 15 val y = b.foo (in test(A, B,…)) 15 val y = b.foo (in test(A, B,…)) 10 override val foo = 3 (in C) -10 override val foo = 3 (in C.foo: Int) +10 override val foo = 3 (in C.foo) 7 return 5; 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 bdf248020df..03cd191716d 100644 --- a/idea/testData/slicer/inflow/overridingParameter.results.txt +++ b/idea/testData/slicer/inflow/overridingParameter.results.txt @@ -5,4 +5,4 @@ 9 class C : B(1) { (in C) 7 return 5; 10 override val foo = 3 (in C) -10 override val foo = 3 (in C.foo: Int) +10 override val foo = 3 (in C.foo) diff --git a/idea/testData/slicer/inflow/overridingPropertyGetterResult.leafGroups.txt b/idea/testData/slicer/inflow/overridingPropertyGetterResult.leafGroups.txt index 5294acf1c1e..5378a03c1ae 100644 --- a/idea/testData/slicer/inflow/overridingPropertyGetterResult.leafGroups.txt +++ b/idea/testData/slicer/inflow/overridingPropertyGetterResult.leafGroups.txt @@ -1,14 +1,14 @@ -10 get() = 2 (in B.foo: Int) +10 get() = 2 (in B.foo.get) 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) +10 get() = 2 (in B.foo.get) -15 get() = 3 (in C.foo: Int) +15 get() = 3 (in C.foo.get) 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) +15 get() = 3 (in C.foo.get) 3 return 5; 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 b49e8b21cd7..cfcee251d78 100644 --- a/idea/testData/slicer/inflow/overridingPropertyGetterResult.results.txt +++ b/idea/testData/slicer/inflow/overridingPropertyGetterResult.results.txt @@ -2,6 +2,6 @@ 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) +10 get() = 2 (in B.foo.get) 14 override val foo: Int (in C) -15 get() = 3 (in C.foo: Int) +15 get() = 3 (in C.foo.get) diff --git a/idea/testData/slicer/inflow/overridingPropertyResult.leafGroups.txt b/idea/testData/slicer/inflow/overridingPropertyResult.leafGroups.txt index e7d7e712719..d080a67d6d3 100644 --- a/idea/testData/slicer/inflow/overridingPropertyResult.leafGroups.txt +++ b/idea/testData/slicer/inflow/overridingPropertyResult.leafGroups.txt @@ -1,14 +1,14 @@ -8 override val foo = 2 (in B.foo: Int) +8 override val foo = 2 (in B.foo) 17 val y = b.foo (in test(A, B,…)) 17 val y = b.foo (in test(A, B,…)) 8 override val foo = 2 (in B) -8 override val foo = 2 (in B.foo: Int) +8 override val foo = 2 (in B.foo) -12 override val foo = 3 (in C.foo: Int) +12 override val foo = 3 (in C.foo) 17 val y = b.foo (in test(A, B,…)) 17 val y = b.foo (in test(A, B,…)) 12 override val foo = 3 (in C) -12 override val foo = 3 (in C.foo: Int) +12 override val foo = 3 (in C.foo) 3 return 5; 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 63fc1659335..4b03a426d25 100644 --- a/idea/testData/slicer/inflow/overridingPropertyResult.results.txt +++ b/idea/testData/slicer/inflow/overridingPropertyResult.results.txt @@ -2,6 +2,6 @@ 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) +8 override val foo = 2 (in B.foo) 12 override val foo = 3 (in C) -12 override val foo = 3 (in C.foo: Int) +12 override val foo = 3 (in C.foo) diff --git a/idea/testData/slicer/inflow/propertyInInterface.leafGroups.txt b/idea/testData/slicer/inflow/propertyInInterface.leafGroups.txt index 9e4a0beaabf..42e1b18cefe 100644 --- a/idea/testData/slicer/inflow/propertyInInterface.leafGroups.txt +++ b/idea/testData/slicer/inflow/propertyInInterface.leafGroups.txt @@ -1,8 +1,8 @@ -8 override var prop: Int = 0 (in C.prop: Int) +8 override var prop: Int = 0 (in C.prop) 13 val v = c.prop (in foo(I, C)) 13 val v = c.prop (in foo(I, C)) 8 override var prop: Int = 0 (in C) -8 override var prop: Int = 0 (in C.prop: Int) +8 override var prop: Int = 0 (in C.prop) 12 i.prop = 10 (in foo(I, C)) 13 val v = c.prop (in foo(I, C)) diff --git a/idea/testData/slicer/inflow/propertyInInterface.results.txt b/idea/testData/slicer/inflow/propertyInInterface.results.txt index c48467587c4..76b283a90d1 100644 --- a/idea/testData/slicer/inflow/propertyInInterface.results.txt +++ b/idea/testData/slicer/inflow/propertyInInterface.results.txt @@ -1,5 +1,5 @@ 13 val v = c.prop (in foo(I, C)) 13 val v = c.prop (in foo(I, C)) 8 override var prop: Int = 0 (in C) -8 override var prop: Int = 0 (in C.prop: Int) +8 override var prop: Int = 0 (in C.prop) 12 i.prop = 10 (in foo(I, C)) diff --git a/idea/testData/slicer/inflow/qualifiedAssignmentsForQualifiedRef.leafGroups.txt b/idea/testData/slicer/inflow/qualifiedAssignmentsForQualifiedRef.leafGroups.txt index 2e334ec150b..a0d4f5bb3a1 100644 --- a/idea/testData/slicer/inflow/qualifiedAssignmentsForQualifiedRef.leafGroups.txt +++ b/idea/testData/slicer/inflow/qualifiedAssignmentsForQualifiedRef.leafGroups.txt @@ -1,7 +1,7 @@ 13 val a = AClass("main: hello") (in main(Array)) 15 val v = "Now my name is '${a.name}'" (in main(Array)) 4 var name : String = name1 (in AClass) -4 var name : String = name1 (in AClass.name: String) +4 var name : String = name1 (in AClass.name) 3 class AClass(name1: String){ (in AClass(String)) 13 val a = AClass("main: hello") (in main(Array)) diff --git a/idea/testData/slicer/inflow/qualifiedAssignmentsForQualifiedRef.results.txt b/idea/testData/slicer/inflow/qualifiedAssignmentsForQualifiedRef.results.txt index 0a63959cf20..fa45eebf913 100644 --- a/idea/testData/slicer/inflow/qualifiedAssignmentsForQualifiedRef.results.txt +++ b/idea/testData/slicer/inflow/qualifiedAssignmentsForQualifiedRef.results.txt @@ -1,6 +1,6 @@ 15 val v = "Now my name is '${a.name}'" (in main(Array)) 4 var name : String = name1 (in AClass) -4 var name : String = name1 (in AClass.name: String) +4 var name : String = name1 (in AClass.name) 3 class AClass(name1: String){ (in AClass(String)) 13 val a = AClass("main: hello") (in main(Array)) 6 name = "uses: bye" (in AClass.uses()) diff --git a/idea/testData/slicer/inflow/qualifiedAssignmentsForSimpleRef.leafGroups.txt b/idea/testData/slicer/inflow/qualifiedAssignmentsForSimpleRef.leafGroups.txt index a96a17ca5d1..4bd6b59c74d 100644 --- a/idea/testData/slicer/inflow/qualifiedAssignmentsForSimpleRef.leafGroups.txt +++ b/idea/testData/slicer/inflow/qualifiedAssignmentsForSimpleRef.leafGroups.txt @@ -1,7 +1,7 @@ 13 val a = AClass("main: hello") (in main(Array)) 8 val v = "And now my name is '$name'" (in AClass.uses()) 4 var name : String = name1 (in AClass) -4 var name : String = name1 (in AClass.name: String) +4 var name : String = name1 (in AClass.name) 3 class AClass(name1: String){ (in AClass(String)) 13 val a = AClass("main: hello") (in main(Array)) diff --git a/idea/testData/slicer/inflow/qualifiedAssignmentsForSimpleRef.results.txt b/idea/testData/slicer/inflow/qualifiedAssignmentsForSimpleRef.results.txt index 463a3eb562c..ce070413154 100644 --- a/idea/testData/slicer/inflow/qualifiedAssignmentsForSimpleRef.results.txt +++ b/idea/testData/slicer/inflow/qualifiedAssignmentsForSimpleRef.results.txt @@ -1,6 +1,6 @@ 8 val v = "And now my name is '$name'" (in AClass.uses()) 4 var name : String = name1 (in AClass) -4 var name : String = name1 (in AClass.name: String) +4 var name : String = name1 (in AClass.name) 3 class AClass(name1: String){ (in AClass(String)) 13 val a = AClass("main: hello") (in main(Array)) 6 name = "uses: bye" (in AClass.uses()) diff --git a/idea/testData/slicer/inflow/settersViaDelegateForQualifiedRef.leafGroups.txt b/idea/testData/slicer/inflow/settersViaDelegateForQualifiedRef.leafGroups.txt index ed45db13185..95660a84e1e 100644 --- a/idea/testData/slicer/inflow/settersViaDelegateForQualifiedRef.leafGroups.txt +++ b/idea/testData/slicer/inflow/settersViaDelegateForQualifiedRef.leafGroups.txt @@ -1,10 +1,10 @@ -6 private var _value: String = "" (in Delegate._value: String) +6 private var _value: String = "" (in Delegate._value) 27 println("My name is '${a.name}'") (in main(Array)) 14 var name by Delegate() (in AClass) 7 operator fun getValue(thisRef: Any?, property: KProperty<*>) = _value (in Delegate) 7 operator fun getValue(thisRef: Any?, property: KProperty<*>) = _value (in Delegate.getValue(Any?, KProperty<*>)) 6 private var _value: String = "" (in Delegate) -6 private var _value: String = "" (in Delegate._value: String) +6 private var _value: String = "" (in Delegate._value) 20 name = "bye" (in AClass.uses()) 27 println("My name is '${a.name}'") (in main(Array)) diff --git a/idea/testData/slicer/inflow/settersViaDelegateForQualifiedRef.results.txt b/idea/testData/slicer/inflow/settersViaDelegateForQualifiedRef.results.txt index 7f1bca40470..f7305af2f33 100644 --- a/idea/testData/slicer/inflow/settersViaDelegateForQualifiedRef.results.txt +++ b/idea/testData/slicer/inflow/settersViaDelegateForQualifiedRef.results.txt @@ -3,7 +3,7 @@ 7 operator fun getValue(thisRef: Any?, property: KProperty<*>) = _value (in Delegate) 7 operator fun getValue(thisRef: Any?, property: KProperty<*>) = _value (in Delegate.getValue(Any?, KProperty<*>)) 6 private var _value: String = "" (in Delegate) -6 private var _value: String = "" (in Delegate._value: String) +6 private var _value: String = "" (in Delegate._value) 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) diff --git a/idea/testData/slicer/inflow/settersViaDelegateForSimpleRef.leafGroups.txt b/idea/testData/slicer/inflow/settersViaDelegateForSimpleRef.leafGroups.txt index dcf9a1212ea..1352d36ea6c 100644 --- a/idea/testData/slicer/inflow/settersViaDelegateForSimpleRef.leafGroups.txt +++ b/idea/testData/slicer/inflow/settersViaDelegateForSimpleRef.leafGroups.txt @@ -1,10 +1,10 @@ -7 private var _value: String = "" (in Delegate._value: String) +7 private var _value: String = "" (in Delegate._value) 22 println("Now my name is '$name'") (in AClass.uses()) 15 var name by Delegate() (in AClass) 8 operator fun getValue(thisRef: Any?, property: KProperty<*>) = _value (in Delegate) 8 operator fun getValue(thisRef: Any?, property: KProperty<*>) = _value (in Delegate.getValue(Any?, KProperty<*>)) 7 private var _value: String = "" (in Delegate) -7 private var _value: String = "" (in Delegate._value: String) +7 private var _value: String = "" (in Delegate._value) 21 name = "bye" (in AClass.uses()) 22 println("Now my name is '$name'") (in AClass.uses()) diff --git a/idea/testData/slicer/inflow/settersViaDelegateForSimpleRef.results.txt b/idea/testData/slicer/inflow/settersViaDelegateForSimpleRef.results.txt index 0e0236e119d..9d02ac49783 100644 --- a/idea/testData/slicer/inflow/settersViaDelegateForSimpleRef.results.txt +++ b/idea/testData/slicer/inflow/settersViaDelegateForSimpleRef.results.txt @@ -3,7 +3,7 @@ 8 operator fun getValue(thisRef: Any?, property: KProperty<*>) = _value (in Delegate) 8 operator fun getValue(thisRef: Any?, property: KProperty<*>) = _value (in Delegate.getValue(Any?, KProperty<*>)) 7 private var _value: String = "" (in Delegate) -7 private var _value: String = "" (in Delegate._value: String) +7 private var _value: String = "" (in Delegate._value) 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) diff --git a/idea/testData/slicer/inflow/settersViaJavaDelegate.leafGroups.txt b/idea/testData/slicer/inflow/settersViaJavaDelegate.leafGroups.txt index 163df242d7b..4c13a44ac48 100644 --- a/idea/testData/slicer/inflow/settersViaJavaDelegate.leafGroups.txt +++ b/idea/testData/slicer/inflow/settersViaJavaDelegate.leafGroups.txt @@ -4,10 +4,11 @@ 9 return _value; 6 private String _value = ""; -5 var name by D() (in AClass.name: String!) +5 var name by D() (in AClass.name) 12 println("Now my name is '$name'") (in AClass.uses()) 5 var name by D() (in AClass) 9 return _value; 13 _value = value; 12 void setValue(@Nullable Object thisRef, @NotNull KProperty property, @NotNull String value) { -5 var name by D() (in AClass.name: String!) +5 var name by D() (in AClass.name) + diff --git a/idea/testData/slicer/inflow/settersViaJavaDelegate.nullnessGroups.txt b/idea/testData/slicer/inflow/settersViaJavaDelegate.nullnessGroups.txt index 570ca373ab9..06be771ba43 100644 --- a/idea/testData/slicer/inflow/settersViaJavaDelegate.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/settersViaJavaDelegate.nullnessGroups.txt @@ -1,11 +1,11 @@ [Other Values] -5 var name by D() (in AClass.name: String!) +5 var name by D() (in AClass.name) 12 println("Now my name is '$name'") (in AClass.uses()) 5 var name by D() (in AClass) 9 return _value; 13 _value = value; 12 void setValue(@Nullable Object thisRef, @NotNull KProperty property, @NotNull String value) { -5 var name by D() (in AClass.name: String!) +5 var name by D() (in AClass.name) 6 private String _value = ""; 12 println("Now my name is '$name'") (in AClass.uses()) 5 var name by D() (in AClass) diff --git a/idea/testData/slicer/inflow/settersViaJavaDelegate.results.txt b/idea/testData/slicer/inflow/settersViaJavaDelegate.results.txt index 01d160a6f6f..4aabe97e843 100644 --- a/idea/testData/slicer/inflow/settersViaJavaDelegate.results.txt +++ b/idea/testData/slicer/inflow/settersViaJavaDelegate.results.txt @@ -4,4 +4,4 @@ 6 private String _value = ""; 13 _value = value; 12 void setValue(@Nullable Object thisRef, @NotNull KProperty property, @NotNull String value) { -5 var name by D() (in AClass.name: String!) +5 var name by D() (in AClass.name) diff --git a/idea/testData/slicer/inflow/thisInExtensionProperty.leafGroups.txt b/idea/testData/slicer/inflow/thisInExtensionProperty.leafGroups.txt index f3e6b775752..1050160e5fd 100644 --- a/idea/testData/slicer/inflow/thisInExtensionProperty.leafGroups.txt +++ b/idea/testData/slicer/inflow/thisInExtensionProperty.leafGroups.txt @@ -2,6 +2,6 @@ 7 val x = "".extensionProp (in foo()) 7 val x = "".extensionProp (in foo()) 3 val Any.extensionProp: Any -4 get() = this (in extensionProp: Any on Any) -3 val Any.extensionProp: Any (in extensionProp: Any on Any) +4 get() = this (in extensionProp.get on Any) +3 val Any.extensionProp: Any (in extensionProp on Any) 7 val x = "".extensionProp (in foo()) diff --git a/idea/testData/slicer/inflow/thisInExtensionProperty.results.txt b/idea/testData/slicer/inflow/thisInExtensionProperty.results.txt index 9b2fdc6a0a8..24a5d75661a 100644 --- a/idea/testData/slicer/inflow/thisInExtensionProperty.results.txt +++ b/idea/testData/slicer/inflow/thisInExtensionProperty.results.txt @@ -1,6 +1,6 @@ 7 val x = "".extensionProp (in foo()) 7 val x = "".extensionProp (in foo()) 3 val Any.extensionProp: Any -4 get() = this (in extensionProp: Any on Any) -3 val Any.extensionProp: Any (in extensionProp: Any on Any) +4 get() = this (in extensionProp.get on Any) +3 val Any.extensionProp: Any (in extensionProp on Any) 7 val x = "".extensionProp (in foo()) diff --git a/idea/testData/slicer/inflow/topLevelVal.leafGroups.txt b/idea/testData/slicer/inflow/topLevelVal.leafGroups.txt index 585b0043c24..1b1b0717fc4 100644 --- a/idea/testData/slicer/inflow/topLevelVal.leafGroups.txt +++ b/idea/testData/slicer/inflow/topLevelVal.leafGroups.txt @@ -1,3 +1,4 @@ -3 val foo: Int = 1 (in foo: Int) +3 val foo: Int = 1 (in foo) 3 val foo: Int = 1 -3 val foo: Int = 1 (in foo: Int) +3 val foo: Int = 1 (in foo) + diff --git a/idea/testData/slicer/inflow/topLevelVal.results.txt b/idea/testData/slicer/inflow/topLevelVal.results.txt index 88596239d0f..8ac48bc3ead 100644 --- a/idea/testData/slicer/inflow/topLevelVal.results.txt +++ b/idea/testData/slicer/inflow/topLevelVal.results.txt @@ -1,2 +1,2 @@ 3 val foo: Int = 1 -3 val foo: Int = 1 (in foo: Int) +3 val foo: Int = 1 (in foo) diff --git a/idea/testData/slicer/inflow/topLevelVar.leafGroups.txt b/idea/testData/slicer/inflow/topLevelVar.leafGroups.txt index 9ce7bfb48a3..1d1cc806bf7 100644 --- a/idea/testData/slicer/inflow/topLevelVar.leafGroups.txt +++ b/idea/testData/slicer/inflow/topLevelVar.leafGroups.txt @@ -1,6 +1,6 @@ -3 var foo: Int = 1 (in foo: Int) +3 var foo: Int = 1 (in foo) 3 var foo: Int = 1 -3 var foo: Int = 1 (in foo: Int) +3 var foo: Int = 1 (in foo) 7 foo = 2 (in test()) 3 var foo: Int = 1 diff --git a/idea/testData/slicer/inflow/topLevelVar.results.txt b/idea/testData/slicer/inflow/topLevelVar.results.txt index c83c37430a3..054b85b96a6 100644 --- a/idea/testData/slicer/inflow/topLevelVar.results.txt +++ b/idea/testData/slicer/inflow/topLevelVar.results.txt @@ -1,4 +1,4 @@ 3 var foo: Int = 1 -3 var foo: Int = 1 (in foo: Int) +3 var foo: Int = 1 (in foo) 7 foo = 2 (in test()) 4 TopLevelVarKt.setFoo(3); diff --git a/idea/testData/slicer/mpp/expectPropertyResultIn/results.txt b/idea/testData/slicer/mpp/expectPropertyResultIn/results.txt index edf79eee854..a2a6730cefb 100644 --- a/idea/testData/slicer/mpp/expectPropertyResultIn/results.txt +++ b/idea/testData/slicer/mpp/expectPropertyResultIn/results.txt @@ -2,7 +2,7 @@ 6 val result = 1.property (in bar()) 6 val result = 1.property (in bar()) 1 actual val Int.property: Any -2 get() = this (in property: Any on Int) -1 actual val Int.property: Any (in property: Any on Int) +2 get() = this (in property.get on Int) +1 actual val Int.property: Any (in property on Int) 6 val result = 1.property (in bar()) 3 expect val Int.property: Any diff --git a/idea/testData/slicer/mpp/expectPropertyResultOut/results.txt b/idea/testData/slicer/mpp/expectPropertyResultOut/results.txt index 9aa3d62ffe7..7e732ff5972 100644 --- a/idea/testData/slicer/mpp/expectPropertyResultOut/results.txt +++ b/idea/testData/slicer/mpp/expectPropertyResultOut/results.txt @@ -1,8 +1,8 @@ 6 val result = 1.property (in bar()) -3 expect val Int.property: Any (in property: Any on Int) -1 actual val Int.property: Any (in property: Any on Int) -2 get() = this (in property: Any on Int) -2 get() = this (in property: Any on Int) +3 expect val Int.property: Any (in property on Int) +1 actual val Int.property: Any (in property on Int) +2 get() = this (in property.get on Int) +2 get() = this (in property on Int) 6 val result = 1.property (in bar()) 6 val result = 1.property (in bar()) 7 println(result) (in bar()) diff --git a/idea/testData/slicer/outflow/getterExpressionBody.results.txt b/idea/testData/slicer/outflow/getterExpressionBody.results.txt index fef2361f1c5..7296faa1197 100644 --- a/idea/testData/slicer/outflow/getterExpressionBody.results.txt +++ b/idea/testData/slicer/outflow/getterExpressionBody.results.txt @@ -1,4 +1,4 @@ -4 get() = 0 (in foo: Int) -4 get() = 0 (in foo: Int) +4 get() = 0 (in foo.get) +4 get() = 0 (in foo) 7 val x = foo (in test()) 7 val x = foo (in test()) diff --git a/idea/testData/slicer/outflow/getterReturnExpression.results.txt b/idea/testData/slicer/outflow/getterReturnExpression.results.txt index 4a96fbaa923..df0e421dfd6 100644 --- a/idea/testData/slicer/outflow/getterReturnExpression.results.txt +++ b/idea/testData/slicer/outflow/getterReturnExpression.results.txt @@ -1,4 +1,4 @@ -5 return 0 (in foo: Int) -4 get(): Int { (in foo: Int) +5 return 0 (in foo.get) +4 get(): Int { (in foo) 9 val x = foo (in test()) 9 val x = foo (in test()) diff --git a/idea/testData/slicer/outflow/memberPropertyUsages.results.txt b/idea/testData/slicer/outflow/memberPropertyUsages.results.txt index fa82db87d63..7a006908cd4 100644 --- a/idea/testData/slicer/outflow/memberPropertyUsages.results.txt +++ b/idea/testData/slicer/outflow/memberPropertyUsages.results.txt @@ -1,6 +1,6 @@ 4 val x = 1 (in A) 3 int x = new A().getX(); -6 val y = x (in A.y: Int) +6 val y = x (in A.y) 6 val y = x (in A) 11 z = x (in A) 8 val z: Int (in A) diff --git a/idea/testData/slicer/outflow/overridingParameter.results.txt b/idea/testData/slicer/outflow/overridingParameter.results.txt index 459477a2526..0e390dc120d 100644 --- a/idea/testData/slicer/outflow/overridingParameter.results.txt +++ b/idea/testData/slicer/outflow/overridingParameter.results.txt @@ -1,4 +1,4 @@ -10 override val foo = 3 (in C.foo: Int) +10 override val foo = 3 (in C.foo) 10 override val foo = 3 (in C) 14 val x = a.foo (in test(A, B,…)) 14 val x = a.foo (in test(A, B,…)) diff --git a/idea/testData/slicer/outflow/overridingPropertyGetterResult.results.txt b/idea/testData/slicer/outflow/overridingPropertyGetterResult.results.txt index 0599e5374c9..bb57938a9a9 100644 --- a/idea/testData/slicer/outflow/overridingPropertyGetterResult.results.txt +++ b/idea/testData/slicer/outflow/overridingPropertyGetterResult.results.txt @@ -1,5 +1,5 @@ -10 get() = 2 (in B.foo: Int) -10 get() = 2 (in B.foo: Int) +10 get() = 2 (in B.foo.get) +10 get() = 2 (in B.foo) 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,…)) diff --git a/idea/testData/slicer/outflow/overridingPropertyResult.results.txt b/idea/testData/slicer/outflow/overridingPropertyResult.results.txt index a42adb9cc2e..de2a27c3adf 100644 --- a/idea/testData/slicer/outflow/overridingPropertyResult.results.txt +++ b/idea/testData/slicer/outflow/overridingPropertyResult.results.txt @@ -1,4 +1,4 @@ -8 override val foo = 2 (in B.foo: Int) +8 override val foo = 2 (in B.foo) 8 override val foo = 2 (in B) 16 val x = a.foo (in test(A, B,…)) 16 val x = a.foo (in test(A, B,…)) diff --git a/idea/testData/slicer/outflow/primaryConstructorParameterUsages.results.txt b/idea/testData/slicer/outflow/primaryConstructorParameterUsages.results.txt index 38985bc6d5d..b992739481e 100644 --- a/idea/testData/slicer/outflow/primaryConstructorParameterUsages.results.txt +++ b/idea/testData/slicer/outflow/primaryConstructorParameterUsages.results.txt @@ -1,5 +1,5 @@ 3 class A(n: Int) { (in A(Int)) -4 val x = n (in A.x: Int) +4 val x = n (in A.x) 4 val x = n (in A) 9 y = n (in A) 6 val y: Int (in A) diff --git a/idea/testData/slicer/outflow/simpleCallDereferences.results.txt b/idea/testData/slicer/outflow/simpleCallDereferences.results.txt index 7c4729ff878..07726f5c774 100644 --- a/idea/testData/slicer/outflow/simpleCallDereferences.results.txt +++ b/idea/testData/slicer/outflow/simpleCallDereferences.results.txt @@ -4,7 +4,7 @@ 17 x.fooExt() (in test()) 9 fun A.fooExt() = 1 (in fooExt() on A) 18 x.barExt (in test()) -10 val A.barExt: Int get() = 2 (in barExt: Int on A) +10 val A.barExt: Int get() = 2 (in barExt on A) 20 val y: A? = x (in test()) 20 val y: A? = x (in test()) 22 DEREFERENCE: y?.foo() (in test()) @@ -12,4 +12,4 @@ 24 y?.fooExt() (in test()) 9 DUPLICATE: fun A.fooExt() = 1 (in fooExt() on A) 25 y?.barExt (in test()) -10 DUPLICATE: val A.barExt: Int get() = 2 (in barExt: Int on A) +10 DUPLICATE: val A.barExt: Int get() = 2 (in barExt on A) diff --git a/idea/testData/slicer/outflow/thisInExtensionProperty.results.txt b/idea/testData/slicer/outflow/thisInExtensionProperty.results.txt index 05bfd21f3f7..8ecd01902b2 100644 --- a/idea/testData/slicer/outflow/thisInExtensionProperty.results.txt +++ b/idea/testData/slicer/outflow/thisInExtensionProperty.results.txt @@ -1,6 +1,6 @@ 7 val x = "".extensionProp (in foo()) -3 val String.extensionProp: Any (in extensionProp: Any on String) -4 get() = this (in extensionProp: Any on String) -4 get() = this (in extensionProp: Any on String) +3 val String.extensionProp: Any (in extensionProp on String) +4 get() = this (in extensionProp.get on String) +4 get() = this (in extensionProp on String) 7 val x = "".extensionProp (in foo()) 7 val x = "".extensionProp (in foo()) diff --git a/idea/testData/slicer/outflow/topLevelPropertyUsages.results.txt b/idea/testData/slicer/outflow/topLevelPropertyUsages.results.txt index 0eb5580a609..d9c864949d3 100644 --- a/idea/testData/slicer/outflow/topLevelPropertyUsages.results.txt +++ b/idea/testData/slicer/outflow/topLevelPropertyUsages.results.txt @@ -1,6 +1,6 @@ 4 val x = 1 3 int x = TopLevelPropertyUsagesKt.getX(); -6 val y = x (in y: Int) +6 val y = x (in y) 6 val y = x 9 val y = x (in test()) 9 val y = x (in test()) diff --git a/idea/testData/slicer/outflow/valParameter.results.txt b/idea/testData/slicer/outflow/valParameter.results.txt index 61c3950bb77..177de11434d 100644 --- a/idea/testData/slicer/outflow/valParameter.results.txt +++ b/idea/testData/slicer/outflow/valParameter.results.txt @@ -1,6 +1,6 @@ 3 class A(val n: Int) { (in A) 3 int n = new A(1).getN(); -4 val x = n (in A.x: Int) +4 val x = n (in A.x) 4 val x = n (in A) 9 y = n (in A) 6 val y: Int (in A) diff --git a/idea/testData/slicer/outflow/varParameter.results.txt b/idea/testData/slicer/outflow/varParameter.results.txt index d49686e2e5f..af77d31cdba 100644 --- a/idea/testData/slicer/outflow/varParameter.results.txt +++ b/idea/testData/slicer/outflow/varParameter.results.txt @@ -1,6 +1,6 @@ 3 class A(var n: Int) { (in A) 3 int n = new A(1).getN(); -4 val x = n (in A.x: Int) +4 val x = n (in A.x) 4 val x = n (in A) 9 y = n (in A) 6 val y: Int (in A)