Use SymbolKind in SymInfo

Author: Duhemm

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

@@ -1,23 +1,25 @@
 package dotty.tools.languageserver
 
 import org.junit.Test
+import org.eclipse.lsp4j.SymbolKind
 
 import dotty.tools.languageserver.util.Code._
 
+
 class DocumentSymbolTest {
 
   @Test def documentSymbol0: Unit =
-    code"class ${m1}Foo$m2".withSource.documentSymbol(m1, (m1 to m2).symInfo("Foo", "Class"))
+    code"class ${m1}Foo$m2".withSource.documentSymbol(m1, (m1 to m2).symInfo("Foo", SymbolKind.Class))
 
   @Test def documentSymbol1: Unit =
     code"class ${m1}Foo$m2; class ${m3}Bar$m4".withSource
-      .documentSymbol(m1, (m1 to m2).symInfo("Foo", "Class"), (m3 to m4).symInfo("Bar", "Class"))
+      .documentSymbol(m1, (m1 to m2).symInfo("Foo", SymbolKind.Class), (m3 to m4).symInfo("Bar", SymbolKind.Class))
 
   @Test def documentSymbol3: Unit = {
     withSources(
       code"class ${m1}Foo$m2",
       code"class ${m3}Bar$m4"
-    ) .documentSymbol(m1, (m1 to m2).symInfo("Foo", "Class"))
-      .documentSymbol(m3, (m3 to m4).symInfo("Bar", "Class"))
+    ) .documentSymbol(m1, (m1 to m2).symInfo("Foo", SymbolKind.Class))
+      .documentSymbol(m3, (m3 to m4).symInfo("Bar", SymbolKind.Class))
   }
 }

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

@@ -1,6 +1,7 @@
 package dotty.tools.languageserver
 
 import org.junit.Test
+import org.eclipse.lsp4j.SymbolKind
 
 import dotty.tools.languageserver.util.Code._
 
@@ -21,7 +22,7 @@ class SymbolTest {
             |  class Bar
             |}
           """
-    ) .symbol("Foo", Foo.range.symInfo("Foo", "Class"), fooFoo.range.symInfo("Foo", "Class", "foo"))
-      .symbol("Bar", Bar.range.symInfo("Bar", "Class"))
+    ) .symbol("Foo", Foo.range.symInfo("Foo", SymbolKind.Class), fooFoo.range.symInfo("Foo", SymbolKind.Class, "foo"))
+      .symbol("Bar", Bar.range.symInfo("Bar", SymbolKind.Class))
   }
 }

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

@@ -30,7 +30,7 @@ case class CodeRange(start: CodeMarker, end: CodeMarker) {
 
   def withCode(text: String): CodeInRange = CodeInRange(text, this)
 
-  def symInfo(name: String, kind: String, container: String = null): SymInfo =
+  def symInfo(name: String, kind: SymbolKind, container: String = null): SymInfo =
     new SymInfo(name, kind, this, container)
 
   def toRange: PosCtx[Range] = {
@@ -45,4 +45,4 @@ case class CodeRange(start: CodeMarker, end: CodeMarker) {
 
   def show: PosCtx[String] =
     s"[start=${start.show}, end=${end.show}]"
-}
+}

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

@@ -3,12 +3,12 @@ package dotty.tools.languageserver.util
 import dotty.tools.languageserver.util.PositionContext._
 import org.eclipse.lsp4j._
 
-class SymInfo(name: String, kind: String, range: CodeRange, container: String) {
+class SymInfo(name: String, kind: SymbolKind, range: CodeRange, container: String) {
   def toSymInformation: PosCtx[SymbolInformation] =
-    new SymbolInformation(name, SymbolKind.valueOf(kind), range.toLocation, container)
+    new SymbolInformation(name, kind, range.toLocation, container)
 
   def show: PosCtx[String] =
     s"SymInfo($name, $kind, ${range.show}, $container)"
   override def toString: String =
     s"SymInfo($name, $kind, $range, $container)"
-}
+}