summaryrefslogtreecommitdiff
path: root/test/scaladoc
diff options
context:
space:
mode:
authorAntoine Gourlay <antoine@gourlay.fr>2014-01-31 20:17:35 +0100
committerAntoine Gourlay <antoine@gourlay.fr>2014-01-31 22:53:15 +0100
commita9e903586e8e0547d0913b9427ee19a20092798d (patch)
tree5c8e6e929637cc3736ea313037e671d18a3932a4 /test/scaladoc
parentf59aeb58681d1dba8d32886de4785f6fb8dc9eff (diff)
downloadscala-a9e903586e8e0547d0913b9427ee19a20092798d.tar.gz
scala-a9e903586e8e0547d0913b9427ee19a20092798d.tar.bz2
scala-a9e903586e8e0547d0913b9427ee19a20092798d.zip
SI-7124 make macro definitions prettier in scaladoc
Macros are now prettier in scaladoc, by - hiding the `macroImpl` annotation - showing the `macro` modifier in front
Diffstat (limited to 'test/scaladoc')
-rw-r--r--test/scaladoc/run/t7124.check3
-rw-r--r--test/scaladoc/run/t7124.scala22
2 files changed, 25 insertions, 0 deletions
diff --git a/test/scaladoc/run/t7124.check b/test/scaladoc/run/t7124.check
new file mode 100644
index 0000000000..96b627a322
--- /dev/null
+++ b/test/scaladoc/run/t7124.check
@@ -0,0 +1,3 @@
+List()
+List(Paragraph(Text(macro)))
+Done.
diff --git a/test/scaladoc/run/t7124.scala b/test/scaladoc/run/t7124.scala
new file mode 100644
index 0000000000..e8272000d2
--- /dev/null
+++ b/test/scaladoc/run/t7124.scala
@@ -0,0 +1,22 @@
+import scala.tools.nsc.doc.model._
+import scala.tools.partest.ScaladocModelTest
+
+object Test extends ScaladocModelTest {
+
+ override def code = """
+ import scala.language.experimental.macros
+ class Test {
+ def print(): Unit = macro ???
+ }
+ """
+
+ def scaladocSettings = ""
+
+ def testModel(root: Package) = {
+ import access._
+ val p = root._class("Test")._method("print")
+
+ println(p.annotations) // no annotations
+ println(p.flags) // a 'macro' flag
+ }
+}