diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceUsage.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceUsage.kt index aa1893a79ad..62751c645d0 100644 --- a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceUsage.kt +++ b/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceUsage.kt @@ -16,19 +16,29 @@ package org.jetbrains.kotlin.idea.slicer +import com.intellij.ide.SelectInEditorManager +import com.intellij.openapi.editor.Editor +import com.intellij.openapi.fileEditor.FileEditorManager +import com.intellij.openapi.fileEditor.OpenFileDescriptor +import com.intellij.openapi.util.ProperTextRange +import com.intellij.openapi.util.Segment +import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiElement import com.intellij.slicer.SliceAnalysisParams import com.intellij.slicer.SliceUsage import com.intellij.usageView.UsageInfo import org.jetbrains.kotlin.idea.findUsages.handlers.SliceUsageProcessor -import org.jetbrains.kotlin.psi.KtElement +import org.jetbrains.kotlin.psi.* +import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject +import org.jetbrains.kotlin.psi.psiUtil.endOffset +import org.jetbrains.kotlin.psi.psiUtil.startOffset open class KotlinSliceUsage : SliceUsage { val mode: KotlinSliceAnalysisMode val forcedExpressionMode: Boolean - private var usageInfo: UsageInfo? = null + private var usageInfo: AdaptedUsageInfo? = null constructor( element: PsiElement, @@ -47,25 +57,37 @@ open class KotlinSliceUsage : SliceUsage { initializeUsageInfo() } + //TODO: it's all hacks due to UsageInfo stored in the base class - fix it in IDEA private fun initializeUsageInfo() { - val originalInfo = getUsageInfo() - if (mode != KotlinSliceAnalysisMode.Default) { - val element = originalInfo.element - if (element != null) { - usageInfo = UsageInfoWrapper(element, mode) - } else { - usageInfo = null - } - } else { - usageInfo = originalInfo - } + usageInfo = getUsageInfo().element?.let { AdaptedUsageInfo(it, mode) } } - // we have to replace UsageInfo with another one whose equality takes into account mode override fun getUsageInfo(): UsageInfo { return usageInfo ?: super.getUsageInfo() } + override fun getMergedInfos(): Array { + return arrayOf(getUsageInfo()) + } + + override fun openTextEditor(focus: Boolean): Editor? { + val project = getUsageInfo().project + val descriptor = OpenFileDescriptor(project, file, getUsageInfo().navigationOffset) + return FileEditorManager.getInstance(project).openTextEditor(descriptor, focus) + } + + override fun highlightInEditor() { + if (!isValid) return + + val usageInfo = getUsageInfo() + val range = usageInfo.navigationRange ?: return + SelectInEditorManager.getInstance(getUsageInfo().project).selectInEditor(file, range.startOffset, range.endOffset, false, false) + + if (usageInfo.navigationOffset != range.startOffset) { + openTextEditor(false) // to position the caret at the identifier + } + } + override fun copy(): KotlinSliceUsage { val element = getUsageInfo().element!! return if (parent == null) @@ -97,9 +119,57 @@ open class KotlinSliceUsage : SliceUsage { } @Suppress("EqualsOrHashCode") - private class UsageInfoWrapper(element: PsiElement, private val mode: KotlinSliceAnalysisMode) : UsageInfo(element) { + private class AdaptedUsageInfo(element: PsiElement, private val mode: KotlinSliceAnalysisMode) : UsageInfo(element) { override fun equals(other: Any?): Boolean { - return other is UsageInfoWrapper && super.equals(other) && mode == other.mode + return other is AdaptedUsageInfo && super.equals(other) && mode == other.mode + } + + override fun getNavigationRange(): Segment? { + val element = element ?: return null + return when (element) { + is KtParameter -> { + val nameRange = element.nameIdentifier?.textRange ?: return super.getNavigationRange() + val start = element.valOrVarKeyword?.startOffset ?: nameRange.startOffset + val end = element.typeReference?.endOffset ?: nameRange.endOffset + TextRange(start, end) + } + + is KtVariableDeclaration -> { + val nameRange = element.nameIdentifier?.textRange ?: return super.getNavigationRange() + val start = element.valOrVarKeyword?.startOffset ?: nameRange.startOffset + val end = element.typeReference?.endOffset ?: nameRange.endOffset + TextRange(start, end) + } + + is KtNamedFunction -> { + val funKeyword = element.funKeyword + val parameterList = element.valueParameterList + val typeReference = element.typeReference + if (funKeyword != null && parameterList != null) + TextRange(funKeyword.startOffset, typeReference?.endOffset ?: parameterList.endOffset) + else + null + } + + is KtPrimaryConstructor -> { + element.containingClassOrObject?.nameIdentifier + ?.let { TextRange(it.startOffset, element.endOffset) } + } + + else -> null + } ?: TextRange(element.textOffset, element.endOffset) + } + + override fun getRangeInElement(): ProperTextRange? { + val elementRange = element?.textRange ?: return null + return navigationRange + ?.takeIf { it in elementRange } + ?.let { ProperTextRange(it.startOffset, it.endOffset).shiftRight(-elementRange.startOffset) } + ?: super.getRangeInElement() + } + + override fun getNavigationOffset(): Int { + return element?.textOffset ?: -1 } } } diff --git a/idea/testData/slicer/inflow/anonymousFunBodyExpression.leafGroups.txt b/idea/testData/slicer/inflow/anonymousFunBodyExpression.leafGroups.txt index a98acf627a4..04e8f683f21 100644 --- a/idea/testData/slicer/inflow/anonymousFunBodyExpression.leafGroups.txt +++ b/idea/testData/slicer/inflow/anonymousFunBodyExpression.leafGroups.txt @@ -1,14 +1,14 @@ 4 return f(1) (in foo((Int) -> Int)) -8 val x = foo(fun(n: Int) = n) (in test()) +8 val x = foo(fun(n: Int) = n) (in test()) 8 val x = foo(fun(n: Int) = n) (in test()) -3 fun foo(f: (Int) -> Int): Int { +3 fun foo(f: (Int) -> Int): Int { 4 return f(1) (in foo((Int) -> Int)) 4 [LAMBDA IN] return f(1) (in foo((Int) -> Int)) 3 [LAMBDA IN] fun foo(f: (Int) -> Int): Int { (in foo((Int) -> Int)) -8 [LAMBDA IN] val x = foo(fun(n: Int) = n) (in test()) -8 val x = foo(fun(n: Int) = n) (in test()) +8 [LAMBDA IN] val x = foo(fun(n: Int) = n) (in test()) +8 val x = foo(fun(n: Int) = n) (in test()) 8 val x = foo(fun(n: Int) = n) (in test()) 8 val x = foo(fun(n: Int) = n) (in test()) -8 [LAMBDA CALLS ARGUMENT #0] val x = foo(fun(n: Int) = n) (in test()) +8 [LAMBDA CALLS ARGUMENT #0] val x = foo(fun(n: Int) = n) (in test()) 3 [LAMBDA CALLS ARGUMENT #0] fun foo(f: (Int) -> Int): Int { (in foo((Int) -> Int)) 4 return f(1) (in foo((Int) -> Int)) diff --git a/idea/testData/slicer/inflow/anonymousFunBodyExpression.nullnessGroups.txt b/idea/testData/slicer/inflow/anonymousFunBodyExpression.nullnessGroups.txt index bc68214e977..56a9d48e31e 100644 --- a/idea/testData/slicer/inflow/anonymousFunBodyExpression.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/anonymousFunBodyExpression.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -8 val x = foo(fun(n: Int) = n) (in test()) -8 val x = foo(fun(n: Int) = n) (in test()) +8 val x = foo(fun(n: Int) = n) (in test()) +8 val x = foo(fun(n: Int) = n) (in test()) diff --git a/idea/testData/slicer/inflow/anonymousFunBodyExpression.results.txt b/idea/testData/slicer/inflow/anonymousFunBodyExpression.results.txt index c8a0f9ca061..401dcb18c07 100644 --- a/idea/testData/slicer/inflow/anonymousFunBodyExpression.results.txt +++ b/idea/testData/slicer/inflow/anonymousFunBodyExpression.results.txt @@ -1,13 +1,13 @@ -8 val x = foo(fun(n: Int) = n) (in test()) +8 val x = foo(fun(n: Int) = n) (in test()) 8 val x = foo(fun(n: Int) = n) (in test()) -3 fun foo(f: (Int) -> Int): Int { +3 fun foo(f: (Int) -> Int): Int { 4 return f(1) (in foo((Int) -> Int)) 4 [LAMBDA IN] return f(1) (in foo((Int) -> Int)) 3 [LAMBDA IN] fun foo(f: (Int) -> Int): Int { (in foo((Int) -> Int)) -8 [LAMBDA IN] val x = foo(fun(n: Int) = n) (in test()) -8 val x = foo(fun(n: Int) = n) (in test()) +8 [LAMBDA IN] val x = foo(fun(n: Int) = n) (in test()) +8 val x = foo(fun(n: Int) = n) (in test()) 8 val x = foo(fun(n: Int) = n) (in test()) 8 val x = foo(fun(n: Int) = n) (in test()) -8 [LAMBDA CALLS ARGUMENT #0] val x = foo(fun(n: Int) = n) (in test()) +8 [LAMBDA CALLS ARGUMENT #0] val x = foo(fun(n: Int) = n) (in test()) 3 [LAMBDA CALLS ARGUMENT #0] fun foo(f: (Int) -> Int): Int { (in foo((Int) -> Int)) 4 return f(1) (in foo((Int) -> Int)) diff --git a/idea/testData/slicer/inflow/anonymousFunReturnExpression.leafGroups.txt b/idea/testData/slicer/inflow/anonymousFunReturnExpression.leafGroups.txt index f5f3f5ba7da..93fdf221494 100644 --- a/idea/testData/slicer/inflow/anonymousFunReturnExpression.leafGroups.txt +++ b/idea/testData/slicer/inflow/anonymousFunReturnExpression.leafGroups.txt @@ -1,14 +1,14 @@ 4 return f(1) (in foo((Int) -> Int)) -8 val x = foo(fun(n: Int): Int { return n }) (in test()) +8 val x = foo(fun(n: Int): Int { return n }) (in test()) 8 val x = foo(fun(n: Int): Int { return n }) (in test()) -3 fun foo(f: (Int) -> Int): Int { +3 fun foo(f: (Int) -> Int): Int { 4 return f(1) (in foo((Int) -> Int)) 4 [LAMBDA IN] return f(1) (in foo((Int) -> Int)) 3 [LAMBDA IN] fun foo(f: (Int) -> Int): Int { (in foo((Int) -> Int)) -8 [LAMBDA IN] val x = foo(fun(n: Int): Int { return n }) (in test()) -8 val x = foo(fun(n: Int): Int { return n }) (in test()) +8 [LAMBDA IN] val x = foo(fun(n: Int): Int { return n }) (in test()) +8 val x = foo(fun(n: Int): Int { return n }) (in test()) 8 val x = foo(fun(n: Int): Int { return n }) (in test()) 8 val x = foo(fun(n: Int): Int { return n }) (in test()) -8 [LAMBDA CALLS ARGUMENT #0] val x = foo(fun(n: Int): Int { return n }) (in test()) +8 [LAMBDA CALLS ARGUMENT #0] val x = foo(fun(n: Int): Int { return n }) (in test()) 3 [LAMBDA CALLS ARGUMENT #0] fun foo(f: (Int) -> Int): Int { (in foo((Int) -> Int)) 4 return f(1) (in foo((Int) -> Int)) diff --git a/idea/testData/slicer/inflow/anonymousFunReturnExpression.nullnessGroups.txt b/idea/testData/slicer/inflow/anonymousFunReturnExpression.nullnessGroups.txt index 3b3573bf4c1..7347c2a5e71 100644 --- a/idea/testData/slicer/inflow/anonymousFunReturnExpression.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/anonymousFunReturnExpression.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -8 val x = foo(fun(n: Int): Int { return n }) (in test()) -8 val x = foo(fun(n: Int): Int { return n }) (in test()) +8 val x = foo(fun(n: Int): Int { return n }) (in test()) +8 val x = foo(fun(n: Int): Int { return n }) (in test()) diff --git a/idea/testData/slicer/inflow/anonymousFunReturnExpression.results.txt b/idea/testData/slicer/inflow/anonymousFunReturnExpression.results.txt index 6b3111149e7..4e2e8ce2670 100644 --- a/idea/testData/slicer/inflow/anonymousFunReturnExpression.results.txt +++ b/idea/testData/slicer/inflow/anonymousFunReturnExpression.results.txt @@ -1,13 +1,13 @@ -8 val x = foo(fun(n: Int): Int { return n }) (in test()) +8 val x = foo(fun(n: Int): Int { return n }) (in test()) 8 val x = foo(fun(n: Int): Int { return n }) (in test()) -3 fun foo(f: (Int) -> Int): Int { +3 fun foo(f: (Int) -> Int): Int { 4 return f(1) (in foo((Int) -> Int)) 4 [LAMBDA IN] return f(1) (in foo((Int) -> Int)) 3 [LAMBDA IN] fun foo(f: (Int) -> Int): Int { (in foo((Int) -> Int)) -8 [LAMBDA IN] val x = foo(fun(n: Int): Int { return n }) (in test()) -8 val x = foo(fun(n: Int): Int { return n }) (in test()) +8 [LAMBDA IN] val x = foo(fun(n: Int): Int { return n }) (in test()) +8 val x = foo(fun(n: Int): Int { return n }) (in test()) 8 val x = foo(fun(n: Int): Int { return n }) (in test()) 8 val x = foo(fun(n: Int): Int { return n }) (in test()) -8 [LAMBDA CALLS ARGUMENT #0] val x = foo(fun(n: Int): Int { return n }) (in test()) +8 [LAMBDA CALLS ARGUMENT #0] val x = foo(fun(n: Int): Int { return n }) (in test()) 3 [LAMBDA CALLS ARGUMENT #0] fun foo(f: (Int) -> Int): Int { (in foo((Int) -> Int)) 4 return f(1) (in foo((Int) -> Int)) diff --git a/idea/testData/slicer/inflow/anonymousFunctionParameter.leafGroups.txt b/idea/testData/slicer/inflow/anonymousFunctionParameter.leafGroups.txt index 56ceb5b07e0..08d4e97e552 100644 --- a/idea/testData/slicer/inflow/anonymousFunctionParameter.leafGroups.txt +++ b/idea/testData/slicer/inflow/anonymousFunctionParameter.leafGroups.txt @@ -1,7 +1,7 @@ 4 f(1) (in foo((Int) -> Unit)) -9 val v = value (in test()) +9 val v = value (in test()) 9 val v = value (in test()) 8 foo(fun(value: Int) { (in test()) -8 [LAMBDA CALLS ARGUMENT #0] foo(fun(value: Int) { (in test()) +8 [LAMBDA CALLS ARGUMENT #0] foo(fun(value: Int) { (in test()) 3 [LAMBDA CALLS ARGUMENT #0] fun foo(f: (Int) -> Unit) { (in foo((Int) -> Unit)) 4 f(1) (in foo((Int) -> Unit)) diff --git a/idea/testData/slicer/inflow/anonymousFunctionParameter.nullnessGroups.txt b/idea/testData/slicer/inflow/anonymousFunctionParameter.nullnessGroups.txt index c5eeb8a9d4d..c66be584cbc 100644 --- a/idea/testData/slicer/inflow/anonymousFunctionParameter.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/anonymousFunctionParameter.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -9 val v = value (in test()) -9 val v = value (in test()) +9 val v = value (in test()) +9 val v = value (in test()) diff --git a/idea/testData/slicer/inflow/anonymousFunctionParameter.results.txt b/idea/testData/slicer/inflow/anonymousFunctionParameter.results.txt index 6df1965fc74..f37a29dac38 100644 --- a/idea/testData/slicer/inflow/anonymousFunctionParameter.results.txt +++ b/idea/testData/slicer/inflow/anonymousFunctionParameter.results.txt @@ -1,6 +1,6 @@ -9 val v = value (in test()) +9 val v = value (in test()) 9 val v = value (in test()) 8 foo(fun(value: Int) { (in test()) -8 [LAMBDA CALLS ARGUMENT #0] foo(fun(value: Int) { (in test()) +8 [LAMBDA CALLS ARGUMENT #0] foo(fun(value: Int) { (in test()) 3 [LAMBDA CALLS ARGUMENT #0] fun foo(f: (Int) -> Unit) { (in foo((Int) -> Unit)) 4 f(1) (in foo((Int) -> Unit)) diff --git a/idea/testData/slicer/inflow/cast.leafGroups.txt b/idea/testData/slicer/inflow/cast.leafGroups.txt index 67e710bd4f1..cc61ac1bfb7 100644 --- a/idea/testData/slicer/inflow/cast.leafGroups.txt +++ b/idea/testData/slicer/inflow/cast.leafGroups.txt @@ -1,5 +1,5 @@ 3 fun test(o: Any) { (in test(Any)) -4 val x = o as String (in test(Any)) +4 val x = o as String (in test(Any)) 4 val x = o as String (in test(Any)) 4 val x = o as String (in test(Any)) 3 fun test(o: Any) { (in test(Any)) diff --git a/idea/testData/slicer/inflow/cast.nullnessGroups.txt b/idea/testData/slicer/inflow/cast.nullnessGroups.txt index e568ea0ea9d..00ac6f7aad8 100644 --- a/idea/testData/slicer/inflow/cast.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/cast.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -4 val x = o as String (in test(Any)) -4 val x = o as String (in test(Any)) +4 val x = o as String (in test(Any)) +4 val x = o as String (in test(Any)) diff --git a/idea/testData/slicer/inflow/cast.results.txt b/idea/testData/slicer/inflow/cast.results.txt index 661fb04c4d7..0f98290cd55 100644 --- a/idea/testData/slicer/inflow/cast.results.txt +++ b/idea/testData/slicer/inflow/cast.results.txt @@ -1,4 +1,4 @@ -4 val x = o as String (in test(Any)) +4 val x = o as String (in test(Any)) 4 val x = o as String (in test(Any)) 4 val x = o as String (in test(Any)) 3 fun test(o: Any) { (in test(Any)) diff --git a/idea/testData/slicer/inflow/compositeAssignments.leafGroups.txt b/idea/testData/slicer/inflow/compositeAssignments.leafGroups.txt index ebff30d4468..56ccce0b5fc 100644 --- a/idea/testData/slicer/inflow/compositeAssignments.leafGroups.txt +++ b/idea/testData/slicer/inflow/compositeAssignments.leafGroups.txt @@ -1,17 +1,17 @@ 7 --result (in assignmentWithSum(Int)) -3 fun assignmentWithSum(n: Int): Int { +3 fun assignmentWithSum(n: Int): Int { 8 return result (in assignmentWithSum(Int)) -4 var result = 0 (in assignmentWithSum(Int)) +4 var result = 0 (in assignmentWithSum(Int)) 7 --result (in assignmentWithSum(Int)) 4 var result = 0 (in assignmentWithSum(Int)) -3 fun assignmentWithSum(n: Int): Int { +3 fun assignmentWithSum(n: Int): Int { 8 return result (in assignmentWithSum(Int)) -4 var result = 0 (in assignmentWithSum(Int)) +4 var result = 0 (in assignmentWithSum(Int)) 4 var result = 0 (in assignmentWithSum(Int)) 5 result += n (in assignmentWithSum(Int)) -3 fun assignmentWithSum(n: Int): Int { +3 fun assignmentWithSum(n: Int): Int { 8 return result (in assignmentWithSum(Int)) -4 var result = 0 (in assignmentWithSum(Int)) +4 var result = 0 (in assignmentWithSum(Int)) 5 result += n (in assignmentWithSum(Int)) diff --git a/idea/testData/slicer/inflow/compositeAssignments.nullnessGroups.txt b/idea/testData/slicer/inflow/compositeAssignments.nullnessGroups.txt index e9a2d0cdeb4..6b1e69ba67d 100644 --- a/idea/testData/slicer/inflow/compositeAssignments.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/compositeAssignments.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -3 fun assignmentWithSum(n: Int): Int { -3 fun assignmentWithSum(n: Int): Int { +3 fun assignmentWithSum(n: Int): Int { +3 fun assignmentWithSum(n: Int): Int { diff --git a/idea/testData/slicer/inflow/compositeAssignments.results.txt b/idea/testData/slicer/inflow/compositeAssignments.results.txt index b3bd23d6a73..24ed9097b9c 100644 --- a/idea/testData/slicer/inflow/compositeAssignments.results.txt +++ b/idea/testData/slicer/inflow/compositeAssignments.results.txt @@ -1,8 +1,8 @@ -3 fun assignmentWithSum(n: Int): Int { +3 fun assignmentWithSum(n: Int): Int { 8 return result (in assignmentWithSum(Int)) -4 var result = 0 (in assignmentWithSum(Int)) +4 var result = 0 (in assignmentWithSum(Int)) 4 var result = 0 (in assignmentWithSum(Int)) 5 result += n (in assignmentWithSum(Int)) 6 result++ (in assignmentWithSum(Int)) -4 DUPLICATE: var result = 0 (in assignmentWithSum(Int)) +4 DUPLICATE: var result = 0 (in assignmentWithSum(Int)) 7 --result (in assignmentWithSum(Int)) diff --git a/idea/testData/slicer/inflow/defaultGetterFieldInSetter.leafGroups.txt b/idea/testData/slicer/inflow/defaultGetterFieldInSetter.leafGroups.txt index a07d9729e71..319e2720667 100644 --- a/idea/testData/slicer/inflow/defaultGetterFieldInSetter.leafGroups.txt +++ b/idea/testData/slicer/inflow/defaultGetterFieldInSetter.leafGroups.txt @@ -1,11 +1,11 @@ 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) 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) +4 var foo: Int = 0 (in A) 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) diff --git a/idea/testData/slicer/inflow/defaultGetterFieldInSetter.results.txt b/idea/testData/slicer/inflow/defaultGetterFieldInSetter.results.txt index affbc37f27b..662904b8ce0 100644 --- a/idea/testData/slicer/inflow/defaultGetterFieldInSetter.results.txt +++ b/idea/testData/slicer/inflow/defaultGetterFieldInSetter.results.txt @@ -1,5 +1,5 @@ 10 val x = foo (in A.test()) -4 var foo: Int = 0 (in A) +4 var foo: Int = 0 (in A) 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) diff --git a/idea/testData/slicer/inflow/delegateGetter.leafGroups.txt b/idea/testData/slicer/inflow/delegateGetter.leafGroups.txt index 3d29dd4cd98..bc28eb80101 100644 --- a/idea/testData/slicer/inflow/delegateGetter.leafGroups.txt +++ b/idea/testData/slicer/inflow/delegateGetter.leafGroups.txt @@ -1,6 +1,6 @@ 6 operator fun getValue(thisRef: Any?, property: KProperty<*>) = 1 (in D.getValue(Any?, KProperty<*>)) -12 val x = foo (in test()) +12 val x = foo (in test()) 12 val x = foo (in test()) -9 val foo: Int by D -6 operator fun getValue(thisRef: Any?, property: KProperty<*>) = 1 (in D) +9 val foo: Int by D +6 operator fun getValue(thisRef: Any?, property: KProperty<*>) = 1 (in D) 6 operator fun getValue(thisRef: Any?, property: KProperty<*>) = 1 (in D.getValue(Any?, KProperty<*>)) diff --git a/idea/testData/slicer/inflow/delegateGetter.nullnessGroups.txt b/idea/testData/slicer/inflow/delegateGetter.nullnessGroups.txt index 9804e41f1d1..a623e634f43 100644 --- a/idea/testData/slicer/inflow/delegateGetter.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/delegateGetter.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -12 val x = foo (in test()) -12 val x = foo (in test()) +12 val x = foo (in test()) +12 val x = foo (in test()) diff --git a/idea/testData/slicer/inflow/delegateGetter.results.txt b/idea/testData/slicer/inflow/delegateGetter.results.txt index d88ed751a15..9870d862509 100644 --- a/idea/testData/slicer/inflow/delegateGetter.results.txt +++ b/idea/testData/slicer/inflow/delegateGetter.results.txt @@ -1,5 +1,5 @@ -12 val x = foo (in test()) +12 val x = foo (in test()) 12 val x = foo (in test()) -9 val foo: Int by D -6 operator fun getValue(thisRef: Any?, property: KProperty<*>) = 1 (in D) +9 val foo: Int by D +6 operator fun getValue(thisRef: Any?, property: KProperty<*>) = 1 (in D) 6 operator fun getValue(thisRef: Any?, property: KProperty<*>) = 1 (in D.getValue(Any?, KProperty<*>)) diff --git a/idea/testData/slicer/inflow/delegateToJavaGetter.leafGroups.txt b/idea/testData/slicer/inflow/delegateToJavaGetter.leafGroups.txt index 0e6ac9a728c..4d62cd1e22a 100644 --- a/idea/testData/slicer/inflow/delegateToJavaGetter.leafGroups.txt +++ b/idea/testData/slicer/inflow/delegateToJavaGetter.leafGroups.txt @@ -1,5 +1,5 @@ 9 return 1; -7 val x = foo (in test()) +7 val x = foo (in test()) 7 val x = foo (in test()) -4 val foo: Int by D.INSTANCE +4 val foo: Int by D.INSTANCE 9 return 1; diff --git a/idea/testData/slicer/inflow/delegateToJavaGetter.nullnessGroups.txt b/idea/testData/slicer/inflow/delegateToJavaGetter.nullnessGroups.txt index b14ba93c49a..0fea5efbd91 100644 --- a/idea/testData/slicer/inflow/delegateToJavaGetter.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/delegateToJavaGetter.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -7 val x = foo (in test()) -7 val x = foo (in test()) +7 val x = foo (in test()) +7 val x = foo (in test()) diff --git a/idea/testData/slicer/inflow/delegateToJavaGetter.results.txt b/idea/testData/slicer/inflow/delegateToJavaGetter.results.txt index 5cb35a79afc..8c8c0fa82f0 100644 --- a/idea/testData/slicer/inflow/delegateToJavaGetter.results.txt +++ b/idea/testData/slicer/inflow/delegateToJavaGetter.results.txt @@ -1,4 +1,4 @@ -7 val x = foo (in test()) +7 val x = foo (in test()) 7 val x = foo (in test()) -4 val foo: Int by D.INSTANCE +4 val foo: Int by D.INSTANCE 9 return 1; diff --git a/idea/testData/slicer/inflow/diamondHierarchyJKMiddleClassFun.leafGroups.txt b/idea/testData/slicer/inflow/diamondHierarchyJKMiddleClassFun.leafGroups.txt index d0f79018da2..8fa08b5e125 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,…)) +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) 4 override fun foo() = 2 (in B.foo()) 11 return 4; -9 val y = b.foo() (in test(A, B,…)) +9 val y = b.foo() (in test(A, B,…)) 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 bcec0624ec0..bb22c5fecae 100644 --- a/idea/testData/slicer/inflow/diamondHierarchyJKMiddleClassFun.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/diamondHierarchyJKMiddleClassFun.nullnessGroups.txt @@ -1,4 +1,3 @@ [NotNull Values] -9 val y = b.foo() (in test(A, B,…)) -9 val y = b.foo() (in test(A, B,…)) - +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 0e6bd3b0c9e..13b70cad8e8 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,…)) +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) 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 ed4d4273964..642514a9c47 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,…)) +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) 4 override fun foo() = 3 (in C.foo()) 13 return 4; -10 val z = c.foo() (in test(A, B,…)) +10 val z = c.foo() (in test(A, B,…)) 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 d7a322e6263..945d11abec8 100644 --- a/idea/testData/slicer/inflow/diamondHierarchyJKMiddleInterfaceFun.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/diamondHierarchyJKMiddleInterfaceFun.nullnessGroups.txt @@ -1,4 +1,3 @@ [NotNull Values] -10 val z = c.foo() (in test(A, B,…)) -10 val z = c.foo() (in test(A, B,…)) - +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 c2221d89ff7..19d019266c1 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,…)) +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) 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 fa306190d4c..e6e598fad99 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,…)) +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) 4 fun foo() = 1 (in A.foo()) 3 return 2; -8 val x = a.foo() (in test(A, B,…)) +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,…)) +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 271fe91e2f7..fbb77c80330 100644 --- a/idea/testData/slicer/inflow/diamondHierarchyJKRootInterfaceFun.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/diamondHierarchyJKRootInterfaceFun.nullnessGroups.txt @@ -1,4 +1,3 @@ [NotNull Values] -8 val x = a.foo() (in test(A, B,…)) -8 val x = a.foo() (in test(A, B,…)) - +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 ed8030dc28e..300199b8ce3 100644 --- a/idea/testData/slicer/inflow/diamondHierarchyJKRootInterfaceFun.results.txt +++ b/idea/testData/slicer/inflow/diamondHierarchyJKRootInterfaceFun.results.txt @@ -1,6 +1,6 @@ -8 val x = a.foo() (in test(A, B,…)) +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) 4 fun foo() = 1 (in A.foo()) 3 return 2; 13 return 4; diff --git a/idea/testData/slicer/inflow/diamondHierarchyMiddleClassFun.leafGroups.txt b/idea/testData/slicer/inflow/diamondHierarchyMiddleClassFun.leafGroups.txt index 63877bc11c1..e4261d9c6d5 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,…)) +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) 8 override fun foo() = 2 (in B.foo()) 16 override fun foo() = 4 (in D.foo()) -21 val y = b.foo() (in test(A, B,…)) +21 val y = b.foo() (in test(A, B,…)) 21 val y = b.foo() (in test(A, B,…)) -16 override fun foo() = 4 (in D) +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 77728322e23..b1fb94b0161 100644 --- a/idea/testData/slicer/inflow/diamondHierarchyMiddleClassFun.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/diamondHierarchyMiddleClassFun.nullnessGroups.txt @@ -1,4 +1,3 @@ [NotNull Values] -21 val y = b.foo() (in test(A, B,…)) -21 val y = b.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/inflow/diamondHierarchyMiddleClassFun.results.txt b/idea/testData/slicer/inflow/diamondHierarchyMiddleClassFun.results.txt index d4fcb30cee4..06cd933a596 100644 --- a/idea/testData/slicer/inflow/diamondHierarchyMiddleClassFun.results.txt +++ b/idea/testData/slicer/inflow/diamondHierarchyMiddleClassFun.results.txt @@ -1,6 +1,6 @@ -21 val y = b.foo() (in test(A, B,…)) +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) 8 override fun foo() = 2 (in B.foo()) -16 override fun foo() = 4 (in D) +16 override fun foo() = 4 (in D) 16 override fun foo() = 4 (in D.foo()) diff --git a/idea/testData/slicer/inflow/diamondHierarchyMiddleInterfaceFun.leafGroups.txt b/idea/testData/slicer/inflow/diamondHierarchyMiddleInterfaceFun.leafGroups.txt index 2609387dc28..a9b50d8d77f 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,…)) +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) 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,…)) +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) 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 2a9b3a5f5c7..394a23e8a49 100644 --- a/idea/testData/slicer/inflow/diamondHierarchyMiddleInterfaceFun.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/diamondHierarchyMiddleInterfaceFun.nullnessGroups.txt @@ -1,4 +1,3 @@ [NotNull Values] -22 val z = c.foo() (in test(A, B,…)) -22 val z = c.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/inflow/diamondHierarchyMiddleInterfaceFun.results.txt b/idea/testData/slicer/inflow/diamondHierarchyMiddleInterfaceFun.results.txt index acce4374eb6..78b6479d6fb 100644 --- a/idea/testData/slicer/inflow/diamondHierarchyMiddleInterfaceFun.results.txt +++ b/idea/testData/slicer/inflow/diamondHierarchyMiddleInterfaceFun.results.txt @@ -1,6 +1,6 @@ -22 val z = c.foo() (in test(A, B,…)) +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) 12 override fun foo() = 3 (in C.foo()) -16 override fun foo() = 4 (in D) +16 override fun foo() = 4 (in D) 16 override fun foo() = 4 (in D.foo()) diff --git a/idea/testData/slicer/inflow/diamondHierarchyRootInterfaceFun.leafGroups.txt b/idea/testData/slicer/inflow/diamondHierarchyRootInterfaceFun.leafGroups.txt index 376792c982e..c024dcf9d03 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,…)) +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) 4 fun foo() = 1 (in A.foo()) 8 override fun foo() = 2 (in B.foo()) -20 val x = a.foo() (in test(A, B,…)) +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) 8 override fun foo() = 2 (in B.foo()) 12 override fun foo() = 3 (in C.foo()) -20 val x = a.foo() (in test(A, B,…)) +20 val x = a.foo() (in test(A, B,…)) 20 val x = a.foo() (in test(A, B,…)) -12 override fun foo() = 3 (in C) +12 override fun foo() = 3 (in C) 12 override fun foo() = 3 (in C.foo()) 16 override fun foo() = 4 (in D.foo()) -20 val x = a.foo() (in test(A, B,…)) +20 val x = a.foo() (in test(A, B,…)) 20 val x = a.foo() (in test(A, B,…)) -16 override fun foo() = 4 (in D) +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 97ca0152440..ed7767b3b27 100644 --- a/idea/testData/slicer/inflow/diamondHierarchyRootInterfaceFun.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/diamondHierarchyRootInterfaceFun.nullnessGroups.txt @@ -1,4 +1,3 @@ [NotNull Values] -20 val x = a.foo() (in test(A, B,…)) -20 val x = a.foo() (in test(A, B,…)) - +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 e76e329df56..fdc8b92906d 100644 --- a/idea/testData/slicer/inflow/diamondHierarchyRootInterfaceFun.results.txt +++ b/idea/testData/slicer/inflow/diamondHierarchyRootInterfaceFun.results.txt @@ -1,10 +1,10 @@ -20 val x = a.foo() (in test(A, B,…)) +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) 4 fun foo() = 1 (in A.foo()) -8 override fun foo() = 2 (in B) +8 override fun foo() = 2 (in B) 8 override fun foo() = 2 (in B.foo()) -12 override fun foo() = 3 (in C) +12 override fun foo() = 3 (in C) 12 override fun foo() = 3 (in C.foo()) -16 override fun foo() = 4 (in D) +16 override fun foo() = 4 (in D) 16 override fun foo() = 4 (in D.foo()) diff --git a/idea/testData/slicer/inflow/doubleLambdaResult.leafGroups.txt b/idea/testData/slicer/inflow/doubleLambdaResult.leafGroups.txt index 763b28b44bb..2313d479af3 100644 --- a/idea/testData/slicer/inflow/doubleLambdaResult.leafGroups.txt +++ b/idea/testData/slicer/inflow/doubleLambdaResult.leafGroups.txt @@ -1,7 +1,7 @@ 8 val x = foo(1, 2) { { it } } (in test()) -8 val x = foo(1, 2) { { it } } (in test()) +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 { +3 fun foo(a: Int, b: Int, f: (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,…)) diff --git a/idea/testData/slicer/inflow/doubleLambdaResult.nullnessGroups.txt b/idea/testData/slicer/inflow/doubleLambdaResult.nullnessGroups.txt index 0942b6ed7f5..8bdcbec3f16 100644 --- a/idea/testData/slicer/inflow/doubleLambdaResult.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/doubleLambdaResult.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -8 val x = foo(1, 2) { { it } } (in test()) -8 val x = foo(1, 2) { { it } } (in test()) +8 val x = foo(1, 2) { { it } } (in test()) +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 4cc74aa2a0d..50f7a1081b8 100644 --- a/idea/testData/slicer/inflow/doubleLambdaResult.results.txt +++ b/idea/testData/slicer/inflow/doubleLambdaResult.results.txt @@ -1,6 +1,6 @@ -8 val x = foo(1, 2) { { it } } (in test()) +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 { +3 fun foo(a: Int, b: Int, f: (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,…)) diff --git a/idea/testData/slicer/inflow/extensionLambdaReceiver.leafGroups.txt b/idea/testData/slicer/inflow/extensionLambdaReceiver.leafGroups.txt index 0e0b2c0614e..b719d265c40 100644 --- a/idea/testData/slicer/inflow/extensionLambdaReceiver.leafGroups.txt +++ b/idea/testData/slicer/inflow/extensionLambdaReceiver.leafGroups.txt @@ -1,5 +1,5 @@ 5 with("A") { (in foo()) -6 val v = this (in foo()) +6 val v = this (in foo()) 6 val v = this (in foo()) 5 [LAMBDA CALLS RECEIVER] with("A") { (in foo()) LIB (INLINE CALL with) [LAMBDA CALLS RECEIVER] public inline fun with(receiver: T, block: T.() -> R): R { (in with(T, T.() -> R)) diff --git a/idea/testData/slicer/inflow/extensionLambdaReceiver.nullnessGroups.txt b/idea/testData/slicer/inflow/extensionLambdaReceiver.nullnessGroups.txt index efcc911298b..654f8ee2343 100644 --- a/idea/testData/slicer/inflow/extensionLambdaReceiver.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/extensionLambdaReceiver.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -6 val v = this (in foo()) -6 val v = this (in foo()) +6 val v = this (in foo()) +6 val v = this (in foo()) diff --git a/idea/testData/slicer/inflow/extensionLambdaReceiver.results.txt b/idea/testData/slicer/inflow/extensionLambdaReceiver.results.txt index 59062eb0382..938b096981b 100644 --- a/idea/testData/slicer/inflow/extensionLambdaReceiver.results.txt +++ b/idea/testData/slicer/inflow/extensionLambdaReceiver.results.txt @@ -1,4 +1,4 @@ -6 val v = this (in foo()) +6 val v = this (in foo()) 6 val v = this (in foo()) 5 [LAMBDA CALLS RECEIVER] with("A") { (in foo()) LIB (INLINE CALL with) [LAMBDA CALLS RECEIVER] public inline fun with(receiver: T, block: T.() -> R): R { (in with(T, T.() -> R)) diff --git a/idea/testData/slicer/inflow/funParamererWithDefault.leafGroups.txt b/idea/testData/slicer/inflow/funParamererWithDefault.leafGroups.txt index 171812ca688..8388db2f0e4 100644 --- a/idea/testData/slicer/inflow/funParamererWithDefault.leafGroups.txt +++ b/idea/testData/slicer/inflow/funParamererWithDefault.leafGroups.txt @@ -1,11 +1,11 @@ 4 FunParamererWithDefaultKt.foo(1, "2"); -5 fun foo(n: Int, s: String = "???") { (in foo(Int, String = ...)) +5 fun foo(n: Int, s: String = "???") { (in foo(Int, String = ...)) 4 FunParamererWithDefaultKt.foo(1, "2"); 11 foo(1, "2") (in test()) -5 fun foo(n: Int, s: String = "???") { (in foo(Int, String = ...)) +5 fun foo(n: Int, s: String = "???") { (in foo(Int, String = ...)) 11 foo(1, "2") (in test()) 5 fun foo(n: Int, s: String = "???") { (in foo(Int, String = ...)) -5 fun foo(n: Int, s: String = "???") { (in foo(Int, String = ...)) +5 fun foo(n: Int, s: String = "???") { (in foo(Int, String = ...)) 5 fun foo(n: Int, s: String = "???") { (in foo(Int, String = ...)) diff --git a/idea/testData/slicer/inflow/funParamererWithDefault.nullnessGroups.txt b/idea/testData/slicer/inflow/funParamererWithDefault.nullnessGroups.txt index 455150e6961..eb2ec6b43fe 100644 --- a/idea/testData/slicer/inflow/funParamererWithDefault.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/funParamererWithDefault.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -5 fun foo(n: Int, s: String = "???") { (in foo(Int, String = ...)) -5 fun foo(n: Int, s: String = "???") { (in foo(Int, String = ...)) +5 fun foo(n: Int, s: String = "???") { (in foo(Int, String = ...)) +5 fun foo(n: Int, s: String = "???") { (in foo(Int, String = ...)) diff --git a/idea/testData/slicer/inflow/funParamererWithDefault.results.txt b/idea/testData/slicer/inflow/funParamererWithDefault.results.txt index 8931ffcbd54..48efca7c753 100644 --- a/idea/testData/slicer/inflow/funParamererWithDefault.results.txt +++ b/idea/testData/slicer/inflow/funParamererWithDefault.results.txt @@ -1,4 +1,4 @@ -5 fun foo(n: Int, s: String = "???") { (in foo(Int, String = ...)) +5 fun foo(n: Int, s: String = "???") { (in foo(Int, String = ...)) 5 fun foo(n: Int, s: String = "???") { (in foo(Int, String = ...)) 4 FunParamererWithDefaultKt.foo(1, "2"); 11 foo(1, "2") (in test()) diff --git a/idea/testData/slicer/inflow/funResultViaCallableRef.leafGroups.txt b/idea/testData/slicer/inflow/funResultViaCallableRef.leafGroups.txt index 18c674a7979..6003a336c31 100644 --- a/idea/testData/slicer/inflow/funResultViaCallableRef.leafGroups.txt +++ b/idea/testData/slicer/inflow/funResultViaCallableRef.leafGroups.txt @@ -1,11 +1,11 @@ 8 fun bar(n: Int) = n (in test()) -9 val x = foo(::bar) (in test()) +9 val x = foo(::bar) (in test()) 9 val x = foo(::bar) (in test()) -3 fun foo(f: (Int) -> Int): Int { +3 fun foo(f: (Int) -> Int): Int { 4 return f(1) (in foo((Int) -> Int)) 4 [LAMBDA IN] return f(1) (in foo((Int) -> Int)) 3 [LAMBDA IN] fun foo(f: (Int) -> Int): Int { (in foo((Int) -> Int)) 9 [LAMBDA IN] val x = foo(::bar) (in test()) -8 fun bar(n: Int) = n (in test()) +8 fun bar(n: Int) = n (in test()) 8 fun bar(n: Int) = n (in test()) 8 fun bar(n: Int) = n (in test()) diff --git a/idea/testData/slicer/inflow/funResultViaCallableRef.nullnessGroups.txt b/idea/testData/slicer/inflow/funResultViaCallableRef.nullnessGroups.txt index 3574b175c0c..ac57434fe66 100644 --- a/idea/testData/slicer/inflow/funResultViaCallableRef.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/funResultViaCallableRef.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -9 val x = foo(::bar) (in test()) -9 val x = foo(::bar) (in test()) +9 val x = foo(::bar) (in test()) +9 val x = foo(::bar) (in test()) diff --git a/idea/testData/slicer/inflow/funResultViaCallableRef.results.txt b/idea/testData/slicer/inflow/funResultViaCallableRef.results.txt index ad1adfb1de5..ac37e2bbd09 100644 --- a/idea/testData/slicer/inflow/funResultViaCallableRef.results.txt +++ b/idea/testData/slicer/inflow/funResultViaCallableRef.results.txt @@ -1,10 +1,10 @@ -9 val x = foo(::bar) (in test()) +9 val x = foo(::bar) (in test()) 9 val x = foo(::bar) (in test()) -3 fun foo(f: (Int) -> Int): Int { +3 fun foo(f: (Int) -> Int): Int { 4 return f(1) (in foo((Int) -> Int)) 4 [LAMBDA IN] return f(1) (in foo((Int) -> Int)) 3 [LAMBDA IN] fun foo(f: (Int) -> Int): Int { (in foo((Int) -> Int)) 9 [LAMBDA IN] val x = foo(::bar) (in test()) -8 fun bar(n: Int) = n (in test()) +8 fun bar(n: Int) = n (in test()) 8 fun bar(n: Int) = n (in test()) 8 fun bar(n: Int) = n (in test()) diff --git a/idea/testData/slicer/inflow/funResultViaCallableRefWithAssignment.leafGroups.txt b/idea/testData/slicer/inflow/funResultViaCallableRefWithAssignment.leafGroups.txt index 52c5baa3b78..1b10c5d57a8 100644 --- a/idea/testData/slicer/inflow/funResultViaCallableRefWithAssignment.leafGroups.txt +++ b/idea/testData/slicer/inflow/funResultViaCallableRefWithAssignment.leafGroups.txt @@ -1,13 +1,13 @@ 8 fun bar(n: Int) = n (in test()) -10 val x = foo(f) (in test()) +10 val x = foo(f) (in test()) 10 val x = foo(f) (in test()) -3 fun foo(f: (Int) -> Int): Int { +3 fun foo(f: (Int) -> Int): Int { 4 return f(1) (in foo((Int) -> Int)) 4 [LAMBDA IN] return f(1) (in foo((Int) -> Int)) 3 [LAMBDA IN] fun foo(f: (Int) -> Int): Int { (in foo((Int) -> Int)) 10 [LAMBDA IN] val x = foo(f) (in test()) -9 [LAMBDA IN] val f = ::bar (in test()) +9 [LAMBDA IN] val f = ::bar (in test()) 9 [LAMBDA IN] val f = ::bar (in test()) -8 fun bar(n: Int) = n (in test()) +8 fun bar(n: Int) = n (in test()) 8 fun bar(n: Int) = n (in test()) 8 fun bar(n: Int) = n (in test()) diff --git a/idea/testData/slicer/inflow/funResultViaCallableRefWithAssignment.nullnessGroups.txt b/idea/testData/slicer/inflow/funResultViaCallableRefWithAssignment.nullnessGroups.txt index b5647a9aba7..8a2bd479d63 100644 --- a/idea/testData/slicer/inflow/funResultViaCallableRefWithAssignment.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/funResultViaCallableRefWithAssignment.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -10 val x = foo(f) (in test()) -10 val x = foo(f) (in test()) +10 val x = foo(f) (in test()) +10 val x = foo(f) (in test()) diff --git a/idea/testData/slicer/inflow/funResultViaCallableRefWithAssignment.results.txt b/idea/testData/slicer/inflow/funResultViaCallableRefWithAssignment.results.txt index d6618751621..bfaac050ac6 100644 --- a/idea/testData/slicer/inflow/funResultViaCallableRefWithAssignment.results.txt +++ b/idea/testData/slicer/inflow/funResultViaCallableRefWithAssignment.results.txt @@ -1,12 +1,12 @@ -10 val x = foo(f) (in test()) +10 val x = foo(f) (in test()) 10 val x = foo(f) (in test()) -3 fun foo(f: (Int) -> Int): Int { +3 fun foo(f: (Int) -> Int): Int { 4 return f(1) (in foo((Int) -> Int)) 4 [LAMBDA IN] return f(1) (in foo((Int) -> Int)) 3 [LAMBDA IN] fun foo(f: (Int) -> Int): Int { (in foo((Int) -> Int)) 10 [LAMBDA IN] val x = foo(f) (in test()) -9 [LAMBDA IN] val f = ::bar (in test()) +9 [LAMBDA IN] val f = ::bar (in test()) 9 [LAMBDA IN] val f = ::bar (in test()) -8 fun bar(n: Int) = n (in test()) +8 fun bar(n: Int) = n (in test()) 8 fun bar(n: Int) = n (in test()) 8 fun bar(n: Int) = n (in test()) diff --git a/idea/testData/slicer/inflow/funResultViaCallableRefWithDirectCall.leafGroups.txt b/idea/testData/slicer/inflow/funResultViaCallableRefWithDirectCall.leafGroups.txt index 5112d81d6a0..ac1ba9098b8 100644 --- a/idea/testData/slicer/inflow/funResultViaCallableRefWithDirectCall.leafGroups.txt +++ b/idea/testData/slicer/inflow/funResultViaCallableRefWithDirectCall.leafGroups.txt @@ -1,8 +1,8 @@ 5 val x = (::bar)(1) (in test()) -5 val x = (::bar)(1) (in test()) +5 val x = (::bar)(1) (in test()) 5 val x = (::bar)(1) (in test()) 5 [LAMBDA IN] val x = (::bar)(1) (in test()) -4 fun bar(n: Int) = n (in test()) +4 fun bar(n: Int) = n (in test()) 4 fun bar(n: Int) = n (in test()) 4 fun bar(n: Int) = n (in test()) 5 val x = (::bar)(1) (in test()) diff --git a/idea/testData/slicer/inflow/funResultViaCallableRefWithDirectCall.nullnessGroups.txt b/idea/testData/slicer/inflow/funResultViaCallableRefWithDirectCall.nullnessGroups.txt index 6b80c1ddd7e..417dcff1a7a 100644 --- a/idea/testData/slicer/inflow/funResultViaCallableRefWithDirectCall.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/funResultViaCallableRefWithDirectCall.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -5 val x = (::bar)(1) (in test()) -5 val x = (::bar)(1) (in test()) +5 val x = (::bar)(1) (in test()) +5 val x = (::bar)(1) (in test()) diff --git a/idea/testData/slicer/inflow/funResultViaCallableRefWithDirectCall.results.txt b/idea/testData/slicer/inflow/funResultViaCallableRefWithDirectCall.results.txt index 372675d9fca..f481d9a2641 100644 --- a/idea/testData/slicer/inflow/funResultViaCallableRefWithDirectCall.results.txt +++ b/idea/testData/slicer/inflow/funResultViaCallableRefWithDirectCall.results.txt @@ -1,7 +1,7 @@ -5 val x = (::bar)(1) (in test()) +5 val x = (::bar)(1) (in test()) 5 val x = (::bar)(1) (in test()) 5 [LAMBDA IN] val x = (::bar)(1) (in test()) -4 fun bar(n: Int) = n (in test()) +4 fun bar(n: Int) = n (in test()) 4 fun bar(n: Int) = n (in test()) 4 fun bar(n: Int) = n (in test()) 5 val x = (::bar)(1) (in test()) diff --git a/idea/testData/slicer/inflow/funWithExpressionBody.leafGroups.txt b/idea/testData/slicer/inflow/funWithExpressionBody.leafGroups.txt index cf2536afc74..60fabc91f4e 100644 --- a/idea/testData/slicer/inflow/funWithExpressionBody.leafGroups.txt +++ b/idea/testData/slicer/inflow/funWithExpressionBody.leafGroups.txt @@ -1,3 +1,3 @@ 3 fun foo(n: Int) = n + 1 (in foo(Int)) -3 fun foo(n: Int) = n + 1 +3 fun foo(n: Int) = n + 1 3 fun foo(n: Int) = n + 1 (in foo(Int)) diff --git a/idea/testData/slicer/inflow/funWithExpressionBody.nullnessGroups.txt b/idea/testData/slicer/inflow/funWithExpressionBody.nullnessGroups.txt index 580e77a9b8a..c7a5399dbf4 100644 --- a/idea/testData/slicer/inflow/funWithExpressionBody.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/funWithExpressionBody.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -3 fun foo(n: Int) = n + 1 -3 fun foo(n: Int) = n + 1 +3 fun foo(n: Int) = n + 1 +3 fun foo(n: Int) = n + 1 diff --git a/idea/testData/slicer/inflow/funWithExpressionBody.results.txt b/idea/testData/slicer/inflow/funWithExpressionBody.results.txt index 947cf84b8d1..0f2ce9388a1 100644 --- a/idea/testData/slicer/inflow/funWithExpressionBody.results.txt +++ b/idea/testData/slicer/inflow/funWithExpressionBody.results.txt @@ -1,2 +1,2 @@ -3 fun foo(n: Int) = n + 1 +3 fun foo(n: Int) = n + 1 3 fun foo(n: Int) = n + 1 (in foo(Int)) diff --git a/idea/testData/slicer/inflow/funWithReturnExpressions.leafGroups.txt b/idea/testData/slicer/inflow/funWithReturnExpressions.leafGroups.txt index f6163a22da9..f3104916940 100644 --- a/idea/testData/slicer/inflow/funWithReturnExpressions.leafGroups.txt +++ b/idea/testData/slicer/inflow/funWithReturnExpressions.leafGroups.txt @@ -1,8 +1,8 @@ 5 return -n (in foo(Int)) -3 fun foo(n: Int): Int { +3 fun foo(n: Int): Int { 5 return -n (in foo(Int)) 3 fun foo(n: Int): Int { (in foo(Int)) -3 fun foo(n: Int): Int { +3 fun foo(n: Int): Int { 4 if (n > 0) return n (in foo(Int)) 3 fun foo(n: Int): Int { (in foo(Int)) diff --git a/idea/testData/slicer/inflow/funWithReturnExpressions.nullnessGroups.txt b/idea/testData/slicer/inflow/funWithReturnExpressions.nullnessGroups.txt index 10f73f79008..f7ff6bc419c 100644 --- a/idea/testData/slicer/inflow/funWithReturnExpressions.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/funWithReturnExpressions.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -3 fun foo(n: Int): Int { -3 fun foo(n: Int): Int { +3 fun foo(n: Int): Int { +3 fun foo(n: Int): Int { diff --git a/idea/testData/slicer/inflow/funWithReturnExpressions.results.txt b/idea/testData/slicer/inflow/funWithReturnExpressions.results.txt index 408f6354afb..0f716e86b88 100644 --- a/idea/testData/slicer/inflow/funWithReturnExpressions.results.txt +++ b/idea/testData/slicer/inflow/funWithReturnExpressions.results.txt @@ -1,4 +1,4 @@ -3 fun foo(n: Int): Int { +3 fun foo(n: Int): Int { 4 if (n > 0) return n (in foo(Int)) 3 fun foo(n: Int): Int { (in foo(Int)) 5 return -n (in foo(Int)) diff --git a/idea/testData/slicer/inflow/getterAndSetterUsingField.leafGroups.txt b/idea/testData/slicer/inflow/getterAndSetterUsingField.leafGroups.txt index 1161cc6235e..208a73358d8 100644 --- a/idea/testData/slicer/inflow/getterAndSetterUsingField.leafGroups.txt +++ b/idea/testData/slicer/inflow/getterAndSetterUsingField.leafGroups.txt @@ -1,11 +1,11 @@ 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) 4 var foo: Int = -1 (in A.foo) 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) +4 var foo: Int = -1 (in A) 5 get() = if (b) field else 0 (in A.foo.get) 5 get() = if (b) field else 0 (in A.foo.get) 7 field = if (b) value else 0 (in A.foo.set) @@ -13,7 +13,7 @@ 12 foo = 1 (in A.test()) 11 val x = foo (in A.test()) -4 var foo: Int = -1 (in A) +4 var foo: Int = -1 (in A) 5 get() = if (b) field else 0 (in A.foo.get) 5 get() = if (b) field else 0 (in A.foo.get) 7 field = if (b) value else 0 (in A.foo.set) diff --git a/idea/testData/slicer/inflow/getterAndSetterUsingField.results.txt b/idea/testData/slicer/inflow/getterAndSetterUsingField.results.txt index 11779d4f1fc..d6566a94ea5 100644 --- a/idea/testData/slicer/inflow/getterAndSetterUsingField.results.txt +++ b/idea/testData/slicer/inflow/getterAndSetterUsingField.results.txt @@ -1,5 +1,5 @@ 11 val x = foo (in A.test()) -4 var foo: Int = -1 (in A) +4 var foo: Int = -1 (in A) 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) diff --git a/idea/testData/slicer/inflow/getterExpressionBody.leafGroups.txt b/idea/testData/slicer/inflow/getterExpressionBody.leafGroups.txt index c8af9f380e6..700ba11906d 100644 --- a/idea/testData/slicer/inflow/getterExpressionBody.leafGroups.txt +++ b/idea/testData/slicer/inflow/getterExpressionBody.leafGroups.txt @@ -1,6 +1,5 @@ 4 get() = 0 (in foo.get) -7 val x = foo (in test()) +7 val x = foo (in test()) 7 val x = foo (in test()) -3 val foo: Int +3 val foo: Int 4 get() = 0 (in foo.get) - diff --git a/idea/testData/slicer/inflow/getterExpressionBody.nullnessGroups.txt b/idea/testData/slicer/inflow/getterExpressionBody.nullnessGroups.txt index b14ba93c49a..0fea5efbd91 100644 --- a/idea/testData/slicer/inflow/getterExpressionBody.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/getterExpressionBody.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -7 val x = foo (in test()) -7 val x = foo (in test()) +7 val x = foo (in test()) +7 val x = foo (in test()) diff --git a/idea/testData/slicer/inflow/getterExpressionBody.results.txt b/idea/testData/slicer/inflow/getterExpressionBody.results.txt index e50670fc688..d37012e7669 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()) 7 val x = foo (in test()) -3 val foo: Int +3 val 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 58730bc0608..85905faba0d 100644 --- a/idea/testData/slicer/inflow/getterReturnExpression.leafGroups.txt +++ b/idea/testData/slicer/inflow/getterReturnExpression.leafGroups.txt @@ -1,6 +1,5 @@ 5 return 0 (in foo.get) -9 val x = foo (in test()) +9 val x = foo (in test()) 9 val x = foo (in test()) -3 val foo: Int +3 val foo: Int 5 return 0 (in foo.get) - diff --git a/idea/testData/slicer/inflow/getterReturnExpression.nullnessGroups.txt b/idea/testData/slicer/inflow/getterReturnExpression.nullnessGroups.txt index 6faa0f5c6e8..d5a47f80596 100644 --- a/idea/testData/slicer/inflow/getterReturnExpression.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/getterReturnExpression.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -9 val x = foo (in test()) -9 val x = foo (in test()) +9 val x = foo (in test()) +9 val x = foo (in test()) diff --git a/idea/testData/slicer/inflow/getterReturnExpression.results.txt b/idea/testData/slicer/inflow/getterReturnExpression.results.txt index b0f96a4d1b9..f452f4f91e9 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()) 9 val x = foo (in test()) -3 val foo: Int +3 val foo: Int 5 return 0 (in foo.get) diff --git a/idea/testData/slicer/inflow/ifExpression.leafGroups.txt b/idea/testData/slicer/inflow/ifExpression.leafGroups.txt index 164913e9219..a092d2d412f 100644 --- a/idea/testData/slicer/inflow/ifExpression.leafGroups.txt +++ b/idea/testData/slicer/inflow/ifExpression.leafGroups.txt @@ -1,10 +1,10 @@ 3 fun test(m: Int, n: Int) { (in test(Int, Int)) -4 val x = if (m > 1) n else 1 (in test(Int, Int)) +4 val x = if (m > 1) n else 1 (in test(Int, Int)) 4 val x = if (m > 1) n else 1 (in test(Int, Int)) 4 val x = if (m > 1) n else 1 (in test(Int, Int)) 3 fun test(m: Int, n: Int) { (in test(Int, Int)) 4 val x = if (m > 1) n else 1 (in test(Int, Int)) -4 val x = if (m > 1) n else 1 (in test(Int, Int)) +4 val x = if (m > 1) n else 1 (in test(Int, Int)) 4 val x = if (m > 1) n else 1 (in test(Int, Int)) 4 val x = if (m > 1) n else 1 (in test(Int, Int)) diff --git a/idea/testData/slicer/inflow/ifExpression.nullnessGroups.txt b/idea/testData/slicer/inflow/ifExpression.nullnessGroups.txt index 8b9df9ed724..115db2aa8ac 100644 --- a/idea/testData/slicer/inflow/ifExpression.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/ifExpression.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -4 val x = if (m > 1) n else 1 (in test(Int, Int)) -4 val x = if (m > 1) n else 1 (in test(Int, Int)) +4 val x = if (m > 1) n else 1 (in test(Int, Int)) +4 val x = if (m > 1) n else 1 (in test(Int, Int)) diff --git a/idea/testData/slicer/inflow/ifExpression.results.txt b/idea/testData/slicer/inflow/ifExpression.results.txt index 127bcc7442c..607d4580c1f 100644 --- a/idea/testData/slicer/inflow/ifExpression.results.txt +++ b/idea/testData/slicer/inflow/ifExpression.results.txt @@ -1,4 +1,4 @@ -4 val x = if (m > 1) n else 1 (in test(Int, Int)) +4 val x = if (m > 1) n else 1 (in test(Int, Int)) 4 val x = if (m > 1) n else 1 (in test(Int, Int)) 4 val x = if (m > 1) n else 1 (in test(Int, Int)) 3 fun test(m: Int, n: Int) { (in test(Int, Int)) diff --git a/idea/testData/slicer/inflow/lambdaResult.leafGroups.txt b/idea/testData/slicer/inflow/lambdaResult.leafGroups.txt index cd6dccb147f..f19104c5744 100644 --- a/idea/testData/slicer/inflow/lambdaResult.leafGroups.txt +++ b/idea/testData/slicer/inflow/lambdaResult.leafGroups.txt @@ -1,7 +1,7 @@ 4 return f(1) (in foo((Int) -> Int)) -8 val x = foo { it } (in test()) +8 val x = foo { it } (in test()) 8 val x = foo { it } (in test()) -3 fun foo(f: (Int) -> Int): Int { +3 fun foo(f: (Int) -> Int): Int { 4 return f(1) (in foo((Int) -> Int)) 4 [LAMBDA IN] return f(1) (in foo((Int) -> Int)) 3 [LAMBDA IN] fun foo(f: (Int) -> Int): Int { (in foo((Int) -> Int)) diff --git a/idea/testData/slicer/inflow/lambdaResult.nullnessGroups.txt b/idea/testData/slicer/inflow/lambdaResult.nullnessGroups.txt index 28380952d79..7b75a78b6e5 100644 --- a/idea/testData/slicer/inflow/lambdaResult.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/lambdaResult.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -8 val x = foo { it } (in test()) -8 val x = foo { it } (in test()) +8 val x = foo { it } (in test()) +8 val x = foo { it } (in test()) diff --git a/idea/testData/slicer/inflow/lambdaResult.results.txt b/idea/testData/slicer/inflow/lambdaResult.results.txt index 154a0a9679f..2d4ec23bddf 100644 --- a/idea/testData/slicer/inflow/lambdaResult.results.txt +++ b/idea/testData/slicer/inflow/lambdaResult.results.txt @@ -1,6 +1,6 @@ -8 val x = foo { it } (in test()) +8 val x = foo { it } (in test()) 8 val x = foo { it } (in test()) -3 fun foo(f: (Int) -> Int): Int { +3 fun foo(f: (Int) -> Int): Int { 4 return f(1) (in foo((Int) -> Int)) 4 [LAMBDA IN] return f(1) (in foo((Int) -> Int)) 3 [LAMBDA IN] fun foo(f: (Int) -> Int): Int { (in foo((Int) -> Int)) diff --git a/idea/testData/slicer/inflow/lambdaResultWithAssignments.leafGroups.txt b/idea/testData/slicer/inflow/lambdaResultWithAssignments.leafGroups.txt index 767fd5e14f9..ba2210a3f8b 100644 --- a/idea/testData/slicer/inflow/lambdaResultWithAssignments.leafGroups.txt +++ b/idea/testData/slicer/inflow/lambdaResultWithAssignments.leafGroups.txt @@ -1,10 +1,10 @@ 5 return x(1) (in foo((Int) -> Int)) -9 val y = foo { it } (in test()) +9 val y = foo { it } (in test()) 9 val y = foo { it } (in test()) -3 fun foo(f: (Int) -> Int): Int { +3 fun foo(f: (Int) -> Int): Int { 5 return x(1) (in foo((Int) -> Int)) 5 [LAMBDA IN] return x(1) (in foo((Int) -> Int)) -4 [LAMBDA IN] val x = f (in foo((Int) -> Int)) +4 [LAMBDA IN] val x = f (in foo((Int) -> Int)) 4 [LAMBDA IN] val x = f (in foo((Int) -> Int)) 3 [LAMBDA IN] fun foo(f: (Int) -> Int): Int { (in foo((Int) -> Int)) 9 [LAMBDA IN] val y = foo { it } (in test()) @@ -13,5 +13,5 @@ 9 [LAMBDA CALLS ARGUMENT #0] val y = foo { it } (in test()) 3 [LAMBDA CALLS ARGUMENT #0] fun foo(f: (Int) -> Int): Int { (in foo((Int) -> Int)) 4 [LAMBDA CALLS ARGUMENT #0] val x = f (in foo((Int) -> Int)) -4 [LAMBDA CALLS ARGUMENT #0] val x = f (in foo((Int) -> Int)) +4 [LAMBDA CALLS ARGUMENT #0] val x = f (in foo((Int) -> Int)) 5 return x(1) (in foo((Int) -> Int)) diff --git a/idea/testData/slicer/inflow/lambdaResultWithAssignments.nullnessGroups.txt b/idea/testData/slicer/inflow/lambdaResultWithAssignments.nullnessGroups.txt index 3c6eec2fea5..b8d4f38dfa5 100644 --- a/idea/testData/slicer/inflow/lambdaResultWithAssignments.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/lambdaResultWithAssignments.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -9 val y = foo { it } (in test()) -9 val y = foo { it } (in test()) +9 val y = foo { it } (in test()) +9 val y = foo { it } (in test()) diff --git a/idea/testData/slicer/inflow/lambdaResultWithAssignments.results.txt b/idea/testData/slicer/inflow/lambdaResultWithAssignments.results.txt index 4e32eb2239d..92f24be408c 100644 --- a/idea/testData/slicer/inflow/lambdaResultWithAssignments.results.txt +++ b/idea/testData/slicer/inflow/lambdaResultWithAssignments.results.txt @@ -1,9 +1,9 @@ -9 val y = foo { it } (in test()) +9 val y = foo { it } (in test()) 9 val y = foo { it } (in test()) -3 fun foo(f: (Int) -> Int): Int { +3 fun foo(f: (Int) -> Int): Int { 5 return x(1) (in foo((Int) -> Int)) 5 [LAMBDA IN] return x(1) (in foo((Int) -> Int)) -4 [LAMBDA IN] val x = f (in foo((Int) -> Int)) +4 [LAMBDA IN] val x = f (in foo((Int) -> Int)) 4 [LAMBDA IN] val x = f (in foo((Int) -> Int)) 3 [LAMBDA IN] fun foo(f: (Int) -> Int): Int { (in foo((Int) -> Int)) 9 [LAMBDA IN] val y = foo { it } (in test()) @@ -12,5 +12,5 @@ 9 [LAMBDA CALLS ARGUMENT #0] val y = foo { it } (in test()) 3 [LAMBDA CALLS ARGUMENT #0] fun foo(f: (Int) -> Int): Int { (in foo((Int) -> Int)) 4 [LAMBDA CALLS ARGUMENT #0] val x = f (in foo((Int) -> Int)) -4 [LAMBDA CALLS ARGUMENT #0] val x = f (in foo((Int) -> Int)) +4 [LAMBDA CALLS ARGUMENT #0] val x = f (in foo((Int) -> Int)) 5 return x(1) (in foo((Int) -> Int)) diff --git a/idea/testData/slicer/inflow/lambdaResultWithDirectCall.leafGroups.txt b/idea/testData/slicer/inflow/lambdaResultWithDirectCall.leafGroups.txt index 8848d2633d7..ab72ec8d356 100644 --- a/idea/testData/slicer/inflow/lambdaResultWithDirectCall.leafGroups.txt +++ b/idea/testData/slicer/inflow/lambdaResultWithDirectCall.leafGroups.txt @@ -1,5 +1,5 @@ 4 val x = { 1 }() (in test()) -4 val x = { 1 }() (in test()) +4 val x = { 1 }() (in test()) 4 val x = { 1 }() (in test()) 4 [LAMBDA IN] val x = { 1 }() (in test()) 4 val x = { 1 }() (in test()) diff --git a/idea/testData/slicer/inflow/lambdaResultWithDirectCall.nullnessGroups.txt b/idea/testData/slicer/inflow/lambdaResultWithDirectCall.nullnessGroups.txt index 6f288f0507c..24bee31e2dd 100644 --- a/idea/testData/slicer/inflow/lambdaResultWithDirectCall.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/lambdaResultWithDirectCall.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -4 val x = { 1 }() (in test()) -4 val x = { 1 }() (in test()) +4 val x = { 1 }() (in test()) +4 val x = { 1 }() (in test()) diff --git a/idea/testData/slicer/inflow/lambdaResultWithDirectCall.results.txt b/idea/testData/slicer/inflow/lambdaResultWithDirectCall.results.txt index 0b655473f31..acead7548a9 100644 --- a/idea/testData/slicer/inflow/lambdaResultWithDirectCall.results.txt +++ b/idea/testData/slicer/inflow/lambdaResultWithDirectCall.results.txt @@ -1,4 +1,4 @@ -4 val x = { 1 }() (in test()) +4 val x = { 1 }() (in test()) 4 val x = { 1 }() (in test()) 4 [LAMBDA IN] val x = { 1 }() (in test()) 4 val x = { 1 }() (in test()) diff --git a/idea/testData/slicer/inflow/lambdaResultWithDirectCallViaAssignment.leafGroups.txt b/idea/testData/slicer/inflow/lambdaResultWithDirectCallViaAssignment.leafGroups.txt index 97caa26cbe6..727a5d082d1 100644 --- a/idea/testData/slicer/inflow/lambdaResultWithDirectCallViaAssignment.leafGroups.txt +++ b/idea/testData/slicer/inflow/lambdaResultWithDirectCallViaAssignment.leafGroups.txt @@ -1,8 +1,8 @@ 4 val f = { 1 } (in test()) -5 val x = f() (in test()) +5 val x = f() (in test()) 5 val x = f() (in test()) 5 [LAMBDA IN] val x = f() (in test()) -4 [LAMBDA IN] val f = { 1 } (in test()) +4 [LAMBDA IN] val f = { 1 } (in test()) 4 [LAMBDA IN] val f = { 1 } (in test()) 4 val f = { 1 } (in test()) 4 val f = { 1 } (in test()) diff --git a/idea/testData/slicer/inflow/lambdaResultWithDirectCallViaAssignment.nullnessGroups.txt b/idea/testData/slicer/inflow/lambdaResultWithDirectCallViaAssignment.nullnessGroups.txt index 6c58bad92cb..d3e6894c118 100644 --- a/idea/testData/slicer/inflow/lambdaResultWithDirectCallViaAssignment.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/lambdaResultWithDirectCallViaAssignment.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -5 val x = f() (in test()) -5 val x = f() (in test()) +5 val x = f() (in test()) +5 val x = f() (in test()) diff --git a/idea/testData/slicer/inflow/lambdaResultWithDirectCallViaAssignment.results.txt b/idea/testData/slicer/inflow/lambdaResultWithDirectCallViaAssignment.results.txt index 92e5f85d9b2..9ec42d4f9a3 100644 --- a/idea/testData/slicer/inflow/lambdaResultWithDirectCallViaAssignment.results.txt +++ b/idea/testData/slicer/inflow/lambdaResultWithDirectCallViaAssignment.results.txt @@ -1,7 +1,7 @@ -5 val x = f() (in test()) +5 val x = f() (in test()) 5 val x = f() (in test()) 5 [LAMBDA IN] val x = f() (in test()) -4 [LAMBDA IN] val f = { 1 } (in test()) +4 [LAMBDA IN] val f = { 1 } (in test()) 4 [LAMBDA IN] val f = { 1 } (in test()) 4 val f = { 1 } (in test()) 4 val f = { 1 } (in test()) diff --git a/idea/testData/slicer/inflow/localVal.leafGroups.txt b/idea/testData/slicer/inflow/localVal.leafGroups.txt index 5c40616c185..5af5ee8d78b 100644 --- a/idea/testData/slicer/inflow/localVal.leafGroups.txt +++ b/idea/testData/slicer/inflow/localVal.leafGroups.txt @@ -1,4 +1,4 @@ 3 fun test(n: Int) { (in test(Int)) -4 val x = n (in test(Int)) +4 val x = n (in test(Int)) 4 val x = n (in test(Int)) 3 fun test(n: Int) { (in test(Int)) diff --git a/idea/testData/slicer/inflow/localVal.nullnessGroups.txt b/idea/testData/slicer/inflow/localVal.nullnessGroups.txt index 0156efe16b2..892785a04d5 100644 --- a/idea/testData/slicer/inflow/localVal.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/localVal.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -4 val x = n (in test(Int)) -4 val x = n (in test(Int)) +4 val x = n (in test(Int)) +4 val x = n (in test(Int)) diff --git a/idea/testData/slicer/inflow/localVal.results.txt b/idea/testData/slicer/inflow/localVal.results.txt index 78be4674a96..d66bb319fa6 100644 --- a/idea/testData/slicer/inflow/localVal.results.txt +++ b/idea/testData/slicer/inflow/localVal.results.txt @@ -1,3 +1,3 @@ -4 val x = n (in test(Int)) +4 val x = n (in test(Int)) 4 val x = n (in test(Int)) 3 fun test(n: Int) { (in test(Int)) diff --git a/idea/testData/slicer/inflow/localVar.leafGroups.txt b/idea/testData/slicer/inflow/localVar.leafGroups.txt index ce86daf12e7..b807bb70507 100644 --- a/idea/testData/slicer/inflow/localVar.leafGroups.txt +++ b/idea/testData/slicer/inflow/localVar.leafGroups.txt @@ -1,8 +1,8 @@ 3 fun test(n: Int) { (in test(Int)) -4 var x = n (in test(Int)) +4 var x = n (in test(Int)) 4 var x = n (in test(Int)) 3 fun test(n: Int) { (in test(Int)) 6 x = 0 (in test(Int)) -4 var x = n (in test(Int)) +4 var x = n (in test(Int)) 6 x = 0 (in test(Int)) diff --git a/idea/testData/slicer/inflow/localVar.nullnessGroups.txt b/idea/testData/slicer/inflow/localVar.nullnessGroups.txt index 62eb0cd3d4d..251c5c8b669 100644 --- a/idea/testData/slicer/inflow/localVar.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/localVar.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -4 var x = n (in test(Int)) -4 var x = n (in test(Int)) +4 var x = n (in test(Int)) +4 var x = n (in test(Int)) diff --git a/idea/testData/slicer/inflow/localVar.results.txt b/idea/testData/slicer/inflow/localVar.results.txt index 6035a8f3273..0083b8e48dc 100644 --- a/idea/testData/slicer/inflow/localVar.results.txt +++ b/idea/testData/slicer/inflow/localVar.results.txt @@ -1,4 +1,4 @@ -4 var x = n (in test(Int)) +4 var x = n (in test(Int)) 4 var x = n (in test(Int)) 3 fun test(n: Int) { (in test(Int)) 6 x = 0 (in test(Int)) diff --git a/idea/testData/slicer/inflow/memberValWithInitializer.leafGroups.txt b/idea/testData/slicer/inflow/memberValWithInitializer.leafGroups.txt index 36a3a035d14..564b243a58c 100644 --- a/idea/testData/slicer/inflow/memberValWithInitializer.leafGroups.txt +++ b/idea/testData/slicer/inflow/memberValWithInitializer.leafGroups.txt @@ -1,4 +1,3 @@ 4 val x: Int = 1 (in A.x) -4 val x: Int = 1 (in A) +4 val x: Int = 1 (in A) 4 val x: Int = 1 (in A.x) - diff --git a/idea/testData/slicer/inflow/memberValWithInitializer.nullnessGroups.txt b/idea/testData/slicer/inflow/memberValWithInitializer.nullnessGroups.txt index 65c7691f6ff..13a28feaeab 100644 --- a/idea/testData/slicer/inflow/memberValWithInitializer.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/memberValWithInitializer.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -4 val x: Int = 1 (in A) -4 val x: Int = 1 (in A) +4 val x: Int = 1 (in A) +4 val x: Int = 1 (in A) diff --git a/idea/testData/slicer/inflow/memberValWithInitializer.results.txt b/idea/testData/slicer/inflow/memberValWithInitializer.results.txt index 50d3a3f25a3..66f3df69639 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) 4 val x: Int = 1 (in A.x) diff --git a/idea/testData/slicer/inflow/memberValWithSplitInitializer.leafGroups.txt b/idea/testData/slicer/inflow/memberValWithSplitInitializer.leafGroups.txt index 5796746c27c..fec64e78782 100644 --- a/idea/testData/slicer/inflow/memberValWithSplitInitializer.leafGroups.txt +++ b/idea/testData/slicer/inflow/memberValWithSplitInitializer.leafGroups.txt @@ -1,3 +1,3 @@ 7 x = 1 (in A) -4 val x: Int (in A) +4 val x: Int (in A) 7 x = 1 (in A) diff --git a/idea/testData/slicer/inflow/memberValWithSplitInitializer.nullnessGroups.txt b/idea/testData/slicer/inflow/memberValWithSplitInitializer.nullnessGroups.txt index 0816722dc07..8016f0e3e44 100644 --- a/idea/testData/slicer/inflow/memberValWithSplitInitializer.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/memberValWithSplitInitializer.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -4 val x: Int (in A) -4 val x: Int (in A) +4 val x: Int (in A) +4 val x: Int (in A) diff --git a/idea/testData/slicer/inflow/memberValWithSplitInitializer.results.txt b/idea/testData/slicer/inflow/memberValWithSplitInitializer.results.txt index 5e6f0ed2893..aa79f13dd9b 100644 --- a/idea/testData/slicer/inflow/memberValWithSplitInitializer.results.txt +++ b/idea/testData/slicer/inflow/memberValWithSplitInitializer.results.txt @@ -1,2 +1,2 @@ -4 val x: Int (in A) +4 val x: Int (in A) 7 x = 1 (in A) diff --git a/idea/testData/slicer/inflow/memberVarWithInitializer.leafGroups.txt b/idea/testData/slicer/inflow/memberVarWithInitializer.leafGroups.txt index c8b7abb31c4..78acabb3439 100644 --- a/idea/testData/slicer/inflow/memberVarWithInitializer.leafGroups.txt +++ b/idea/testData/slicer/inflow/memberVarWithInitializer.leafGroups.txt @@ -1,7 +1,7 @@ 4 var x: Int = 1 (in A.x) -4 var x: Int = 1 (in A) +4 var x: Int = 1 (in A) 4 var x: Int = 1 (in A.x) 9 x = 2 (in A.test()) -4 var x: Int = 1 (in A) +4 var x: Int = 1 (in A) 9 x = 2 (in A.test()) diff --git a/idea/testData/slicer/inflow/memberVarWithInitializer.nullnessGroups.txt b/idea/testData/slicer/inflow/memberVarWithInitializer.nullnessGroups.txt index 9c54662d948..45153a16a82 100644 --- a/idea/testData/slicer/inflow/memberVarWithInitializer.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/memberVarWithInitializer.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -4 var x: Int = 1 (in A) -4 var x: Int = 1 (in A) +4 var x: Int = 1 (in A) +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 cc9320367ae..4912b8b3349 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) 4 var x: Int = 1 (in A.x) 9 x = 2 (in A.test()) diff --git a/idea/testData/slicer/inflow/memberVarWithSplitInitializer.leafGroups.txt b/idea/testData/slicer/inflow/memberVarWithSplitInitializer.leafGroups.txt index 5d8334e3d9c..48f83de1570 100644 --- a/idea/testData/slicer/inflow/memberVarWithSplitInitializer.leafGroups.txt +++ b/idea/testData/slicer/inflow/memberVarWithSplitInitializer.leafGroups.txt @@ -1,7 +1,7 @@ 7 x = 1 (in A) -4 var x: Int (in A) +4 var x: Int (in A) 7 x = 1 (in A) 14 x = 2 (in A.test()) -4 var x: Int (in A) +4 var x: Int (in A) 14 x = 2 (in A.test()) diff --git a/idea/testData/slicer/inflow/memberVarWithSplitInitializer.nullnessGroups.txt b/idea/testData/slicer/inflow/memberVarWithSplitInitializer.nullnessGroups.txt index 21daad13184..ad7964d2389 100644 --- a/idea/testData/slicer/inflow/memberVarWithSplitInitializer.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/memberVarWithSplitInitializer.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -4 var x: Int (in A) -4 var x: Int (in A) +4 var x: Int (in A) +4 var x: Int (in A) diff --git a/idea/testData/slicer/inflow/memberVarWithSplitInitializer.results.txt b/idea/testData/slicer/inflow/memberVarWithSplitInitializer.results.txt index b256dc29f21..60b323aff09 100644 --- a/idea/testData/slicer/inflow/memberVarWithSplitInitializer.results.txt +++ b/idea/testData/slicer/inflow/memberVarWithSplitInitializer.results.txt @@ -1,3 +1,3 @@ -4 var x: Int (in A) +4 var x: Int (in A) 7 x = 1 (in A) 14 x = 2 (in A.test()) diff --git a/idea/testData/slicer/inflow/noFieldInGetter.leafGroups.txt b/idea/testData/slicer/inflow/noFieldInGetter.leafGroups.txt index 6737348b735..b6391adf198 100644 --- a/idea/testData/slicer/inflow/noFieldInGetter.leafGroups.txt +++ b/idea/testData/slicer/inflow/noFieldInGetter.leafGroups.txt @@ -1,10 +1,9 @@ 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) 4 var foo: Int = 0 (in A.foo) 5 get() = 1 (in A.foo.get) 11 val x = foo (in A.test()) -4 var foo: Int = 0 (in A) +4 var foo: Int = 0 (in A) 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 e93eb3b7ec2..698765b1f5b 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) 4 var foo: Int = 0 (in A.foo) 5 get() = 1 (in A.foo.get) diff --git a/idea/testData/slicer/inflow/nonLocalReturn.leafGroups.txt b/idea/testData/slicer/inflow/nonLocalReturn.leafGroups.txt index c3a881c4ae4..fb13d2bba67 100644 --- a/idea/testData/slicer/inflow/nonLocalReturn.leafGroups.txt +++ b/idea/testData/slicer/inflow/nonLocalReturn.leafGroups.txt @@ -1,7 +1,7 @@ 5 fun bar(a: Int): Int = foo(a) { if (it > 0) it else return 0 } (in bar(Int)) -5 fun bar(a: Int): Int = foo(a) { if (it > 0) it else return 0 } +5 fun bar(a: Int): Int = foo(a) { if (it > 0) it else return 0 } 5 fun bar(a: Int): Int = foo(a) { if (it > 0) it else return 0 } (in bar(Int)) -3 (INLINE CALL foo) inline fun foo(a: Int, f: (Int) -> Int) = f(a) +3 (INLINE CALL foo) inline fun foo(a: Int, f: (Int) -> Int) = f(a) 3 (INLINE CALL foo) inline fun foo(a: Int, f: (Int) -> Int) = f(a) (in foo(Int, (Int) -> Int)) 3 (INLINE CALL foo) [LAMBDA IN] inline fun foo(a: Int, f: (Int) -> Int) = f(a) (in foo(Int, (Int) -> Int)) 3 (INLINE CALL foo) [LAMBDA IN] inline fun foo(a: Int, f: (Int) -> Int) = f(a) (in foo(Int, (Int) -> Int)) @@ -17,5 +17,5 @@ 5 fun bar(a: Int): Int = foo(a) { if (it > 0) it else return 0 } (in bar(Int)) 5 fun bar(a: Int): Int = foo(a) { if (it > 0) it else return 0 } (in bar(Int)) -5 fun bar(a: Int): Int = foo(a) { if (it > 0) it else return 0 } +5 fun bar(a: Int): Int = foo(a) { if (it > 0) it else return 0 } 5 fun bar(a: Int): Int = foo(a) { if (it > 0) it else return 0 } (in bar(Int)) diff --git a/idea/testData/slicer/inflow/nonLocalReturn.nullnessGroups.txt b/idea/testData/slicer/inflow/nonLocalReturn.nullnessGroups.txt index e1218e3dd54..99452698c3c 100644 --- a/idea/testData/slicer/inflow/nonLocalReturn.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/nonLocalReturn.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -5 fun bar(a: Int): Int = foo(a) { if (it > 0) it else return 0 } -5 fun bar(a: Int): Int = foo(a) { if (it > 0) it else return 0 } +5 fun bar(a: Int): Int = foo(a) { if (it > 0) it else return 0 } +5 fun bar(a: Int): Int = foo(a) { if (it > 0) it else return 0 } diff --git a/idea/testData/slicer/inflow/nonLocalReturn.results.txt b/idea/testData/slicer/inflow/nonLocalReturn.results.txt index 0c711a2f786..8446d917cc9 100644 --- a/idea/testData/slicer/inflow/nonLocalReturn.results.txt +++ b/idea/testData/slicer/inflow/nonLocalReturn.results.txt @@ -1,6 +1,6 @@ -5 fun bar(a: Int): Int = foo(a) { if (it > 0) it else return 0 } +5 fun bar(a: Int): Int = foo(a) { if (it > 0) it else return 0 } 5 fun bar(a: Int): Int = foo(a) { if (it > 0) it else return 0 } (in bar(Int)) -3 (INLINE CALL foo) inline fun foo(a: Int, f: (Int) -> Int) = f(a) +3 (INLINE CALL foo) inline fun foo(a: Int, f: (Int) -> Int) = f(a) 3 (INLINE CALL foo) inline fun foo(a: Int, f: (Int) -> Int) = f(a) (in foo(Int, (Int) -> Int)) 3 (INLINE CALL foo) [LAMBDA IN] inline fun foo(a: Int, f: (Int) -> Int) = f(a) (in foo(Int, (Int) -> Int)) 3 (INLINE CALL foo) [LAMBDA IN] inline fun foo(a: Int, f: (Int) -> Int) = f(a) (in foo(Int, (Int) -> Int)) diff --git a/idea/testData/slicer/inflow/notNullAssertion.leafGroups.txt b/idea/testData/slicer/inflow/notNullAssertion.leafGroups.txt index 9848eedf103..7e47753aae4 100644 --- a/idea/testData/slicer/inflow/notNullAssertion.leafGroups.txt +++ b/idea/testData/slicer/inflow/notNullAssertion.leafGroups.txt @@ -1,5 +1,5 @@ 3 fun test(s: String?) { (in test(String?)) -4 val x = s!! (in test(String?)) +4 val x = s!! (in test(String?)) 4 val x = s!! (in test(String?)) 4 val x = s!! (in test(String?)) 3 fun test(s: String?) { (in test(String?)) diff --git a/idea/testData/slicer/inflow/notNullAssertion.nullnessGroups.txt b/idea/testData/slicer/inflow/notNullAssertion.nullnessGroups.txt index 215da21bab3..e4807fbe990 100644 --- a/idea/testData/slicer/inflow/notNullAssertion.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/notNullAssertion.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -4 val x = s!! (in test(String?)) -4 val x = s!! (in test(String?)) +4 val x = s!! (in test(String?)) +4 val x = s!! (in test(String?)) diff --git a/idea/testData/slicer/inflow/notNullAssertion.results.txt b/idea/testData/slicer/inflow/notNullAssertion.results.txt index 3c5dd79a495..60eb3abdadf 100644 --- a/idea/testData/slicer/inflow/notNullAssertion.results.txt +++ b/idea/testData/slicer/inflow/notNullAssertion.results.txt @@ -1,4 +1,4 @@ -4 val x = s!! (in test(String?)) +4 val x = s!! (in test(String?)) 4 val x = s!! (in test(String?)) 4 val x = s!! (in test(String?)) 3 fun test(s: String?) { (in test(String?)) diff --git a/idea/testData/slicer/inflow/nullsAndNotNulls.leafGroups.txt b/idea/testData/slicer/inflow/nullsAndNotNulls.leafGroups.txt index f400c3c1ee6..870ffafa80d 100644 --- a/idea/testData/slicer/inflow/nullsAndNotNulls.leafGroups.txt +++ b/idea/testData/slicer/inflow/nullsAndNotNulls.leafGroups.txt @@ -1,17 +1,17 @@ 7 else -> null (in test(Int)) 9 return s (in test(Int)) -4 var s = when { (in test(Int)) +4 var s = when { (in test(Int)) 4 var s = when { (in test(Int)) 7 else -> null (in test(Int)) 6 n < 0 -> "-" (in test(Int)) 9 return s (in test(Int)) -4 var s = when { (in test(Int)) +4 var s = when { (in test(Int)) 4 var s = when { (in test(Int)) 6 n < 0 -> "-" (in test(Int)) 5 n > 0 -> "+" (in test(Int)) 9 return s (in test(Int)) -4 var s = when { (in test(Int)) +4 var s = when { (in test(Int)) 4 var s = when { (in test(Int)) 5 n > 0 -> "+" (in test(Int)) diff --git a/idea/testData/slicer/inflow/nullsAndNotNulls.nullnessGroups.txt b/idea/testData/slicer/inflow/nullsAndNotNulls.nullnessGroups.txt index e168ec837ad..991bf00269b 100644 --- a/idea/testData/slicer/inflow/nullsAndNotNulls.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/nullsAndNotNulls.nullnessGroups.txt @@ -1,18 +1,18 @@ [Null Values] 7 else -> null (in test(Int)) 9 return s (in test(Int)) -4 var s = when { (in test(Int)) +4 var s = when { (in test(Int)) 4 var s = when { (in test(Int)) 7 else -> null (in test(Int)) [NotNull Values] 5 n > 0 -> "+" (in test(Int)) 9 return s (in test(Int)) -4 var s = when { (in test(Int)) +4 var s = when { (in test(Int)) 4 var s = when { (in test(Int)) 5 n > 0 -> "+" (in test(Int)) 6 n < 0 -> "-" (in test(Int)) 9 return s (in test(Int)) -4 var s = when { (in test(Int)) +4 var s = when { (in test(Int)) 4 var s = when { (in test(Int)) 6 n < 0 -> "-" (in test(Int)) diff --git a/idea/testData/slicer/inflow/nullsAndNotNulls.results.txt b/idea/testData/slicer/inflow/nullsAndNotNulls.results.txt index fc23543dadb..ae61bef738c 100644 --- a/idea/testData/slicer/inflow/nullsAndNotNulls.results.txt +++ b/idea/testData/slicer/inflow/nullsAndNotNulls.results.txt @@ -1,5 +1,5 @@ 9 return s (in test(Int)) -4 var s = when { (in test(Int)) +4 var s = when { (in test(Int)) 4 var s = when { (in test(Int)) 5 n > 0 -> "+" (in test(Int)) 6 n < 0 -> "-" (in test(Int)) diff --git a/idea/testData/slicer/inflow/overrideProperty.leafGroups.txt b/idea/testData/slicer/inflow/overrideProperty.leafGroups.txt index 7d948878957..62f37c94945 100644 --- a/idea/testData/slicer/inflow/overrideProperty.leafGroups.txt +++ b/idea/testData/slicer/inflow/overrideProperty.leafGroups.txt @@ -1,11 +1,11 @@ 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)) 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) 8 override var prop: Int = 1 (in Derived.prop) 12 b.prop = 10 (in foo(Base, Derived)) -13 val v = d.prop (in foo(Base, Derived)) +13 val v = d.prop (in foo(Base, Derived)) 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) 12 b.prop = 10 (in foo(Base, Derived)) diff --git a/idea/testData/slicer/inflow/overrideProperty.nullnessGroups.txt b/idea/testData/slicer/inflow/overrideProperty.nullnessGroups.txt index 840c90aa030..93d4072ac32 100644 --- a/idea/testData/slicer/inflow/overrideProperty.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/overrideProperty.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -13 val v = d.prop (in foo(Base, Derived)) -13 val v = d.prop (in foo(Base, Derived)) +13 val v = d.prop (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 894088f8a40..33c6313e49f 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)) 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) 8 override var prop: Int = 1 (in Derived.prop) 12 b.prop = 10 (in foo(Base, Derived)) diff --git a/idea/testData/slicer/inflow/overridingFunctionResult.leafGroups.txt b/idea/testData/slicer/inflow/overridingFunctionResult.leafGroups.txt index 4261f084cae..87a5db00723 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,…)) +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) 8 override fun foo() = 2 (in B.foo()) 12 override fun foo() = 3 (in C.foo()) -17 val y = b.foo() (in test(A, B,…)) +17 val y = b.foo() (in test(A, B,…)) 17 val y = b.foo() (in test(A, B,…)) -12 override fun foo() = 3 (in C) +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,…)) +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 c0622cf6c5b..aa580902e98 100644 --- a/idea/testData/slicer/inflow/overridingFunctionResult.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/overridingFunctionResult.nullnessGroups.txt @@ -1,4 +1,3 @@ [NotNull Values] -17 val y = b.foo() (in test(A, B,…)) -17 val y = b.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/inflow/overridingFunctionResult.results.txt b/idea/testData/slicer/inflow/overridingFunctionResult.results.txt index 920088fbad8..cc43fc56c27 100644 --- a/idea/testData/slicer/inflow/overridingFunctionResult.results.txt +++ b/idea/testData/slicer/inflow/overridingFunctionResult.results.txt @@ -1,7 +1,7 @@ -17 val y = b.foo() (in test(A, B,…)) +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) 8 override fun foo() = 2 (in B.foo()) -12 override fun foo() = 3 (in C) +12 override fun foo() = 3 (in C) 12 override fun foo() = 3 (in C.foo()) diff --git a/idea/testData/slicer/inflow/overridingParameter.leafGroups.txt b/idea/testData/slicer/inflow/overridingParameter.leafGroups.txt index de3ff91135e..ec5ddbdf3ef 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,…)) +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) +7 open class B(override val foo: Int) : A() (in B) 9 class C : B(1) { (in C) 10 override val foo = 3 (in C.foo) -15 val y = b.foo (in test(A, B,…)) +15 val y = b.foo (in test(A, B,…)) 15 val y = b.foo (in test(A, B,…)) -10 override val foo = 3 (in C) +10 override val foo = 3 (in C) 10 override val foo = 3 (in C.foo) 7 return 5; -15 val y = b.foo (in test(A, B,…)) +15 val y = b.foo (in test(A, B,…)) 15 val y = b.foo (in test(A, B,…)) 7 return 5; 3 super(10); -15 val y = b.foo (in test(A, B,…)) +15 val y = b.foo (in test(A, B,…)) 15 val y = b.foo (in test(A, B,…)) -7 open class B(override val foo: Int) : A() (in 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 ba477ebfe11..ec57ebfb148 100644 --- a/idea/testData/slicer/inflow/overridingParameter.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/overridingParameter.nullnessGroups.txt @@ -1,4 +1,3 @@ [NotNull Values] -15 val y = b.foo (in test(A, B,…)) -15 val y = b.foo (in test(A, B,…)) - +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 03cd191716d..75f6afaea39 100644 --- a/idea/testData/slicer/inflow/overridingParameter.results.txt +++ b/idea/testData/slicer/inflow/overridingParameter.results.txt @@ -1,8 +1,8 @@ -15 val y = b.foo (in test(A, B,…)) +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) +7 open class B(override val foo: Int) : A() (in B) 3 super(10); 9 class C : B(1) { (in C) 7 return 5; -10 override val foo = 3 (in C) +10 override val foo = 3 (in C) 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 5378a03c1ae..8ebf71dfef8 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.get) -20 val y = b.foo (in test(A, B,…)) +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) +9 override val foo: Int (in B) 10 get() = 2 (in B.foo.get) 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,…)) 20 val y = b.foo (in test(A, B,…)) -14 override val foo: Int (in C) +14 override val foo: Int (in C) 15 get() = 3 (in C.foo.get) 3 return 5; -20 val y = b.foo (in test(A, B,…)) +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 cc96943e5db..8fee188727d 100644 --- a/idea/testData/slicer/inflow/overridingPropertyGetterResult.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/overridingPropertyGetterResult.nullnessGroups.txt @@ -1,4 +1,3 @@ [NotNull Values] -20 val y = b.foo (in test(A, B,…)) -20 val y = b.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/inflow/overridingPropertyGetterResult.results.txt b/idea/testData/slicer/inflow/overridingPropertyGetterResult.results.txt index cfcee251d78..bfe9e645a19 100644 --- a/idea/testData/slicer/inflow/overridingPropertyGetterResult.results.txt +++ b/idea/testData/slicer/inflow/overridingPropertyGetterResult.results.txt @@ -1,7 +1,7 @@ -20 val y = b.foo (in test(A, B,…)) +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) +9 override val foo: Int (in B) 10 get() = 2 (in B.foo.get) -14 override val foo: Int (in C) +14 override val foo: Int (in C) 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 d080a67d6d3..1979b05fda7 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) -17 val y = b.foo (in test(A, B,…)) +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) 8 override val foo = 2 (in B.foo) 12 override val foo = 3 (in C.foo) -17 val y = b.foo (in test(A, B,…)) +17 val y = b.foo (in test(A, B,…)) 17 val y = b.foo (in test(A, B,…)) -12 override val foo = 3 (in C) +12 override val foo = 3 (in C) 12 override val foo = 3 (in C.foo) 3 return 5; -17 val y = b.foo (in test(A, B,…)) +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 8a2a15e18c6..44fcac41aef 100644 --- a/idea/testData/slicer/inflow/overridingPropertyResult.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/overridingPropertyResult.nullnessGroups.txt @@ -1,4 +1,3 @@ [NotNull Values] -17 val y = b.foo (in test(A, B,…)) -17 val y = b.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/inflow/overridingPropertyResult.results.txt b/idea/testData/slicer/inflow/overridingPropertyResult.results.txt index 4b03a426d25..a637240d3ef 100644 --- a/idea/testData/slicer/inflow/overridingPropertyResult.results.txt +++ b/idea/testData/slicer/inflow/overridingPropertyResult.results.txt @@ -1,7 +1,7 @@ -17 val y = b.foo (in test(A, B,…)) +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) 8 override val foo = 2 (in B.foo) -12 override val foo = 3 (in C) +12 override val foo = 3 (in C) 12 override val foo = 3 (in C.foo) diff --git a/idea/testData/slicer/inflow/primaryConstructorParameterWithDefault.leafGroups.txt b/idea/testData/slicer/inflow/primaryConstructorParameterWithDefault.leafGroups.txt index e6e65eb01c3..42c842f3368 100644 --- a/idea/testData/slicer/inflow/primaryConstructorParameterWithDefault.leafGroups.txt +++ b/idea/testData/slicer/inflow/primaryConstructorParameterWithDefault.leafGroups.txt @@ -1,16 +1,16 @@ 7 class B2: A(1, "2") (in B2) -4 open class A @JvmOverloads constructor(n: Int, s: String = "???") (in A(Int, String = ...)) +4 open class A @JvmOverloads constructor(n: Int, s: String = "???") (in A(Int, String = ...)) 7 class B2: A(1, "2") (in B2) 12 new A(1, "2"); -4 open class A @JvmOverloads constructor(n: Int, s: String = "???") (in A(Int, String = ...)) +4 open class A @JvmOverloads constructor(n: Int, s: String = "???") (in A(Int, String = ...)) 12 new A(1, "2"); 2 D(int n, String s) { -4 open class A @JvmOverloads constructor(n: Int, s: String = "???") (in A(Int, String = ...)) +4 open class A @JvmOverloads constructor(n: Int, s: String = "???") (in A(Int, String = ...)) 3 super(n, s); 2 D(int n, String s) { 4 open class A @JvmOverloads constructor(n: Int, s: String = "???") (in A(Int, String = ...)) -4 open class A @JvmOverloads constructor(n: Int, s: String = "???") (in A(Int, String = ...)) +4 open class A @JvmOverloads constructor(n: Int, s: String = "???") (in A(Int, String = ...)) 4 open class A @JvmOverloads constructor(n: Int, s: String = "???") (in A(Int, String = ...)) diff --git a/idea/testData/slicer/inflow/primaryConstructorParameterWithDefault.nullnessGroups.txt b/idea/testData/slicer/inflow/primaryConstructorParameterWithDefault.nullnessGroups.txt index c46b918481f..747931907da 100644 --- a/idea/testData/slicer/inflow/primaryConstructorParameterWithDefault.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/primaryConstructorParameterWithDefault.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -4 open class A @JvmOverloads constructor(n: Int, s: String = "???") (in A(Int, String = ...)) -4 open class A @JvmOverloads constructor(n: Int, s: String = "???") (in A(Int, String = ...)) +4 open class A @JvmOverloads constructor(n: Int, s: String = "???") (in A(Int, String = ...)) +4 open class A @JvmOverloads constructor(n: Int, s: String = "???") (in A(Int, String = ...)) diff --git a/idea/testData/slicer/inflow/primaryConstructorParameterWithDefault.results.txt b/idea/testData/slicer/inflow/primaryConstructorParameterWithDefault.results.txt index 3f444da7724..e26a88fad5b 100644 --- a/idea/testData/slicer/inflow/primaryConstructorParameterWithDefault.results.txt +++ b/idea/testData/slicer/inflow/primaryConstructorParameterWithDefault.results.txt @@ -1,4 +1,4 @@ -4 open class A @JvmOverloads constructor(n: Int, s: String = "???") (in A(Int, String = ...)) +4 open class A @JvmOverloads constructor(n: Int, s: String = "???") (in A(Int, String = ...)) 3 super(n, s); 2 D(int n, String s) { 4 open class A @JvmOverloads constructor(n: Int, s: String = "???") (in A(Int, String = ...)) diff --git a/idea/testData/slicer/inflow/propertyInInterface.leafGroups.txt b/idea/testData/slicer/inflow/propertyInInterface.leafGroups.txt index 42e1b18cefe..9693f858f0a 100644 --- a/idea/testData/slicer/inflow/propertyInInterface.leafGroups.txt +++ b/idea/testData/slicer/inflow/propertyInInterface.leafGroups.txt @@ -1,11 +1,11 @@ 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)) 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) 8 override var prop: Int = 0 (in C.prop) 12 i.prop = 10 (in foo(I, C)) -13 val v = c.prop (in foo(I, C)) +13 val v = c.prop (in foo(I, C)) 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) 12 i.prop = 10 (in foo(I, C)) diff --git a/idea/testData/slicer/inflow/propertyInInterface.nullnessGroups.txt b/idea/testData/slicer/inflow/propertyInInterface.nullnessGroups.txt index da6cd5c2688..51fc78b2e9b 100644 --- a/idea/testData/slicer/inflow/propertyInInterface.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/propertyInInterface.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -13 val v = c.prop (in foo(I, C)) -13 val v = c.prop (in foo(I, C)) +13 val v = c.prop (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 76b283a90d1..77d6904d232 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)) 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) 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 a0d4f5bb3a1..ff22e9a689a 100644 --- a/idea/testData/slicer/inflow/qualifiedAssignmentsForQualifiedRef.leafGroups.txt +++ b/idea/testData/slicer/inflow/qualifiedAssignmentsForQualifiedRef.leafGroups.txt @@ -1,21 +1,21 @@ 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) 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)) 14 a.name = "main: bye" (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) 14 a.name = "main: bye" (in main(Array)) 6 name = "uses: bye" (in AClass.uses()) 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) 6 name = "uses: bye" (in AClass.uses()) 7 this.name = "uses: after this" (in AClass.uses()) 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) 7 this.name = "uses: after this" (in AClass.uses()) diff --git a/idea/testData/slicer/inflow/qualifiedAssignmentsForQualifiedRef.results.txt b/idea/testData/slicer/inflow/qualifiedAssignmentsForQualifiedRef.results.txt index fa45eebf913..60abb33f6fe 100644 --- a/idea/testData/slicer/inflow/qualifiedAssignmentsForQualifiedRef.results.txt +++ b/idea/testData/slicer/inflow/qualifiedAssignmentsForQualifiedRef.results.txt @@ -1,5 +1,5 @@ 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) 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.leafGroups.txt b/idea/testData/slicer/inflow/qualifiedAssignmentsForSimpleRef.leafGroups.txt index 4bd6b59c74d..6c8cf8b82d2 100644 --- a/idea/testData/slicer/inflow/qualifiedAssignmentsForSimpleRef.leafGroups.txt +++ b/idea/testData/slicer/inflow/qualifiedAssignmentsForSimpleRef.leafGroups.txt @@ -1,21 +1,21 @@ 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) 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)) 14 a.name = "main: bye" (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) 14 a.name = "main: bye" (in main(Array)) 6 name = "uses: bye" (in AClass.uses()) 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) 6 name = "uses: bye" (in AClass.uses()) 7 this.name = "uses: after this" (in AClass.uses()) 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) 7 this.name = "uses: after this" (in AClass.uses()) diff --git a/idea/testData/slicer/inflow/qualifiedAssignmentsForSimpleRef.results.txt b/idea/testData/slicer/inflow/qualifiedAssignmentsForSimpleRef.results.txt index ce070413154..2274e8f8864 100644 --- a/idea/testData/slicer/inflow/qualifiedAssignmentsForSimpleRef.results.txt +++ b/idea/testData/slicer/inflow/qualifiedAssignmentsForSimpleRef.results.txt @@ -1,5 +1,5 @@ 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) 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/safeCast.leafGroups.txt b/idea/testData/slicer/inflow/safeCast.leafGroups.txt index 214d22d11f5..9a770796dc8 100644 --- a/idea/testData/slicer/inflow/safeCast.leafGroups.txt +++ b/idea/testData/slicer/inflow/safeCast.leafGroups.txt @@ -1,5 +1,5 @@ 3 fun test(o: Any) { (in test(Any)) -4 val x = o as? String (in test(Any)) +4 val x = o as? String (in test(Any)) 4 val x = o as? String (in test(Any)) 4 val x = o as? String (in test(Any)) 3 fun test(o: Any) { (in test(Any)) diff --git a/idea/testData/slicer/inflow/safeCast.nullnessGroups.txt b/idea/testData/slicer/inflow/safeCast.nullnessGroups.txt index a05ad699ff0..37b69067c43 100644 --- a/idea/testData/slicer/inflow/safeCast.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/safeCast.nullnessGroups.txt @@ -1,5 +1,5 @@ [NotNull Values] 4 val x = o as? String (in test(Any)) -4 val x = o as? String (in test(Any)) +4 val x = o as? String (in test(Any)) 4 val x = o as? String (in test(Any)) 4 val x = o as? String (in test(Any)) diff --git a/idea/testData/slicer/inflow/safeCast.results.txt b/idea/testData/slicer/inflow/safeCast.results.txt index 7ee1d07e4bf..5496e7e5daa 100644 --- a/idea/testData/slicer/inflow/safeCast.results.txt +++ b/idea/testData/slicer/inflow/safeCast.results.txt @@ -1,4 +1,4 @@ -4 val x = o as? String (in test(Any)) +4 val x = o as? String (in test(Any)) 4 val x = o as? String (in test(Any)) 4 val x = o as? String (in test(Any)) 3 fun test(o: Any) { (in test(Any)) diff --git a/idea/testData/slicer/inflow/secondaryConstructorParameterWithDefault.leafGroups.txt b/idea/testData/slicer/inflow/secondaryConstructorParameterWithDefault.leafGroups.txt index 90f60061a66..6dcd0f6a63c 100644 --- a/idea/testData/slicer/inflow/secondaryConstructorParameterWithDefault.leafGroups.txt +++ b/idea/testData/slicer/inflow/secondaryConstructorParameterWithDefault.leafGroups.txt @@ -1,16 +1,16 @@ 9 class B2: A(1, "2") (in B2) -5 @JvmOverloads constructor(n: Int, s: String = "???") (in constructor A(Int, String = ...)) +5 @JvmOverloads constructor(n: Int, s: String = "???") (in constructor A(Int, String = ...)) 9 class B2: A(1, "2") (in B2) 12 new A(1, "2"); -5 @JvmOverloads constructor(n: Int, s: String = "???") (in constructor A(Int, String = ...)) +5 @JvmOverloads constructor(n: Int, s: String = "???") (in constructor A(Int, String = ...)) 12 new A(1, "2"); 2 D(int n, String s) { -5 @JvmOverloads constructor(n: Int, s: String = "???") (in constructor A(Int, String = ...)) +5 @JvmOverloads constructor(n: Int, s: String = "???") (in constructor A(Int, String = ...)) 3 super(n, s); 2 D(int n, String s) { 5 @JvmOverloads constructor(n: Int, s: String = "???") (in constructor A(Int, String = ...)) -5 @JvmOverloads constructor(n: Int, s: String = "???") (in constructor A(Int, String = ...)) +5 @JvmOverloads constructor(n: Int, s: String = "???") (in constructor A(Int, String = ...)) 5 @JvmOverloads constructor(n: Int, s: String = "???") (in constructor A(Int, String = ...)) diff --git a/idea/testData/slicer/inflow/secondaryConstructorParameterWithDefault.nullnessGroups.txt b/idea/testData/slicer/inflow/secondaryConstructorParameterWithDefault.nullnessGroups.txt index 3b6bd4ab4e5..60ec18a0751 100644 --- a/idea/testData/slicer/inflow/secondaryConstructorParameterWithDefault.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/secondaryConstructorParameterWithDefault.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -5 @JvmOverloads constructor(n: Int, s: String = "???") (in constructor A(Int, String = ...)) -5 @JvmOverloads constructor(n: Int, s: String = "???") (in constructor A(Int, String = ...)) +5 @JvmOverloads constructor(n: Int, s: String = "???") (in constructor A(Int, String = ...)) +5 @JvmOverloads constructor(n: Int, s: String = "???") (in constructor A(Int, String = ...)) diff --git a/idea/testData/slicer/inflow/secondaryConstructorParameterWithDefault.results.txt b/idea/testData/slicer/inflow/secondaryConstructorParameterWithDefault.results.txt index 219cb703e18..2ebfb356f90 100644 --- a/idea/testData/slicer/inflow/secondaryConstructorParameterWithDefault.results.txt +++ b/idea/testData/slicer/inflow/secondaryConstructorParameterWithDefault.results.txt @@ -1,4 +1,4 @@ -5 @JvmOverloads constructor(n: Int, s: String = "???") (in constructor A(Int, String = ...)) +5 @JvmOverloads constructor(n: Int, s: String = "???") (in constructor A(Int, String = ...)) 3 super(n, s); 2 D(int n, String s) { 5 @JvmOverloads constructor(n: Int, s: String = "???") (in constructor A(Int, String = ...)) diff --git a/idea/testData/slicer/inflow/settersViaDelegateForQualifiedRef.leafGroups.txt b/idea/testData/slicer/inflow/settersViaDelegateForQualifiedRef.leafGroups.txt index 95660a84e1e..d4830a31b74 100644 --- a/idea/testData/slicer/inflow/settersViaDelegateForQualifiedRef.leafGroups.txt +++ b/idea/testData/slicer/inflow/settersViaDelegateForQualifiedRef.leafGroups.txt @@ -1,27 +1,27 @@ 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) +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) 6 private var _value: String = "" (in Delegate._value) 20 name = "bye" (in AClass.uses()) 27 println("My name is '${a.name}'") (in main(Array)) -14 var name by Delegate() (in AClass) -7 operator fun getValue(thisRef: Any?, property: KProperty<*>) = _value (in Delegate) +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) 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)) 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) +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) 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/settersViaDelegateForQualifiedRef.results.txt b/idea/testData/slicer/inflow/settersViaDelegateForQualifiedRef.results.txt index f7305af2f33..205fe0ce3c5 100644 --- a/idea/testData/slicer/inflow/settersViaDelegateForQualifiedRef.results.txt +++ b/idea/testData/slicer/inflow/settersViaDelegateForQualifiedRef.results.txt @@ -1,8 +1,8 @@ 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) +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) 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<*>,…)) diff --git a/idea/testData/slicer/inflow/settersViaDelegateForSimpleRef.leafGroups.txt b/idea/testData/slicer/inflow/settersViaDelegateForSimpleRef.leafGroups.txt index 1352d36ea6c..73578b34490 100644 --- a/idea/testData/slicer/inflow/settersViaDelegateForSimpleRef.leafGroups.txt +++ b/idea/testData/slicer/inflow/settersViaDelegateForSimpleRef.leafGroups.txt @@ -1,27 +1,27 @@ 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) +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) 7 private var _value: String = "" (in Delegate._value) 21 name = "bye" (in AClass.uses()) 22 println("Now my name is '$name'") (in AClass.uses()) -15 var name by Delegate() (in AClass) -8 operator fun getValue(thisRef: Any?, property: KProperty<*>) = _value (in Delegate) +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) 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 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) +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) 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/settersViaDelegateForSimpleRef.results.txt b/idea/testData/slicer/inflow/settersViaDelegateForSimpleRef.results.txt index 9d02ac49783..4145f83d30a 100644 --- a/idea/testData/slicer/inflow/settersViaDelegateForSimpleRef.results.txt +++ b/idea/testData/slicer/inflow/settersViaDelegateForSimpleRef.results.txt @@ -1,8 +1,8 @@ 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) +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) 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<*>,…)) diff --git a/idea/testData/slicer/inflow/settersViaJavaDelegate.leafGroups.txt b/idea/testData/slicer/inflow/settersViaJavaDelegate.leafGroups.txt index 4c13a44ac48..1e0aaa793ed 100644 --- a/idea/testData/slicer/inflow/settersViaJavaDelegate.leafGroups.txt +++ b/idea/testData/slicer/inflow/settersViaJavaDelegate.leafGroups.txt @@ -1,14 +1,13 @@ 6 private String _value = ""; 12 println("Now my name is '$name'") (in AClass.uses()) -5 var name by D() (in AClass) +5 var name by D() (in AClass) 9 return _value; 6 private String _value = ""; 5 var name by D() (in AClass.name) 12 println("Now my name is '$name'") (in AClass.uses()) -5 var name by D() (in AClass) +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) - diff --git a/idea/testData/slicer/inflow/settersViaJavaDelegate.nullnessGroups.txt b/idea/testData/slicer/inflow/settersViaJavaDelegate.nullnessGroups.txt index 06be771ba43..f94fe951e9b 100644 --- a/idea/testData/slicer/inflow/settersViaJavaDelegate.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/settersViaJavaDelegate.nullnessGroups.txt @@ -1,13 +1,13 @@ [Other Values] 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) +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) 6 private String _value = ""; 12 println("Now my name is '$name'") (in AClass.uses()) -5 var name by D() (in AClass) +5 var name by D() (in AClass) 9 return _value; 6 private String _value = ""; diff --git a/idea/testData/slicer/inflow/settersViaJavaDelegate.results.txt b/idea/testData/slicer/inflow/settersViaJavaDelegate.results.txt index 4aabe97e843..a455278878f 100644 --- a/idea/testData/slicer/inflow/settersViaJavaDelegate.results.txt +++ b/idea/testData/slicer/inflow/settersViaJavaDelegate.results.txt @@ -1,5 +1,5 @@ 12 println("Now my name is '$name'") (in AClass.uses()) -5 var name by D() (in AClass) +5 var name by D() (in AClass) 9 return _value; 6 private String _value = ""; 13 _value = value; diff --git a/idea/testData/slicer/inflow/thisInExtensionFunction.leafGroups.txt b/idea/testData/slicer/inflow/thisInExtensionFunction.leafGroups.txt index 63b1365767d..e976a6bb8eb 100644 --- a/idea/testData/slicer/inflow/thisInExtensionFunction.leafGroups.txt +++ b/idea/testData/slicer/inflow/thisInExtensionFunction.leafGroups.txt @@ -1,7 +1,7 @@ 8 val x = "".extensionFun() (in foo()) -8 val x = "".extensionFun() (in foo()) +8 val x = "".extensionFun() (in foo()) 8 val x = "".extensionFun() (in foo()) -3 fun Any.extensionFun(): Any { +3 fun Any.extensionFun(): Any { 4 return this (in extensionFun() on Any) 3 fun Any.extensionFun(): Any { (in extensionFun() on Any) 8 val x = "".extensionFun() (in foo()) diff --git a/idea/testData/slicer/inflow/thisInExtensionFunction.nullnessGroups.txt b/idea/testData/slicer/inflow/thisInExtensionFunction.nullnessGroups.txt index 1c184aa676c..b09e4428cf8 100644 --- a/idea/testData/slicer/inflow/thisInExtensionFunction.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/thisInExtensionFunction.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -8 val x = "".extensionFun() (in foo()) -8 val x = "".extensionFun() (in foo()) +8 val x = "".extensionFun() (in foo()) +8 val x = "".extensionFun() (in foo()) diff --git a/idea/testData/slicer/inflow/thisInExtensionFunction.results.txt b/idea/testData/slicer/inflow/thisInExtensionFunction.results.txt index e8af754c3c5..f0ff4e43c44 100644 --- a/idea/testData/slicer/inflow/thisInExtensionFunction.results.txt +++ b/idea/testData/slicer/inflow/thisInExtensionFunction.results.txt @@ -1,6 +1,6 @@ -8 val x = "".extensionFun() (in foo()) +8 val x = "".extensionFun() (in foo()) 8 val x = "".extensionFun() (in foo()) -3 fun Any.extensionFun(): Any { +3 fun Any.extensionFun(): Any { 4 return this (in extensionFun() on Any) 3 fun Any.extensionFun(): Any { (in extensionFun() on Any) 8 val x = "".extensionFun() (in foo()) diff --git a/idea/testData/slicer/inflow/thisInExtensionProperty.leafGroups.txt b/idea/testData/slicer/inflow/thisInExtensionProperty.leafGroups.txt index 1050160e5fd..d066e04f2a2 100644 --- a/idea/testData/slicer/inflow/thisInExtensionProperty.leafGroups.txt +++ b/idea/testData/slicer/inflow/thisInExtensionProperty.leafGroups.txt @@ -1,7 +1,7 @@ 7 val x = "".extensionProp (in foo()) -7 val x = "".extensionProp (in foo()) +7 val x = "".extensionProp (in foo()) 7 val x = "".extensionProp (in foo()) -3 val Any.extensionProp: Any +3 val Any.extensionProp: 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.nullnessGroups.txt b/idea/testData/slicer/inflow/thisInExtensionProperty.nullnessGroups.txt index 5d7467ab561..424815e2547 100644 --- a/idea/testData/slicer/inflow/thisInExtensionProperty.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/thisInExtensionProperty.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -7 val x = "".extensionProp (in foo()) -7 val x = "".extensionProp (in foo()) +7 val x = "".extensionProp (in foo()) +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 24a5d75661a..05bfa3a51e2 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()) 7 val x = "".extensionProp (in foo()) -3 val Any.extensionProp: Any +3 val Any.extensionProp: 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 1b1b0717fc4..8b569f04cfe 100644 --- a/idea/testData/slicer/inflow/topLevelVal.leafGroups.txt +++ b/idea/testData/slicer/inflow/topLevelVal.leafGroups.txt @@ -1,4 +1,3 @@ 3 val foo: Int = 1 (in foo) -3 val foo: Int = 1 +3 val foo: Int = 1 3 val foo: Int = 1 (in foo) - diff --git a/idea/testData/slicer/inflow/topLevelVal.nullnessGroups.txt b/idea/testData/slicer/inflow/topLevelVal.nullnessGroups.txt index a7aa6d8fdd7..6c28be32af0 100644 --- a/idea/testData/slicer/inflow/topLevelVal.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/topLevelVal.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -3 val foo: Int = 1 -3 val foo: Int = 1 +3 val foo: Int = 1 +3 val foo: Int = 1 diff --git a/idea/testData/slicer/inflow/topLevelVal.results.txt b/idea/testData/slicer/inflow/topLevelVal.results.txt index 8ac48bc3ead..06fe09ab5ac 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 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 1d1cc806bf7..9925a5c5526 100644 --- a/idea/testData/slicer/inflow/topLevelVar.leafGroups.txt +++ b/idea/testData/slicer/inflow/topLevelVar.leafGroups.txt @@ -1,11 +1,11 @@ 3 var foo: Int = 1 (in foo) -3 var foo: Int = 1 +3 var foo: Int = 1 3 var foo: Int = 1 (in foo) 7 foo = 2 (in test()) -3 var foo: Int = 1 +3 var foo: Int = 1 7 foo = 2 (in test()) 4 TopLevelVarKt.setFoo(3); -3 var foo: Int = 1 +3 var foo: Int = 1 4 TopLevelVarKt.setFoo(3); diff --git a/idea/testData/slicer/inflow/topLevelVar.nullnessGroups.txt b/idea/testData/slicer/inflow/topLevelVar.nullnessGroups.txt index d5b7c8122e0..b1252a8cc43 100644 --- a/idea/testData/slicer/inflow/topLevelVar.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/topLevelVar.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -3 var foo: Int = 1 -3 var foo: Int = 1 +3 var foo: Int = 1 +3 var foo: Int = 1 diff --git a/idea/testData/slicer/inflow/topLevelVar.results.txt b/idea/testData/slicer/inflow/topLevelVar.results.txt index 054b85b96a6..8a4c702eafd 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 3 var foo: Int = 1 (in foo) 7 foo = 2 (in test()) 4 TopLevelVarKt.setFoo(3); diff --git a/idea/testData/slicer/inflow/valParameter.leafGroups.txt b/idea/testData/slicer/inflow/valParameter.leafGroups.txt index 4948b3b542a..3c3a0121e02 100644 --- a/idea/testData/slicer/inflow/valParameter.leafGroups.txt +++ b/idea/testData/slicer/inflow/valParameter.leafGroups.txt @@ -1,16 +1,16 @@ 2 D(int n) { -3 open class A(val n: Int) (in A) +3 open class A(val n: Int) (in A) 3 super(n); 2 D(int n) { 5 class B : A(1) (in B) -3 open class A(val n: Int) (in A) +3 open class A(val n: Int) (in A) 5 class B : A(1) (in B) 8 val z = A(2).n (in test()) -3 open class A(val n: Int) (in A) +3 open class A(val n: Int) (in A) 8 val z = A(2).n (in test()) 7 A a = new A(3); -3 open class A(val n: Int) (in A) +3 open class A(val n: Int) (in A) 7 A a = new A(3); diff --git a/idea/testData/slicer/inflow/valParameter.nullnessGroups.txt b/idea/testData/slicer/inflow/valParameter.nullnessGroups.txt index cccbd1d7f96..d4d393507cc 100644 --- a/idea/testData/slicer/inflow/valParameter.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/valParameter.nullnessGroups.txt @@ -1,4 +1,3 @@ [NotNull Values] -3 open class A(val n: Int) (in A) -3 open class A(val n: Int) (in A) - +3 open class A(val n: Int) (in A) +3 open class A(val n: Int) (in A) diff --git a/idea/testData/slicer/inflow/valParameter.results.txt b/idea/testData/slicer/inflow/valParameter.results.txt index 53652d88895..13190b3c91c 100644 --- a/idea/testData/slicer/inflow/valParameter.results.txt +++ b/idea/testData/slicer/inflow/valParameter.results.txt @@ -1,4 +1,4 @@ -3 open class A(val n: Int) (in A) +3 open class A(val n: Int) (in A) 3 super(n); 2 D(int n) { 5 class B : A(1) (in B) diff --git a/idea/testData/slicer/inflow/varParameter.leafGroups.txt b/idea/testData/slicer/inflow/varParameter.leafGroups.txt index 84aa5c48564..bdce05abec6 100644 --- a/idea/testData/slicer/inflow/varParameter.leafGroups.txt +++ b/idea/testData/slicer/inflow/varParameter.leafGroups.txt @@ -1,24 +1,24 @@ 2 D(int n) { -3 open class A(var n: Int) { (in A) +3 open class A(var n: Int) { (in A) 3 super(n); 2 D(int n) { 20 class B : A(1) (in B) -3 open class A(var n: Int) { (in A) +3 open class A(var n: Int) { (in A) 20 class B : A(1) (in B) 23 val z = A(2).n (in test()) -3 open class A(var n: Int) { (in A) +3 open class A(var n: Int) { (in A) 23 val z = A(2).n (in test()) 24 A(3).n = 2 (in test()) -3 open class A(var n: Int) { (in A) +3 open class A(var n: Int) { (in A) 24 A(3).n = 2 (in test()) 7 A a = new A(3); -3 open class A(var n: Int) { (in A) +3 open class A(var n: Int) { (in A) 7 A a = new A(3); 9 a.setN(4); -3 open class A(var n: Int) { (in A) +3 open class A(var n: Int) { (in A) 9 a.setN(4); diff --git a/idea/testData/slicer/inflow/varParameter.nullnessGroups.txt b/idea/testData/slicer/inflow/varParameter.nullnessGroups.txt index 3adf3e33455..9be78f56937 100644 --- a/idea/testData/slicer/inflow/varParameter.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/varParameter.nullnessGroups.txt @@ -1,4 +1,3 @@ [NotNull Values] -3 open class A(var n: Int) { (in A) -3 open class A(var n: Int) { (in A) - +3 open class A(var n: Int) { (in A) +3 open class A(var n: Int) { (in A) diff --git a/idea/testData/slicer/inflow/varParameter.results.txt b/idea/testData/slicer/inflow/varParameter.results.txt index b1a459c0645..e0537da392a 100644 --- a/idea/testData/slicer/inflow/varParameter.results.txt +++ b/idea/testData/slicer/inflow/varParameter.results.txt @@ -1,4 +1,4 @@ -3 open class A(var n: Int) { (in A) +3 open class A(var n: Int) { (in A) 3 super(n); 2 D(int n) { 7 A a = new A(3); diff --git a/idea/testData/slicer/inflow/whenExpression.leafGroups.txt b/idea/testData/slicer/inflow/whenExpression.leafGroups.txt index 7371e00cda6..f797208837b 100644 --- a/idea/testData/slicer/inflow/whenExpression.leafGroups.txt +++ b/idea/testData/slicer/inflow/whenExpression.leafGroups.txt @@ -1,15 +1,15 @@ 3 fun test(m: Int, n: Int) { (in test(Int, Int)) -4 val x = when (m) { (in test(Int, Int)) +4 val x = when (m) { (in test(Int, Int)) 4 val x = when (m) { (in test(Int, Int)) 6 2 -> n (in test(Int, Int)) 3 fun test(m: Int, n: Int) { (in test(Int, Int)) 7 else -> 0 (in test(Int, Int)) -4 val x = when (m) { (in test(Int, Int)) +4 val x = when (m) { (in test(Int, Int)) 4 val x = when (m) { (in test(Int, Int)) 7 else -> 0 (in test(Int, Int)) 5 1 -> 1 (in test(Int, Int)) -4 val x = when (m) { (in test(Int, Int)) +4 val x = when (m) { (in test(Int, Int)) 4 val x = when (m) { (in test(Int, Int)) 5 1 -> 1 (in test(Int, Int)) diff --git a/idea/testData/slicer/inflow/whenExpression.nullnessGroups.txt b/idea/testData/slicer/inflow/whenExpression.nullnessGroups.txt index 1f8e75108f2..8295ff5fb0e 100644 --- a/idea/testData/slicer/inflow/whenExpression.nullnessGroups.txt +++ b/idea/testData/slicer/inflow/whenExpression.nullnessGroups.txt @@ -1,3 +1,3 @@ [NotNull Values] -4 val x = when (m) { (in test(Int, Int)) -4 val x = when (m) { (in test(Int, Int)) +4 val x = when (m) { (in test(Int, Int)) +4 val x = when (m) { (in test(Int, Int)) diff --git a/idea/testData/slicer/inflow/whenExpression.results.txt b/idea/testData/slicer/inflow/whenExpression.results.txt index 3a6bd5df800..1ce8a3a3892 100644 --- a/idea/testData/slicer/inflow/whenExpression.results.txt +++ b/idea/testData/slicer/inflow/whenExpression.results.txt @@ -1,4 +1,4 @@ -4 val x = when (m) { (in test(Int, Int)) +4 val x = when (m) { (in test(Int, Int)) 4 val x = when (m) { (in test(Int, Int)) 5 1 -> 1 (in test(Int, Int)) 6 2 -> n (in test(Int, Int)) diff --git a/idea/testData/slicer/mpp/expectExtensionFunctionResultOut/results.txt b/idea/testData/slicer/mpp/expectExtensionFunctionResultOut/results.txt index 577a42e3e5d..411cf37fc24 100644 --- a/idea/testData/slicer/mpp/expectExtensionFunctionResultOut/results.txt +++ b/idea/testData/slicer/mpp/expectExtensionFunctionResultOut/results.txt @@ -2,7 +2,7 @@ 3 expect fun Any.foo(): Any (in foo() on Any) 1 actual fun Any.foo(): Any { (in foo() on Any) 2 return this (in foo() on Any) -1 actual fun Any.foo(): Any { +1 actual fun Any.foo(): Any { 6 val result = 1.foo() (in bar()) -6 val result = 1.foo() (in bar()) +6 val result = 1.foo() (in bar()) 7 println(result) (in bar()) diff --git a/idea/testData/slicer/mpp/expectFunctionResultIn/results.txt b/idea/testData/slicer/mpp/expectFunctionResultIn/results.txt index 46695e8e9be..ea135037a2e 100644 --- a/idea/testData/slicer/mpp/expectFunctionResultIn/results.txt +++ b/idea/testData/slicer/mpp/expectFunctionResultIn/results.txt @@ -1,8 +1,8 @@ 7 println(result) (in bar()) -6 val result = foo(1) (in bar()) +6 val result = foo(1) (in bar()) 6 val result = foo(1) (in bar()) -1 actual fun foo(p: Any): Any { +1 actual fun foo(p: Any): Any { 2 return p (in foo(Any)) 1 actual fun foo(p: Any): Any { (in foo(Any)) 6 val result = foo(1) (in bar()) -3 expect fun foo(p: Any): Any +3 expect fun foo(p: Any): Any diff --git a/idea/testData/slicer/mpp/expectFunctionResultOut/results.txt b/idea/testData/slicer/mpp/expectFunctionResultOut/results.txt index c5cfbdac96f..cd7bb29e3d8 100644 --- a/idea/testData/slicer/mpp/expectFunctionResultOut/results.txt +++ b/idea/testData/slicer/mpp/expectFunctionResultOut/results.txt @@ -2,7 +2,7 @@ 3 expect fun foo(p: Any): Any (in foo(Any)) 1 actual fun foo(p: Any): Any { (in foo(Any)) 2 return p (in foo(Any)) -1 actual fun foo(p: Any): Any { +1 actual fun foo(p: Any): Any { 6 val result = foo(1) (in bar()) -6 val result = foo(1) (in bar()) +6 val result = foo(1) (in bar()) 7 println(result) (in bar()) diff --git a/idea/testData/slicer/mpp/expectPropertyResultIn/results.txt b/idea/testData/slicer/mpp/expectPropertyResultIn/results.txt index a2a6730cefb..f387ad83cb7 100644 --- a/idea/testData/slicer/mpp/expectPropertyResultIn/results.txt +++ b/idea/testData/slicer/mpp/expectPropertyResultIn/results.txt @@ -1,8 +1,8 @@ 7 println(result) (in bar()) -6 val result = 1.property (in bar()) +6 val result = 1.property (in bar()) 6 val result = 1.property (in bar()) -1 actual val Int.property: Any +1 actual val Int.property: Any 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 +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 7e732ff5972..0eeb3840983 100644 --- a/idea/testData/slicer/mpp/expectPropertyResultOut/results.txt +++ b/idea/testData/slicer/mpp/expectPropertyResultOut/results.txt @@ -4,5 +4,5 @@ 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()) +6 val result = 1.property (in bar()) 7 println(result) (in bar()) diff --git a/idea/testData/slicer/outflow/abstractExtensionMethodParameter.results.txt b/idea/testData/slicer/outflow/abstractExtensionMethodParameter.results.txt index 7f56268e45b..2b96b95ef13 100644 --- a/idea/testData/slicer/outflow/abstractExtensionMethodParameter.results.txt +++ b/idea/testData/slicer/outflow/abstractExtensionMethodParameter.results.txt @@ -3,6 +3,6 @@ 3 public void foo(int receiver, Object p) { 4 System.out.println(p); 9 val v = p // this usage will be shown twice due to bug in Java implementation: https://youtrack.jetbrains.com/issue/IDEA-236958 (in foo(Any) on Int) -9 val v = p // this usage will be shown twice due to bug in Java implementation: https://youtrack.jetbrains.com/issue/IDEA-236958 (in foo(Any) on Int) +9 val v = p // this usage will be shown twice due to bug in Java implementation: https://youtrack.jetbrains.com/issue/IDEA-236958 (in foo(Any) on Int) 8 override fun Int.foo(p: Any) { (in foo(Any) on Int) 9 DUPLICATE: val v = p // this usage will be shown twice due to bug in Java implementation: https://youtrack.jetbrains.com/issue/IDEA-236958 (in foo(Any) on Int) diff --git a/idea/testData/slicer/outflow/abstractMethodParameter1.results.txt b/idea/testData/slicer/outflow/abstractMethodParameter1.results.txt index bb63ed5d0fd..cc7c6e1a090 100644 --- a/idea/testData/slicer/outflow/abstractMethodParameter1.results.txt +++ b/idea/testData/slicer/outflow/abstractMethodParameter1.results.txt @@ -1,4 +1,4 @@ 4 fun foo(p: Any) (in I.foo(Any)) 8 override fun foo(p: Any) { (in C.foo(Any)) 9 val v = p (in C.foo(Any)) -9 val v = p (in C.foo(Any)) +9 val v = p (in C.foo(Any)) diff --git a/idea/testData/slicer/outflow/abstractMethodParameter2.results.txt b/idea/testData/slicer/outflow/abstractMethodParameter2.results.txt index deb6fdfad51..a4b9958c4d6 100644 --- a/idea/testData/slicer/outflow/abstractMethodParameter2.results.txt +++ b/idea/testData/slicer/outflow/abstractMethodParameter2.results.txt @@ -3,6 +3,6 @@ 2 public void foo(Object p) { 3 System.out.println(p); 9 val v = p // this usage will be shown twice due to bug in Java implementation: https://youtrack.jetbrains.com/issue/IDEA-236958 (in C.foo(Any)) -9 val v = p // this usage will be shown twice due to bug in Java implementation: https://youtrack.jetbrains.com/issue/IDEA-236958 (in C.foo(Any)) +9 val v = p // this usage will be shown twice due to bug in Java implementation: https://youtrack.jetbrains.com/issue/IDEA-236958 (in C.foo(Any)) 8 override fun foo(p: Any) { (in C.foo(Any)) 9 DUPLICATE: val v = p // this usage will be shown twice due to bug in Java implementation: https://youtrack.jetbrains.com/issue/IDEA-236958 (in C.foo(Any)) diff --git a/idea/testData/slicer/outflow/anonymousFunBodyExpression.results.txt b/idea/testData/slicer/outflow/anonymousFunBodyExpression.results.txt index 10a22b1033b..b96b5cf01f1 100644 --- a/idea/testData/slicer/outflow/anonymousFunBodyExpression.results.txt +++ b/idea/testData/slicer/outflow/anonymousFunBodyExpression.results.txt @@ -1,8 +1,8 @@ 8 val x = foo(fun(n: Int) = n) (in test()) -8 val x = foo(fun(n: Int) = n) (in test()) -8 [LAMBDA CALLS] val x = foo(fun(n: Int) = n) (in test()) +8 val x = foo(fun(n: Int) = n) (in test()) +8 [LAMBDA CALLS] val x = foo(fun(n: Int) = n) (in test()) 3 [LAMBDA CALLS] fun foo(f: (Int) -> Int): Int { (in foo((Int) -> Int)) 4 return f(1) (in foo((Int) -> Int)) -3 fun foo(f: (Int) -> Int): Int { +3 fun foo(f: (Int) -> Int): Int { 8 val x = foo(fun(n: Int) = n) (in test()) -8 val x = foo(fun(n: Int) = n) (in test()) +8 val x = foo(fun(n: Int) = n) (in test()) diff --git a/idea/testData/slicer/outflow/anonymousFunReturnExpression.results.txt b/idea/testData/slicer/outflow/anonymousFunReturnExpression.results.txt index 717540d26c4..f8b3eba85a0 100644 --- a/idea/testData/slicer/outflow/anonymousFunReturnExpression.results.txt +++ b/idea/testData/slicer/outflow/anonymousFunReturnExpression.results.txt @@ -1,8 +1,8 @@ 8 val x = foo(fun(n: Int): Int { return n }) (in test()) -8 val x = foo(fun(n: Int): Int { return n }) (in test()) -8 [LAMBDA CALLS] val x = foo(fun(n: Int): Int { return n }) (in test()) +8 val x = foo(fun(n: Int): Int { return n }) (in test()) +8 [LAMBDA CALLS] val x = foo(fun(n: Int): Int { return n }) (in test()) 3 [LAMBDA CALLS] fun foo(f: (Int) -> Int): Int { (in foo((Int) -> Int)) 4 return f(1) (in foo((Int) -> Int)) -3 fun foo(f: (Int) -> Int): Int { +3 fun foo(f: (Int) -> Int): Int { 8 val x = foo(fun(n: Int): Int { return n }) (in test()) -8 val x = foo(fun(n: Int): Int { return n }) (in test()) +8 val x = foo(fun(n: Int): Int { return n }) (in test()) diff --git a/idea/testData/slicer/outflow/callArgument.results.txt b/idea/testData/slicer/outflow/callArgument.results.txt index c5a95f5a7e4..e164e62dcdd 100644 --- a/idea/testData/slicer/outflow/callArgument.results.txt +++ b/idea/testData/slicer/outflow/callArgument.results.txt @@ -1,6 +1,6 @@ 7 val x = 1 (in test()) -7 val x = 1 (in test()) +7 val x = 1 (in test()) 9 foo(x) (in test()) 2 fun foo(n: Int) { (in foo(Int)) 3 val y = n (in foo(Int)) -3 val y = n (in foo(Int)) +3 val y = n (in foo(Int)) diff --git a/idea/testData/slicer/outflow/callArgumentKJK.results.txt b/idea/testData/slicer/outflow/callArgumentKJK.results.txt index fd027b922ae..6406d5b26a7 100644 --- a/idea/testData/slicer/outflow/callArgumentKJK.results.txt +++ b/idea/testData/slicer/outflow/callArgumentKJK.results.txt @@ -1,5 +1,5 @@ 8 val x = 1 (in K.test()) -8 val x = 1 (in K.test()) +8 val x = 1 (in K.test()) 9 J().foo(x) (in K.test()) 2 void foo(int n) { 3 int y = n; @@ -7,4 +7,4 @@ 4 new K().bar(y); 3 fun bar(m: Int) { (in K.bar(Int)) 4 val z = m (in K.bar(Int)) -4 val z = m (in K.bar(Int)) +4 val z = m (in K.bar(Int)) diff --git a/idea/testData/slicer/outflow/cast.results.txt b/idea/testData/slicer/outflow/cast.results.txt index d096579cb8a..7e83507c3b9 100644 --- a/idea/testData/slicer/outflow/cast.results.txt +++ b/idea/testData/slicer/outflow/cast.results.txt @@ -1,7 +1,7 @@ 3 fun test(o: Any) { (in test(Any)) 4 val x = o as String (in test(Any)) 4 val x = o as String (in test(Any)) -4 val x = o as String (in test(Any)) +4 val x = o as String (in test(Any)) 5 val y = o as? String (in test(Any)) 5 val y = o as? String (in test(Any)) -5 val y = o as? String (in test(Any)) +5 val y = o as? String (in test(Any)) diff --git a/idea/testData/slicer/outflow/defaultExplicitPrimaryConstructorCalls.results.txt b/idea/testData/slicer/outflow/defaultExplicitPrimaryConstructorCalls.results.txt index a66681fde75..8cb1b3e9d25 100644 --- a/idea/testData/slicer/outflow/defaultExplicitPrimaryConstructorCalls.results.txt +++ b/idea/testData/slicer/outflow/defaultExplicitPrimaryConstructorCalls.results.txt @@ -6,4 +6,4 @@ 11 A a = new A(); 10 constructor() : super() (in constructor C()) 14 val x = A() (in test()) -14 val x = A() (in test()) +14 val x = A() (in test()) diff --git a/idea/testData/slicer/outflow/diamondHierarchyJKLeafClassFun.results.txt b/idea/testData/slicer/outflow/diamondHierarchyJKLeafClassFun.results.txt index 4f8337235d2..b7ba710707f 100644 --- a/idea/testData/slicer/outflow/diamondHierarchyJKLeafClassFun.results.txt +++ b/idea/testData/slicer/outflow/diamondHierarchyJKLeafClassFun.results.txt @@ -1,14 +1,14 @@ 4 override fun foo() = 4 (in D.foo()) -4 override fun foo() = 4 (in D) +4 override fun foo() = 4 (in D) 2 public int foo(); 8 val x = a.foo() (in test(A, B,…)) -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,…)) +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,…)) +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,…)) +11 val u = d.foo() (in test(A, B,…)) 6 public int foo() { 8 DUPLICATE: val x = a.foo() (in test(A, B,…)) 9 DUPLICATE: val y = b.foo() (in test(A, B,…)) diff --git a/idea/testData/slicer/outflow/diamondHierarchyJKMiddleClassFun.results.txt b/idea/testData/slicer/outflow/diamondHierarchyJKMiddleClassFun.results.txt index fc2ddeb325f..cfa495feba3 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) +4 override fun foo() = 2 (in B) 2 public int foo(); 8 val x = a.foo() (in test(A, B,…)) -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,…)) +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,…)) +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,…)) +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 5bbfcb2fbcb..acd9088a667 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) +4 override fun foo() = 3 (in C) 2 public int foo(); 8 val x = a.foo() (in test(A, B,…)) -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,…)) +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,…)) +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,…)) +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 031b43f6b1e..31c27805311 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) +16 override fun foo() = 4 (in D) 20 val x = a.foo() (in test(A, B,…)) -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,…)) +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,…)) +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,…)) +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 16a902e3ff8..a37ade8ceaf 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) +8 override fun foo() = 2 (in B) 20 val x = a.foo() (in test(A, B,…)) -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,…)) +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 be5c4a1de82..daf3f265c5e 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) +12 override fun foo() = 3 (in C) 20 val x = a.foo() (in test(A, B,…)) -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,…)) +22 val z = c.foo() (in test(A, B,…)) diff --git a/idea/testData/slicer/outflow/docCommentRefs.results.txt b/idea/testData/slicer/outflow/docCommentRefs.results.txt index 7ebaba41480..f5f33f897c9 100644 --- a/idea/testData/slicer/outflow/docCommentRefs.results.txt +++ b/idea/testData/slicer/outflow/docCommentRefs.results.txt @@ -1,3 +1,3 @@ -4 fun foo(): Int = 10 (in KotlinClass) +4 fun foo(): Int = 10 (in KotlinClass) 10 val v = foo() (in KotlinClass.bar()) -10 val v = foo() (in KotlinClass.bar()) +10 val v = foo() (in KotlinClass.bar()) diff --git a/idea/testData/slicer/outflow/docCommentRefs2.results.txt b/idea/testData/slicer/outflow/docCommentRefs2.results.txt index 7c20ac93828..9c56f12b4e1 100644 --- a/idea/testData/slicer/outflow/docCommentRefs2.results.txt +++ b/idea/testData/slicer/outflow/docCommentRefs2.results.txt @@ -1,3 +1,3 @@ -3 val String.foo: Int +3 val String.foo: Int 10 val v = "".foo (in bar()) -10 val v = "".foo (in bar()) +10 val v = "".foo (in bar()) diff --git a/idea/testData/slicer/outflow/doubleLambdaResult.results.txt b/idea/testData/slicer/outflow/doubleLambdaResult.results.txt index b82afc1944c..448db2ed4a4 100644 --- a/idea/testData/slicer/outflow/doubleLambdaResult.results.txt +++ b/idea/testData/slicer/outflow/doubleLambdaResult.results.txt @@ -6,6 +6,6 @@ 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 { +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()) +8 val x = foo(1, 2) { { it } } (in test()) diff --git a/idea/testData/slicer/outflow/explicitLambdaReturnExpression.results.txt b/idea/testData/slicer/outflow/explicitLambdaReturnExpression.results.txt index dccf603618b..0c0025e9e42 100644 --- a/idea/testData/slicer/outflow/explicitLambdaReturnExpression.results.txt +++ b/idea/testData/slicer/outflow/explicitLambdaReturnExpression.results.txt @@ -3,6 +3,6 @@ 8 [LAMBDA CALLS] val x = foo { (in test()) 3 [LAMBDA CALLS] fun foo(f: (Int) -> Int): Int { (in foo((Int) -> Int)) 4 return f(1) (in foo((Int) -> Int)) -3 fun foo(f: (Int) -> Int): Int { +3 fun foo(f: (Int) -> Int): Int { 8 val x = foo { (in test()) -8 val x = foo { (in test()) +8 val x = foo { (in test()) diff --git a/idea/testData/slicer/outflow/extensionIndexingDereferences.results.txt b/idea/testData/slicer/outflow/extensionIndexingDereferences.results.txt index 6b8c670503a..ed1e407c9ba 100644 --- a/idea/testData/slicer/outflow/extensionIndexingDereferences.results.txt +++ b/idea/testData/slicer/outflow/extensionIndexingDereferences.results.txt @@ -1,22 +1,22 @@ -15 val x = A() (in test()) +15 val x = A() (in test()) 18 x[1] (in test()) 6 operator fun A.get(i: Int) = this (in get(Int) on A) 6 operator fun A.get(i: Int) = this (in get(Int) on A) -6 operator fun A.get(i: Int) = this +6 operator fun A.get(i: Int) = this 18 x[1] (in test()) 20 x[1] += y (in test()) 8 operator fun A.plusAssign(a: A) { (in plusAssign(A) on A) 9 val v = this (in plusAssign(A) on A) -9 val v = this (in plusAssign(A) on A) +9 val v = this (in plusAssign(A) on A) 21 x[1] *= y (in test()) 11 operator fun A.times(a: A) = this (in times(A) on A) 11 operator fun A.times(a: A) = this (in times(A) on A) -11 operator fun A.times(a: A) = this +11 operator fun A.times(a: A) = this 21 x[1] *= y (in test()) 22 x[1]++ (in test()) 12 operator fun A.inc() = this (in inc() on A) 12 operator fun A.inc() = this (in inc() on A) -12 operator fun A.inc() = this +12 operator fun A.inc() = this 22 x[1]++ (in test()) 12 DUPLICATE: operator fun A.inc() = this (in inc() on A) 19 x[1] = y (in test()) diff --git a/idea/testData/slicer/outflow/funBodyExpression.results.txt b/idea/testData/slicer/outflow/funBodyExpression.results.txt index 292cdac0999..f218608c514 100644 --- a/idea/testData/slicer/outflow/funBodyExpression.results.txt +++ b/idea/testData/slicer/outflow/funBodyExpression.results.txt @@ -1,4 +1,4 @@ 3 fun foo(n: Int): Int = n (in foo(Int)) -3 fun foo(n: Int): Int = n +3 fun foo(n: Int): Int = n 6 val x = foo(1) (in test()) -6 val x = foo(1) (in test()) +6 val x = foo(1) (in test()) diff --git a/idea/testData/slicer/outflow/funParameterUsages.results.txt b/idea/testData/slicer/outflow/funParameterUsages.results.txt index d0e3fe33016..888a22d72cb 100644 --- a/idea/testData/slicer/outflow/funParameterUsages.results.txt +++ b/idea/testData/slicer/outflow/funParameterUsages.results.txt @@ -1,7 +1,7 @@ 3 fun foo(n: Int) { (in foo(Int)) 4 val x = n (in foo(Int)) -4 val x = n (in foo(Int)) +4 val x = n (in foo(Int)) 7 y = n (in foo(Int)) -6 val y: Int (in foo(Int)) +6 val y: Int (in foo(Int)) 9 bar(n) (in foo(Int)) 12 fun bar(m: Int) { (in bar(Int)) diff --git a/idea/testData/slicer/outflow/funResultViaCallableRef.results.txt b/idea/testData/slicer/outflow/funResultViaCallableRef.results.txt index a99e26338a9..e6fb79852fa 100644 --- a/idea/testData/slicer/outflow/funResultViaCallableRef.results.txt +++ b/idea/testData/slicer/outflow/funResultViaCallableRef.results.txt @@ -1,8 +1,8 @@ 8 fun bar(n: Int) = n (in test()) -8 fun bar(n: Int) = n (in test()) +8 fun bar(n: Int) = n (in test()) 9 [LAMBDA CALLS] val x = foo(::bar) (in test()) 3 [LAMBDA CALLS] fun foo(f: (Int) -> Int): Int { (in foo((Int) -> Int)) 4 return f(1) (in foo((Int) -> Int)) -3 fun foo(f: (Int) -> Int): Int { +3 fun foo(f: (Int) -> Int): Int { 9 val x = foo(::bar) (in test()) -9 val x = foo(::bar) (in test()) +9 val x = foo(::bar) (in test()) diff --git a/idea/testData/slicer/outflow/funResultViaCallableRefWithAssignment.results.txt b/idea/testData/slicer/outflow/funResultViaCallableRefWithAssignment.results.txt index 6cc075c2b3b..dde22b95ccf 100644 --- a/idea/testData/slicer/outflow/funResultViaCallableRefWithAssignment.results.txt +++ b/idea/testData/slicer/outflow/funResultViaCallableRefWithAssignment.results.txt @@ -1,10 +1,10 @@ 8 fun bar(n: Int) = n (in test()) -8 fun bar(n: Int) = n (in test()) +8 fun bar(n: Int) = n (in test()) 9 [LAMBDA CALLS] val f = ::bar (in test()) -9 [LAMBDA CALLS] val f = ::bar (in test()) +9 [LAMBDA CALLS] val f = ::bar (in test()) 10 [LAMBDA CALLS] val x = foo(f) (in test()) 3 [LAMBDA CALLS] fun foo(f: (Int) -> Int): Int { (in foo((Int) -> Int)) 4 return f(1) (in foo((Int) -> Int)) -3 fun foo(f: (Int) -> Int): Int { +3 fun foo(f: (Int) -> Int): Int { 10 val x = foo(f) (in test()) -10 val x = foo(f) (in test()) +10 val x = foo(f) (in test()) diff --git a/idea/testData/slicer/outflow/funResultViaCallableRefWithDirectCall.results.txt b/idea/testData/slicer/outflow/funResultViaCallableRefWithDirectCall.results.txt index f878fe59078..8bc5bbaf68f 100644 --- a/idea/testData/slicer/outflow/funResultViaCallableRefWithDirectCall.results.txt +++ b/idea/testData/slicer/outflow/funResultViaCallableRefWithDirectCall.results.txt @@ -1,5 +1,5 @@ 4 fun bar(n: Int) = n (in test()) -4 fun bar(n: Int) = n (in test()) +4 fun bar(n: Int) = n (in test()) 5 [LAMBDA CALLS] val x = (::bar)(1) (in test()) 5 val x = (::bar)(1) (in test()) -5 val x = (::bar)(1) (in test()) +5 val x = (::bar)(1) (in test()) diff --git a/idea/testData/slicer/outflow/funReturnExpression.results.txt b/idea/testData/slicer/outflow/funReturnExpression.results.txt index 3a1f208acbc..3807c6a19e1 100644 --- a/idea/testData/slicer/outflow/funReturnExpression.results.txt +++ b/idea/testData/slicer/outflow/funReturnExpression.results.txt @@ -1,4 +1,4 @@ 4 return n (in foo(Int)) -3 fun foo(n: Int): Int { +3 fun foo(n: Int): Int { 8 val x = foo(1) (in test()) -8 val x = foo(1) (in test()) +8 val x = foo(1) (in test()) diff --git a/idea/testData/slicer/outflow/functionCalls.results.txt b/idea/testData/slicer/outflow/functionCalls.results.txt index 24cb6fa2291..695e4b78ca8 100644 --- a/idea/testData/slicer/outflow/functionCalls.results.txt +++ b/idea/testData/slicer/outflow/functionCalls.results.txt @@ -1,4 +1,4 @@ -3 fun foo(n: Int) = n + 1 +3 fun foo(n: Int) = n + 1 3 int x = FunctionCallsKt.foo(2); 6 val x = foo(1) (in test(Int)) -6 val x = foo(1) (in test(Int)) +6 val x = foo(1) (in test(Int)) diff --git a/idea/testData/slicer/outflow/getFunCalls.results.txt b/idea/testData/slicer/outflow/getFunCalls.results.txt index dcbb9c21855..5c680354c83 100644 --- a/idea/testData/slicer/outflow/getFunCalls.results.txt +++ b/idea/testData/slicer/outflow/getFunCalls.results.txt @@ -1,3 +1,3 @@ -4 operator fun get(n: Int) = this (in A) +4 operator fun get(n: Int) = this (in A) 8 val x = A()[2] (in test()) -8 val x = A()[2] (in test()) +8 val x = A()[2] (in test()) diff --git a/idea/testData/slicer/outflow/getterExpressionBody.results.txt b/idea/testData/slicer/outflow/getterExpressionBody.results.txt index 7296faa1197..4b39745dfaa 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.get) 4 get() = 0 (in foo) 7 val x = foo (in test()) -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 df0e421dfd6..4847ad6ceb8 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.get) 4 get(): Int { (in foo) 9 val x = foo (in test()) -9 val x = foo (in test()) +9 val x = foo (in test()) diff --git a/idea/testData/slicer/outflow/ifExpression.results.txt b/idea/testData/slicer/outflow/ifExpression.results.txt index 64252490a52..4f1027a9fa9 100644 --- a/idea/testData/slicer/outflow/ifExpression.results.txt +++ b/idea/testData/slicer/outflow/ifExpression.results.txt @@ -1,3 +1,3 @@ 3 fun test(m: Int, n: Int) { (in test(Int, Int)) 4 val x = if (m > 1) n else 1 (in test(Int, Int)) -4 val x = if (m > 1) n else 1 (in test(Int, Int)) +4 val x = if (m > 1) n else 1 (in test(Int, Int)) diff --git a/idea/testData/slicer/outflow/implicitReceiver.results.txt b/idea/testData/slicer/outflow/implicitReceiver.results.txt index f5966a3f9f0..46e08a21be9 100644 --- a/idea/testData/slicer/outflow/implicitReceiver.results.txt +++ b/idea/testData/slicer/outflow/implicitReceiver.results.txt @@ -2,6 +2,6 @@ 9 fun String.foo() { (in outer() on Int) 5 fun String.stringExtensionFun() = this (in outer() on Int) 5 fun String.stringExtensionFun() = this (in outer() on Int) -5 fun String.stringExtensionFun() = this (in outer() on Int) +5 fun String.stringExtensionFun() = this (in outer() on Int) 10 val string = stringExtensionFun() (in outer() on Int) -10 val string = stringExtensionFun() (in outer() on Int) +10 val string = stringExtensionFun() (in outer() on Int) diff --git a/idea/testData/slicer/outflow/indexingDereferences.results.txt b/idea/testData/slicer/outflow/indexingDereferences.results.txt index 1cfab0b90d5..b021a039d3d 100644 --- a/idea/testData/slicer/outflow/indexingDereferences.results.txt +++ b/idea/testData/slicer/outflow/indexingDereferences.results.txt @@ -1,4 +1,4 @@ -15 val x = A() (in test()) +15 val x = A() (in test()) 18 DEREFERENCE: x[1] (in test()) 19 DEREFERENCE: x[1] = y (in test()) 20 DEREFERENCE: x[1] += y (in test()) diff --git a/idea/testData/slicer/outflow/invokeExtensionLambda.results.txt b/idea/testData/slicer/outflow/invokeExtensionLambda.results.txt index f5e70476d7b..39204fb3e0e 100644 --- a/idea/testData/slicer/outflow/invokeExtensionLambda.results.txt +++ b/idea/testData/slicer/outflow/invokeExtensionLambda.results.txt @@ -11,9 +11,9 @@ 11 [LAMBDA CALLS] fun f(receiver: String, lambda: String.() -> String): String { (in f(String, String.() -> String)) 12 [LAMBDA CALLS] return lambda.invoke(receiver) (in f(String, String.() -> String)) 12 return lambda.invoke(receiver) (in f(String, String.() -> String)) -11 fun f(receiver: String, lambda: String.() -> String): String { +11 fun f(receiver: String, lambda: String.() -> String): String { 4 val v1 = f(p, { this }) (in foo(String) on String) -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,…)) 16 return lambda.invoke(a, b, c) (in g(String, String,…)) @@ -27,9 +27,9 @@ 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 { +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) +6 val v2 = g("a", "b", p, { p1, p2 -> p2 }) (in foo(String) on String) 8 val v3 = inlineF(p, { this }) (in foo(String) on String) 19 (INLINE CALL inlineF) inline fun inlineF(receiver: String, lambda: String.() -> String): String { (in inlineF(String, String.() -> String)) 20 (INLINE CALL inlineF) return lambda.invoke(receiver) (in inlineF(String, String.() -> String)) @@ -43,4 +43,4 @@ 20 (INLINE CALL inlineF) [LAMBDA CALLS] return lambda.invoke(receiver) (in inlineF(String, String.() -> String)) 20 (INLINE CALL inlineF) return lambda.invoke(receiver) (in inlineF(String, String.() -> String)) 8 val v3 = inlineF(p, { this }) (in foo(String) on String) -8 val v3 = inlineF(p, { this }) (in foo(String) on String) +8 val v3 = inlineF(p, { this }) (in foo(String) on String) diff --git a/idea/testData/slicer/outflow/invokeExtensionLambda2.results.txt b/idea/testData/slicer/outflow/invokeExtensionLambda2.results.txt index fe4a08cfbd4..b4523a127db 100644 --- a/idea/testData/slicer/outflow/invokeExtensionLambda2.results.txt +++ b/idea/testData/slicer/outflow/invokeExtensionLambda2.results.txt @@ -17,4 +17,4 @@ 8 (INLINE CALL bar) [LAMBDA CALLS] return lambda()(x) (in bar(String, () -> String.() -> String)) 8 (INLINE CALL bar) return lambda()(x) (in bar(String, () -> String.() -> String)) 4 val v1 = bar(p) { { this } } (in foo(String) on String) -4 val v1 = bar(p) { { this } } (in foo(String) on String) +4 val v1 = bar(p) { { this } } (in foo(String) on String) diff --git a/idea/testData/slicer/outflow/invokeExtensionLambda3.results.txt b/idea/testData/slicer/outflow/invokeExtensionLambda3.results.txt index 64678981968..02c21b7eda0 100644 --- a/idea/testData/slicer/outflow/invokeExtensionLambda3.results.txt +++ b/idea/testData/slicer/outflow/invokeExtensionLambda3.results.txt @@ -2,7 +2,7 @@ 4 val v = bar(p) { this } (in foo(String) on String) 7 fun bar(receiver: T, block: T.() -> R): R { (in bar(T, T.() -> R)) 9 return receiver.b() (in bar(T, T.() -> R)) -8 [LAMBDA RECEIVER] val b = block (in bar(T, T.() -> R)) +8 [LAMBDA RECEIVER] val b = block (in bar(T, T.() -> R)) 8 [LAMBDA RECEIVER] val b = block (in bar(T, T.() -> R)) 7 [LAMBDA RECEIVER] fun bar(receiver: T, block: T.() -> R): R { (in bar(T, T.() -> R)) 4 [LAMBDA RECEIVER] val v = bar(p) { this } (in foo(String) on String) @@ -11,8 +11,8 @@ 4 [LAMBDA CALLS] val v = bar(p) { this } (in foo(String) on String) 7 [LAMBDA CALLS] fun bar(receiver: T, block: T.() -> R): R { (in bar(T, T.() -> R)) 8 [LAMBDA CALLS] val b = block (in bar(T, T.() -> R)) -8 [LAMBDA CALLS] val b = block (in bar(T, T.() -> R)) +8 [LAMBDA CALLS] val b = block (in bar(T, T.() -> R)) 9 return receiver.b() (in bar(T, T.() -> R)) -7 fun bar(receiver: T, block: T.() -> R): R { +7 fun bar(receiver: T, block: T.() -> R): R { 4 val v = bar(p) { this } (in foo(String) on String) -4 val v = bar(p) { this } (in foo(String) on String) +4 val v = bar(p) { this } (in foo(String) on String) diff --git a/idea/testData/slicer/outflow/invokeLambdaSecondParam.results.txt b/idea/testData/slicer/outflow/invokeLambdaSecondParam.results.txt index f5021ddb90e..597f3005658 100644 --- a/idea/testData/slicer/outflow/invokeLambdaSecondParam.results.txt +++ b/idea/testData/slicer/outflow/invokeLambdaSecondParam.results.txt @@ -10,6 +10,6 @@ 4 [LAMBDA CALLS] val v = f({ p1, p2 -> p2 }, p) (in foo(String) on String) 7 [LAMBDA CALLS] fun f(lambda: (String, String) -> String, receiver: String): String { (in f((String, String) -> String, String)) 8 return lambda("a", receiver) (in f((String, String) -> String, String)) -7 fun f(lambda: (String, String) -> String, receiver: String): String { +7 fun f(lambda: (String, String) -> String, receiver: String): String { 4 val v = f({ p1, p2 -> p2 }, p) (in foo(String) on String) -4 val v = f({ p1, p2 -> p2 }, p) (in foo(String) on String) +4 val v = f({ p1, p2 -> p2 }, p) (in foo(String) on String) diff --git a/idea/testData/slicer/outflow/jvmFieldMemberPropertyJavaUsages.results.txt b/idea/testData/slicer/outflow/jvmFieldMemberPropertyJavaUsages.results.txt index 956a2346e27..b8ac2dabda2 100644 --- a/idea/testData/slicer/outflow/jvmFieldMemberPropertyJavaUsages.results.txt +++ b/idea/testData/slicer/outflow/jvmFieldMemberPropertyJavaUsages.results.txt @@ -1,3 +1,3 @@ -5 @JvmField val x = 1 (in A) +5 @JvmField val x = 1 (in A) 3 int x = new A().x; 3 int x = new A().x; diff --git a/idea/testData/slicer/outflow/lambdaResult.results.txt b/idea/testData/slicer/outflow/lambdaResult.results.txt index 8d23e9149a1..29fdb267a86 100644 --- a/idea/testData/slicer/outflow/lambdaResult.results.txt +++ b/idea/testData/slicer/outflow/lambdaResult.results.txt @@ -3,6 +3,6 @@ 8 [LAMBDA CALLS] val x = foo { it } (in test()) 3 [LAMBDA CALLS] fun foo(f: (Int) -> Int): Int { (in foo((Int) -> Int)) 4 return f(1) (in foo((Int) -> Int)) -3 fun foo(f: (Int) -> Int): Int { +3 fun foo(f: (Int) -> Int): Int { 8 val x = foo { it } (in test()) -8 val x = foo { it } (in test()) +8 val x = foo { it } (in test()) diff --git a/idea/testData/slicer/outflow/lambdaResultWithAssignments.results.txt b/idea/testData/slicer/outflow/lambdaResultWithAssignments.results.txt index 6b81b2b3bbb..6495677c832 100644 --- a/idea/testData/slicer/outflow/lambdaResultWithAssignments.results.txt +++ b/idea/testData/slicer/outflow/lambdaResultWithAssignments.results.txt @@ -3,8 +3,8 @@ 9 [LAMBDA CALLS] val y = foo { it } (in test()) 3 [LAMBDA CALLS] fun foo(f: (Int) -> Int): Int { (in foo((Int) -> Int)) 4 [LAMBDA CALLS] val x = f (in foo((Int) -> Int)) -4 [LAMBDA CALLS] val x = f (in foo((Int) -> Int)) +4 [LAMBDA CALLS] val x = f (in foo((Int) -> Int)) 5 return x(1) (in foo((Int) -> Int)) -3 fun foo(f: (Int) -> Int): Int { +3 fun foo(f: (Int) -> Int): Int { 9 val y = foo { it } (in test()) -9 val y = foo { it } (in test()) +9 val y = foo { it } (in test()) diff --git a/idea/testData/slicer/outflow/lambdaResultWithDirectCall.results.txt b/idea/testData/slicer/outflow/lambdaResultWithDirectCall.results.txt index 9c76d2c228e..fcb8db0e2ac 100644 --- a/idea/testData/slicer/outflow/lambdaResultWithDirectCall.results.txt +++ b/idea/testData/slicer/outflow/lambdaResultWithDirectCall.results.txt @@ -2,4 +2,4 @@ 4 val x = { 1 }() (in test()) 4 [LAMBDA CALLS] val x = { 1 }() (in test()) 4 val x = { 1 }() (in test()) -4 val x = { 1 }() (in test()) +4 val x = { 1 }() (in test()) diff --git a/idea/testData/slicer/outflow/lambdaResultWithDirectCallViaAssignment.results.txt b/idea/testData/slicer/outflow/lambdaResultWithDirectCallViaAssignment.results.txt index 082932e1a15..92c705992d3 100644 --- a/idea/testData/slicer/outflow/lambdaResultWithDirectCallViaAssignment.results.txt +++ b/idea/testData/slicer/outflow/lambdaResultWithDirectCallViaAssignment.results.txt @@ -1,6 +1,6 @@ 4 val f = { 1 } (in test()) 4 val f = { 1 } (in test()) 4 [LAMBDA CALLS] val f = { 1 } (in test()) -4 [LAMBDA CALLS] val f = { 1 } (in test()) +4 [LAMBDA CALLS] val f = { 1 } (in test()) 5 val x = f() (in test()) -5 val x = f() (in test()) +5 val x = f() (in test()) diff --git a/idea/testData/slicer/outflow/lambdaResultWithInvokeCall.results.txt b/idea/testData/slicer/outflow/lambdaResultWithInvokeCall.results.txt index 7ce0b34c3dc..bfa807c9aab 100644 --- a/idea/testData/slicer/outflow/lambdaResultWithInvokeCall.results.txt +++ b/idea/testData/slicer/outflow/lambdaResultWithInvokeCall.results.txt @@ -4,6 +4,6 @@ 7 [LAMBDA CALLS] fun foo(callback: () -> Int): Int { (in foo(() -> Int)) 8 [LAMBDA CALLS] return callback.invoke() (in foo(() -> Int)) 8 return callback.invoke() (in foo(() -> Int)) -7 fun foo(callback: () -> Int): Int { +7 fun foo(callback: () -> Int): Int { 4 val x = foo { 1 } (in test()) -4 val x = foo { 1 } (in test()) +4 val x = foo { 1 } (in test()) diff --git a/idea/testData/slicer/outflow/letResult.results.txt b/idea/testData/slicer/outflow/letResult.results.txt index b6dd152b6fd..44557d5e530 100644 --- a/idea/testData/slicer/outflow/letResult.results.txt +++ b/idea/testData/slicer/outflow/letResult.results.txt @@ -8,14 +8,14 @@ LIB (INLINE CALL let) [LAMBDA PARAMETER #0] public inline fun T.let(< 5 val v1 = p.let { value -> bar(value) } (in foo(String)) 17 fun bar(s: String) = s (in bar(String)) 17 fun bar(s: String) = s (in bar(String)) -17 fun bar(s: String) = s +17 fun bar(s: String) = s 5 val v1 = p.let { value -> bar(value) } (in foo(String)) 5 val v1 = p.let { value -> bar(value) } (in foo(String)) 5 [LAMBDA CALLS] val v1 = p.let { value -> bar(value) } (in foo(String)) LIB (INLINE CALL let) [LAMBDA CALLS] public inline fun T.let(block: (T) -> R): R { (in let((T) -> R) on T) LIB (INLINE CALL let) return block(this) (in let((T) -> R) on T) 5 val v1 = p.let { value -> bar(value) } (in foo(String)) -5 val v1 = p.let { value -> bar(value) } (in foo(String)) +5 val v1 = p.let { value -> bar(value) } (in foo(String)) 7 val v2 = p.let { it } (in foo(String)) LIB (INLINE CALL let) public inline fun T.let(block: (T) -> R): R { (in let((T) -> R) on T) LIB (INLINE CALL let) return block(this) (in let((T) -> R) on T) @@ -27,7 +27,7 @@ LIB (INLINE CALL let) [LAMBDA PARAMETER #0] public inline fun T.let(< LIB (INLINE CALL let) [LAMBDA CALLS] public inline fun T.let(block: (T) -> R): R { (in let((T) -> R) on T) LIB (INLINE CALL let) return block(this) (in let((T) -> R) on T) 7 val v2 = p.let { it } (in foo(String)) -7 val v2 = p.let { it } (in foo(String)) +7 val v2 = p.let { it } (in foo(String)) 9 val v3 = p.let { (in foo(String)) LIB (INLINE CALL let) public inline fun T.let(block: (T) -> R): R { (in let((T) -> R) on T) LIB (INLINE CALL let) return block(this) (in let((T) -> R) on T) @@ -40,9 +40,9 @@ LIB (INLINE CALL let) [LAMBDA PARAMETER #0] public inline fun T.let(< 14 [LAMBDA PARAMETER #0] val v4 = p.let(::zoo) (in foo(String)) 18 fun zoo(s: String) = s (in zoo(String)) 18 fun zoo(s: String) = s (in zoo(String)) -18 fun zoo(s: String) = s +18 fun zoo(s: String) = s 14 [LAMBDA CALLS] val v4 = p.let(::zoo) (in foo(String)) LIB (INLINE CALL let) [LAMBDA CALLS] public inline fun T.let(block: (T) -> R): R { (in let((T) -> R) on T) LIB (INLINE CALL let) return block(this) (in let((T) -> R) on T) 14 val v4 = p.let(::zoo) (in foo(String)) -14 val v4 = p.let(::zoo) (in foo(String)) +14 val v4 = p.let(::zoo) (in foo(String)) diff --git a/idea/testData/slicer/outflow/localVariableUsages.results.txt b/idea/testData/slicer/outflow/localVariableUsages.results.txt index 6232eee6bed..6d20fc85e6c 100644 --- a/idea/testData/slicer/outflow/localVariableUsages.results.txt +++ b/idea/testData/slicer/outflow/localVariableUsages.results.txt @@ -1,7 +1,7 @@ -6 val x = 1 (in test()) +6 val x = 1 (in test()) 8 val y = x (in test()) -8 val y = x (in test()) +8 val y = x (in test()) 11 z = x (in test()) -10 val z: Int (in test()) +10 val z: Int (in test()) 13 foo(x) (in test()) 2 fun foo(n: Int) { (in foo(Int)) diff --git a/idea/testData/slicer/outflow/memberPropertyUsages.results.txt b/idea/testData/slicer/outflow/memberPropertyUsages.results.txt index 7a006908cd4..9ecba3a99eb 100644 --- a/idea/testData/slicer/outflow/memberPropertyUsages.results.txt +++ b/idea/testData/slicer/outflow/memberPropertyUsages.results.txt @@ -1,8 +1,8 @@ -4 val x = 1 (in A) +4 val x = 1 (in A) 3 int x = new A().getX(); 6 val y = x (in A.y) -6 val y = x (in A) +6 val y = x (in A) 11 z = x (in A) -8 val z: Int (in A) +8 val z: Int (in A) 13 bar(x) (in A) 16 fun bar(m: Int) { (in A.bar(Int)) diff --git a/idea/testData/slicer/outflow/nonInlineLetResult.results.txt b/idea/testData/slicer/outflow/nonInlineLetResult.results.txt index a7239ad1c3d..3641ecf0b13 100644 --- a/idea/testData/slicer/outflow/nonInlineLetResult.results.txt +++ b/idea/testData/slicer/outflow/nonInlineLetResult.results.txt @@ -8,19 +8,19 @@ 4 val v1 = p.let { value -> bar(value) } (in foo(String)) 14 fun bar(s: String) = s (in bar(String)) 14 fun bar(s: String) = s (in bar(String)) -14 fun bar(s: String) = s +14 fun bar(s: String) = s 4 val v1 = p.let { value -> bar(value) } (in foo(String)) 4 val v1 = p.let { value -> bar(value) } (in foo(String)) 4 [LAMBDA CALLS] val v1 = p.let { value -> bar(value) } (in foo(String)) 16 [LAMBDA CALLS] fun T.let(block: (T) -> R): R { (in let((T) -> R) on T) 17 return block(this) (in let((T) -> R) on T) -16 fun T.let(block: (T) -> R): R { +16 fun T.let(block: (T) -> R): R { 4 val v1 = p.let { value -> bar(value) } (in foo(String)) -4 val v1 = p.let { value -> bar(value) } (in foo(String)) +4 val v1 = p.let { value -> bar(value) } (in foo(String)) 6 val v2 = p.let { it } (in foo(String)) -6 val v2 = p.let { it } (in foo(String)) +6 val v2 = p.let { it } (in foo(String)) 8 val v3 = p.let { (in foo(String)) -8 val v3 = p.let { (in foo(String)) +8 val v3 = p.let { (in foo(String)) 6 [LAMBDA PARAMETER #0] val v2 = p.let { it } (in foo(String)) 6 val v2 = p.let { it } (in foo(String)) 6 val v2 = p.let { it } (in foo(String)) diff --git a/idea/testData/slicer/outflow/nonLocalReturn.results.txt b/idea/testData/slicer/outflow/nonLocalReturn.results.txt index 252767e461a..43fc3e9b8eb 100644 --- a/idea/testData/slicer/outflow/nonLocalReturn.results.txt +++ b/idea/testData/slicer/outflow/nonLocalReturn.results.txt @@ -1,4 +1,4 @@ 5 fun bar(a: Int): Int = foo(a) { if (it > 0) it else return 0 } (in bar(Int)) -5 fun bar(a: Int): Int = foo(a) { if (it > 0) it else return 0 } +5 fun bar(a: Int): Int = foo(a) { if (it > 0) it else return 0 } 8 val x = bar(1) (in test()) -8 val x = bar(1) (in test()) +8 val x = bar(1) (in test()) diff --git a/idea/testData/slicer/outflow/notNullAssertion.results.txt b/idea/testData/slicer/outflow/notNullAssertion.results.txt index 76044ef856f..46ee13d4c02 100644 --- a/idea/testData/slicer/outflow/notNullAssertion.results.txt +++ b/idea/testData/slicer/outflow/notNullAssertion.results.txt @@ -1,4 +1,4 @@ 3 fun test(s: String?) { (in test(String?)) 4 val x = s!! (in test(String?)) 4 val x = s!! (in test(String?)) -4 val x = s!! (in test(String?)) +4 val x = s!! (in test(String?)) diff --git a/idea/testData/slicer/outflow/nullableLambda.results.txt b/idea/testData/slicer/outflow/nullableLambda.results.txt index 2993d8ddfc6..b683ae7d1f8 100644 --- a/idea/testData/slicer/outflow/nullableLambda.results.txt +++ b/idea/testData/slicer/outflow/nullableLambda.results.txt @@ -13,6 +13,6 @@ 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 { +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) +4 val v = bar(p, true, { this }) (in foo(String) on String) diff --git a/idea/testData/slicer/outflow/openMethodParameter.results.txt b/idea/testData/slicer/outflow/openMethodParameter.results.txt index 6daf06c264a..c4cc229089d 100644 --- a/idea/testData/slicer/outflow/openMethodParameter.results.txt +++ b/idea/testData/slicer/outflow/openMethodParameter.results.txt @@ -1,5 +1,5 @@ 4 open fun foo(p: String) { (in C.foo(String)) 5 val v = p (in C.foo(String)) -5 val v = p (in C.foo(String)) +5 val v = p (in C.foo(String)) 10 override fun foo(p: String) { (in D.foo(String)) 11 val v = p + 1 (in D.foo(String)) diff --git a/idea/testData/slicer/outflow/operatorCallDereferences.results.txt b/idea/testData/slicer/outflow/operatorCallDereferences.results.txt index f677345ce5f..cbef32178c5 100644 --- a/idea/testData/slicer/outflow/operatorCallDereferences.results.txt +++ b/idea/testData/slicer/outflow/operatorCallDereferences.results.txt @@ -1,4 +1,4 @@ -21 var x = A() (in test()) +21 var x = A() (in test()) 23 DEREFERENCE: +x (in test()) 24 DEREFERENCE: x + 1 (in test()) 25 DEREFERENCE: x++ (in test()) @@ -7,16 +7,16 @@ 29 -x (in test()) 14 operator fun A.unaryMinus() = this (in unaryMinus() on A) 14 operator fun A.unaryMinus() = this (in unaryMinus() on A) -14 operator fun A.unaryMinus() = this +14 operator fun A.unaryMinus() = this 29 -x (in test()) 30 x - 1 (in test()) 13 operator fun A.minus(n: Int) = this (in minus(Int) on A) 13 operator fun A.minus(n: Int) = this (in minus(Int) on A) -13 operator fun A.minus(n: Int) = this +13 operator fun A.minus(n: Int) = this 30 x - 1 (in test()) 32 x -= 1 (in test()) -21 DUPLICATE: var x = A() (in test()) +21 DUPLICATE: var x = A() (in test()) 33 x /= 1 (in test()) 16 operator fun A.divAssign(n: Int) { (in divAssign(Int) on A) 17 val v = this (in divAssign(Int) on A) -17 val v = this (in divAssign(Int) on A) +17 val v = this (in divAssign(Int) on A) diff --git a/idea/testData/slicer/outflow/operatorFunCalls.results.txt b/idea/testData/slicer/outflow/operatorFunCalls.results.txt index e4b32b0bfdd..edc96e58d32 100644 --- a/idea/testData/slicer/outflow/operatorFunCalls.results.txt +++ b/idea/testData/slicer/outflow/operatorFunCalls.results.txt @@ -1,3 +1,3 @@ -4 operator fun plus(n: Int) = this (in A) +4 operator fun plus(n: Int) = this (in A) 8 val x = A() + 2 (in test()) -8 val x = A() + 2 (in test()) +8 val x = A() + 2 (in test()) diff --git a/idea/testData/slicer/outflow/overridingFunctionResult.results.txt b/idea/testData/slicer/outflow/overridingFunctionResult.results.txt index 61ed59c613d..ccec00bfb8d 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) +8 override fun foo() = 2 (in B) 16 val x = a.foo() (in test(A, B,…)) -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,…)) +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 040a679392a..e6127dfbfd4 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) +4 override fun foo() = 2 (in B) 2 public int foo() { 8 val x = a.foo() (in test(A, B,…)) -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,…)) +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,…)) +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 0e390dc120d..b790dcc2f36 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) -10 override val foo = 3 (in C) +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,…)) +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,…)) +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,…)) +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 bb57938a9a9..cfcc1bffd9b 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.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,…)) +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,…)) +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 de2a27c3adf..1c6d8d35155 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) -8 override val foo = 2 (in B) +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,…)) +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,…)) +17 val y = b.foo (in test(A, B,…)) diff --git a/idea/testData/slicer/outflow/primaryConstructorCalls.results.txt b/idea/testData/slicer/outflow/primaryConstructorCalls.results.txt index 51ce9294572..a1f7306dc61 100644 --- a/idea/testData/slicer/outflow/primaryConstructorCalls.results.txt +++ b/idea/testData/slicer/outflow/primaryConstructorCalls.results.txt @@ -5,4 +5,4 @@ 7 A a = new A(1); 10 constructor() : super(1) (in constructor C()) 14 val x = A(1) (in test()) -14 val x = A(1) (in test()) +14 val x = A(1) (in test()) diff --git a/idea/testData/slicer/outflow/primaryConstructorParameterUsages.results.txt b/idea/testData/slicer/outflow/primaryConstructorParameterUsages.results.txt index b992739481e..e9a4a032a8d 100644 --- a/idea/testData/slicer/outflow/primaryConstructorParameterUsages.results.txt +++ b/idea/testData/slicer/outflow/primaryConstructorParameterUsages.results.txt @@ -1,7 +1,7 @@ 3 class A(n: Int) { (in A(Int)) 4 val x = n (in A.x) -4 val x = n (in A) +4 val x = n (in A) 9 y = n (in A) -6 val y: Int (in A) +6 val y: Int (in A) 11 bar(n) (in A) 14 fun bar(m: Int) { (in A.bar(Int)) diff --git a/idea/testData/slicer/outflow/secondaryConstructorCalls.results.txt b/idea/testData/slicer/outflow/secondaryConstructorCalls.results.txt index a88345ef30d..70616258ee3 100644 --- a/idea/testData/slicer/outflow/secondaryConstructorCalls.results.txt +++ b/idea/testData/slicer/outflow/secondaryConstructorCalls.results.txt @@ -5,4 +5,4 @@ 9 class B : A(1) (in B) 12 constructor() : super(1) (in constructor C()) 16 val x = A(1) (in test()) -16 val x = A(1) (in test()) +16 val x = A(1) (in test()) diff --git a/idea/testData/slicer/outflow/simpleCallDereferences.results.txt b/idea/testData/slicer/outflow/simpleCallDereferences.results.txt index 07726f5c774..0eec9504b25 100644 --- a/idea/testData/slicer/outflow/simpleCallDereferences.results.txt +++ b/idea/testData/slicer/outflow/simpleCallDereferences.results.txt @@ -1,4 +1,4 @@ -13 val x = A() (in test()) +13 val x = A() (in test()) 15 DEREFERENCE: x.foo() (in test()) 16 DEREFERENCE: x.bar (in test()) 17 x.fooExt() (in test()) @@ -6,7 +6,7 @@ 18 x.barExt (in test()) 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()) +20 val y: A? = x (in test()) 22 DEREFERENCE: y?.foo() (in test()) 23 DEREFERENCE: y?.bar (in test()) 24 y?.fooExt() (in test()) diff --git a/idea/testData/slicer/outflow/thisInExtensionFunction.results.txt b/idea/testData/slicer/outflow/thisInExtensionFunction.results.txt index df83b84937d..bcd869af3c4 100644 --- a/idea/testData/slicer/outflow/thisInExtensionFunction.results.txt +++ b/idea/testData/slicer/outflow/thisInExtensionFunction.results.txt @@ -1,6 +1,6 @@ 6 val x = "".extensionFun() (in foo()) 3 fun String.extensionFun(): Any = this (in extensionFun() on String) 3 fun String.extensionFun(): Any = this (in extensionFun() on String) -3 fun String.extensionFun(): Any = this +3 fun String.extensionFun(): Any = this 6 val x = "".extensionFun() (in foo()) -6 val x = "".extensionFun() (in foo()) +6 val x = "".extensionFun() (in foo()) diff --git a/idea/testData/slicer/outflow/thisInExtensionProperty.results.txt b/idea/testData/slicer/outflow/thisInExtensionProperty.results.txt index 8ecd01902b2..aabd6ac89f0 100644 --- a/idea/testData/slicer/outflow/thisInExtensionProperty.results.txt +++ b/idea/testData/slicer/outflow/thisInExtensionProperty.results.txt @@ -3,4 +3,4 @@ 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()) +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 d9c864949d3..2193ecee946 100644 --- a/idea/testData/slicer/outflow/topLevelPropertyUsages.results.txt +++ b/idea/testData/slicer/outflow/topLevelPropertyUsages.results.txt @@ -1,10 +1,10 @@ -4 val x = 1 +4 val x = 1 3 int x = TopLevelPropertyUsagesKt.getX(); 6 val y = x (in y) -6 val y = x +6 val y = x 9 val y = x (in test()) -9 val y = x (in test()) +9 val y = x (in test()) 14 z = x (in test()) -11 val z: Int (in test()) +11 val z: Int (in test()) 16 bar(x) (in test()) 20 fun bar(m: Int) { (in bar(Int)) diff --git a/idea/testData/slicer/outflow/usagesInTemplates.results.txt b/idea/testData/slicer/outflow/usagesInTemplates.results.txt index 70ae04971c2..2f85ae2fcb8 100644 --- a/idea/testData/slicer/outflow/usagesInTemplates.results.txt +++ b/idea/testData/slicer/outflow/usagesInTemplates.results.txt @@ -1,4 +1,4 @@ -8 val hello = "Hello" (in main(Array)) +8 val hello = "Hello" (in main(Array)) 9 val v = "hello = $hello" (in main(Array)) 10 f1(hello) (in main(Array)) 3 fun f1(param: String){ (in f1(String)) diff --git a/idea/testData/slicer/outflow/valParameter.results.txt b/idea/testData/slicer/outflow/valParameter.results.txt index 177de11434d..fba4942063f 100644 --- a/idea/testData/slicer/outflow/valParameter.results.txt +++ b/idea/testData/slicer/outflow/valParameter.results.txt @@ -1,12 +1,12 @@ -3 class A(val n: Int) { (in A) +3 class A(val n: Int) { (in A) 3 int n = new A(1).getN(); 4 val x = n (in A.x) -4 val x = n (in A) +4 val x = n (in A) 9 y = n (in A) -6 val y: Int (in A) +6 val y: Int (in A) 11 bar(n) (in A) 14 fun bar(m: Int) { (in A.bar(Int)) 15 val z = n (in A.bar(Int)) -15 val z = n (in A.bar(Int)) +15 val z = n (in A.bar(Int)) 20 val z = A(1).n (in test()) -20 val z = A(1).n (in test()) +20 val z = A(1).n (in test()) diff --git a/idea/testData/slicer/outflow/varParameter.results.txt b/idea/testData/slicer/outflow/varParameter.results.txt index af77d31cdba..96c618a398e 100644 --- a/idea/testData/slicer/outflow/varParameter.results.txt +++ b/idea/testData/slicer/outflow/varParameter.results.txt @@ -1,12 +1,12 @@ -3 class A(var n: Int) { (in A) +3 class A(var n: Int) { (in A) 3 int n = new A(1).getN(); 4 val x = n (in A.x) -4 val x = n (in A) +4 val x = n (in A) 9 y = n (in A) -6 val y: Int (in A) +6 val y: Int (in A) 11 bar(n) (in A) 14 fun bar(m: Int) { (in A.bar(Int)) 15 val z = n (in A.bar(Int)) -15 val z = n (in A.bar(Int)) +15 val z = n (in A.bar(Int)) 21 val z = A(1).n (in test()) -21 val z = A(1).n (in test()) +21 val z = A(1).n (in test()) diff --git a/idea/testData/slicer/outflow/whenExpression.results.txt b/idea/testData/slicer/outflow/whenExpression.results.txt index c970b668e87..1fbe57eb7ca 100644 --- a/idea/testData/slicer/outflow/whenExpression.results.txt +++ b/idea/testData/slicer/outflow/whenExpression.results.txt @@ -1,3 +1,3 @@ 3 fun test(m: Int, n: Int) { (in test(Int, Int)) 6 2 -> n (in test(Int, Int)) -4 val x = when (m) { (in test(Int, Int)) +4 val x = when (m) { (in test(Int, Int)) diff --git a/idea/testData/slicer/outflow/withResult.results.txt b/idea/testData/slicer/outflow/withResult.results.txt index 21941da0735..19cf1500dd2 100644 --- a/idea/testData/slicer/outflow/withResult.results.txt +++ b/idea/testData/slicer/outflow/withResult.results.txt @@ -10,7 +10,7 @@ LIB (INLINE CALL with) [LAMBDA RECEIVER] public inline fun with(recei LIB (INLINE CALL with) [LAMBDA CALLS] public inline fun with(receiver: T, block: T.() -> R): R { (in with(T, T.() -> R)) LIB (INLINE CALL with) return receiver.block() (in with(T, T.() -> R)) 5 val v1 = with(p) { this } (in foo(String) on String) -5 val v1 = with(p) { this } (in foo(String) on String) +5 val v1 = with(p) { this } (in foo(String) on String) 7 val v2 = with(p) { bar(this) } (in foo(String) on String) LIB (INLINE CALL with) public inline fun with(receiver: T, block: T.() -> R): R { (in with(T, T.() -> R)) LIB (INLINE CALL with) return receiver.block() (in with(T, T.() -> R)) @@ -19,14 +19,14 @@ LIB (INLINE CALL with) [LAMBDA RECEIVER] public inline fun with(recei 7 val v2 = with(p) { bar(this) } (in foo(String) on String) 14 fun bar(s: String) = s (in bar(String)) 14 fun bar(s: String) = s (in bar(String)) -14 fun bar(s: String) = s +14 fun bar(s: String) = s 7 val v2 = with(p) { bar(this) } (in foo(String) on String) 7 val v2 = with(p) { bar(this) } (in foo(String) on String) 7 [LAMBDA CALLS] val v2 = with(p) { bar(this) } (in foo(String) on String) LIB (INLINE CALL with) [LAMBDA CALLS] public inline fun with(receiver: T, block: T.() -> R): R { (in with(T, T.() -> R)) LIB (INLINE CALL with) return receiver.block() (in with(T, T.() -> R)) 7 val v2 = with(p) { bar(this) } (in foo(String) on String) -7 val v2 = with(p) { bar(this) } (in foo(String) on String) +7 val v2 = with(p) { bar(this) } (in foo(String) on String) 9 val v3 = with(p) { this@foo } (in foo(String) on String) LIB (INLINE CALL with) public inline fun with(receiver: T, block: T.() -> R): R { (in with(T, T.() -> R)) LIB (INLINE CALL with) return receiver.block() (in with(T, T.() -> R)) @@ -39,9 +39,9 @@ LIB (INLINE CALL with) [LAMBDA RECEIVER] public inline fun with(recei 11 [LAMBDA RECEIVER] val v4 = with(p, ::zoo) (in foo(String) on String) 15 fun zoo(s: String) = s (in zoo(String)) 15 fun zoo(s: String) = s (in zoo(String)) -15 fun zoo(s: String) = s +15 fun zoo(s: String) = s 11 [LAMBDA CALLS] val v4 = with(p, ::zoo) (in foo(String) on String) LIB (INLINE CALL with) [LAMBDA CALLS] public inline fun with(receiver: T, block: T.() -> R): R { (in with(T, T.() -> R)) LIB (INLINE CALL with) return receiver.block() (in with(T, T.() -> R)) 11 val v4 = with(p, ::zoo) (in foo(String) on String) -11 val v4 = with(p, ::zoo) (in foo(String) on String) +11 val v4 = with(p, ::zoo) (in foo(String) on String)