From b6e989fbf63c9f47acfb54175241b42fdfbfe51b Mon Sep 17 00:00:00 2001 From: Vlad Ureche Date: Thu, 3 May 2012 02:54:27 +0200 Subject: Fixes the backticks in use case signature crash Suggested by Simon in https://groups.google.com/forum/?hl=en&fromgroups#!topic/scala-internals/z7s1CCRCz74 Now it eliminates backticks and gracefully bails out with an error message when it can't remove the wiki syntax. --- test/scaladoc/run/usecase-var-expansion.check | 4 ++++ test/scaladoc/run/usecase-var-expansion.scala | 26 ++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 test/scaladoc/run/usecase-var-expansion.check create mode 100644 test/scaladoc/run/usecase-var-expansion.scala (limited to 'test/scaladoc/run') diff --git a/test/scaladoc/run/usecase-var-expansion.check b/test/scaladoc/run/usecase-var-expansion.check new file mode 100644 index 0000000000..3faa4735c0 --- /dev/null +++ b/test/scaladoc/run/usecase-var-expansion.check @@ -0,0 +1,4 @@ +newSource:8: error: Incorrect variable expansion for $Coll in use case. Does the variable expand to wiki syntax when documenting class Test2? + * @usecase def foo: $Coll[T] + ^ +Done. diff --git a/test/scaladoc/run/usecase-var-expansion.scala b/test/scaladoc/run/usecase-var-expansion.scala new file mode 100644 index 0000000000..e86ea4a835 --- /dev/null +++ b/test/scaladoc/run/usecase-var-expansion.scala @@ -0,0 +1,26 @@ +import scala.tools.nsc.doc.model._ +import scala.tools.partest.ScaladocModelTest +import language._ + +object Test extends ScaladocModelTest { + + override def code = """ + /** + * @define Coll `Test` + */ + class Test[T] { + /** + * member $Coll + * @usecase def foo: $Coll[T] + * usecase $Coll + */ + def foo(implicit err: String): Test[T] = sys.error(err) + } + + /** @define Coll {{{some `really` < !! >> invalid $$$ thing}}} */ + class Test2[T] extends Test[Int] + """ + + def scaladocSettings = "" + def testModel(root: Package) = () +} -- cgit v1.2.3