Refactoring: updated methods signatures

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
 }

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)
 }

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)
   }
 }

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 {