diff options
| author | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-07-29 07:16:41 -0700 |
|---|---|---|
| committer | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-07-29 07:16:41 -0700 |
| commit | ce9e98177e7a36327cf4a2d33772b626e9e2e753 (patch) | |
| tree | f5ca9bc1019a1fcdd9022f69696c7b0cd871a245 /src | |
| parent | e95691996d3df58499491db6c5b6d386b64cefdc (diff) | |
| parent | fa09fad51fb54ad37d34685943ec1c74dbbf8687 (diff) | |
| download | scala-ce9e98177e7a36327cf4a2d33772b626e9e2e753.tar.gz scala-ce9e98177e7a36327cf4a2d33772b626e9e2e753.tar.bz2 scala-ce9e98177e7a36327cf4a2d33772b626e9e2e753.zip | |
Merge pull request #990 from VladUreche/issue/6140
SI-6140 Scaladoc infinite recursion in wiki parser
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/doc/model/comment/CommentFactory.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/doc/model/comment/CommentFactory.scala b/src/compiler/scala/tools/nsc/doc/model/comment/CommentFactory.scala index 1a11964e37..85d6a8911e 100644 --- a/src/compiler/scala/tools/nsc/doc/model/comment/CommentFactory.scala +++ b/src/compiler/scala/tools/nsc/doc/model/comment/CommentFactory.scala @@ -660,7 +660,7 @@ trait CommentFactory { thisFactory: ModelFactory with CommentFactory with Member else if (check(",,")) subscript() else if (check("[[")) link() else { - readUntil { char == safeTagMarker || check("''") || char == '`' || check("__") || char == '^' || check(",,") || check("[[") || check("{{") || isInlineEnd || checkParaEnded || char == endOfLine } + readUntil { char == safeTagMarker || check("''") || char == '`' || check("__") || char == '^' || check(",,") || check("[[") || isInlineEnd || checkParaEnded || char == endOfLine } Text(getRead()) } } |