zio · adamgfraser · Jun 29, 2020 · Jun 22, 2020 · Jun 27, 2020
diff --git a/core-tests/shared/src/test/scala/zio/ChunkSpec.scala b/core-tests/shared/src/test/scala/zio/ChunkSpec.scala
@@ -102,6 +102,10 @@ object ChunkSpec extends ZIOBaseSpec {
           val expected = (as ++ bs).length
           assert(actual)(equalTo(expected))
         }
+      },
+      zio.test.test("returns most specific type") {
+        val seq = (zio.Chunk("foo"): Seq[String]) :+ "post1"
+        assert(seq)(isSubtype[Chunk[String]](equalTo(Chunk("foo", "post1"))))
       }
     ),
     suite("prepend")(
@@ -149,6 +153,10 @@ object ChunkSpec extends ZIOBaseSpec {
           val expected = (as ++ bs).length
           assert(actual)(equalTo(expected))
         }
+      },
+      zio.test.test("returns most specific type") {
+        val seq = "pre1" +: (zio.Chunk("foo"): Seq[String])
+        assert(seq)(isSubtype[Chunk[String]](equalTo(Chunk("pre1", "foo"))))
       }
     ),
     testM("apply") {

diff --git a/core/shared/src/main/scala-2.11-2.12/ChunkFactory.scala b/core/shared/src/main/scala-2.11-2.12/ChunkFactory.scala
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2017-2020 John A. De Goes and the ZIO Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package zio
+
+import scala.collection.generic.IndexedSeqFactory
+
+private[zio] trait ChunkFactory extends IndexedSeqFactory[Chunk] {
+  def newBuilder[A]: ChunkBuilder[A] =
+    ChunkBuilder.make()
+}
diff --git a/core/shared/src/main/scala-2.11-2.12/ChunkLike.scala b/core/shared/src/main/scala-2.11-2.12/ChunkLike.scala
@@ -18,7 +18,7 @@ package zio
 
 import scala.collection.GenTraversableOnce
 import scala.collection.IndexedSeqLike
-import scala.collection.generic.CanBuildFrom
+import scala.collection.generic.{ CanBuildFrom, GenericCompanion, GenericTraversableTemplate }
 import scala.collection.immutable.IndexedSeq
 import scala.reflect.ClassTag
 
@@ -36,28 +36,28 @@ import scala.reflect.ClassTag
  * extends `IndexedSeq` to provide interoperability with Scala's collection
  * library but users should avoid these methods whenever possible.
  */
-private[zio] trait ChunkLike[+A] extends IndexedSeq[A] with IndexedSeqLike[A, Chunk[A]] { self: Chunk[A] =>
+private[zio] trait ChunkLike[+A]
+    extends IndexedSeq[A]
+    with IndexedSeqLike[A, Chunk[A]]
+    with GenericTraversableTemplate[A, Chunk] { self: Chunk[A] =>
 
   override final def :+[A1 >: A, That](a1: A1)(implicit bf: CanBuildFrom[Chunk[A], A1, That]): That =
-    bf match {
-      case _: ChunkCanBuildFrom[A1] => append(a1)
-      case _                        => super.:+(a1)
-    }
+    if (isChunkCanBuildFrom[A, A1, That](bf)) append(a1).asInstanceOf[That]
+    else super.+:(a1)
 
   override final def +:[A1 >: A, That](a1: A1)(implicit bf: CanBuildFrom[Chunk[A], A1, That]): That =
-    bf match {
-      case _: ChunkCanBuildFrom[A1] => prepend(a1)
-      case _                        => super.:+(a1)
-    }
+    if (isChunkCanBuildFrom[A, A1, That](bf)) prepend(a1).asInstanceOf[That]
+    else super.:+(a1)
 
   /**
    * Returns a filtered, mapped subset of the elements of this chunk.
    */
   override final def collect[B, That](pf: PartialFunction[A, B])(implicit bf: CanBuildFrom[Chunk[A], B, That]): That =
-    bf match {
-      case _: ChunkCanBuildFrom[_] => collectChunk(pf)
-      case _                       => super.collect(pf)
-    }
+    if (isChunkCanBuildFrom[A, B, That](bf)) collectChunk(pf).asInstanceOf[That]
+    else super.collect(pf)
+
+  override def companion: GenericCompanion[Chunk] =
+    Chunk
 
   /**
    * Returns the concatenation of mapping every element into a new chunk using
@@ -66,10 +66,8 @@ private[zio] trait ChunkLike[+A] extends IndexedSeq[A] with IndexedSeqLike[A, Ch
   override final def flatMap[B, That](
     f: A => GenTraversableOnce[B]
   )(implicit bf: CanBuildFrom[Chunk[A], B, That]): That =
-    bf match {
-      case _: ChunkCanBuildFrom[_] => flatMapChunk(f)
-      case _                       => super.flatMap(f)
-    }
+    if (isChunkCanBuildFrom[A, B, That](bf)) flatMapChunk(f).asInstanceOf[That]
+    else super.flatMap(f)
 
   /**
    * Returns the first index for which the given predicate is satisfied.
@@ -81,10 +79,8 @@ private[zio] trait ChunkLike[+A] extends IndexedSeq[A] with IndexedSeqLike[A, Ch
    * Returns a chunk with the elements mapped by the specified function.
    */
   override final def map[B, That](f: A => B)(implicit bf: CanBuildFrom[Chunk[A], B, That]): That =
-    bf match {
-      case _: ChunkCanBuildFrom[_] => mapChunk(f)
-      case _                       => super.map(f)
-    }
+    if (isChunkCanBuildFrom[A, B, That](bf)) mapChunk(f).asInstanceOf[That]
+    else super.map(f)
 
   /**
    * Generates a readable string representation of this chunk using the
@@ -201,6 +197,14 @@ private[zio] trait ChunkLike[+A] extends IndexedSeq[A] with IndexedSeqLike[A, Ch
    */
   override protected[this] def newBuilder: ChunkBuilder[A] =
     ChunkBuilder.make()
+
+  /**
+   * Returns whether the specified `CanBuildFrom` is a `ChunkCanBuildFrom` or
+   * a `CanBuildFrom` of one of the supertypes of `Chunk`.
+   */
+  @inline
+  private[this] def isChunkCanBuildFrom[A, B, That](bf: CanBuildFrom[Chunk[A], B, That]): Boolean =
+    bf.isInstanceOf[ChunkCanBuildFrom[_]] || (bf eq IndexedSeq.ReusableCBF) || (bf eq collection.immutable.Seq.ReusableCBF) || (bf eq collection.Seq.ReusableCBF)
 }
 
 object ChunkLike {

diff --git a/core/shared/src/main/scala-2.13+/ChunkFactory.scala b/core/shared/src/main/scala-2.13+/ChunkFactory.scala
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2017-2020 John A. De Goes and the ZIO Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package zio
+
+private[zio] trait ChunkFactory {
+  def apply[A](as: A*): Chunk[A]
+  def fill[A](n: Int)(elem: => A): Chunk[A]
+}
diff --git a/core/shared/src/main/scala/zio/Chunk.scala b/core/shared/src/main/scala/zio/Chunk.scala
@@ -1067,7 +1067,7 @@ sealed trait Chunk[+A] extends ChunkLike[A] { self =>
     }
 }
 
-object Chunk {
+object Chunk extends ChunkFactory {
 
   /**
    * Returns the empty chunk.
@@ -1078,7 +1078,7 @@ object Chunk {
   /**
    * Returns a chunk from a number of values.
    */
-  def apply[A](as: A*): Chunk[A] =
+  override def apply[A](as: A*): Chunk[A] =
     fromIterable(as)
 
   /**
@@ -1192,7 +1192,7 @@ object Chunk {
         fromArray(it.toArray)
     }
 
-  def fill[A](n: Int)(elem: => A): Chunk[A] =
+  override def fill[A](n: Int)(elem: => A): Chunk[A] =
     if (n <= 0) Chunk.empty
     else {
       val builder = ChunkBuilder.make[A]()