Rename SourcePosition -> Position

Author: odersky

compiler/src/dotty/tools/backend/jvm/CollectEntryPoints.scala

@@ -12,7 +12,7 @@ import SymDenotations._
 import Contexts._
 import Types._
 import Symbols._
-import dotty.tools.dotc.util.SourcePosition
+import dotty.tools.dotc.util.Position
 import Decorators._
 import StdNames.nme
 
@@ -47,7 +47,7 @@ object CollectEntryPoints{
     def hasJavaMainMethod(sym: Symbol): Boolean =
       (toDenot(sym).info member nme.main).alternatives exists(x => isJavaMainMethod(x.symbol))
 
-    def fail(msg: String, pos: SourcePosition = sym.sourcePos) = {
+    def fail(msg: String, pos: Position = sym.sourcePos) = {
       ctx.warning(
         i"""${sym.name} has a main method with parameter type Array[String], but ${sym.fullName} will not be a runnable program.
            |Reason: $msg""", sym.sourcePos

compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala

@@ -390,7 +390,7 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma
     ctx.error(msg)
     throw new RuntimeException(msg)
   }
-  def sourcePos(pos: Position)(implicit ctx: Context): util.SourcePosition =
+  def sourcePos(pos: Position)(implicit ctx: Context): util.Position =
     ctx.source.atSpan(pos)
 
   def emitAsmp: Option[String] = None

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

@@ -3,7 +3,7 @@ package dotc
 package ast
 
 import util.Spans._
-import util.{SourceFile, NoSource, SourcePosition}
+import util.{SourceFile, NoSource, Position}
 import core.Contexts.Context
 import core.Decorators._
 import core.Flags.{JavaDefined, Extension}
@@ -28,7 +28,7 @@ abstract class Positioned(implicit @transientParam src: SourceFile) extends Prod
   def uniqueId: Int = myUniqueId
 
   def source: SourceFile = SourceFile.fromId(uniqueId)
-  def sourcePos(implicit ctx: Context): SourcePosition = source.atSpan(span)
+  def sourcePos(implicit ctx: Context): Position = source.atSpan(span)
 
   //setId(initialSource(src).nextId)
   setPos(initialSpan(src), source)
@@ -68,7 +68,7 @@ abstract class Positioned(implicit @transientParam src: SourceFile) extends Prod
     newpd
   }
 
-  def withSourcePos(sourcePos: SourcePosition): this.type = {
+  def withSourcePos(sourcePos: Position): this.type = {
     val ownSpan = this.span
     val newpd: this.type =
       if ((sourcePos.source `eq` source) && sourcePos.span == ownSpan || ownSpan.isSynthetic) this

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

@@ -9,7 +9,7 @@ import language.higherKinds
 import collection.mutable.ListBuffer
 import printing.Printer
 import printing.Texts.Text
-import util.{Stats, Attachment, Property, SourceFile, NoSource, SourcePosition}
+import util.{Stats, Attachment, Property, SourceFile, NoSource, Position}
 import config.Config
 import annotation.internal.sharable
 import annotation.unchecked.uncheckedVariance
@@ -809,7 +809,7 @@ object Trees {
       mapElems(_.withSpan(span)).asInstanceOf[this.type]
     override def withPosOf(posd: Positioned): this.type =
       mapElems(_.withPosOf(posd)).asInstanceOf[this.type]
-    override def withSourcePos(sourcePos: SourcePosition): this.type =
+    override def withSourcePos(sourcePos: Position): this.type =
       mapElems(_.withSourcePos(sourcePos)).asInstanceOf[this.type]
   }
 

compiler/src/dotty/tools/dotc/core/Decorators.scala

@@ -4,7 +4,7 @@ package core
 import annotation.tailrec
 import Symbols._
 import Contexts._, Names._, Phases._, printing.Texts._, printing.Printer
-import util.Spans.Span, util.SourcePosition
+import util.Spans.Span, util.Position
 import collection.mutable.ListBuffer
 import dotty.tools.dotc.transform.MegaPhase
 import ast.tpd._

compiler/src/dotty/tools/dotc/core/Symbols.scala

@@ -26,7 +26,7 @@ import reporting.diagnostic.Message
 import collection.mutable
 import io.AbstractFile
 import language.implicitConversions
-import util.{SourceFile, NoSource, Property, SourcePosition}
+import util.{SourceFile, NoSource, Property, Position}
 import scala.collection.JavaConverters._
 import scala.annotation.internal.sharable
 import config.Printers.typr
@@ -661,7 +661,7 @@ object Symbols {
      */
     final def span: Span = if (coord.isSpan) coord.toSpan else NoSpan
 
-    final def sourcePos(implicit ctx: Context): SourcePosition = {
+    final def sourcePos(implicit ctx: Context): Position = {
       val src = source
       (if (src.exists) src else ctx.source).atSpan(span)
     }

compiler/src/dotty/tools/dotc/core/TypeOps.scala

@@ -5,7 +5,7 @@ package core
 import Contexts._, Types._, Symbols._, Names._, Flags._
 import SymDenotations._
 import util.Spans._
-import util.SourcePosition
+import util.Position
 import NameKinds.DepParamName
 import Decorators._
 import StdNames._
@@ -321,7 +321,7 @@ trait TypeOps { this: Context => // TODO: Make standalone object.
   def dynamicsEnabled: Boolean =
     featureEnabled(defn.LanguageModuleClass, nme.dynamics)
 
-  def testScala2Mode(msg: => Message, pos: SourcePosition, replace: => Unit = ()): Boolean = {
+  def testScala2Mode(msg: => Message, pos: Position, replace: => Unit = ()): Boolean = {
     if (scala2Mode) {
       migrationWarning(msg, pos)
       replace

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

@@ -16,7 +16,7 @@ import dotty.tools.dotc.core.StdNames.{nme, tpnme}
 import dotty.tools.dotc.core.TypeError
 import dotty.tools.dotc.core.Types.{NameFilter, NamedType, Type, NoType}
 import dotty.tools.dotc.printing.Texts._
-import dotty.tools.dotc.util.{NoSourcePosition, SourcePosition}
+import dotty.tools.dotc.util.{NoPosition, Position}
 
 import scala.collection.mutable
 
@@ -39,7 +39,7 @@ object Completion {
    *
    *  @return offset and list of symbols for possible completions
    */
-  def completions(pos: SourcePosition)(implicit ctx: Context): (Int, List[Completion]) = {
+  def completions(pos: Position)(implicit ctx: Context): (Int, List[Completion]) = {
     val path = Interactive.pathTo(ctx.compilationUnit.tpdTree, pos.span)
     computeCompletions(pos, path)(Interactive.contextOfPath(path))
   }
@@ -54,7 +54,7 @@ object Completion {
    *
    * Otherwise, provide no completion suggestion.
    */
-  private def completionMode(path: List[Tree], pos: SourcePosition): Mode = {
+  private def completionMode(path: List[Tree], pos: Position): Mode = {
     path match {
       case (ref: RefTree) :: _ =>
         if (ref.name.isTermName) Mode.Term
@@ -77,7 +77,7 @@ object Completion {
    * Inspect `path` to determine the completion prefix. Only symbols whose name start with the
    * returned prefix should be considered.
    */
-  private def completionPrefix(path: List[Tree], pos: SourcePosition): String = {
+  private def completionPrefix(path: List[Tree], pos: Position): String = {
     path match {
       case Thicket(name :: _ :: Nil) :: (_: Import) :: _ =>
         completionPrefix(name :: Nil, pos)
@@ -105,13 +105,13 @@ object Completion {
   }
 
   /** Create a new `CompletionBuffer` for completing at `pos`. */
-  private def completionBuffer(path: List[Tree], pos: SourcePosition): CompletionBuffer = {
+  private def completionBuffer(path: List[Tree], pos: Position): CompletionBuffer = {
     val mode = completionMode(path, pos)
     val prefix = completionPrefix(path, pos)
     new CompletionBuffer(mode, prefix, pos)
   }
 
-  private def computeCompletions(pos: SourcePosition, path: List[Tree])(implicit ctx: Context): (Int, List[Completion]) = {
+  private def computeCompletions(pos: Position, path: List[Tree])(implicit ctx: Context): (Int, List[Completion]) = {
 
     val offset = completionOffset(path)
     val buffer = completionBuffer(path, pos)
@@ -135,7 +135,7 @@ object Completion {
     (offset, completionList)
   }
 
-  private class CompletionBuffer(val mode: Mode, val prefix: String, pos: SourcePosition) {
+  private class CompletionBuffer(val mode: Mode, val prefix: String, pos: Position) {
 
     private[this] val completions = new RenameAwareScope
 

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

@@ -9,7 +9,7 @@ import ast.{NavigateAST, Trees, tpd, untpd}
 import core._, core.Decorators._
 import Contexts._, Flags._, Names._, NameOps._, Symbols._, Trees._, Types._
 import transform.SymUtils.decorateSymbol
-import util.Spans._, util.SourceFile, util.SourcePosition
+import util.Spans._, util.SourceFile, util.Position
 import core.Denotations.SingleDenotation
 import NameKinds.SimpleNameKind
 import config.Printers.interactiv
@@ -70,15 +70,15 @@ object Interactive {
     tree.isInstanceOf[DefTree with NameTree]
 
   /** The type of the closest enclosing tree with a type containing position `pos`. */
-  def enclosingType(trees: List[SourceTree], pos: SourcePosition)(implicit ctx: Context): Type = {
+  def enclosingType(trees: List[SourceTree], pos: Position)(implicit ctx: Context): Type = {
     val path = pathTo(trees, pos)
     if (path.isEmpty) NoType
     else path.head.tpe
   }
 
   /** The closest enclosing tree with a symbol containing position `pos`, or the `EmptyTree`.
    */
-  def enclosingTree(trees: List[SourceTree], pos: SourcePosition)(implicit ctx: Context): Tree =
+  def enclosingTree(trees: List[SourceTree], pos: Position)(implicit ctx: Context): Tree =
     enclosingTree(pathTo(trees, pos))
 
   /** The closes enclosing tree with a symbol, or the `EmptyTree`.
@@ -97,7 +97,7 @@ object Interactive {
    *
    * @see sourceSymbol
    */
-  def enclosingSourceSymbols(path: List[Tree], pos: SourcePosition)(implicit ctx: Context): List[Symbol] = {
+  def enclosingSourceSymbols(path: List[Tree], pos: Position)(implicit ctx: Context): List[Symbol] = {
     val syms = path match {
       // For a named arg, find the target `DefDef` and jump to the param
       case NamedArg(name, _) :: Apply(fn, _) :: _ =>
@@ -250,7 +250,7 @@ object Interactive {
    *  or `Nil` if no such path exists. If a non-empty path is returned it starts with
    *  the tree closest enclosing `pos` and ends with an element of `trees`.
    */
-  def pathTo(trees: List[SourceTree], pos: SourcePosition)(implicit ctx: Context): List[Tree] =
+  def pathTo(trees: List[SourceTree], pos: Position)(implicit ctx: Context): List[Tree] =
     trees.find(_.pos.contains(pos)) match {
       case Some(tree) => pathTo(tree.tree, pos.span)
       case None => Nil
@@ -332,7 +332,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): List[SourceTree] = {
+  def findDefinitions(path: List[Tree], pos: Position, driver: InteractiveDriver): List[SourceTree] = {
     implicit val ctx = driver.currentCtx
     val enclTree = enclosingTree(path)
     val includeOverridden = enclTree.isInstanceOf[MemberDef]

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

@@ -17,15 +17,15 @@ import util._, util.Spans._
 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.atSpan(tree.span)
+  final def pos(implicit ctx: Context): Position = source.atSpan(tree.span)
 
   /** The position of the name in `tree` */
-  def namePos(implicit ctx: Context): SourcePosition = tree match {
+  def namePos(implicit ctx: Context): Position = tree match {
     case tree: tpd.NameTree =>
       // FIXME: Merge with NameTree#namePos ?
       val treeSpan = tree.span
       if (treeSpan.isZeroExtent || tree.name.toTermName == nme.ERROR)
-        NoSourcePosition
+        NoPosition
       else {
         // Constructors are named `<init>` in the trees, but `this` in the source.
         val nameLength = tree.name match {
@@ -46,7 +46,7 @@ case class SourceTree(tree: tpd.Tree /** really: tpd.Import | tpd.NameTree */, s
         source.atSpan(position)
       }
     case _ =>
-      NoSourcePosition
+      NoPosition
   }
 }
 

compiler/src/dotty/tools/dotc/parsing/Parsers.scala

@@ -5,7 +5,7 @@ package parsing
 import scala.annotation.internal.sharable
 import scala.collection.mutable.ListBuffer
 import scala.collection.immutable.BitSet
-import util.{ SourceFile, SourcePosition }
+import util.{ SourceFile, Position }
 import Tokens._
 import Scanners._
 import xml.MarkupParsers.MarkupParser
@@ -102,7 +102,7 @@ object Parsers {
     def nameStart: Offset =
       if (in.token == BACKQUOTED_IDENT) in.offset + 1 else in.offset
 
-    def sourcePos(off: Int = in.offset): SourcePosition =
+    def sourcePos(off: Int = in.offset): Position =
       source.atSpan(Span(off))
 
     /* ------------- ERROR HANDLING ------------------------------------------- */
@@ -259,7 +259,7 @@ object Parsers {
       }
     }
 
-    def warning(msg: => Message, sourcePos: SourcePosition): Unit =
+    def warning(msg: => Message, sourcePos: Position): Unit =
       ctx.warning(msg, sourcePos)
 
     def warning(msg: => Message, offset: Int = in.offset): Unit =

compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala

@@ -8,7 +8,7 @@ import StdNames.nme
 import ast.Trees._
 import typer.Implicits._
 import typer.ImportInfo
-import util.SourcePosition
+import util.Position
 import java.lang.Integer.toOctalString
 import config.Config.summarizeDepth
 import scala.util.control.NonFatal
@@ -506,7 +506,7 @@ class PlainPrinter(_ctx: Context) extends Printer {
     nodeName ~ "(" ~ elems ~ tpSuffix ~ ")" ~ (Str(tree.sourcePos.toString) provided ctx.settings.YprintPos.value)
   }.close // todo: override in refined printer
 
-  def toText(pos: SourcePosition): Text = {
+  def toText(pos: Position): Text = {
     if (!pos.exists) "<no position>"
     else if (pos.source.exists) s"${pos.source.file.name}:${pos.line + 1}"
     else s"(no source file, offset = ${pos.span.point})"

compiler/src/dotty/tools/dotc/printing/Printer.scala

@@ -7,7 +7,7 @@ import Texts._, ast.Trees._
 import Types.Type, Symbols.Symbol, Scopes.Scope, Constants.Constant,
        Names.Name, Denotations._, Annotations.Annotation
 import typer.Implicits.SearchResult
-import util.SourcePosition
+import util.Position
 import typer.ImportInfo
 
 import scala.annotation.internal.sharable
@@ -136,7 +136,7 @@ abstract class Printer {
   def toText[T >: Untyped](tree: Tree[T]): Text
 
   /** Textual representation of source position */
-  def toText(pos: SourcePosition): Text
+  def toText(pos: Position): Text
 
   /** Textual representation of implicit search result */
   def toText(result: SearchResult): Text

compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala

@@ -24,7 +24,7 @@ import scala.tasty.util.Chars.isOperatorPart
 import transform.TypeUtils._
 
 import language.implicitConversions
-import dotty.tools.dotc.util.SourcePosition
+import dotty.tools.dotc.util.Position
 import dotty.tools.dotc.ast.untpd.{MemberDef, Modifiers, PackageDef, RefTree, Template, TypeDef, ValOrDefDef}
 
 class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
@@ -841,7 +841,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
 
   override def plain: PlainPrinter = new PlainPrinter(_ctx)
 
-  private def withPos(txt: Text, pos: SourcePosition): Text = {
+  private def withPos(txt: Text, pos: Position): Text = {
     if (!printLines || !pos.exists) txt
     else txt match {
       case Str(s, _) => Str(s, LineRange(pos.line, pos.endLine))