diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2014-09-03 08:20:10 +1000 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2014-09-03 08:20:10 +1000 |
commit | 816c399beb22da612721ec7a4fa781dbeeb03a46 (patch) | |
tree | 8f6d6a8dd6217565f8fa8dbe432c96a0acb58d31 | |
parent | c66b88636149e950983d302cc035fc40d5ed14bf (diff) | |
parent | 1bbfd6b45b178986bfd26831689f8aa8393ae8a6 (diff) | |
download | scala-816c399beb22da612721ec7a4fa781dbeeb03a46.tar.gz scala-816c399beb22da612721ec7a4fa781dbeeb03a46.tar.bz2 scala-816c399beb22da612721ec7a4fa781dbeeb03a46.zip |
Merge pull request #3958 from lrytz/merge/2.10-to-2.11-sept-2
Merge 2.10 to 2.11
-rw-r--r-- | src/library/scala/runtime/SeqCharSequence.scala | 7 | ||||
-rw-r--r-- | test/scaladoc/run/t8314.check | 3 | ||||
-rw-r--r-- | test/scaladoc/run/t8314.scala | 16 |
3 files changed, 25 insertions, 1 deletions
diff --git a/src/library/scala/runtime/SeqCharSequence.scala b/src/library/scala/runtime/SeqCharSequence.scala index ce7d7afc9e..74e67bb9e7 100644 --- a/src/library/scala/runtime/SeqCharSequence.scala +++ b/src/library/scala/runtime/SeqCharSequence.scala @@ -44,5 +44,10 @@ final class ArrayCharSequence(val xs: Array[Char], start: Int, end: Int) extends new ArrayCharSequence(xs, start1, start1 + newlen) } } - override def toString = xs drop start take length mkString "" + override def toString = { + val start = math.max(this.start, 0) + val end = math.min(xs.length, start + length) + + if (start >= end) "" else new String(xs, start, end - start) + } } diff --git a/test/scaladoc/run/t8314.check b/test/scaladoc/run/t8314.check new file mode 100644 index 0000000000..aa04c12c8f --- /dev/null +++ b/test/scaladoc/run/t8314.check @@ -0,0 +1,3 @@ +Body(List(Paragraph(Chain(List(Summary(Chain(List(Text(This should be ), Monospace(Text(monospaced)))))))))) + +Done. diff --git a/test/scaladoc/run/t8314.scala b/test/scaladoc/run/t8314.scala new file mode 100644 index 0000000000..7f6d6fdb00 --- /dev/null +++ b/test/scaladoc/run/t8314.scala @@ -0,0 +1,16 @@ +import scala.tools.nsc.doc.model._ +import scala.tools.partest.ScaladocModelTest + +object Test extends ScaladocModelTest { + override def code = """ + /** This should be `monospaced` */ + class A + """ + + def scaladocSettings = "" + + def testModel(root: Package) = { + import access._ + root._class("A").comment foreach println + } +} |