Make all error messages display the full response

Author: nicolasstucki

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

@@ -3,22 +3,43 @@ package dotty.tools.languageserver.util
 import dotty.tools.languageserver.util.embedded.{CodeInRange, CodeMarker}
 import dotty.tools.languageserver.util.server.TestFile
 
+import org.eclipse.lsp4j._
+
 import PositionContext._
 
 case class CodeRange(start: CodeMarker, end: CodeMarker) {
+  private var checked = false
   def check(): PosCtx[Unit] = {
-    assert(start.file == end.file, s"$start and $end where not in the same file")
-    assert(start.line <= end.line, s"Expected $end to be after $start")
-    assert(start.line != end.line || start.character < end.character, s"Expected $end to be after $start")
+    if (!checked) {
+      assert(start.file == end.file, s"$start and $end where not in the same file")
+      assert(start.line <= end.line, s"Expected $end to be after $start")
+      assert(start.line != end.line || start.character < end.character, s"Expected $end to be after $start")
+      checked = true
+    }
   }
 
-  def file: PosCtx[TestFile] = start.file
+  def file: PosCtx[TestFile] = {
+    check()
+    start.file
+  }
 
-  def toTuple: PosCtx[(Int, Int, Int, Int)] =
+  def toTuple: PosCtx[(Int, Int, Int, Int)] = {
+    check()
     (start.line, start.character, end.line, end.character)
+  }
 
   def withCode(text: String): CodeInRange = CodeInRange(text, this)
 
-  def show: PositionContext.PosCtx[String] =
+  def toLSPRange: PosCtx[Range] = {
+    check()
+    new Range(start.toLSP, end.toLSP)
+  }
+
+  def toLSPLocation: PosCtx[Location] = {
+    check()
+    new Location(file.uri, toLSPRange)
+  }
+
+  def show: PosCtx[String] =
     s"[start=${start.show}, end=${end.show}]"
 }

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

@@ -1,14 +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.server.TestFile
 
 trait ActionOnMarker extends Action {
 
   def marker: CodeMarker
-  def onPosition(file: TestFile, line: Int, char: Int): Exec
+  def onMarker(file: TestFile, line: Int, char: Int): Exec
 
   def execute(): Exec =
-    onPosition(marker.file, marker.line, marker.character)
+    onMarker(marker.file, marker.line, marker.character)
 
 }

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

@@ -8,7 +8,7 @@ import scala.collection.JavaConverters._
 
 class CodeCompletion(val marker: CodeMarker, completions: List[(String, String, String)]) extends ActionOnMarker {
 
-  override def onPosition(file: TestFile, line: Int, char: Int): Exec = {
+  override def onMarker(file: TestFile, line: Int, char: Int): Exec = {
     val res = implicitly[TestServer].completion(file, line, char)
     assert(res.isRight, res)
     val cList = res.getRight

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

@@ -8,7 +8,7 @@ class CodeDefinition(val range: CodeRange, refOpt: Option[CodeRange]) extends Ac
   override def onPosition(file: TestFile, line: Int, char: Int): Exec = {
     val res = implicitly[TestServer].definition(file, line, char)
     assert(res.size() == refOpt.size, res)
-    refOpt.foreach(Responses.checkLocation(res.get(0), _))
+    refOpt.foreach(ref => assert(res.get(0) == ref.toLSPLocation, res))
   }
 
   override def show: PositionContext.PosCtx[String] =

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

@@ -1,7 +1,7 @@
 package dotty.tools.languageserver.util.actions
 
 import dotty.tools.languageserver.util.server.{TestFile, TestServer}
-import dotty.tools.languageserver.util.{CodeRange, Responses, PositionContext}
+import dotty.tools.languageserver.util.{CodeRange, PositionContext}
 import org.eclipse.lsp4j._
 
 import scala.collection.JavaConverters._
@@ -15,7 +15,7 @@ class CodeDocumentHighlight(val range: CodeRange, highs: Seq[(CodeRange, String)
     assert(refs.size == kinds.length, res)
     res.asScala.zip(refs).zip(kinds).foreach { case ((dhl, ref), kind) =>
       assert(dhl.getKind == DocumentHighlightKind.valueOf(kind), res)
-      Responses.checkRange(dhl.getRange, ref)
+      assert(dhl.getRange == ref.toLSPRange, res)
     }
   }
 

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

@@ -2,19 +2,19 @@ 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, Responses}
+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 onPosition(file: TestFile, line: Int, char: Int): Exec = {
+  override def onMarker(file: TestFile, line: Int, char: Int): Exec = {
     val res = implicitly[TestServer].documentSymbol(file)
     assert(res.size() == symbols.size, res)
     for ((symInfo, (name, kind, range)) <- res.asScala.zip(symbols)) {
       assert(symInfo.getName == name, res)
       assert(symInfo.getKind.toString == kind, res)
-      Responses.checkLocation(symInfo.getLocation, range)
+      assert(symInfo.getLocation == range.toLSPLocation, res)
     }
   }
 

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

@@ -1,15 +1,15 @@
 package dotty.tools.languageserver.util.actions
 
 import dotty.tools.languageserver.util.server.{TestFile, TestServer}
-import dotty.tools.languageserver.util.{CodeRange, PositionContext, Responses}
+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 onPosition(file: TestFile, line: Int, char: Int): Exec = {
     val res = implicitly[TestServer].references(file, line, char, withDecl)
     assert(res.size() == refs.size)
-    res.asScala.zip(refs).foreach { case (loc, ref) => Responses.checkLocation(loc, ref) }
+    res.asScala.zip(refs).foreach { case (loc, ref) => assert(loc == ref.toLSPLocation, res) }
   }
 
   override def show: PositionContext.PosCtx[String] =

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

@@ -1,21 +1,21 @@
 package dotty.tools.languageserver.util.actions
 
 import dotty.tools.languageserver.util.embedded.CodeMarker
-import dotty.tools.languageserver.util.{CodeRange, PositionContext, Responses}
+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 onPosition(file: TestFile, line: Int, char: Int): Exec = {
+  override def onMarker(file: TestFile, line: Int, char: Int): Exec = {
     val res = implicitly[TestServer].rename(file, line, char, newName)
     assert(res.getDocumentChanges == null, res)
     val editItems = res.getChanges.values().asScala.flatMap(_.asScala) // TDO use a Map
     assert(expected.forall { exp =>
       editItems.exists { editItem =>
         editItem.getNewText == newName &&
-        Responses.rangeEqual(editItem.getRange, exp)
+        editItem.getRange == exp.toLSPRange
       }
     }, res)
   }

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

@@ -2,14 +2,22 @@ package dotty.tools.languageserver.util.embedded
 
 import dotty.tools.languageserver.util.server.TestFile
 import dotty.tools.languageserver.util.{CodeRange, PositionContext}
+
+import org.eclipse.lsp4j._
+
 import PositionContext._
 
 /** Used to mark positions in the code */
 class CodeMarker(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 show: PosCtx[String] = s"($name,line=$line,char=$character)"
   override def toString: String = s"CodePosition($name)"
 }