Remove a layer of indirection

Author: nicolasstucki

language-server/test/dotty/tools/languageserver/util/CodeRange.scala

@@ -32,7 +32,7 @@ case class CodeRange(start: CodeMarker, end: CodeMarker) {
 
   def toLSPRange: PosCtx[Range] = {
     check()
-    new Range(start.toLSP, end.toLSP)
+    new Range(start.toPosition, end.toPosition)
   }
 
   def toLSPLocation: PosCtx[Location] = {

language-server/test/dotty/tools/languageserver/util/CodeTester.scala

@@ -1,6 +1,5 @@
 package dotty.tools.languageserver.util
 
-import dotty.tools.dotc.printing.Highlighting
 import dotty.tools.languageserver.util.Code.SourceWithPositions
 import dotty.tools.languageserver.util.actions._
 import dotty.tools.languageserver.util.embedded.CodeMarker

language-server/test/dotty/tools/languageserver/util/actions/Action.scala

@@ -1,10 +1,14 @@
 package dotty.tools.languageserver.util.actions
 
+import dotty.tools.languageserver.DottyLanguageServer
 import dotty.tools.languageserver.util.PositionContext
 import dotty.tools.languageserver.util.server.TestServer
 
+import PositionContext._
+
 trait Action {
-  type Exec = implicit (TestServer, PositionContext) => Unit
-  def execute(): Exec
-  def show: PositionContext.PosCtx[String]
+  type Exec[T] = implicit (TestServer, PositionContext) => T
+  def execute(): Exec[Unit]
+  def show: PosCtx[String]
+  def server: Exec[DottyLanguageServer] = implicitly[TestServer].server
 }

language-server/test/dotty/tools/languageserver/util/actions/ActionOnRange.scala

@@ -1,15 +1,14 @@
 package dotty.tools.languageserver.util.actions
 
-import dotty.tools.languageserver.util.server.TestFile
 import dotty.tools.languageserver.util.{CodeRange, PositionContext}
 import dotty.tools.languageserver.util.embedded.CodeMarker
 
 trait ActionOnRange extends Action {
 
   def range: CodeRange
-  def onMarker(marker: CodeMarker): Exec
+  def onMarker(marker: CodeMarker): Exec[Unit]
 
-  def execute(): Exec = {
+  def execute(): Exec[Unit] = {
     val posCtx = implicitly[PositionContext]
     range.check()
     val file = range.file
@@ -18,8 +17,8 @@ trait ActionOnRange extends Action {
     val startCharacter = start.character
     val endLine = range.end.line
     val endCharacter = range.end.character
-    assert(startLine <= endLine)
-    assert(startLine != endLine || startCharacter < endCharacter)
+    assert(startLine <= endLine, "Start of range should be before end " + range.show)
+    assert(startLine != endLine || startCharacter < endCharacter, "Start of range should be before end " + range.show)
     assert(startLine == endLine, "multiline ranges not supported") // TODO implement multiline
     (startCharacter until endCharacter).foreach { char =>
       val marker = new CodeMarker(start.name + "-with-offset=" + (char - startCharacter))

language-server/test/dotty/tools/languageserver/util/actions/CodeCompletion.scala

@@ -2,17 +2,14 @@ package dotty.tools.languageserver.util.actions
 
 import dotty.tools.languageserver.util.PositionContext
 import dotty.tools.languageserver.util.embedded.CodeMarker
-import dotty.tools.languageserver.util.server.{TestFile, TestServer}
+import dotty.tools.languageserver.util.server.TestFile
 
 import scala.collection.JavaConverters._
 
 class CodeCompletion(val marker: CodeMarker, completions: List[(String, String, String)]) extends ActionOnMarker {
 
-  override def execute(): Exec = {
-    val file: TestFile = marker.file
-    val line: Int = marker.line
-    val char: Int = marker.character
-    val res = implicitly[TestServer].completion(file, line, char)
+  override def execute(): Exec[Unit] = {
+    val res = server.completion(marker.toTextDocumentPositionParams).get()
     assert(res.isRight, res)
     val cList = res.getRight
     assert(!cList.isIncomplete, res)

language-server/test/dotty/tools/languageserver/util/actions/CodeDefinition.scala

@@ -2,15 +2,11 @@ package dotty.tools.languageserver.util.actions
 
 import dotty.tools.languageserver.util._
 import dotty.tools.languageserver.util.embedded.CodeMarker
-import dotty.tools.languageserver.util.server.{TestFile, TestServer}
 
 class CodeDefinition(val range: CodeRange, refOpt: Option[CodeRange]) extends ActionOnRange {
 
-  override def onMarker(marker: CodeMarker): Exec = {
-    val file: TestFile = marker.file
-    val line: Int = marker.line
-    val char: Int = marker.character
-    val res = implicitly[TestServer].definition(file, line, char)
+  override def onMarker(marker: CodeMarker): Exec[Unit] = {
+    val res = server.definition(marker.toTextDocumentPositionParams).get()
     assert(res.size() == refOpt.size, res)
     refOpt.foreach(ref => assert(res.get(0) == ref.toLSPLocation, res))
   }

language-server/test/dotty/tools/languageserver/util/actions/CodeDocumentHighlight.scala

@@ -1,20 +1,16 @@
 package dotty.tools.languageserver.util.actions
 
 import dotty.tools.languageserver.util.embedded.CodeMarker
-import dotty.tools.languageserver.util.server.{TestFile, TestServer}
 import dotty.tools.languageserver.util.{CodeRange, PositionContext}
 import org.eclipse.lsp4j._
 
 import scala.collection.JavaConverters._
 
 class CodeDocumentHighlight(val range: CodeRange, highs: Seq[(CodeRange, String)]) extends ActionOnRange {
 
-  override def onMarker(marker: CodeMarker): Exec = {
-    val file: TestFile = marker.file
-    val line: Int = marker.line
-    val char: Int = marker.character
+  override def onMarker(marker: CodeMarker): Exec[Unit] = {
     val (refs, kinds) = highs.unzip
-    val res = implicitly[TestServer].documentHighlight(file, line, char)
+    val res = server.documentHighlight(marker.toTextDocumentPositionParams).get()
     assert(res.size() == refs.size, res)
     assert(refs.size == kinds.length, res)
     res.asScala.zip(refs).zip(kinds).foreach { case ((dhl, ref), kind) =>

language-server/test/dotty/tools/languageserver/util/actions/CodeDocumentSymbol.scala

@@ -1,18 +1,14 @@
 package dotty.tools.languageserver.util.actions
 
 import dotty.tools.languageserver.util.embedded.CodeMarker
-import dotty.tools.languageserver.util.server.{TestFile, TestServer}
 import dotty.tools.languageserver.util.{CodeRange, PositionContext}
 
 import scala.collection.JavaConverters._
 
 class CodeDocumentSymbol(val marker: CodeMarker, symbols: Seq[(String, String, CodeRange)]) extends ActionOnMarker {
 
-  override def execute(): Exec = {
-    val file: TestFile = marker.file
-    val line: Int = marker.line
-    val char: Int = marker.character
-    val res = implicitly[TestServer].documentSymbol(file)
+  override def execute(): Exec[Unit] = {
+    val res = server.documentSymbol(marker.toDocumentSymbolParams).get()
     assert(res.size() == symbols.size, res)
     for ((symInfo, (name, kind, range)) <- res.asScala.zip(symbols)) {
       assert(symInfo.getName == name, res)

language-server/test/dotty/tools/languageserver/util/actions/CodeHover.scala

@@ -1,16 +1,12 @@
 package dotty.tools.languageserver.util.actions
 
 import dotty.tools.languageserver.util.embedded.CodeMarker
-import dotty.tools.languageserver.util.server.{TestFile, TestServer}
 import dotty.tools.languageserver.util.{CodeRange, PositionContext}
 
 class CodeHover(val range: CodeRange, expected: String) extends ActionOnRange {
 
-  override def onMarker(marker: CodeMarker): Exec = {
-    val file: TestFile = marker.file
-    val line: Int = marker.line
-    val char: Int = marker.character
-    val res = implicitly[TestServer].hover(file, line, char)
+  override def onMarker(marker: CodeMarker): Exec[Unit] = {
+    val res = server.hover(marker.toTextDocumentPositionParams).get()
     assert(res.getRange == null)
     if (expected == "") assert(res.getContents == null, "Expected null contents in " + res)
     else {
@@ -21,6 +17,6 @@ class CodeHover(val range: CodeRange, expected: String) extends ActionOnRange {
     }
   }
 
-    override def show: PositionContext.PosCtx[String] =
-      s"CodeHover(${range.show}, $expected"
+  override def show: PositionContext.PosCtx[String] =
+    s"CodeHover(${range.show}, $expected"
 }

language-server/test/dotty/tools/languageserver/util/actions/CodeReferences.scala

@@ -1,18 +1,14 @@
 package dotty.tools.languageserver.util.actions
 
 import dotty.tools.languageserver.util.embedded.CodeMarker
-import dotty.tools.languageserver.util.server.{TestFile, TestServer}
 import dotty.tools.languageserver.util.{CodeRange, PositionContext}
 
 import scala.collection.JavaConverters._
 
 class CodeReferences(val range: CodeRange, refs: List[CodeRange], withDecl: Boolean) extends ActionOnRange {
 
-  override def onMarker(marker: CodeMarker): Exec = {
-    val file: TestFile = marker.file
-    val line: Int = marker.line
-    val char: Int = marker.character
-    val res = implicitly[TestServer].references(file, line, char, withDecl)
+  override def onMarker(marker: CodeMarker): Exec[Unit] = {
+    val res = server.references(marker.toReferenceParams(withDecl)).get()
     assert(res.size() == refs.size)
     res.asScala.zip(refs).foreach { case (loc, ref) => assert(loc == ref.toLSPLocation, res) }
   }

language-server/test/dotty/tools/languageserver/util/actions/CodeRename.scala

@@ -2,17 +2,13 @@ package dotty.tools.languageserver.util.actions
 
 import dotty.tools.languageserver.util.embedded.CodeMarker
 import dotty.tools.languageserver.util.{CodeRange, PositionContext}
-import dotty.tools.languageserver.util.server.{TestFile, TestServer}
 
 import scala.collection.JavaConverters._
 
 class CodeRename(val marker: CodeMarker, newName: String, expected: List[CodeRange]) extends ActionOnMarker {
 
-  override def execute(): Exec = {
-    val file: TestFile = marker.file
-    val line: Int = marker.line
-    val char: Int = marker.character
-    val res = implicitly[TestServer].rename(file, line, char, newName)
+  override def execute(): Exec[Unit] = {
+    val res = server.rename(marker.toRenameParams(newName)).get()
     assert(res.getDocumentChanges == null, res)
     val editItems = res.getChanges.values().asScala.flatMap(_.asScala) // TDO use a Map
     assert(expected.forall { exp =>

language-server/test/dotty/tools/languageserver/util/embedded/CodeMarker.scala

@@ -13,10 +13,31 @@ class CodeMarker(val name: String) extends Embedded {
   def to(other: CodeMarker): CodeRange = CodeRange(this, other)
 
   def file: PosCtx[TestFile] = implicitly[PositionContext].positionOf(this)._1
+
   def line: PosCtx[Int] = implicitly[PositionContext].positionOf(this)._2
+
   def character: PosCtx[Int] = implicitly[PositionContext].positionOf(this)._3
 
-  def toLSP: PosCtx[Position] = new Position(line, character)
+  def toPosition: PosCtx[Position] = new Position(line, character)
+
+  def toTextDocumentPositionParams: PosCtx[TextDocumentPositionParams] =
+    new TextDocumentPositionParams(toTextDocumentIdentifier, toPosition)
+
+  def toDocumentSymbolParams: PosCtx[DocumentSymbolParams] =
+    new DocumentSymbolParams(toTextDocumentIdentifier)
+
+  def toRenameParams(newName: String): PosCtx[RenameParams] =
+    new RenameParams(toTextDocumentIdentifier, toPosition, newName)
+
+  def toTextDocumentIdentifier: PosCtx[TextDocumentIdentifier] =
+    new TextDocumentIdentifier(file.uri)
+
+  def toReferenceParams(withDecl: Boolean): PosCtx[ReferenceParams] = {
+    val rp = new ReferenceParams(new ReferenceContext(withDecl))
+    rp.setTextDocument(toTextDocumentIdentifier)
+    rp.setPosition(toPosition)
+    rp
+  }
 
   def show: PosCtx[String] = s"($name,line=$line,char=$character)"
   override def toString: String = s"CodePosition($name)"

language-server/test/dotty/tools/languageserver/util/server/TestFile.scala

@@ -6,7 +6,6 @@ import org.eclipse.lsp4j.TextDocumentIdentifier
 
 class TestFile(val file: String) extends AnyVal {
   def uri: String = s"file://${TestFile.sourceDir}/$file"
-  def textDocumentIdentifier: TextDocumentIdentifier = new TextDocumentIdentifier(uri)
 }
 
 object TestFile {

language-server/test/dotty/tools/languageserver/util/server/TestServer.scala

@@ -33,7 +33,7 @@ class TestServer(testFolder: Path) {
   testFolder.resolve("out").toFile.mkdirs()
   new PrintWriter(configFile.toString) { write(dottyIdeJson); close() }
 
-  private val server = new DottyLanguageServer
+  val server = new DottyLanguageServer
   private val client = new TestClient
   server.connect(client)
 
@@ -57,48 +57,4 @@ class TestServer(testFolder: Path) {
     testFile
   }
 
-  def definition(file: TestFile, line: Int, character: Int): util.List[Location] =
-    server.definition(pos(file, line, character)).get().asInstanceOf[util.List[Location]]
-
-  def hover(file: TestFile, line: Int, character: Int): Hover =
-    server.hover(pos(file, line, character)).get()
-
-  def references(file: TestFile, line: Int, character: Int, withDecl: Boolean): util.List[Location] = {
-    val rp = new ReferenceParams()
-    rp.setContext(new ReferenceContext(withDecl))
-    rp.setTextDocument(file.textDocumentIdentifier)
-    rp.setPosition(new Position(line, character))
-    server.references(rp).get().asInstanceOf[util.List[Location]]
-  }
-
-  def documentHighlight(file: TestFile, line: Int, character: Int): util.List[DocumentHighlight] = {
-    val tdpp = new TextDocumentPositionParams()
-    tdpp.setTextDocument(file.textDocumentIdentifier)
-    tdpp.setPosition(new Position(line, character))
-    server.documentHighlight(tdpp).get().asInstanceOf[util.List[DocumentHighlight]]
-  }
-
-  def completion(file: TestFile, line: Int, character: Int) =
-    server.completion(pos(file, line, character)).get()
-
-  def rename(file: TestFile, line: Int, character: Int, newName: String) = {
-    val rp = new RenameParams()
-    rp.setTextDocument(file.textDocumentIdentifier)
-    rp.setPosition(new Position(line, character))
-    rp.setNewName(newName)
-    server.rename(rp).get()
-  }
-
-  def documentSymbol(file: TestFile) = {
-    val dsp = new DocumentSymbolParams()
-    dsp.setTextDocument(file.textDocumentIdentifier)
-    server.documentSymbol(dsp).get()
-  }
-
-  private def pos(file: TestFile, line: Int, character: Int) = {
-    val tdpp = new TextDocumentPositionParams
-    tdpp.setTextDocument(file.textDocumentIdentifier)
-    tdpp.setPosition(new Position(line, character))
-    tdpp
-  }
 }