Merge pull request scala#10416 from lrytz/t12796

Fix ListBuffer.insertAfter, used in patchInPlace

Author: som-snytt

src/library/scala/collection/mutable/ListBuffer.scala

@@ -46,7 +46,7 @@ class ListBuffer[A]
   @transient private[this] var mutationCount: Int = 0
 
   private var first: List[A] = Nil
-  private var last0: ::[A] = null
+  private var last0: ::[A] = null // last element (`last0` just because the name `last` is already taken)
   private[this] var aliased = false
   private[this] var len = 0
 
@@ -244,6 +244,7 @@ class ListBuffer[A]
       val follow = getNext(prev)
       if (prev eq null) first = fresh.first else prev.next = fresh.first
       fresh.last0.next = follow
+      if (follow.isEmpty) last0 = fresh.last0
       len += fresh.length
     }
   }

test/junit/scala/collection/mutable/ListBufferTest.scala

@@ -323,4 +323,19 @@ class ListBufferTest {
     test(ArrayBuffer[String]())
     test(ListBuffer[String]())
   }
+
+  @Test
+  def t12796(): Unit = {
+    val b = ListBuffer(1).patchInPlace(1, List(2), 1)
+    assertEquals(2, b.last)
+    assertEquals(List(1, 2), b.toList)
+  }
+
+  @Test
+  def t12796b(): Unit = {
+    val b = ListBuffer(1, 2)
+    b.insertAll(2, List(3))
+    assertEquals(3, b.last)
+    assertEquals(List(1, 2, 3), b.toList)
+  }
 }