From 617be516b261524c2f0762de10f2bde376043ad7 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Thu, 1 Sep 2016 19:10:48 +0200 Subject: Print inlining positions in error messages Error messages now print the inlined positions as well as the position of the inlined call, recursively. --- src/dotty/tools/dotc/core/Decorators.scala | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'src/dotty/tools/dotc/core/Decorators.scala') diff --git a/src/dotty/tools/dotc/core/Decorators.scala b/src/dotty/tools/dotc/core/Decorators.scala index 387e7e466..fc546667d 100644 --- a/src/dotty/tools/dotc/core/Decorators.scala +++ b/src/dotty/tools/dotc/core/Decorators.scala @@ -7,6 +7,8 @@ import Contexts._, Names._, Phases._, printing.Texts._, printing.Printer, printi import util.Positions.Position, util.SourcePosition import collection.mutable.ListBuffer import dotty.tools.dotc.transform.TreeTransforms._ +import typer.Inliner +import ast.tpd.Inlined import scala.language.implicitConversions import printing.Formatting._ @@ -148,8 +150,16 @@ object Decorators { } } - implicit def sourcePos(pos: Position)(implicit ctx: Context): SourcePosition = - ctx.source.atPos(pos) + implicit def sourcePos(pos: Position)(implicit ctx: Context): SourcePosition = { + def recur(inlineds: Stream[Inlined], pos: Position): SourcePosition = inlineds match { + case inlined #:: rest => + Inliner.sourceFile(inlined).atPos(pos) + .withOuter(recur(rest, inlined.call.pos)) + case empty => + ctx.source.atPos(pos) + } + recur(Inliner.enclosingInlineds, pos) + } implicit class StringInterpolators(val sc: StringContext) extends AnyVal { -- cgit v1.2.3