Make actions on markers directly

nicolasstucki · nicolasstucki · commit f9b9d39da488 · 2018-01-17T09:30:11.000+01:00
diff --git a/language-server/test/dotty/tools/languageserver/util/PositionContext.scala b/language-server/test/dotty/tools/languageserver/util/PositionContext.scala
@@ -18,6 +18,9 @@ class PositionContext(positionMap: Map[CodeMarker, (TestFile, Int, Int)]) {
   }
 
   def contains(pos: CodeMarker): Boolean = positionMap.contains(pos)
+
+  def withPos(marker: CodeMarker, pos: (TestFile, Int, Int)) =
+    new PositionContext(positionMap.updated(marker, pos))
 }
 
 object PositionContext {
diff --git a/language-server/test/dotty/tools/languageserver/util/actions/ActionOnMarker.scala b/language-server/test/dotty/tools/languageserver/util/actions/ActionOnMarker.scala
@@ -1,14 +1,9 @@
 package dotty.tools.languageserver.util.actions
 
 import dotty.tools.languageserver.util.embedded.CodeMarker
-import dotty.tools.languageserver.util.server.TestFile
 
 trait ActionOnMarker extends Action {
 
   def marker: CodeMarker
-  def onMarker(file: TestFile, line: Int, char: Int): Exec
-
-  def execute(): Exec =
-    onMarker(marker.file, marker.line, marker.character)
 
 }
diff --git a/language-server/test/dotty/tools/languageserver/util/actions/ActionOnRange.scala b/language-server/test/dotty/tools/languageserver/util/actions/ActionOnRange.scala
@@ -1,23 +1,30 @@
 package dotty.tools.languageserver.util.actions
 
 import dotty.tools.languageserver.util.server.TestFile
-import dotty.tools.languageserver.util.CodeRange
+import dotty.tools.languageserver.util.{CodeRange, PositionContext}
+import dotty.tools.languageserver.util.embedded.CodeMarker
 
 trait ActionOnRange extends Action {
 
   def range: CodeRange
-  def onPosition(file: TestFile, line: Int, char: Int): Exec
+  def onMarker(marker: CodeMarker): Exec
 
   def execute(): Exec = {
+    val posCtx = implicitly[PositionContext]
     range.check()
     val file = range.file
-    val startLine = range.start.line
-    val startCharacter = range.start.character
+    val start = range.start
+    val startLine = start.line
+    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, "multiline ranges not supported") // TODO implement multiline
-    (startCharacter until endCharacter).foreach(char => onPosition(file, startLine, char))
+    (startCharacter until endCharacter).foreach { char =>
+      val marker = new CodeMarker(start.name + "-with-offset=" + (char - startCharacter))
+      implicit def posCtx2: PositionContext = posCtx.withPos(marker, (file, startLine, char))
+      onMarker(marker)
+    }
   }
 }
