fixup! adds splitBy extension method on scala.collection.Iterable

Author: jeantil

src/main/scala/scala/collection/decorators/IterableDecorator.scala

@@ -35,44 +35,26 @@ class IterableDecorator[C, I <: IsIterable[C]](coll: C)(implicit val it: I) {
 
 
   /**
-    * Constructs an iterator where consecutive elements are accumulated as
+    * Constructs a collection where consecutive elements are accumulated as
     * long as the output of f for each element doesn't change.
     * <pre>
     * Vector(1,2,2,3,3,3,2,2)
     * .splitBy(identity)
     * </pre>
     * produces
     * <pre>
-    * Iterator(Vector(1),
+    * Vector(Vector(1),
     * Vector(2,2),
     * Vector(3,3,3),
     * Vector(2,2))
     * </pre>
     *
     * @param f the function to compute a key for an element
     * @tparam K the type of the computed key
-    * @return an iterator of sequences of the consecutive elements with the
-    *         same key in the original iterator
+    * @return a collection of collections of the consecutive elements with the
+    *         same key in the original collection
     */
-  def splitBy[K, That, CC](f: it.A => K)(implicit bf: BuildFrom[C, it.A, That], bff: BuildFrom[C, That, CC]): CC = {
-    val builder = bff.newBuilder(coll)
-
-    val iterator = it(coll).iterator
-    var init = bf.newBuilder(coll)
-    if (iterator.hasNext) {
-      var ref = iterator.next();
-      init += ref
-      while (iterator.hasNext) {
-        val el = iterator.next();
-        if (f(el) != f(ref)) {
-          builder += init.result()
-          init = bf.newBuilder(coll)
-          ref = el
-        }
-        init += el
-      }
-      builder += init.result()
-    }
-    builder.result();
+  def splitBy[K, CC1, CC2](f: it.A => K)(implicit bf: BuildFrom[C, it.A, CC1], bff: BuildFrom[C, CC1, CC2]): CC2 = {
+    bff.fromSpecific(coll)(it(coll).iterator.splitBy(f).map(bf.fromSpecific(coll)))
   }
 }