From eaee6697f2cebb4bdef244edd836fa83242792fe Mon Sep 17 00:00:00 2001
From: "Vitaliy.Bibaev" <vitaliy.bibaev@jetbrains.com>
Date: Thu, 21 Dec 2017 15:49:20 +0300
Subject: [PATCH] Make zipWithNext work & add test

---
 .../lib/sequence/KotlinSequencesSupport.kt    |  3 ++-
 .../exec/sequence/outs/zipWithNextMany.out    | 20 +++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/sequence/KotlinSequencesSupport.kt b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/sequence/KotlinSequencesSupport.kt
index 617769d3b7d..d1f555398ad 100644
--- a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/sequence/KotlinSequencesSupport.kt
+++ b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/sequence/KotlinSequencesSupport.kt
@@ -4,6 +4,7 @@ package com.intellij.debugger.streams.kotlin.lib.sequence
 import com.intellij.debugger.streams.lib.IntermediateOperation
 import com.intellij.debugger.streams.lib.impl.*
 import com.intellij.debugger.streams.resolve.AppendResolver
+import com.intellij.debugger.streams.resolve.PairMapResolver
 import com.intellij.debugger.streams.trace.impl.handler.unified.DistinctByKeyHandler
 import com.intellij.debugger.streams.trace.impl.handler.unified.DistinctTraceHandler
 
@@ -28,7 +29,7 @@ class KotlinSequencesSupport : LibrarySupportBase() {
     addIntermediateOperationsSupport(ConcatOperation("plus", AppendResolver()))
     addIntermediateOperationsSupport(ConcatOperation("plusElement", AppendResolver()))
 
-    addIntermediateOperationsSupport()
+    addIntermediateOperationsSupport(OrderBasedOperation("zipWithNext", PairMapResolver()))
   }
 
   private fun filterOperations(vararg names: String): Array<IntermediateOperation> =
diff --git a/idea/testData/debugger/sequence/exec/sequence/outs/zipWithNextMany.out b/idea/testData/debugger/sequence/exec/sequence/outs/zipWithNextMany.out
index 783a5d24835..813d70d2558 100644
--- a/idea/testData/debugger/sequence/exec/sequence/outs/zipWithNextMany.out
+++ b/idea/testData/debugger/sequence/exec/sequence/outs/zipWithNextMany.out
@@ -13,16 +13,16 @@ count
     after: nothing
 mappings for zipWithNext
   direct:
-    1 -> nothing
-    2 -> nothing
-    4 -> nothing
-    6 -> nothing
-    8 -> nothing
+    1 -> 3
+    2 -> 3,5
+    4 -> 5,7
+    6 -> 7,9
+    8 -> 9
   reverse:
-    nothing <- 3
-    nothing <- 5
-    nothing <- 7
-    nothing <- 9
+    1,2 <- 3
+    2,4 <- 5
+    4,6 <- 7
+    6,8 <- 9
 mappings for count
   direct:
     3 -> nothing
@@ -33,6 +33,4 @@ mappings for count
     empty
 Disconnected from the target VM
 
-WRONG
-
 Process finished with exit code 0