diff options
| author | Vlad Ureche <vlad.ureche@gmail.com> | 2012-07-25 14:30:13 +0200 |
|---|---|---|
| committer | Vlad Ureche <vlad.ureche@gmail.com> | 2012-07-25 14:34:11 +0200 |
| commit | fa09fad51fb54ad37d34685943ec1c74dbbf8687 (patch) | |
| tree | d27197682b0c16e35fb722ab346500ccca91c9e9 /src | |
| parent | 950c783e31f9cb5d4268cc83d824020c8345d910 (diff) | |
| download | scala-fa09fad51fb54ad37d34685943ec1c74dbbf8687.tar.gz scala-fa09fad51fb54ad37d34685943ec1c74dbbf8687.tar.bz2 scala-fa09fad51fb54ad37d34685943ec1c74dbbf8687.zip | |
SI-6140 Scaladoc infinite recursion in wiki parser
introduced by dc70d1b7.
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()) } } |