Merge pull request scala#6903 from Prithvirajbilla/10991

Adds missing constructor on mutable.StringBuilder

Author: julienrf

src/library/scala/collection/mutable/Builder.scala

@@ -83,7 +83,7 @@ trait Builder[-A, +To] extends Growable[A] { self =>
   *  section on `StringBuilders` for more information.
   */
 @SerialVersionUID(3L)
-class StringBuilder(private val sb: java.lang.StringBuilder) extends AbstractSeq[Char]
+class StringBuilder(private val underlying: java.lang.StringBuilder) extends AbstractSeq[Char]
   with Builder[Char, String]
   with IndexedSeq[Char]
   with IndexedSeqOps[Char, IndexedSeq, StringBuilder]
@@ -92,41 +92,56 @@ class StringBuilder(private val sb: java.lang.StringBuilder) extends AbstractSeq
 
   def this() = this(new java.lang.StringBuilder)
 
-  def this(length: Int) = this(new java.lang.StringBuilder(length))
+  /** Constructs a string builder with no characters in it and an
+    *  initial capacity specified by the `capacity` argument.
+    *
+    *  @param  capacity  the initial capacity.
+    *  @throws NegativeArraySizeException  if capacity < 0.
+    */
+  def this(capacity: Int) = this(new java.lang.StringBuilder(capacity))
 
-  def this(s: String) = this(new java.lang.StringBuilder(s))
+  /** Constructs a string builder with initial characters
+    *  equal to characters of `str`.
+    */
+  def this(str: String) = this(new java.lang.StringBuilder(str))
+
+  /** Constructs a string builder initialized with string value `initValue`
+    *  and with additional character capacity `initCapacity`.
+    */
+  def this(initCapacity: Int, initValue: String) =
+    this(new java.lang.StringBuilder(initValue.length + initCapacity) append initValue)
 
   // Methods required to make this an IndexedSeq:
-  def apply(i: Int): Char = sb.charAt(i)
+  def apply(i: Int): Char = underlying.charAt(i)
 
  override protected def fromSpecificIterable(coll: scala.collection.Iterable[Char]): StringBuilder =
     new StringBuilder() ++= coll
 
   override protected def newSpecificBuilder: Builder[Char, StringBuilder] =
     new GrowableBuilder(new StringBuilder())
 
-  def length: Int = sb.length()
+  def length: Int = underlying.length()
 
-  def length_=(n: Int): Unit = sb.setLength(n)
+  def length_=(n: Int): Unit = underlying.setLength(n)
 
-  def addOne(x: Char) = { sb.append(x); this }
+  def addOne(x: Char) = { underlying.append(x); this }
 
-  def clear() = sb.setLength(0)
+  def clear() = underlying.setLength(0)
 
   /** Overloaded version of `addAll` that takes a string */
-  def addAll(s: String): this.type = { sb.append(s); this }
+  def addAll(s: String): this.type = { underlying.append(s); this }
 
   /** Alias for `addAll` */
   def ++= (s: String): this.type = addAll(s)
 
-  def result() = sb.toString
+  def result() = underlying.toString
 
   override def toString = result()
 
   // append* methods delegate to the underlying java.lang.StringBuilder:
 
   def appendAll(xs: String): StringBuilder = {
-    sb append xs
+    underlying append xs
     this
   }
 
@@ -137,7 +152,7 @@ class StringBuilder(private val sb: java.lang.StringBuilder) extends AbstractSeq
     *  @return     this StringBuilder.
     */
   def append(x: Any): StringBuilder = {
-    sb append String.valueOf(x)
+    underlying append String.valueOf(x)
     this
   }
 
@@ -147,7 +162,7 @@ class StringBuilder(private val sb: java.lang.StringBuilder) extends AbstractSeq
     *  @return     this StringBuilder.
     */
   def append(s: String): StringBuilder = {
-    sb append s
+    underlying append s
     this
   }
 
@@ -157,7 +172,7 @@ class StringBuilder(private val sb: java.lang.StringBuilder) extends AbstractSeq
     *  @return
     */
   def append(s: StringBuilder): StringBuilder = {
-    sb append s.sb
+    underlying append s.underlying
     this
   }
 
@@ -174,7 +189,7 @@ class StringBuilder(private val sb: java.lang.StringBuilder) extends AbstractSeq
     *  @return     a reference to this object.
     */
   def appendAll(xs: Array[Char]): StringBuilder = {
-    sb append xs
+    underlying append xs
     this
   }
 
@@ -186,7 +201,7 @@ class StringBuilder(private val sb: java.lang.StringBuilder) extends AbstractSeq
     *  @return         this StringBuilder.
     */
   def appendAll(xs: Array[Char], offset: Int, len: Int): StringBuilder = {
-    sb.append(xs, offset, len)
+    underlying.append(xs, offset, len)
     this
   }
 
@@ -197,14 +212,14 @@ class StringBuilder(private val sb: java.lang.StringBuilder) extends AbstractSeq
     *  @param   x  a primitive value
     *  @return     This StringBuilder.
     */
-  def append(x: Boolean): StringBuilder = { sb append x ; this }
+  def append(x: Boolean): StringBuilder = { underlying append x ; this }
   def append(x: Byte): StringBuilder = append(x.toInt)
   def append(x: Short): StringBuilder = append(x.toInt)
-  def append(x: Int): StringBuilder = { sb append x ; this }
-  def append(x: Long): StringBuilder = { sb append x ; this }
-  def append(x: Float): StringBuilder = { sb append x ; this }
-  def append(x: Double): StringBuilder = { sb append x ; this }
-  def append(x: Char): StringBuilder = { sb append x ; this }
+  def append(x: Int): StringBuilder = { underlying append x ; this }
+  def append(x: Long): StringBuilder = { underlying append x ; this }
+  def append(x: Float): StringBuilder = { underlying append x ; this }
+  def append(x: Double): StringBuilder = { underlying append x ; this }
+  def append(x: Char): StringBuilder = { underlying append x ; this }
 
   /** Remove a subsequence of Chars from this sequence, starting at the
     *  given start index (inclusive) and extending to the end index (exclusive)
@@ -216,7 +231,7 @@ class StringBuilder(private val sb: java.lang.StringBuilder) extends AbstractSeq
     *  @throws StringIndexOutOfBoundsException   if start < 0 || start > end
     */
   def delete(start: Int, end: Int): StringBuilder = {
-    sb.delete(start, end)
+    underlying.delete(start, end)
     this
   }
 
@@ -230,7 +245,7 @@ class StringBuilder(private val sb: java.lang.StringBuilder) extends AbstractSeq
     *  @throws StringIndexOutOfBoundsException if start < 0, start > length, or start > end
     */
   def replace(start: Int, end: Int, str: String): StringBuilder = {
-    sb.replace(start, end, str)
+    underlying.replace(start, end, str)
     this
   }
 
@@ -247,7 +262,7 @@ class StringBuilder(private val sb: java.lang.StringBuilder) extends AbstractSeq
     *         offset < 0, len < 0, or (offset + len) > str.length.
     */
   def insertAll(index: Int, str: Array[Char], offset: Int, len: Int): StringBuilder = {
-    sb.insert(index, str, offset, len)
+    underlying.insert(index, str, offset, len)
     this
   }
 
@@ -269,7 +284,7 @@ class StringBuilder(private val sb: java.lang.StringBuilder) extends AbstractSeq
     *  @throws StringIndexOutOfBoundsException  if the index is out of bounds.
     */
   def insert(index: Int, x: String): StringBuilder = {
-    sb.insert(index, x)
+    underlying.insert(index, x)
     this
   }
 
@@ -291,7 +306,7 @@ class StringBuilder(private val sb: java.lang.StringBuilder) extends AbstractSeq
     *  @throws StringIndexOutOfBoundsException  if the index is out of bounds.
     */
   def insertAll(index: Int, xs: Array[Char]): StringBuilder = {
-    sb.insert(index, xs)
+    underlying.insert(index, xs)
     this
   }
 
@@ -318,9 +333,9 @@ class StringBuilder(private val sb: java.lang.StringBuilder) extends AbstractSeq
     *  @param  len  the new length
     *  @throws IndexOutOfBoundsException if the argument is negative.
     */
-  def setLength(len: Int): Unit = sb.setLength(len)
+  def setLength(len: Int): Unit = underlying.setLength(len)
 
-  def update(idx: Int, elem: Char): Unit = sb.setCharAt(idx, elem)
+  def update(idx: Int, elem: Char): Unit = underlying.setCharAt(idx, elem)
 
 
   /** Like reverse, but destructively updates the target StringBuilder.
@@ -335,7 +350,7 @@ class StringBuilder(private val sb: java.lang.StringBuilder) extends AbstractSeq
    *  @return   the reversed StringBuilder (same as the target StringBuilder)
    */
   def reverseInPlace(): this.type = {
-    sb.reverse()
+    underlying.reverse()
     this
   }
 
@@ -345,7 +360,7 @@ class StringBuilder(private val sb: java.lang.StringBuilder) extends AbstractSeq
    *
    *  @return  the capacity
    */
-  def capacity: Int = sb.capacity()
+  def capacity: Int = underlying.capacity()
 
   /** Ensure that the capacity is at least the given argument.
    *  If the argument is greater than the current capacity, new
@@ -354,15 +369,15 @@ class StringBuilder(private val sb: java.lang.StringBuilder) extends AbstractSeq
    *
    *  @param newCapacity    the minimum desired capacity.
    */
-  def ensureCapacity(newCapacity: Int): Unit = { sb.ensureCapacity(newCapacity) }
+  def ensureCapacity(newCapacity: Int): Unit = { underlying.ensureCapacity(newCapacity) }
 
   /** Returns the Char at the specified index, counting from 0 as in Arrays.
    *
    *  @param  index   the index to look up
    *  @return         the Char at the given index.
    *  @throws IndexOutOfBoundsException  if the index is out of bounds.
    */
-  def charAt(index: Int): Char = sb.charAt(index)
+  def charAt(index: Int): Char = underlying.charAt(index)
 
   /** Removes the Char at the specified index.  The sequence is
    *  shortened by one.
@@ -372,7 +387,7 @@ class StringBuilder(private val sb: java.lang.StringBuilder) extends AbstractSeq
    *  @throws IndexOutOfBoundsException  if the index is out of bounds.
    */
   def deleteCharAt(index: Int): this.type = {
-    sb.deleteCharAt(index)
+    underlying.deleteCharAt(index)
     this
   }
 
@@ -383,7 +398,7 @@ class StringBuilder(private val sb: java.lang.StringBuilder) extends AbstractSeq
    *  @throws IndexOutOfBoundsException  if the index is out of bounds.
    */
   def setCharAt(index: Int, ch: Char): this.type = {
-    sb.setCharAt(index, ch)
+    underlying.setCharAt(index, ch)
     this
   }
 
@@ -410,7 +425,7 @@ class StringBuilder(private val sb: java.lang.StringBuilder) extends AbstractSeq
    *  @throws StringIndexOutOfBoundsException If either index is out of bounds,
    *          or if start > end.
    */
-  def substring(start: Int, end: Int): String = sb.substring(start, end)
+  def substring(start: Int, end: Int): String = underlying.substring(start, end)
 
   /** For implementing CharSequence.
    */
@@ -422,30 +437,30 @@ class StringBuilder(private val sb: java.lang.StringBuilder) extends AbstractSeq
    *  @param    str       the target string to search for
    *  @return             the first applicable index where target occurs, or -1 if not found.
    */
-  def indexOf(str: String): Int = sb.indexOf(str)
+  def indexOf(str: String): Int = underlying.indexOf(str)
 
   /** Finds the index of the first occurrence of the specified substring.
    *
    *  @param    str       the target string to search for
    *  @param    fromIndex the smallest index in the source string to consider
    *  @return             the first applicable index where target occurs, or -1 if not found.
    */
-  def indexOf(str: String, fromIndex: Int): Int = sb.indexOf(str, fromIndex)
+  def indexOf(str: String, fromIndex: Int): Int = underlying.indexOf(str, fromIndex)
 
   /** Finds the index of the last occurrence of the specified substring.
    *
    *  @param    str       the target string to search for
    *  @return             the last applicable index where target occurs, or -1 if not found.
    */
-  def lastIndexOf(str: String): Int = sb.lastIndexOf(str)
+  def lastIndexOf(str: String): Int = underlying.lastIndexOf(str)
 
   /** Finds the index of the last occurrence of the specified substring.
    *
    *  @param    str       the target string to search for
    *  @param    fromIndex the smallest index in the source string to consider
    *  @return             the last applicable index where target occurs, or -1 if not found.
    */
-  def lastIndexOf(str: String, fromIndex: Int): Int = sb.lastIndexOf(str, fromIndex)
+  def lastIndexOf(str: String, fromIndex: Int): Int = underlying.lastIndexOf(str, fromIndex)
 
   override protected[this] def writeReplace(): AnyRef = this
 }

