Fix tests

Author: odersky

compiler/src/dotty/tools/dotc/transform/Splicer.scala

@@ -201,14 +201,14 @@ object Splicer {
         else if (fn.symbol.is(Module))
           interpretModuleAccess(fn.symbol)
         else if (fn.symbol.isStatic) {
-          val staticMethodCall = interpretedStaticMethodCall(fn.symbol.owner, fn.symbol, tree.sourcePos)
+          val staticMethodCall = interpretedStaticMethodCall(fn.symbol.owner, fn.symbol, tree)
           staticMethodCall(args.flatten.map(interpretTree))
         }
         else if (fn.qualifier.symbol.is(Module) && fn.qualifier.symbol.isStatic)
           if (fn.name == nme.asInstanceOfPM)
             interpretModuleAccess(fn.qualifier.symbol)
           else {
-            val staticMethodCall = interpretedStaticMethodCall(fn.qualifier.symbol.moduleClass, fn.symbol, tree.sourcePos)
+            val staticMethodCall = interpretedStaticMethodCall(fn.qualifier.symbol.moduleClass, fn.symbol, tree)
             staticMethodCall(args.flatten.map(interpretTree))
           }
         else if (env.contains(fn.symbol))
@@ -266,10 +266,10 @@ object Splicer {
     private def interpretQuoteContext()(implicit env: Env): Object =
       QuoteContext()
 
-    private def interpretedStaticMethodCall(moduleClass: Symbol, fn: Symbol, pos: SourcePosition)(implicit env: Env): List[Object] => Object = {
+    private def interpretedStaticMethodCall(moduleClass: Symbol, fn: Symbol, tree: Tree)(implicit env: Env): List[Object] => Object = {
       if fn.isDefinedInCurrentRun then
         if ctx.compilationUnit.source.file == fn.associatedFile then
-          ctx.error("Cannot call macro defined in the same source file", pos)
+          ctx.error(em"Cannot call macro $fn defined in the same source file", tree.sourcePos)
         ctx.compilationUnit.suspend()
 
       val (inst, clazz) =

compiler/src/dotty/tools/dotc/util/SourcePosition.scala

@@ -61,6 +61,9 @@ extends interfaces.SourcePosition with Showable {
   def focus   : SourcePosition = withSpan(span.focus)
   def toSynthetic: SourcePosition = withSpan(span.toSynthetic)
 
+  def outermost: SourcePosition =
+    if outer == null || outer == NoSourcePosition then this else outer.outermost
+
   override def toString: String =
     s"${if (source.exists) source.file.toString else "(no source)"}:$span"
 

tests/neg/macro-cycle1.scala

@@ -2,7 +2,7 @@ import scala.quoted.{Expr, QuoteContext}
 object Test {
   def fooImpl(given QuoteContext): Expr[Unit] = '{println("hi")}
 
-  inline def foo: Unit = ${fooImpl}
+  inline def foo: Unit = ${fooImpl}  // error
 
-  foo // error
+  foo
 }