Use DocumentHighlightKind instead of strings

Author: Duhemm

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

@@ -1,22 +1,22 @@
 package dotty.tools.languageserver
 
 import org.junit.Test
-
 import dotty.tools.languageserver.util.Code._
+import org.eclipse.lsp4j.DocumentHighlightKind
 
 class HighlightTest {
 
   @Test def valHighlight0: Unit = {
     val xDef = (m1 to m2).withCode("x")
     code"class X { val $xDef = 9 }".withSource
-      .highlight(xDef.range, (xDef.range, "Read"))
+      .highlight(xDef.range, (xDef.range, DocumentHighlightKind.Read))
   }
 
   @Test def valHighlight1: Unit = {
     val xDef = (m1 to m2).withCode("x")
     val xRef = (m3 to m4).withCode("x")
     code"class X { val $xDef = 9; $xRef}".withSource
-      .highlight(xRef.range, (xDef.range, "Read"), (xRef.range, "Read"))
+      .highlight(xRef.range, (xDef.range, DocumentHighlightKind.Read), (xRef.range, DocumentHighlightKind.Read))
   }
 
 }

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.CompletionItemKind
+import org.eclipse.lsp4j.{CompletionItemKind, DocumentHighlightKind}
 
 /**
  * Simulates an LSP client for test in a workspace defined by `sources`.
@@ -55,7 +55,7 @@ class CodeTester(sources: List[SourceWithPositions], actions: List[Action]) {
    *
    * @see dotty.tools.languageserver.util.actions.CodeDefinition
    */
-  def highlight(range: CodeRange, expected: (CodeRange, String)*): CodeTester =
+  def highlight(range: CodeRange, expected: (CodeRange, DocumentHighlightKind)*): CodeTester =
     doAction(new CodeDocumentHighlight(range, expected))
 
   /**

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

@@ -16,15 +16,15 @@ import scala.collection.JavaConverters._
  * @param expected The expected results.
  */
 class CodeDocumentHighlight(override val range: CodeRange,
-                            expected: Seq[(CodeRange, String)]) extends ActionOnRange {
+                            expected: Seq[(CodeRange, DocumentHighlightKind)]) extends ActionOnRange {
 
   override def onMarker(marker: CodeMarker): Exec[Unit] = {
     val (references, kinds) = expected.unzip
     val results = server.documentHighlight(fix(marker.toTextDocumentPositionParams)).get()
     assert(results.size() == references.size, results)
     assert(references.size == kinds.length, results)
     results.asScala.zip(references).zip(kinds).foreach { case ((dhl, ref), kind) =>
-      assert(dhl.getKind == DocumentHighlightKind.valueOf(kind), results)
+      assert(dhl.getKind == kind, results)
       assert(dhl.getRange == ref.toRange, results)
     }
   }