Merge pull request #7684 from dotty-staging/emit-inline-errors-at-expansion-site

Emit inline errors at expansion site

Author: nicolasstucki

compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala

@@ -33,7 +33,7 @@ trait MessageRendering {
  */
  def outer(pos: SourcePosition, prefix: String)(implicit ctx: Context): List[String] =
  if (pos.outer.exists)
- i"$prefix| This location is in code that was inlined at ${pos.outer}" ::
+ i"$prefix| This location contains code that was inlined from $pos" ::
  outer(pos.outer, prefix)
  else Nil
 
@@ -114,9 +114,9 @@ trait MessageRendering {
  */
  def posStr(pos: SourcePosition, diagnosticLevel: String, message: Message)(implicit ctx: Context): String =
  if (pos.exists) hl(diagnosticLevel)({
+ val pos1 = pos.nonInlined
  val file =
- if (pos.source.file.exists) s"${pos.source.file.toString}:${pos.line + 1}:${pos.column}"
- else s"${pos.source.file.toString}: offset ${pos.start} (missing source file)"
+ s"${pos1.source.file.toString}:${pos1.line + 1}:${pos1.column}"
  val errId =
  if (message.errorId ne ErrorMessageID.NoExplanationID) {
  val errorNumber = message.errorId.errorNumber
@@ -149,9 +149,10 @@ trait MessageRendering {
  val posString = posStr(pos, diagnosticLevel, msg)
  if (posString.nonEmpty) sb.append(posString).append(EOL)
  if (pos.exists && pos.source.file.exists) {
- val (srcBefore, srcAfter, offset) = sourceLines(pos, diagnosticLevel)
- val marker = columnMarker(pos, offset, diagnosticLevel)
- val err = errorMsg(pos, msg.msg, offset)
+ val pos1 = pos.nonInlined
+ val (srcBefore, srcAfter, offset) = sourceLines(pos1, diagnosticLevel)
+ val marker = columnMarker(pos1, offset, diagnosticLevel)
+ val err = errorMsg(pos1, msg.msg, offset)
  sb.append((srcBefore ::: marker :: err :: outer(pos, " " * (offset - 1)) ::: srcAfter).mkString(EOL))
  }
  else sb.append(msg.msg)

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

@@ -64,6 +64,17 @@ extends interfaces.SourcePosition with Showable {
  def outermost: SourcePosition =
  if outer == null || outer == NoSourcePosition then this else outer.outermost
 
+ /** Inner most position that is contained within the `outermost` position.
+ * Most precise position that that comes from the call site.
+ */
+ def nonInlined: SourcePosition = {
+ val om = outermost
+ def rec(self: SourcePosition): SourcePosition =
+ if om.contains(self) then self else rec(self.outer)
+ rec(this)
+ }
+
+
  override def toString: String =
  s"${if (source.exists) source.file.toString else "(no source)"}:$span"
 
@@ -75,4 +86,3 @@ extends interfaces.SourcePosition with Showable {
  override def toString: String = "?"
  override def withOuter(outer: SourcePosition): SourcePosition = outer
 }
-

compiler/test/dotty/tools/vulpix/ParallelTesting.scala

@@ -679,11 +679,12 @@ trait ParallelTesting extends RunnerOrchestration { self =>
  }
 
  def getMissingExpectedErrors(errorMap: HashMap[String, Integer], reporterErrors: Iterator[MessageContainer]) = !reporterErrors.forall { error =>
- val key = if (error.pos.exists) {
+ val pos1 = error.pos.nonInlined
+ val key = if (pos1.exists) {
  def toRelative(path: String): String = // For some reason, absolute paths leak from the compiler itself...
  path.split("/").dropWhile(_ != "tests").mkString("/")
- val fileName = toRelative(error.pos.source.file.toString)
- s"$fileName:${error.pos.line}"
+ val fileName = toRelative(pos1.source.file.toString)
+ s"$fileName:${pos1.line}"
 
  } else "nopos"
 
@@ -695,7 +696,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
  true
  }
  else {
- echo(s"Error reported in ${error.pos.source}, but no annotation found")
+ echo(s"Error reported in ${pos1.source}, but no annotation found")
  false
  }
  }

project/scripts/cmdTests

@@ -50,7 +50,7 @@ cp tests/neg/i6371/B_2.scala $OUT/B.scala
 "$SBT" "dotc $OUT/A.scala -d $OUT1"
 rm $OUT/A.scala
 "$SBT" "dotc -classpath $OUT1 -d $OUT1 $OUT/B.scala" > "$tmp" 2>&1 || echo "ok"
-grep -qe "A.scala: offset 63 (missing source file)" "$tmp"
+grep -qe "B.scala:2:7" "$tmp"
 
 
 ## Disabled because of flakeyness, should be changed to not depend on sbt

tests/neg-macros/delegate-match-1.check

@@ -4,4 +4,4 @@
  | ^
  | AmbiguousImplicits
  | both value a1 in class Test1 and value a2 in class Test1 match type A
- | This location is in code that was inlined at Test_2.scala:6
+ | This location contains code that was inlined from Test_2.scala:6

tests/neg-macros/delegate-match-2.check

@@ -4,4 +4,4 @@
  | ^
  | DivergingImplicit
  | method a1 in class Test produces a diverging implicit search when trying to match type A
- | This location is in code that was inlined at Test_2.scala:5
+ | This location contains code that was inlined from Test_2.scala:5

tests/neg-macros/delegate-match-3.check

@@ -4,4 +4,4 @@
  | ^
  | NoMatchingImplicits
  | no implicit values were found that match type A
- | This location is in code that was inlined at Test_2.scala:3
+ | This location contains code that was inlined from Test_2.scala:3

tests/neg-macros/i6432.check

@@ -3,14 +3,14 @@
 4 | foo"abc${"123"}xyz${"456"}fgh" // error // error // error
  | ^^^
  | abc
- | This location is in code that was inlined at Test_2.scala:4
+ | This location contains code that was inlined from Test_2.scala:4
 -- Error: tests/neg-macros/i6432/Test_2.scala:4:17 ---------------------------------------------------------------------
 4 | foo"abc${"123"}xyz${"456"}fgh" // error // error // error
  | ^^^
  | xyz
- | This location is in code that was inlined at Test_2.scala:4
+ | This location contains code that was inlined from Test_2.scala:4
 -- Error: tests/neg-macros/i6432/Test_2.scala:4:28 ---------------------------------------------------------------------
 4 | foo"abc${"123"}xyz${"456"}fgh" // error // error // error
  | ^^^
  | fgh
- | This location is in code that was inlined at Test_2.scala:4
+ | This location contains code that was inlined from Test_2.scala:4

tests/neg-macros/i6432b.check

@@ -3,14 +3,14 @@
 4 | foo"""abc${"123"}xyz${"456"}fgh""" // error // error // error
  | ^^^
  | abc
- | This location is in code that was inlined at Test_2.scala:4
+ | This location contains code that was inlined from Test_2.scala:4
 -- Error: tests/neg-macros/i6432b/Test_2.scala:4:19 --------------------------------------------------------------------
 4 | foo"""abc${"123"}xyz${"456"}fgh""" // error // error // error
  | ^^^
  | xyz
- | This location is in code that was inlined at Test_2.scala:4
+ | This location contains code that was inlined from Test_2.scala:4
 -- Error: tests/neg-macros/i6432b/Test_2.scala:4:30 --------------------------------------------------------------------
 4 | foo"""abc${"123"}xyz${"456"}fgh""" // error // error // error
  | ^^^
  | fgh
- | This location is in code that was inlined at Test_2.scala:4
+ | This location contains code that was inlined from Test_2.scala:4

tests/neg-macros/i6976.check

@@ -6,4 +6,4 @@
  | scala.MatchError: Inlined(EmptyTree,List(),Literal(Constant(2))) (of class dotty.tools.dotc.ast.Trees$Inlined)
  |	at playground.macros$.mcrImpl(Macro_1.scala:12)
  |
- | This location is in code that was inlined at Test_2.scala:5
+ | This location contains code that was inlined from Test_2.scala:5