Merge pull request #3441 from gourlaysama/t7124

SI-7124 make macro definitions prettier in scaladoc

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
+  }
+}