diff --git a/language-server/test/dotty/tools/languageserver/util/actions/CodeCompletion.scala b/language-server/test/dotty/tools/languageserver/util/actions/CodeCompletion.scala
@@ -8,7 +8,10 @@ import scala.collection.JavaConverters._
 
 class CodeCompletion(val marker: CodeMarker, completions: List[(String, String, String)]) extends ActionOnMarker {
 
-  override def onMarker(file: TestFile, line: Int, char: Int): Exec = {
+  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)
     assert(res.isRight, res)
     val cList = res.getRight
diff --git a/language-server/test/dotty/tools/languageserver/util/actions/CodeDefinition.scala b/language-server/test/dotty/tools/languageserver/util/actions/CodeDefinition.scala
@@ -1,11 +1,15 @@
 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 onPosition(file: TestFile, line: Int, char: Int): Exec = {
+  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)
     assert(res.size() == refOpt.size, res)
     refOpt.foreach(ref => assert(res.get(0) == ref.toLSPLocation, res))
diff --git a/language-server/test/dotty/tools/languageserver/util/actions/CodeDocumentHighlight.scala b/language-server/test/dotty/tools/languageserver/util/actions/CodeDocumentHighlight.scala
@@ -1,5 +1,6 @@
 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._
@@ -8,7 +9,10 @@ import scala.collection.JavaConverters._
 
 class CodeDocumentHighlight(val range: CodeRange, highs: Seq[(CodeRange, String)]) extends ActionOnRange {
 
-  override def onPosition(file: TestFile, line: Int, char: Int): Exec = {
+  override def onMarker(marker: CodeMarker): Exec = {
+    val file: TestFile = marker.file
+    val line: Int = marker.line
+    val char: Int = marker.character
     val (refs, kinds) = highs.unzip
     val res = implicitly[TestServer].documentHighlight(file, line, char)
     assert(res.size() == refs.size, res)
diff --git a/language-server/test/dotty/tools/languageserver/util/actions/CodeDocumentSymbol.scala b/language-server/test/dotty/tools/languageserver/util/actions/CodeDocumentSymbol.scala
@@ -8,7 +8,10 @@ import scala.collection.JavaConverters._
 
 class CodeDocumentSymbol(val marker: CodeMarker, symbols: Seq[(String, String, CodeRange)]) extends ActionOnMarker {
 
-  override def onMarker(file: TestFile, line: Int, char: Int): Exec = {
+  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)
     assert(res.size() == symbols.size, res)
     for ((symInfo, (name, kind, range)) <- res.asScala.zip(symbols)) {
diff --git a/language-server/test/dotty/tools/languageserver/util/actions/CodeHover.scala b/language-server/test/dotty/tools/languageserver/util/actions/CodeHover.scala
@@ -1,17 +1,21 @@
 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 onPosition(file: TestFile, line: Int, char: Int): Exec = {
-    val obj = implicitly[TestServer].hover(file, line, char)
-    assert(obj.getRange == null)
-    if (expected == "") assert(obj.getContents == null, "Expected null contents in " + obj)
+  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)
+    assert(res.getRange == null)
+    if (expected == "") assert(res.getContents == null, "Expected null contents in " + res)
     else {
-      assert(obj.getContents.size() == 1, obj)
-      val content = obj.getContents.get(0)
+      assert(res.getContents.size() == 1, res)
+      val content = res.getContents.get(0)
       assert(content.isLeft, "Expected left but was " + content)
       assert(content.getLeft == expected, s"Expected $expected but was ${content.getLeft}")
     }
diff --git a/language-server/test/dotty/tools/languageserver/util/actions/CodeReferences.scala b/language-server/test/dotty/tools/languageserver/util/actions/CodeReferences.scala
@@ -1,12 +1,17 @@
 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 onPosition(file: TestFile, line: Int, char: Int): Exec = {
+
+  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)
     assert(res.size() == refs.size)
     res.asScala.zip(refs).foreach { case (loc, ref) => assert(loc == ref.toLSPLocation, res) }
diff --git a/language-server/test/dotty/tools/languageserver/util/actions/CodeRename.scala b/language-server/test/dotty/tools/languageserver/util/actions/CodeRename.scala
@@ -8,7 +8,10 @@ import scala.collection.JavaConverters._
 
 class CodeRename(val marker: CodeMarker, newName: String, expected: List[CodeRange]) extends ActionOnMarker {
 
-  override def onMarker(file: TestFile, line: Int, char: Int): Exec = {
+  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)
     assert(res.getDocumentChanges == null, res)
     val editItems = res.getChanges.values().asScala.flatMap(_.asScala) // TDO use a Map
diff --git a/language-server/test/dotty/tools/languageserver/util/embedded/CodeMarker.scala b/language-server/test/dotty/tools/languageserver/util/embedded/CodeMarker.scala
@@ -8,7 +8,7 @@ import org.eclipse.lsp4j._
 import PositionContext._
 
 /** Used to mark positions in the code */
-class CodeMarker(name: String) extends Embedded {
+class CodeMarker(val name: String) extends Embedded {
 
   def to(other: CodeMarker): CodeRange = CodeRange(this, other)
 

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,9 @@ class PositionContext(positionMap: Map[CodeMarker, (TestFile, Int, Int)]) {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`def contains(pos: CodeMarker): Boolean = positionMap.contains(pos)`
	`21`	`+`
	`22`	`+ def withPos(marker: CodeMarker, pos: (TestFile, Int, Int)) =`
	`23`	`+ new PositionContext(positionMap.updated(marker, pos))`
`21`	`24`	`}`
`22`	`25`
`23`	`26`	`object PositionContext {`