From 8ea583671a0dc88a9a8ef59eb4f60d70541adfce Mon Sep 17 00:00:00 2001
From: Felix Mulder <felix.mulder@gmail.com>
Date: Tue, 18 Oct 2016 15:25:51 +0200
Subject: Fix #1604: print outer context if applicable

---
 src/dotty/tools/dotc/reporting/MessageRendering.scala | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/dotty/tools/dotc/reporting/MessageRendering.scala')

diff --git a/src/dotty/tools/dotc/reporting/MessageRendering.scala b/src/dotty/tools/dotc/reporting/MessageRendering.scala
index 6d9e45a6e..79632c965 100644
--- a/src/dotty/tools/dotc/reporting/MessageRendering.scala
+++ b/src/dotty/tools/dotc/reporting/MessageRendering.scala
@@ -15,6 +15,12 @@ trait MessageRendering {
   def stripColor(str: String): String =
     str.replaceAll("\u001B\\[[;\\d]*m", "")
 
+  def outer(pos: SourcePosition, prefix: String)(implicit ctx: Context): List[String] =
+    if (pos.outer.exists) {
+       s"$prefix| This location is in code that was inlined at ${pos.outer}" ::
+       outer(pos.outer, prefix)
+    } else Nil
+
   def sourceLines(pos: SourcePosition)(implicit ctx: Context): (List[String], List[String], Int) = {
     var maxLen = Int.MinValue
     def render(xs: List[Int]) =
@@ -92,7 +98,7 @@ trait MessageRendering {
       val (srcBefore, srcAfter, offset) = sourceLines(pos)
       val marker = columnMarker(pos, offset)
       val err = errorMsg(pos, msg.msg, offset)
-      sb.append((srcBefore ::: marker :: err :: srcAfter).mkString("\n"))
+      sb.append((srcBefore ::: marker :: err :: outer(pos, " " * (offset - 1)) ::: srcAfter).mkString("\n"))
     } else sb.append(msg.msg)
     sb.toString
   }
-- 
cgit v1.2.3