Parameter to receiver

JetBrains · Apr 17, 2020 · fdfae52 · fdfae52
1 parent 04d4f74
commit fdfae52
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/OutflowSlicer.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/OutflowSlicer.kt
@@ -156,17 +156,17 @@ class OutflowSlicer(
         expressionWithValue.processPseudocodeUsages { pseudoValue, instruction ->
             when (instruction) {
                 is WriteValueInstruction -> {
-                    if (!processIfReceiverValue(instruction, pseudoValue, mode)) {
+                    if (!pseudoValue.processIfReceiverValue(instruction, mode)) {
                         instruction.target.accessedDescriptor?.originalSource?.getPsi()?.passToProcessor()
                     }
                 }
 
                 is ReadValueInstruction -> {
-                    processIfReceiverValue(instruction, pseudoValue, mode)
+                    pseudoValue.processIfReceiverValue(instruction, mode)
                 }
 
                 is CallInstruction -> {
-                    if (!processIfReceiverValue(instruction, pseudoValue, mode)) {
+                    if (!pseudoValue.processIfReceiverValue(instruction, mode)) {
                         val parameterDescriptor = instruction.arguments[pseudoValue] ?: return@processPseudocodeUsages
                         val parameter = parameterDescriptor.originalSource.getPsi()
                         if (parameter != null) {

diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/Slicer.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/Slicer.kt
@@ -257,20 +257,16 @@ abstract class Slicer(
                     pseudocode.getUsages(receiverPseudoValue).forEach { receiverUseInstruction ->
                         if (receiverUseInstruction is KtElementInstruction) {
                             // TODO: make sure it processes correct receiver!!
-                            processIfReceiverValue(receiverUseInstruction, receiverPseudoValue, mode)
+                            receiverPseudoValue.processIfReceiverValue(receiverUseInstruction, mode)
                         }
                     }
                 }
             }
         }
     }
 
-    protected fun processIfReceiverValue(
-        instruction: KtElementInstruction,
-        receiverPseudoValue: PseudoValue,
-        mode: KotlinSliceAnalysisMode,
-    ): Boolean {
-        val receiverValue = (instruction as? InstructionWithReceivers)?.receiverValues?.get(receiverPseudoValue) ?: return false
+    protected fun PseudoValue.processIfReceiverValue(instruction: KtElementInstruction, mode: KotlinSliceAnalysisMode): Boolean {
+        val receiverValue = (instruction as? InstructionWithReceivers)?.receiverValues?.get(this) ?: return false
         val resolvedCall = instruction.element.resolveToCall() ?: return true
         val descriptor = resolvedCall.resultingDescriptor
 
@@ -309,7 +305,6 @@ abstract class Slicer(
             }
         }
 
-
         return true
     }