Permalink
Browse files

SI-6140 Scaladoc infinite recursion in wiki parser

introduced by dc70d1b.
  • Loading branch information...
VladUreche committed Jul 25, 2012
1 parent 950c783 commit fa09fad51fb54ad37d34685943ec1c74dbbf8687
@@ -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())
}
}
@@ -0,0 +1 @@
Done.
@@ -0,0 +1,18 @@
import scala.tools.nsc.doc.model._
import scala.tools.partest.ScaladocModelTest
object Test extends ScaladocModelTest {
// This caused an infinite recursion in method inline() in CommentFactory.scala
override def code = """
/** {{ code? }} */
class C
"""
// no need for special settings
def scaladocSettings = ""
def testModel(rootPackage: Package) = {
// if it doesn't hang, the test is passed
}
}

0 comments on commit fa09fad

Please sign in to comment.