6 files changed, 29 insertions, 4 deletions
diff --git a/test/files/presentation/hyperlinks-macro.check b/test/files/presentation/hyperlinks-macro.check
index 39e66d1eca..80d2268fa1 100644
--- a/test/files/presentation/hyperlinks-macro.check
+++ b/test/files/presentation/hyperlinks-macro.check
@@ -1,8 +1,8 @@
 reload: MacroCall.scala
 
-askHyperlinkPos for `<local Test>` at (5,7) MacroCall.scala
+askHyperlinkPos for `foo` at (5,7) MacroCall.scala
 ================================================================================
-[response] found askHyperlinkPos for `<local Test>` at (1,13) MacroCall.scala
+[response] found askHyperlinkPos for `foo` at (2,7) MacroCall.scala
 ================================================================================
 
 askHyperlinkPos for `foo` at (9,7) MacroCall.scala
diff --git a/test/files/presentation/hyperlinks-macro/src/MacroCall.scala b/test/files/presentation/hyperlinks-macro/src/MacroCall.scala
index 42685735b2..d9676b3d2a 100644
--- a/test/files/presentation/hyperlinks-macro/src/MacroCall.scala
+++ b/test/files/presentation/hyperlinks-macro/src/MacroCall.scala
@@ -9,4 +9,3 @@ object Test {
     foo/*#*/
   }
 }
-// Currently, the hyperlink within the argument to the macro `reify` does not resolve correctly.
diff --git a/test/scaladoc/run/SI-6812.check b/test/scaladoc/run/SI-6812.check
index 619c56180b..3be8a300e7 100644
--- a/test/scaladoc/run/SI-6812.check
+++ b/test/scaladoc/run/SI-6812.check
@@ -1 +1,2 @@
+warning: -Ymacro-no-expand is deprecated: Use -Ymacro-expand:none
 Done.
diff --git a/test/scaladoc/run/SI-6812.scala b/test/scaladoc/run/SI-6812.scala
index 059c327e7e..6893e816d0 100644
--- a/test/scaladoc/run/SI-6812.scala
+++ b/test/scaladoc/run/SI-6812.scala
@@ -19,6 +19,6 @@ object Test extends ScaladocModelTest {
   """
 
   def scaladocSettings = ""
-  override def extraSettings = super.extraSettings + " -Ymacro-no-expand"
+  override def extraSettings = super.extraSettings + " -Ymacro-no-expand -deprecation"
   def testModel(root: Package) = ()
 }
diff --git a/test/scaladoc/run/SI-6812b.check b/test/scaladoc/run/SI-6812b.check
new file mode 100644
index 0000000000..619c56180b
--- /dev/null
+++ b/test/scaladoc/run/SI-6812b.check
@@ -0,0 +1 @@
+Done.
diff --git a/test/scaladoc/run/SI-6812b.scala b/test/scaladoc/run/SI-6812b.scala
new file mode 100644
index 0000000000..b8a8140357
--- /dev/null
+++ b/test/scaladoc/run/SI-6812b.scala
@@ -0,0 +1,24 @@
+import scala.tools.nsc.doc.model._
+import scala.tools.partest.ScaladocModelTest
+import language._
+
+object Test extends ScaladocModelTest {
+
+  override def code = """
+    import scala.reflect.macros.BlackboxContext
+    import language.experimental.macros
+
+    object Macros {
+      def impl(c: BlackboxContext) = c.literalUnit
+      def foo: Unit = macro impl
+    }
+
+    class C {
+      def bar = Macros.foo
+    }
+  """
+
+  def scaladocSettings = ""
+  override def extraSettings = super.extraSettings + " -Ymacro-expand:none"
+  def testModel(root: Package) = ()
+}