Support multiple results in CodeDefinition

Author: Duhemm

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

@@ -7,33 +7,33 @@ import dotty.tools.languageserver.util.Code._
 class DefinitionTest {
 
   @Test def classDefinitionNotFound0: Unit =
-    code"class Foo { new ${m1}Bar$m2 }".withSource.definition(m1 to m2, None)
+    code"class Foo { new ${m1}Bar$m2 }".withSource.definition(m1 to m2, Nil)
 
   @Test def classDefinition0: Unit = {
     withSources(
       code"class ${m1}Foo$m2 { new Foo }",
       code"class Bar { val foo: ${m3}Foo$m4 = new ${m5}Foo$m6 }"
-    ) .definition(m1 to m2, Some(m1 to m2))
-      .definition(m3 to m4, Some(m1 to m2))
-      .definition(m5 to m6, Some(m1 to m2))
+    ) .definition(m1 to m2, List(m1 to m2))
+      .definition(m3 to m4, List(m1 to m2))
+      .definition(m5 to m6, List(m1 to m2))
   }
 
   @Test def valDefinition0: Unit = {
     withSources(
       code"class Foo { val ${m1}x$m2 = 0; ${m3}x$m4 }",
       code"class Bar { val foo = new Foo; foo.${m5}x$m6 }"
-    ) .definition(m1 to m2, Some(m1 to m2))
-      .definition(m3 to m4, Some(m1 to m2))
-      .definition(m5 to m6, Some(m1 to m2))
+    ) .definition(m1 to m2, List(m1 to m2))
+      .definition(m3 to m4, List(m1 to m2))
+      .definition(m5 to m6, List(m1 to m2))
   }
 
   @Test def defDefinition0: Unit = {
     withSources(
       code"class Foo { def ${m1}x$m2 = 0; ${m3}x$m4 }",
       code"class Bar { val foo = new Foo; foo.${m5}x$m6 }"
-    ) .definition(m1 to m2, Some(m1 to m2))
-      .definition(m3 to m4, Some(m1 to m2))
-      .definition(m5 to m6, Some(m1 to m2))
+    ) .definition(m1 to m2, List(m1 to m2))
+      .definition(m3 to m4, List(m1 to m2))
+      .definition(m5 to m6, List(m1 to m2))
   }
 
 }

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

@@ -18,7 +18,7 @@ class CodeTester(sources: List[SourceWithPositions], actions: List[Action]) {
   def hover(range: CodeRange, expected: String): CodeTester =
     doAction(new CodeHover(range, expected))
 
-  def definition(range: CodeRange, refOpt: Option[CodeRange]): CodeTester =
+  def definition(range: CodeRange, refOpt: Seq[CodeRange]): CodeTester =
     doAction(new CodeDefinition(range, refOpt))
 
   def highlight(range: CodeRange, highs: (CodeRange, String)*): CodeTester =

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

@@ -3,14 +3,16 @@ package dotty.tools.languageserver.util.actions
 import dotty.tools.languageserver.util._
 import dotty.tools.languageserver.util.embedded.CodeMarker
 
-class CodeDefinition(val range: CodeRange, refOpt: Option[CodeRange]) extends ActionOnRange {
+class CodeDefinition(val range: CodeRange, expected: Seq[CodeRange]) extends ActionOnRange {
 
   override def onMarker(marker: CodeMarker): Exec[Unit] = {
-    val res = server.definition(fix(marker.toTextDocumentPositionParams)).get()
-    assert(res.size() == refOpt.size, res)
-    refOpt.foreach(ref => assert(res.get(0) == ref.toLocation, res))
+    val results = server.definition(fix(marker.toTextDocumentPositionParams)).get()
+    assert(results.size == expected.size, s"Expected ${expected.size} matches, found ${results.size}")
+    (0 until results.size).foreach { i =>
+      assert(results.get(i) == expected(i).toLocation, s"Expected ${expected(i).toLocation}, found ${results.get(i)}.")
+    }
   }
 
   override def show: PositionContext.PosCtx[String] =
-    s"CodeDefinition(${range.show}, ${refOpt.map(_.show)})"
+    s"CodeDefinition(${range.show}, ${expected.map(_.show)})"
 }