The beautification of repl pasting had the prob...

The beautification of repl pasting had the problem that the new
beautiful output was not itself pastable. Now I have achieved "paste
idempotence". No review.

3 files changed, 42 insertions, 33 deletions

diff --git a/test/files/run/repl-paste-2.check b/test/files/run/repl-paste-2.check
index 684f20e1d2..435592567d 100644
--- a/test/files/run/repl-paste-2.check
+++ b/test/files/run/repl-paste-2.check
@@ -3,14 +3,17 @@ Type :help for more information.
 
 scala> 
 
-scala> scala> 123
-res0: Int = 123
+scala> scala> 0123
+res4: Int = 0123
+
+scala> 123
+res5: Int = 123
 
 scala> 567
-res1: Int = 567
+res6: Int = 567
 
-scala> res0 + res1
-res2: Int = 690
+scala> res5 + res6
+res7: Int = 690
 
 scala> val x = dingus
 <console>:7: error: not found: value dingus
@@ -21,35 +24,38 @@ scala> val x = "dingus"
 x: java.lang.String = dingus
 
 scala> x.length
-res3: Int = 6
+res9: Int = 6
+
+scala> x.length + res5
+res10: Int = 12
 
-scala> x.length + res3
-res4: Int = 12
+// Replaying 8 commands from transcript.
 
-// Replaying 7 commands from transcript.
+scala> 0123
+res0: Int = 83
 
-val res0 = { 123 }
-res0: Int = 123
+scala> val res5 = { 123 }
+res5: Int = 123
 
-val res1 = { 567 }
-res1: Int = 567
+scala> val res6 = { 567 }
+res6: Int = 567
 
-val res2 = { res0 + res1 }
-res2: Int = 690
+scala> res5 + res6
+res1: Int = 690
 
-val x = dingus
+scala> val x = dingus
 <console>:7: error: not found: value dingus
        val x = dingus
                ^
 
-val x = "dingus"
+scala> val x = "dingus"
 x: java.lang.String = dingus
 
-val res3 = { x.length }
-res3: Int = 6
+scala> x.length
+res2: Int = 6
 
-val res4 = { x.length + res3 }
-res4: Int = 12
+scala> x.length + res5
+res3: Int = 129
 
 
 scala> 
diff --git a/test/files/run/repl-paste-2.scala b/test/files/run/repl-paste-2.scala
index 802c627701..f62927791d 100644
--- a/test/files/run/repl-paste-2.scala
+++ b/test/files/run/repl-paste-2.scala
@@ -2,14 +2,17 @@ import scala.tools.partest.ReplTest
 
 object Test extends ReplTest {
   def code = """
+scala> 0123
+res4: Int = 0123
+
 scala> 123
-res0: Int = 123
+res5: Int = 123
 
 scala> 567
-res1: Int = 567
+res6: Int = 567
 
-scala> res0 + res1
-res2: Int = 690
+scala> res5 + res6
+res7: Int = 690
 
 scala> val x = dingus
 <console>:7: error: not found: value dingus
@@ -20,9 +23,9 @@ scala> val x = "dingus"
 x: java.lang.String = dingus
 
 scala> x.length
-res3: Int = 6
+res9: Int = 6
 
-scala> x.length + res3
-res4: Int = 12
+scala> x.length + res5
+res10: Int = 12
   """
 }
\ No newline at end of file
diff --git a/test/files/run/repl-transcript.check b/test/files/run/repl-transcript.check
index c6563c67a9..03162451b6 100644
--- a/test/files/run/repl-transcript.check
+++ b/test/files/run/repl-transcript.check
@@ -19,19 +19,19 @@ scala> res6.sum + res5
 
 // Replaying 5 commands from transcript.
 
-class Bippity
+scala> class Bippity
 defined class Bippity
 
-def f = new Bippity
+scala> def f = new Bippity
 f: Bippity
 
-val res5 = { 123 }
+scala> val res5 = { 123 }
 res5: Int = 123
 
-val res6 = { 1 to 100 map (_  + 1) }
+scala> val res6 = { 1 to 100 map (_  + 1) }
 res6: scala.collection.immutable.IndexedSeq[Int] = Vector(2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101)
 
-res6.sum + res5
+scala> res6.sum + res5
 res0: Int = 5273