Use SourceFile implicits instead of SourceInfo

No need to do the wrapping

Author: odersky

compiler/src/dotty/tools/dotc/ast/Desugar.scala

@@ -8,7 +8,7 @@ import Symbols._, StdNames._, Trees._
 import Decorators._, transform.SymUtils._
 import NameKinds.{UniqueName, EvidenceParamName, DefaultGetterName}
 import typer.FrontEnd
-import util.Property
+import util.{Property, SourceFile}
 import collection.mutable.ListBuffer
 import reporting.diagnostic.messages._
 import reporting.trace
@@ -43,23 +43,23 @@ object desugar {
 
 // ----- DerivedTypeTrees -----------------------------------
 
-  class SetterParamTree(implicit @transientParam src: SourceInfo) extends DerivedTypeTree {
+  class SetterParamTree(implicit @transientParam src: SourceFile) extends DerivedTypeTree {
     def derivedTree(sym: Symbol)(implicit ctx: Context): tpd.TypeTree = tpd.TypeTree(sym.info.resultType)
   }
 
-  class TypeRefTree(implicit @transientParam src: SourceInfo) extends DerivedTypeTree {
+  class TypeRefTree(implicit @transientParam src: SourceFile) extends DerivedTypeTree {
     def derivedTree(sym: Symbol)(implicit ctx: Context): tpd.TypeTree = tpd.TypeTree(sym.typeRef)
   }
 
-  class TermRefTree(implicit @transientParam src: SourceInfo) extends DerivedTypeTree {
+  class TermRefTree(implicit @transientParam src: SourceFile) extends DerivedTypeTree {
     def derivedTree(sym: Symbol)(implicit ctx: Context): tpd.Tree = tpd.ref(sym)
   }
 
   /** A type tree that computes its type from an existing parameter.
    *  @param suffix  String difference between existing parameter (call it `P`) and parameter owning the
    *                 DerivedTypeTree (call it `O`). We have: `O.name == P.name + suffix`.
    */
-  class DerivedFromParamTree(suffix: String)(implicit @transientParam src: SourceInfo) extends DerivedTypeTree {
+  class DerivedFromParamTree(suffix: String)(implicit @transientParam src: SourceFile) extends DerivedTypeTree {
 
     /** Make sure that for all enclosing module classes their companion classes
      *  are completed. Reason: We need the constructor of such companion classes to
@@ -1029,7 +1029,7 @@ object desugar {
     mayNeedSetter
    }
 
-  private def derivedDefDef(original: Tree, named: NameTree, tpt: Tree, rhs: Tree, mods: Modifiers)(implicit src: SourceInfo) =
+  private def derivedDefDef(original: Tree, named: NameTree, tpt: Tree, rhs: Tree, mods: Modifiers)(implicit src: SourceFile) =
     DefDef(named.name.asTermName, Nil, Nil, tpt, rhs)
       .withMods(mods)
       .withSpan(original.span.withPoint(named.span.start))
@@ -1393,6 +1393,6 @@ object desugar {
     buf.toList
   }
 
-  private class IrrefutableGenFrom(pat: Tree, expr: Tree)(implicit @transientParam src: SourceInfo)
+  private class IrrefutableGenFrom(pat: Tree, expr: Tree)(implicit @transientParam src: SourceFile)
     extends GenFrom(pat, expr)
 }

compiler/src/dotty/tools/dotc/ast/DesugarEnums.scala

@@ -6,7 +6,7 @@ import core._
 import util.Spans._, Types._, Contexts._, Constants._, Names._, NameOps._, Flags._
 import Symbols._, StdNames._, Trees._
 import Decorators._
-import util.Property
+import util.{Property, SourceFile}
 import typer.ErrorReporting._
 
 import scala.annotation.internal.sharable
@@ -73,7 +73,7 @@ object DesugarEnums {
     else if (isEnumCase(cdef)) cdef.withMods(cdef.mods.withFlags(cdef.mods.flags | Final))
     else cdef
 
-  private def valuesDot(name: String)(implicit src: SourceInfo) =
+  private def valuesDot(name: String)(implicit src: SourceFile) =
     Select(Ident(nme.DOLLAR_VALUES), name.toTermName)
   private def registerCall(implicit ctx: Context): List[Tree] =
     if (enumClass.typeParams.nonEmpty) Nil

compiler/src/dotty/tools/dotc/ast/Positioned.scala

@@ -4,7 +4,7 @@ package ast
 
 import util.Spans._
 import util.{SourceFile, NoSource, SourcePosition}
-import core.Contexts.{Context, SourceInfo}
+import core.Contexts.Context
 import core.Decorators._
 import core.Flags.{JavaDefined, Extension}
 import core.StdNames.nme
@@ -13,7 +13,7 @@ import annotation.internal.sharable
 
 /** A base class for things that have positions (currently: modifiers and trees)
  */
-abstract class Positioned(implicit @transientParam src: SourceInfo) extends Product with Cloneable {
+abstract class Positioned(implicit @transientParam src: SourceFile) extends Product with Cloneable {
 
   /** A unique identifier. Among other things, used for determining the source file
    *  component of the position.
@@ -157,7 +157,7 @@ abstract class Positioned(implicit @transientParam src: SourceInfo) extends Prod
 
   /** The initial, synthetic span. This is usually the union of all positioned children's spans.
    */
-  def initialSpan(si: SourceInfo): Span = {
+  def initialSpan(givenSource: SourceFile): Span = {
 
     def include(span1: Span, p2: Positioned): Span = {
       val span2 = p2.span
@@ -167,7 +167,7 @@ abstract class Positioned(implicit @transientParam src: SourceInfo) extends Prod
         if (src `eq` src2) span1.union(span2)
         else if (!src.exists) {
           setId(src2.nextId)
-          if (span1.exists) initialSpan(si) // we might have some mis-classified children; re-run everything
+          if (span1.exists) initialSpan(givenSource) // we might have some mis-classified children; re-run everything
           else span2
         }
         else span1 // sources differ: ignore child span
@@ -197,7 +197,7 @@ abstract class Positioned(implicit @transientParam src: SourceInfo) extends Prod
       }
       n += 1
     }
-    if (uniqueId == -1) setId(si.source.nextId)
+    if (uniqueId == -1) setId(givenSource.nextId)
     span.toSynthetic
   }