Remove SourceImportTree

We keep only `SourceTree`, that we had before, but it now accepts any
`tpd.Tree`. After we bootstrap, this should become `tpd.Import |
tpd.NameTree`.

Author: Duhemm

compiler/src/dotty/tools/dotc/interactive/Interactive.scala

@@ -279,7 +279,7 @@ object Interactive {
    *  source code.
    */
   def namedTrees(trees: List[SourceTree], include: Include.Set, sym: Symbol)
-   (implicit ctx: Context): List[SourceNamedTree] =
+   (implicit ctx: Context): List[SourceTree] =
     if (!sym.exists)
       Nil
     else
@@ -288,7 +288,7 @@ object Interactive {
   /** Find named trees with a non-empty position whose name contains `nameSubstring` in `trees`.
    */
   def namedTrees(trees: List[SourceTree], nameSubstring: String)
-   (implicit ctx: Context): List[SourceNamedTree] = {
+   (implicit ctx: Context): List[SourceTree] = {
     val predicate: NameTree => Boolean = _.name.toString.contains(nameSubstring)
     namedTrees(trees, 0, predicate)
   }
@@ -298,10 +298,10 @@ object Interactive {
    *  @param includeReferences  If true, include references and not just definitions
    */
   def namedTrees(trees: List[SourceTree], include: Include.Set, treePredicate: NameTree => Boolean)
-    (implicit ctx: Context): List[SourceNamedTree] = safely {
+    (implicit ctx: Context): List[SourceTree] = safely {
     val includeReferences = (include & Include.references) != 0
     val includeImports = (include & Include.imports) != 0
-    val buf = new mutable.ListBuffer[SourceNamedTree]
+    val buf = new mutable.ListBuffer[SourceTree]
 
     def traverser(source: SourceFile) = {
       new untpd.TreeTraverser {
@@ -319,7 +319,7 @@ object Interactive {
                    && !tree.pos.isZeroExtent
                    && (includeReferences || isDefinition(tree))
                    && treePredicate(tree))
-                buf += SourceNamedTree(tree, source)
+                buf += SourceTree(tree, source)
               traverseChildren(tree)
             case tree: untpd.Inlined =>
               traverse(tree.call)
@@ -347,7 +347,7 @@ object Interactive {
                         includes: Include.Set,
                         symbol: Symbol,
                         predicate: NameTree => Boolean = util.common.alwaysTrue
-                       )(implicit ctx: Context): List[SourceNamedTree] = {
+                       )(implicit ctx: Context): List[SourceTree] = {
     val linkedSym = symbol.linkedClass
     val includeDeclaration = (includes & Include.definitions) != 0
     val includeLinkedClass = (includes & Include.linkedClass) != 0
@@ -450,7 +450,7 @@ object Interactive {
    * @param driver The driver responsible for `path`.
    * @return The definitions for the symbol at the end of `path`.
    */
-  def findDefinitions(path: List[Tree], pos: SourcePosition, driver: InteractiveDriver)(implicit ctx: Context): List[SourceNamedTree] = {
+  def findDefinitions(path: List[Tree], pos: SourcePosition, driver: InteractiveDriver)(implicit ctx: Context): List[SourceTree] = {
     enclosingSourceSymbols(path, pos).flatMap { sym =>
       val enclTree = enclosingTree(path)
 

compiler/src/dotty/tools/dotc/interactive/InteractiveDriver.scala

@@ -253,9 +253,9 @@ class InteractiveDriver(val settings: List[String]) extends Driver {
       case PackageDef(_, stats) =>
         stats.foreach(addTrees)
       case imp: Import =>
-        trees += SourceImportTree(imp, source)
+        trees += SourceTree(imp, source)
       case tree: TypeDef =>
-        trees += SourceNamedTree(tree, source)
+        trees += SourceTree(tree, source)
       case _ =>
     }
     addTrees(topTree)

compiler/src/dotty/tools/dotc/interactive/SourceTree.scala

@@ -9,50 +9,44 @@ import core._, core.Decorators.{sourcePos => _}
 import Contexts._, NameOps._, Symbols._, StdNames._
 import util._, util.Positions._
 
-/** A `tree` coming from `source` */
-sealed trait SourceTree {
-
-  /** The underlying tree. */
-  def tree: tpd.Tree
-
-  /** The source from which `tree` comes. */
-  def source: SourceFile
+/**
+ * A `tree` coming from `source`
+ *
+ * `tree` can be either an `Import` or a `NameTree`.
+ */
+case class SourceTree(tree: tpd.Tree /** really: tpd.Import | tpd.NameTree */, source: SourceFile) {
 
   /** The position of `tree` */
   final def pos(implicit ctx: Context): SourcePosition = source.atPos(tree.pos)
-}
-
-/** An import coming from `source` */
-case class SourceImportTree(tree: tpd.Import, source: SourceFile) extends SourceTree
-
-/** A typechecked `tree` coming from `source` */
-case class SourceNamedTree(tree: tpd.NameTree, source: SourceFile) extends SourceTree {
 
   /** The position of the name in `tree` */
-  def namePos(implicit ctx: Context): SourcePosition = {
-    // FIXME: Merge with NameTree#namePos ?
-    val treePos = tree.pos
-    if (treePos.isZeroExtent || tree.name.toTermName == nme.ERROR)
-      NoSourcePosition
-    else {
-      // Constructors are named `<init>` in the trees, but `this` in the source.
-      val nameLength = tree.name match {
-        case nme.CONSTRUCTOR => nme.this_.toString.length
-        case other => other.stripModuleClassSuffix.show.toString.length
-      }
-      val position = {
-        // FIXME: This is incorrect in some cases, like with backquoted identifiers,
-        //        see https://github.com/lampepfl/dotty/pull/1634#issuecomment-257079436
-        val (start, end) =
-          if (!treePos.isSynthetic)
-            (treePos.point, treePos.point + nameLength)
-          else
-            // If we don't have a point, we need to find it
-            (treePos.end - nameLength, treePos.end)
-        Position(start, end, start)
+  def namePos(implicit ctx: Context): SourcePosition = tree match {
+    case tree: tpd.NameTree =>
+      // FIXME: Merge with NameTree#namePos ?
+      val treePos = tree.pos
+      if (treePos.isZeroExtent || tree.name.toTermName == nme.ERROR)
+        NoSourcePosition
+      else {
+        // Constructors are named `<init>` in the trees, but `this` in the source.
+        val nameLength = tree.name match {
+          case nme.CONSTRUCTOR => nme.this_.toString.length
+          case other => other.stripModuleClassSuffix.show.toString.length
+        }
+        val position = {
+          // FIXME: This is incorrect in some cases, like with backquoted identifiers,
+          //        see https://github.com/lampepfl/dotty/pull/1634#issuecomment-257079436
+          val (start, end) =
+            if (!treePos.isSynthetic)
+              (treePos.point, treePos.point + nameLength)
+            else
+              // If we don't have a point, we need to find it
+              (treePos.end - nameLength, treePos.end)
+          Position(start, end, start)
+        }
+        source.atPos(position)
       }
-      source.atPos(position)
-    }
+    case _ =>
+      NoSourcePosition
   }
 }
 
@@ -63,19 +57,19 @@ object SourceTree {
       Nil
     else {
       import ast.Trees._
-      def sourceTreeOfClass(tree: tpd.Tree): Option[SourceNamedTree] = tree match {
+      def sourceTreeOfClass(tree: tpd.Tree): Option[SourceTree] = tree match {
         case PackageDef(_, stats) =>
           stats.flatMap(sourceTreeOfClass).headOption
         case tree: tpd.TypeDef if tree.symbol == sym =>
           val sourceFile = new SourceFile(sym.sourceFile, Codec.UTF8)
-          Some(SourceNamedTree(tree, sourceFile))
+          Some(SourceTree(tree, sourceFile))
         case _ =>
           None
       }
 
-      def sourceImports(tree: tpd.Tree, sourceFile: SourceFile): List[SourceImportTree] = tree match {
+      def sourceImports(tree: tpd.Tree, sourceFile: SourceFile): List[SourceTree] = tree match {
         case PackageDef(_, stats) => stats.flatMap(sourceImports(_, sourceFile))
-        case imp: tpd.Import => SourceImportTree(imp, sourceFile) :: Nil
+        case imp: tpd.Import => SourceTree(imp, sourceFile) :: Nil
         case _ => Nil
       }