Address review comments

Author: Duhemm

language-server/test/dotty/tools/languageserver/CompletionTest.scala

@@ -9,6 +9,6 @@ class CompletionTest {
 
   @Test def completion0: Unit = {
     code"class Foo { val xyz: Int = 0; def y: Int = xy$m1 }".withSource
-      .completion(m1, List(("xyz", CompletionItemKind.Field, "Int")))
+      .completion(m1, Set(("xyz", CompletionItemKind.Field, "Int")))
   }
 }

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

@@ -56,13 +56,13 @@ object Code {
 
         ai.next() match {
           case emb: CodeMarker =>
-            positions += Tuple3(emb, line, char)
+            positions += ((emb, line, char))
 
           case emb: CodeInRange =>
-            positions += Tuple3(emb.range.start, line, char)
+            positions += ((emb.range.start, line, char))
             scan(emb.text)
             stringBuilder.append(emb.text)
-            positions += Tuple3(emb.range.end, line, char)
+            positions += ((emb.range.end, line, char))
         }
 
       }

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

@@ -14,7 +14,7 @@ import PositionContext._
  * @param end   The end marker.
  */
 case class CodeRange(start: CodeMarker, end: CodeMarker) {
-  private var checked = false
+  private[this] var checked = false
   def check(): PosCtx[Unit] = {
     if (!checked) {
       assert(start.file == end.file, s"$start and $end where not in the same file")
@@ -29,11 +29,6 @@ case class CodeRange(start: CodeMarker, end: CodeMarker) {
     start.file
   }
 
-  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 symInfo(name: String, kind: SymbolKind, container: String = null): SymInfo =

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

@@ -81,7 +81,7 @@ class CodeTester(sources: List[SourceWithPositions], actions: List[Action]) {
    *
    * @see dotty.tools.languageserver.util.actions.CodeCompletion
    */
-  def completion(marker: CodeMarker, expected: List[(String, CompletionItemKind, String)]): CodeTester =
+  def completion(marker: CodeMarker, expected: Set[(String, CompletionItemKind, String)]): CodeTester =
     doAction(new CodeCompletion(marker, expected))
 
   /**

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

@@ -4,8 +4,8 @@ import dotty.tools.languageserver.util.embedded.CodeMarker
 import dotty.tools.languageserver.util.server.TestFile
 
 class PositionContext(positionMap: Map[CodeMarker, (TestFile, Int, Int)]) {
-  private var lastKey: CodeMarker = _
-  private var lastValue: (TestFile, Int, Int) = _
+  private[this] var lastKey: CodeMarker = _
+  private[this] var lastValue: (TestFile, Int, Int) = _
   def positionOf(pos: CodeMarker): (TestFile, Int, Int) = {
     if (lastKey eq pos) lastValue
     else {

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

@@ -9,30 +9,24 @@ import org.eclipse.lsp4j.CompletionItemKind
 import scala.collection.JavaConverters._
 
 /**
- * An action requesting for code completion at `marker`, expecting `completions`.
+ * An action requesting for code completion at `marker`, expecting `expected`.
  * This action corresponds to the `textDocument/completion` method of the Language Server Protocol.
  *
- * @param marker      The marker indicating the position where completion should be requested.
- * @param completions The expected results from the language server.
+ * @param marker    The marker indicating the position where completion should be requested.
+ * @param expected The expected results from the language server.
  */
 class CodeCompletion(override val marker: CodeMarker,
-                     completions: List[(String, CompletionItemKind, String)]) extends ActionOnMarker {
+                     expected: Set[(String, CompletionItemKind, String)]) extends ActionOnMarker {
 
   override def execute(): Exec[Unit] = {
     val result = server.completion(marker.toTextDocumentPositionParams).get()
     assert(result.isRight, result)
-    val cList = result.getRight
-    assert(!cList.isIncomplete, result)
-    completions.foreach { completion =>
-      assert(
-        cList.getItems.asScala.exists(item =>
-          completion == (item.getLabel, item.getKind, item.getDetail)
-        ),
-        "Did not return completion for " + completion + "\n" + cList.getItems.asScala.toList
-      )
+    assert(!result.getRight.isIncomplete, s"Completion results were 'incomplete': $result")
+    val completionResults = result.getRight.getItems.asScala.toSet.map { item =>
+      (item.getLabel, item.getKind, item.getDetail)
     }
   }
 
   override def show: PositionContext.PosCtx[String] =
-    s"CodeCompletion(${marker.show}, $completions)"
+    s"CodeCompletion(${marker.show}, $expected)"
 }

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

@@ -14,13 +14,13 @@ class CodeMarker(val name: String) extends Embedded {
   def to(other: CodeMarker): CodeRange = CodeRange(this, other)
 
   /** The file containing this marker. */
-  def file: PosCtx[TestFile] = implicitly[PositionContext].positionOf(this)._1
+  def file: PosCtx[TestFile] = posCtx.positionOf(this)._1
 
   /** The line containing this marker. */
-  def line: PosCtx[Int] = implicitly[PositionContext].positionOf(this)._2
+  def line: PosCtx[Int] = posCtx.positionOf(this)._2
 
   /** The columng number of this marker. */
-  def character: PosCtx[Int] = implicitly[PositionContext].positionOf(this)._3
+  def character: PosCtx[Int] = posCtx.positionOf(this)._3
 
   /** Converts this marker to a position. */
   def toPosition: PosCtx[Position] = new Position(line, character)
@@ -46,4 +46,6 @@ class CodeMarker(val name: String) extends Embedded {
 
   def show: PosCtx[String] = s"($name,line=$line,char=$character)"
   override def toString: String = s"CodePosition($name)"
+
+  private implicit def posCtx(implicit ctx: PositionContext): PositionContext = ctx
 }