test/junit/scala/SerializationStabilityTest.scala

@@ -81,7 +81,7 @@ object SerializationStability {
     }
   }
 
-  // Generated on 20180701-21:01:46 with Scala version 2.13.0-20180701-205044-6e3f96b)
+  // Generated on 20180709-21:06:19 with Scala version 2.13.0-20180710-010238-d0a74ab)
   def main(args: Array[String]): Unit = {
     overwrite.foreach(updateComment)
     def g = Thread.currentThread.getStackTrace
@@ -208,7 +208,7 @@ object SerializationStability {
 
     // TODO scala/bug#8576 unstable under -Xcheckinit
     // check(g)(mutable.ListBuffer(1, 2, 3))( "rO0ABXNyACNzY2FsYS5jb2xsZWN0aW9uLm11dGFibGUuTGlzdEJ1ZmZlci9y9I7QyWzGAwAEWgAIZXhwb3J0ZWRJAANsZW5MAAVsYXN0MHQAKUxzY2FsYS9jb2xsZWN0aW9uL2ltbXV0YWJsZS8kY29sb24kY29sb247TAAqc2NhbGEkY29sbGVjdGlvbiRtdXRhYmxlJExpc3RCdWZmZXIkJHN0YXJ0dAAhTHNjYWxhL2NvbGxlY3Rpb24vaW1tdXRhYmxlL0xpc3Q7eHBzcgARamF2YS5sYW5nLkludGVnZXIS4qCk94GHOAIAAUkABXZhbHVleHIAEGphdmEubGFuZy5OdW1iZXKGrJUdC5TgiwIAAHhwAAAAAXNxAH4ABAAAAAJzcQB+AAQAAAADc3IALHNjYWxhLmNvbGxlY3Rpb24uaW1tdXRhYmxlLkxpc3RTZXJpYWxpemVFbmQkilxjW/dTC20CAAB4cHcFAAAAAAN4")
-    check(g)(new mutable.StringBuilder(new java.lang.StringBuilder("123")))( "rO0ABXNyACZzY2FsYS5jb2xsZWN0aW9uLm11dGFibGUuU3RyaW5nQnVpbGRlcgAAAAAAAAADAgABTAACc2J0ABlMamF2YS9sYW5nL1N0cmluZ0J1aWxkZXI7eHIAJHNjYWxhLmNvbGxlY3Rpb24ubXV0YWJsZS5BYnN0cmFjdFNlcQAAAAAAAAADAgAAeHIAHHNjYWxhLmNvbGxlY3Rpb24uQWJzdHJhY3RTZXEAAAAAAAAAAwIAAHhyACFzY2FsYS5jb2xsZWN0aW9uLkFic3RyYWN0SXRlcmFibGUAAAAAAAAAAwIAAHhwc3IAF2phdmEubGFuZy5TdHJpbmdCdWlsZGVyPNX7FFpMassDAAB4cHcEAAAAA3VyAAJbQ7AmZrDiXYSsAgAAeHAAAAATADEAMgAzAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4")
+    check(g)(new mutable.StringBuilder(new java.lang.StringBuilder("123")))( "rO0ABXNyACZzY2FsYS5jb2xsZWN0aW9uLm11dGFibGUuU3RyaW5nQnVpbGRlcgAAAAAAAAADAgABTAAKdW5kZXJseWluZ3QAGUxqYXZhL2xhbmcvU3RyaW5nQnVpbGRlcjt4cgAkc2NhbGEuY29sbGVjdGlvbi5tdXRhYmxlLkFic3RyYWN0U2VxAAAAAAAAAAMCAAB4cgAcc2NhbGEuY29sbGVjdGlvbi5BYnN0cmFjdFNlcQAAAAAAAAADAgAAeHIAIXNjYWxhLmNvbGxlY3Rpb24uQWJzdHJhY3RJdGVyYWJsZQAAAAAAAAADAgAAeHBzcgAXamF2YS5sYW5nLlN0cmluZ0J1aWxkZXI81fsUWkxqywMAAHhwdwQAAAADdXIAAltDsCZmsOJdhKwCAAB4cAAAABMAMQAyADMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHg=")
     check(g)(mutable.UnrolledBuffer[Int]())( "rO0ABXNyADJzY2FsYS5jb2xsZWN0aW9uLmdlbmVyaWMuRGVmYXVsdFNlcmlhbGl6YXRpb25Qcm94eQAAAAAAAAADAwABTAAHZmFjdG9yeXQAGkxzY2FsYS9jb2xsZWN0aW9uL0ZhY3Rvcnk7eHBzcgAqc2NhbGEuY29sbGVjdGlvbi5JdGVyYWJsZUZhY3RvcnkkVG9GYWN0b3J5AAAAAAAAAAMCAAFMAAdmYWN0b3J5dAAiTHNjYWxhL2NvbGxlY3Rpb24vSXRlcmFibGVGYWN0b3J5O3hwc3IAMnNjYWxhLmNvbGxlY3Rpb24uQ2xhc3NUYWdTZXFGYWN0b3J5JEFueVNlcURlbGVnYXRlAAAAAAAAAAMCAAB4cgA8c2NhbGEuY29sbGVjdGlvbi5DbGFzc1RhZ0l0ZXJhYmxlRmFjdG9yeSRBbnlJdGVyYWJsZURlbGVnYXRlAAAAAAAAAAMCAAFMAAhkZWxlZ2F0ZXQAKkxzY2FsYS9jb2xsZWN0aW9uL0NsYXNzVGFnSXRlcmFibGVGYWN0b3J5O3hwc3IAKHNjYWxhLmNvbGxlY3Rpb24ubXV0YWJsZS5VbnJvbGxlZEJ1ZmZlciQAAAAAAAAAAwMABEkADnVucm9sbGVkbGVuZ3RoSQAJd2F0ZXJsaW5lSQAOd2F0ZXJsaW5lRGVsaW1MAAh1bnRhZ2dlZHQAHUxzY2FsYS9jb2xsZWN0aW9uL1NlcUZhY3Rvcnk7eHB4dwT/////c3IAJnNjYWxhLmNvbGxlY3Rpb24uZ2VuZXJpYy5TZXJpYWxpemVFbmQkAAAAAAAAAAMCAAB4cHg=")
 
     check(g)("...".r)("rO0ABXNyABlzY2FsYS51dGlsLm1hdGNoaW5nLlJlZ2V44u3Vap7wIb8CAAJMAAdwYXR0ZXJudAAZTGphdmEvdXRpbC9yZWdleC9QYXR0ZXJuO0wAJXNjYWxhJHV0aWwkbWF0Y2hpbmckUmVnZXgkJGdyb3VwTmFtZXN0ACBMc2NhbGEvY29sbGVjdGlvbi9pbW11dGFibGUvU2VxO3hwc3IAF2phdmEudXRpbC5yZWdleC5QYXR0ZXJuRmfVa25JAg0CAAJJAAVmbGFnc0wAB3BhdHRlcm50ABJMamF2YS9sYW5nL1N0cmluZzt4cAAAAAB0AAMuLi5zcgAyc2NhbGEuY29sbGVjdGlvbi5nZW5lcmljLkRlZmF1bHRTZXJpYWxpemF0aW9uUHJveHkAAAAAAAAAAwMAAUwAB2ZhY3Rvcnl0ABpMc2NhbGEvY29sbGVjdGlvbi9GYWN0b3J5O3hwc3IAKnNjYWxhLmNvbGxlY3Rpb24uSXRlcmFibGVGYWN0b3J5JFRvRmFjdG9yeQAAAAAAAAADAgABTAAHZmFjdG9yeXQAIkxzY2FsYS9jb2xsZWN0aW9uL0l0ZXJhYmxlRmFjdG9yeTt4cHNyACBzY2FsYS5jb2xsZWN0aW9uLmltbXV0YWJsZS5MaXN0JAAAAAAAAAADAwABTAARcGFydGlhbE5vdEFwcGxpZWR0ABFMc2NhbGEvRnVuY3Rpb24xO3hweHcEAAAAAHg=",