Merge pull request #7295 from dotty-staging/fix-f-position

nicolasstucki · web-flow · commit 10091bd6aef6 · 2019-09-23T16:36:19.000+02:00
Correct position for f interpolator expansion
diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala
@@ -2753,7 +2753,7 @@ class Typer extends Namer
           // a call to dotty.internal.StringContext.f which we can implement using the new macros.
           // As the macro is implemented in the bootstrapped library, it can only be used from the bootstrapped compiler.
           val Apply(TypeApply(Select(sc, _), _), args) = tree
-          val newCall = ref(defn.InternalStringContextMacroModule_f).appliedTo(sc).appliedToArgs(args)
+          val newCall = ref(defn.InternalStringContextMacroModule_f).appliedTo(sc).appliedToArgs(args).withSpan(tree.span)
           readaptSimplified(Inliner.inlineCall(newCall))
         }
         else if (ctx.settings.XignoreScala2Macros.value) {

Original file line number	Diff line number	Diff line change
`@@ -2753,7 +2753,7 @@ class Typer extends Namer`
`2753`	`2753`	`// a call to dotty.internal.StringContext.f which we can implement using the new macros.`
`2754`	`2754`	`// As the macro is implemented in the bootstrapped library, it can only be used from the bootstrapped compiler.`
`2755`	`2755`	`val Apply(TypeApply(Select(sc, _), _), args) = tree`
`2756`		`- val newCall = ref(defn.InternalStringContextMacroModule_f).appliedTo(sc).appliedToArgs(args)`
	`2756`	`+ val newCall = ref(defn.InternalStringContextMacroModule_f).appliedTo(sc).appliedToArgs(args).withSpan(tree.span)`
`2757`	`2757`	`readaptSimplified(Inliner.inlineCall(newCall))`
`2758`	`2758`	`}`
`2759`	`2759`	`else if (ctx.settings.XignoreScala2Macros.value) {`