From 3b14ed9ae8b57947ad40743739b7c8749c37c685 Mon Sep 17 00:00:00 2001
From: "Vitaliy.Bibaev" <vitaliy.bibaev@jetbrains.com>
Date: Thu, 16 Nov 2017 10:41:02 +0300
Subject: [PATCH] Refactoring: updated methods signatures

---
 .../trace/impl/handler/collections/BothSemanticsHandler.kt  | 6 +++---
 .../trace/impl/handler/collections/CollectionHandlerBase.kt | 4 ++--
 .../handler/collections/CollectionIntermediateHandler.kt    | 4 ++--
 .../impl/handler/collections/CollectionTerminatorHandler.kt | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/impl/handler/collections/BothSemanticsHandler.kt b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/impl/handler/collections/BothSemanticsHandler.kt
index 19301d1212e..c8b1ad0e53f 100644
--- a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/impl/handler/collections/BothSemanticsHandler.kt
+++ b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/impl/handler/collections/BothSemanticsHandler.kt
@@ -17,9 +17,9 @@ interface BothSemanticsHandler {
 
   fun additionalCallsAfter(call: StreamCall, dsl: Dsl): List<IntermediateStreamCall>
 
-  fun getResultExpression(call: StreamCall, variables: List<Variable>): Expression
+  fun transformAsIntermediateCall(call: IntermediateStreamCall, variables: List<Variable>, dsl: Dsl): IntermediateStreamCall
 
-  fun transformAsIntermediateCall(call: IntermediateStreamCall, dsl: Dsl): IntermediateStreamCall
+  fun transformAsTerminalCall(call: TerminatorStreamCall, variables: List<Variable>, dsl: Dsl): TerminatorStreamCall
 
-  fun transformAsTerminalCall(call: TerminatorStreamCall, dsl: Dsl): TerminatorStreamCall
+  fun getResultExpression(call: StreamCall, dsl: Dsl, variables: List<Variable>): Expression
 }
\ No newline at end of file
diff --git a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/impl/handler/collections/CollectionHandlerBase.kt b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/impl/handler/collections/CollectionHandlerBase.kt
index 7e0527fd255..c3981503c13 100644
--- a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/impl/handler/collections/CollectionHandlerBase.kt
+++ b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/impl/handler/collections/CollectionHandlerBase.kt
@@ -10,7 +10,7 @@ import com.intellij.debugger.streams.wrapper.StreamCall
 /**
  * @author Vitaliy.Bibaev
  */
-abstract class CollectionHandlerBase(order: Int, dsl: Dsl,
+abstract class CollectionHandlerBase(order: Int, private val dsl: Dsl,
                                      private val call: StreamCall, private val internalHandler: BothSemanticsHandler)
   : TraceHandler {
   private val declarations: List<VariableDeclaration> = internalHandler.variablesDeclaration(call, order, dsl)
@@ -18,5 +18,5 @@ abstract class CollectionHandlerBase(order: Int, dsl: Dsl,
 
   override fun additionalVariablesDeclaration(): List<VariableDeclaration> = declarations
 
-  override fun getResultExpression(): Expression = internalHandler.getResultExpression(call, variables)
+  override fun getResultExpression(): Expression = internalHandler.getResultExpression(call, dsl, variables)
 }
\ No newline at end of file
diff --git a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/impl/handler/collections/CollectionIntermediateHandler.kt b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/impl/handler/collections/CollectionIntermediateHandler.kt
index e47e77359da..693327a5a49 100644
--- a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/impl/handler/collections/CollectionIntermediateHandler.kt
+++ b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/impl/handler/collections/CollectionIntermediateHandler.kt
@@ -27,10 +27,10 @@ class CollectionIntermediateHandler(
   }
 
   override fun transformCall(call: IntermediateStreamCall): IntermediateStreamCall {
-    return internalHandler.transformAsIntermediateCall(call, dsl)
+    return internalHandler.transformAsIntermediateCall(call, variables, dsl)
   }
 
   override fun getResultExpression(): Expression {
-    return internalHandler.getResultExpression(call, variables)
+    return internalHandler.getResultExpression(call, dsl, variables)
   }
 }
\ No newline at end of file
diff --git a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/impl/handler/collections/CollectionTerminatorHandler.kt b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/impl/handler/collections/CollectionTerminatorHandler.kt
index 61bba089836..69128a19cf0 100644
--- a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/impl/handler/collections/CollectionTerminatorHandler.kt
+++ b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/impl/handler/collections/CollectionTerminatorHandler.kt
@@ -34,7 +34,7 @@ class CollectionTerminatorHandler(private val call: TerminatorStreamCall,
       internalHandler.additionalCallsBefore(call, dsl)
 
   override fun transformCall(call: TerminatorStreamCall): TerminatorStreamCall {
-    return internalHandler.transformAsTerminalCall(call, dsl)
+    return internalHandler.transformAsTerminalCall(call, variables, dsl)
   }
 
   private fun createCallAfterExpression(additionalCallsAfter: List<IntermediateStreamCall>): Expression {