Add basic completion tests

Author: nicolasstucki

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

@@ -0,0 +1,38 @@
+package dotty.tools.languageserver
+
+import org.junit.Test
+
+import dotty.tools.languageserver.util.BaseTest
+import dotty.tools.languageserver.util.Code._
+
+class CompletionTest extends BaseTest {
+
+  @Test def competion0: Unit = {
+
+    checkActions(code"class Foo { val xyz: Int = 0; def y: Int = xy$m1 }".completion(m1,
+      List(
+        ("clone", "Method", "(): Object"),
+        ("!=", "Method", "(x$0: Any): Boolean"),
+        ("wait", "Method", "(x$0: Long, x$1: Int): Unit"),
+        ("wait", "Method", "(x$0: Long): Unit"),
+        ("wait", "Method", "(): Unit"),
+        ("notifyAll", "Method", "(): Unit"),
+        ("finalize", "Method", "(): Unit"),
+        ("asInstanceOf", "Method", "[X0] => X0"),
+        ("==", "Method", "(x$0: Any): Boolean"),
+        ("equals", "Method", "(x$0: Any): Boolean"),
+        ("isInstanceOf", "Method", "[X0] => Boolean"),
+        ("getClass", "Method", "(): Class[_]"),
+        ("##", "Method", "=> Int"),
+        ("eq", "Method", "(x$0: Object): Boolean"),
+        ("synchronized", "Method", "[X0](x$0: X0): X0"),
+        ("xyz", "Field", "Int"),
+        ("ne", "Method", "(x$0: Object): Boolean"),
+        ("toString", "Method", "(): String"),
+        ("hashCode", "Method", "(): Int"),
+        ("y", "Method", "=> Int"),
+        ("notify", "Method", "(): Unit")
+      )
+    ))
+  }
+}

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

@@ -17,7 +17,11 @@ object Main {
         if (method.getAnnotation(classOf[Test]) ne null) {
           print(s"Testing $clazz.${method.getName} ")
           try {
-            method.invoke(clazz.getConstructor().newInstance())
+            try {
+              method.invoke(clazz.getConstructor().newInstance())
+            } catch {
+              case ex: InvocationTargetException => throw ex.getCause
+            }
             println(Console.GREEN + "passed" + Console.RESET)
             passed += 1
           } catch {
@@ -51,6 +55,7 @@ object Main {
   }
 
   private def testsClasses = List(
+    classOf[CompletionTest],
     classOf[HoverTest],
     classOf[DefinitionTest],
     classOf[ReferencesTest],

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

@@ -5,7 +5,7 @@ import java.nio.file.Paths
 
 import dotty.tools.dotc.util.DiffUtil
 import dotty.tools.languageserver.util.Code._
-import dotty.tools.languageserver.util.actions.{CodeDefinition, CodeHover, CodeMark, CodeReferences}
+import dotty.tools.languageserver.util.actions._
 import dotty.tools.languageserver.util.server.TestServer
 
 class BaseTest {
@@ -53,6 +53,9 @@ class BaseTest {
         case _: CodeHover => testServer.hover(file, line, character).toString
         case _: CodeDefinition => testServer.definition(file, line, character).toString
         case codeRef: CodeReferences => testServer.references(file, line, character, codeRef.withDecl).toString
+        case code: CodeCompletion =>
+          val (_, pos) = marks(code.mark)
+          testServer.completion(file, pos.line, pos.char).toString
       }
 
       val expected = action.code.expected(marks)

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

@@ -58,7 +58,10 @@ object Code {
 
   def noRef: EmptyReference.type = EmptyReference
 
-  case class CodeWithActions(text: String, actions: List[ActionOnRange], marks: List[(CodeMark, Position)])
+  case class CodeWithActions(text: String, actions: List[ActionOnRange], marks: List[(CodeMark, Position)]) {
+    def completion(mark: CodeMark, completions: List[(String, String, String)]) =
+      CodeWithActions(text, ActionOnRange(CodeCompletion(mark, completions), Range(Position(0, 0), Position(0, 1))) :: actions, marks)
+  }
 
   case class ActionOnRange(code: CodeWithAction, range: actions.Range)
 

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

@@ -0,0 +1,33 @@
+package dotty.tools.languageserver.util.actions
+
+import dotty.tools.languageserver.util.actions.Responses._
+
+case class CodeCompletion(mark: CodeMark, completions: List[(String, String, String)]) extends CodeWithAction {
+  override def text: String = ""
+  def expected(marks: Map[CodeMark, (String, Position)]): String =
+    s"""Either [
+       |  left = null
+       |  right = CompletionList [
+       |  isIncomplete = false
+       |  items = SeqWrapper (
+       |${completions.map(comp => completionItem(comp._1, comp._2, comp._3)).mkString(",\n")}
+       |  )
+       |]
+       |]""".stripMargin
+
+  def completionItem(label: String, kind: String, detail: String): String =
+    s"""    CompletionItem [
+       |      label = "$label"
+       |      kind = $kind
+       |      detail = "$detail"
+       |      documentation = null
+       |      sortText = null
+       |      filterText = null
+       |      insertText = null
+       |      insertTextFormat = null
+       |      textEdit = null
+       |      additionalTextEdits = null
+       |      command = null
+       |      data = null
+       |    ]""".stripMargin
+}

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

@@ -70,6 +70,9 @@ class TestServer(testFolder: Path) {
     server.references(rp).get().asScala.toList
   }
 
+  def completion(file: TestFile, line: Int, character: Int) =
+    server.completion(pos(file, line, character)).get()
+
   private def pos(file: TestFile, line: Int, character: Int) = {
     val tdpp = new TextDocumentPositionParams
     tdpp.setTextDocument(file.textDocumentIdentifier)