aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools/dotc/core/Contexts.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2016-09-01 17:44:27 +0200
committerMartin Odersky <odersky@gmail.com>2016-10-02 16:11:21 +0200
commitfaba2b7999bf73bf10116b391efbdd751054ead0 (patch)
tree220e1956858d92066949faf63aeb623e6d6fa63a /src/dotty/tools/dotc/core/Contexts.scala
parent8a3762a62d12b7f57de27c840425184df56b2689 (diff)
downloaddotty-faba2b7999bf73bf10116b391efbdd751054ead0.tar.gz
dotty-faba2b7999bf73bf10116b391efbdd751054ead0.tar.bz2
dotty-faba2b7999bf73bf10116b391efbdd751054ead0.zip
Track Inlined nodes in ctx.source
Diffstat (limited to 'src/dotty/tools/dotc/core/Contexts.scala')
-rw-r--r--src/dotty/tools/dotc/core/Contexts.scala10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/dotty/tools/dotc/core/Contexts.scala b/src/dotty/tools/dotc/core/Contexts.scala
index 6f9d19c40..ea0ab95e6 100644
--- a/src/dotty/tools/dotc/core/Contexts.scala
+++ b/src/dotty/tools/dotc/core/Contexts.scala
@@ -18,7 +18,7 @@ import util.Positions._
import ast.Trees._
import ast.untpd
import util.{FreshNameCreator, SimpleMap, SourceFile, NoSource}
-import typer.{Implicits, ImplicitRunInfo, ImportInfo, NamerContextOps, SearchHistory, TypeAssigner, Typer}
+import typer.{Implicits, ImplicitRunInfo, ImportInfo, Inliner, NamerContextOps, SearchHistory, TypeAssigner, Typer}
import Implicits.ContextualImplicits
import config.Settings._
import config.Config
@@ -370,8 +370,12 @@ object Contexts {
/** The current source file; will be derived from current
* compilation unit.
*/
- def source: SourceFile =
- if (compilationUnit == null) NoSource else compilationUnit.source
+ def source: SourceFile = {
+ val file = Inliner.inlinedSource
+ if (file.exists) file
+ else if (compilationUnit == null) NoSource
+ else compilationUnit.source
+ }
/** Does current phase use an erased types interpretation? */
def erasedTypes: Boolean = phase.erasedTypes