summaryrefslogtreecommitdiff
path: root/test/scaladoc
diff options
context:
space:
mode:
authorVlad Ureche <vlad.ureche@gmail.com>2012-07-25 14:30:13 +0200
committerVlad Ureche <vlad.ureche@gmail.com>2012-07-25 14:34:11 +0200
commitfa09fad51fb54ad37d34685943ec1c74dbbf8687 (patch)
treed27197682b0c16e35fb722ab346500ccca91c9e9 /test/scaladoc
parent950c783e31f9cb5d4268cc83d824020c8345d910 (diff)
downloadscala-fa09fad51fb54ad37d34685943ec1c74dbbf8687.tar.gz
scala-fa09fad51fb54ad37d34685943ec1c74dbbf8687.tar.bz2
scala-fa09fad51fb54ad37d34685943ec1c74dbbf8687.zip
SI-6140 Scaladoc infinite recursion in wiki parser
introduced by dc70d1b7.
Diffstat (limited to 'test/scaladoc')
-rw-r--r--test/scaladoc/run/SI-6140.check1
-rw-r--r--test/scaladoc/run/SI-6140.scala18
2 files changed, 19 insertions, 0 deletions
diff --git a/test/scaladoc/run/SI-6140.check b/test/scaladoc/run/SI-6140.check
new file mode 100644
index 0000000000..619c56180b
--- /dev/null
+++ b/test/scaladoc/run/SI-6140.check
@@ -0,0 +1 @@
+Done.
diff --git a/test/scaladoc/run/SI-6140.scala b/test/scaladoc/run/SI-6140.scala
new file mode 100644
index 0000000000..4bb9a4dc85
--- /dev/null
+++ b/test/scaladoc/run/SI-6140.scala
@@ -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
+ }
+}