Merge pull request #5421 from som-snytt/issue/9936

SI-9936 SeqLike.indexWhere starts at zero

2 files changed, 20 insertions, 1 deletions

diff --git a/src/library/scala/collection/SeqLike.scala b/src/library/scala/collection/SeqLike.scala
index a26765027c..2d662257e5 100644
--- a/src/library/scala/collection/SeqLike.scala
+++ b/src/library/scala/collection/SeqLike.scala
@@ -113,7 +113,7 @@ trait SeqLike[+A, +Repr] extends Any with IterableLike[A, Repr] with GenSeqLike[
   }
 
   def indexWhere(p: A => Boolean, from: Int): Int = {
-    var i = from
+    var i = from max 0
     val it = iterator.drop(from)
     while (it.hasNext) {
       if (p(it.next())) return i
diff --git a/test/junit/scala/collection/SeqLikeTest.scala b/test/junit/scala/collection/SeqLikeTest.scala
new file mode 100644
index 0000000000..2ab682299d
--- /dev/null
+++ b/test/junit/scala/collection/SeqLikeTest.scala
@@ -0,0 +1,19 @@
+package scala.collection
+
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+import org.junit.Assert._
+import org.junit.Test
+
+@RunWith(classOf[JUnit4])
+class SeqLikeTest {
+
+  @Test def `SI-9936 indexWhere`(): Unit = {
+    assertEquals(2, "abcde".indexOf('c', -1))
+    assertEquals(2, "abcde".indexOf('c', -2))
+    assertEquals(2, "abcde".toVector.indexOf('c', -1))
+    assertEquals(2, "abcde".toVector.indexOf('c', -2))
+    assertEquals(2, "abcde".toVector.indexWhere(_ == 'c', -1))
+    assertEquals(2, "abcde".toVector.indexWhere(_ == 'c', -2))
+  }
+}