diff options
| -rw-r--r-- | src/library/scala/runtime/ScalaRunTime.scala | 1 | ||||
| -rw-r--r-- | test/files/jvm/interpreter.check | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/library/scala/runtime/ScalaRunTime.scala b/src/library/scala/runtime/ScalaRunTime.scala index 5d1fad896a..956147ab4a 100644 --- a/src/library/scala/runtime/ScalaRunTime.scala +++ b/src/library/scala/runtime/ScalaRunTime.scala @@ -290,6 +290,7 @@ object ScalaRunTime { def inner(arg: Any): String = arg match { case null => "null" case "" => "\"\"" + case x: String => if (x.head.isWhitespace || x.last.isWhitespace) "\"" + x + "\"" else x case x if useOwnToString(x) => x.toString case x: AnyRef if isArray(x) => WrappedArray make x take maxElements map inner mkString ("Array(", ", ", ")") case x: collection.Map[_, _] => x take maxElements map mapInner mkString (x.stringPrefix + "(", ", ", ")") diff --git a/test/files/jvm/interpreter.check b/test/files/jvm/interpreter.check index 3955804db0..ce43875c36 100644 --- a/test/files/jvm/interpreter.check +++ b/test/files/jvm/interpreter.check @@ -198,10 +198,10 @@ scala> scala> scala> scala> | | | res9: java.lang.String = - +" hello there - +" scala> scala> | | You typed two blank lines. Starting a new command. |