Apply renamings to language server

Author: odersky

language-server/src/dotty/tools/languageserver/DottyLanguageServer.scala

@@ -18,7 +18,7 @@ import scala.io.Codec
 
 import dotc._
 import ast.{Trees, tpd}
-import core._, core.Decorators.{sourcePos => _, _}
+import core._, core.Decorators._
 import Annotations.AnnotInfo
 import Comments._, Constants._, Contexts._, Flags._, Names._, NameOps._, Symbols._, SymDenotations._, Trees._, Types._
 import classpath.ClassPathEntries
@@ -388,7 +388,7 @@ class DottyLanguageServer extends LanguageServer
     val refs =
       path match {
         // Selected a renaming in an import node
-        case Thicket(_ :: (rename: Ident) :: Nil) :: (_: Import) :: rest if rename.pos.contains(pos.pos) =>
+        case Thicket(_ :: (rename: Ident) :: Nil) :: (_: Import) :: rest if rename.span.contains(pos.span) =>
           findRenamedReferences(uriTrees, syms, rename.name)
 
         // Selected a reference that has been renamed
@@ -545,7 +545,7 @@ class DottyLanguageServer extends LanguageServer
     val trees = driver.openedTrees(uri)
     val path = Interactive.pathTo(trees, pos).dropWhile(!_.isInstanceOf[Apply])
 
-    val (paramN, callableN, alternatives) = Signatures.callInfo(path, pos.pos)
+    val (paramN, callableN, alternatives) = Signatures.callInfo(path, pos.span)
     val signatureInfos = alternatives.flatMap(Signatures.toSignature)
 
     new SignatureHelp(signatureInfos.map(signatureToSignatureInformation).asJava, callableN, paramN)
@@ -754,7 +754,7 @@ object DottyLanguageServer {
    * @return The position in the actual source file (before wrapping).
    */
   private def toUnwrappedPosition(position: SourcePosition): SourcePosition = {
-    new SourcePosition(position.source, position.pos, position.outer) {
+    new SourcePosition(position.source, position.span, position.outer) {
       override def startLine: Int = position.startLine - 1
       override def endLine: Int = position.endLine - 1
     }

language-server/src/dotty/tools/languageserver/worksheet/Worksheet.scala

@@ -40,7 +40,7 @@ object Worksheet {
                 template.body.flatMap {
                   case statement: DefTree if statement.symbol.is(Synthetic) =>
                     None
-                  case statement if seen.add(bounds(statement.pos)) =>
+                  case statement if seen.add(bounds(statement.span)) =>
                     Some(query(statement, tree.source))
                   case _ =>
                     None
@@ -66,12 +66,12 @@ object Worksheet {
    * @param sourcefile The sourcefile of the worksheet.
    */
   private def query(tree: Tree, sourcefile: SourceFile): (Int, String) = {
-    val line = sourcefile.offsetToLine(tree.pos.end)
-    val source = sourcefile.content.slice(tree.pos.start, tree.pos.end).mkString
+    val line = sourcefile.offsetToLine(tree.span.end)
+    val source = sourcefile.content.slice(tree.span.start, tree.span.end).mkString
     (line, source)
   }
 
-  private def bounds(pos: Span): (Int, Int) = (pos.start, pos.end)
+  private def bounds(span: Span): (Int, Int) = (span.start, span.end)
 
 }