Use collection prefix from toString for ColCompatHelper's className implementation of Scala 2.13.0-M5.

Author: cheeseng

project/GenColCompatHelper.scala

@@ -55,7 +55,14 @@ object GenColCompatHelper {
           |
           |  object Factory {}
           |
-          |  def className(col: scala.collection.Iterable[_]): String = org.scalactic.NameUtil.getSimpleNameOfAnObjectsClass(col)
+          |  def className(col: scala.collection.Iterable[_]): String = {
+          |    val colToString = col.toString
+          |    val bracketIdx = colToString.indexOf("(")
+          |    if (bracketIdx >= 0)
+          |      colToString.take(bracketIdx)
+          |    else
+          |      org.scalactic.NameUtil.getSimpleNameOfAnObjectsClass(col)
+          |  }
           |
           |  def newBuilder[A, C](f: Factory[A, C]): scala.collection.mutable.Builder[A, C] = f.newBuilder
           |

scalactic/src/main/scala/org/scalactic/Prettifier.scala

@@ -205,8 +205,7 @@ object Prettifier {
             case anArray: Array[_] =>  "Array(" + (anArray map apply).mkString(", ") + ")"
             case aWrappedArray: WrappedArray[_] => "Array(" + (aWrappedArray map apply).mkString(", ") + ")"
             case anArrayOps if ArrayHelper.isArrayOps(anArrayOps) => "Array(" + (ArrayHelper.asArrayOps(anArrayOps) map apply).mkString(", ") + ")"
-            case aList: List[_] => "List(" + (aList map apply).mkString(", ") + ")"
-            case aGenMap: GenMap[_, _] =>
+            case aGenMap: scala.collection.GenMap[_, _] =>
               ColCompatHelper.className(aGenMap) + "(" +
               (aGenMap.toIterator.map { case (key, value) => // toIterator is needed for consistent ordering
                 apply(key) + " -> " + apply(value)