Use CompletionItemKind in CodeCompletion

Author: Duhemm

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

@@ -1,13 +1,14 @@
 package dotty.tools.languageserver
 
 import org.junit.Test
+import org.eclipse.lsp4j.CompletionItemKind
 
 import dotty.tools.languageserver.util.Code._
 
 class CompletionTest {
 
   @Test def completion0: Unit = {
     code"class Foo { val xyz: Int = 0; def y: Int = xy$m1 }".withSource
-      .completion(m1, List(("xyz", "Field", "Int")))
+      .completion(m1, List(("xyz", CompletionItemKind.Field, "Int")))
   }
 }

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

@@ -4,7 +4,7 @@ import dotty.tools.languageserver.util.Code.SourceWithPositions
 import dotty.tools.languageserver.util.actions._
 import dotty.tools.languageserver.util.embedded.CodeMarker
 import dotty.tools.languageserver.util.server.{TestFile, TestServer}
-import org.eclipse.lsp4j.SymbolInformation
+import org.eclipse.lsp4j.CompletionItemKind
 
 /**
  * Simulates an LSP client for test in a workspace defined by `sources`.
@@ -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, String, String)]): CodeTester =
+  def completion(marker: CodeMarker, expected: List[(String, CompletionItemKind, String)]): CodeTester =
     doAction(new CodeCompletion(marker, expected))
 
   /**

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

@@ -4,6 +4,8 @@ import dotty.tools.languageserver.util.PositionContext
 import dotty.tools.languageserver.util.embedded.CodeMarker
 import dotty.tools.languageserver.util.server.TestFile
 
+import org.eclipse.lsp4j.CompletionItemKind
+
 import scala.collection.JavaConverters._
 
 /**
@@ -14,7 +16,7 @@ import scala.collection.JavaConverters._
  * @param completions The expected results from the language server.
  */
 class CodeCompletion(override val marker: CodeMarker,
-                     completions: List[(String, String, String)]) extends ActionOnMarker {
+                     completions: List[(String, CompletionItemKind, String)]) extends ActionOnMarker {
 
   override def execute(): Exec[Unit] = {
     val result = server.completion(marker.toTextDocumentPositionParams).get()
@@ -24,7 +26,7 @@ class CodeCompletion(override val marker: CodeMarker,
     completions.foreach { completion =>
       assert(
         cList.getItems.asScala.exists(item =>
-          completion == (item.getLabel, item.getKind.toString, item.getDetail)
+          completion == (item.getLabel, item.getKind, item.getDetail)
         ),
         "Did not return completion for " + completion + "\n" + cList.getItems.asScala.toList
       )