Compile the language server with the 2.13 stdlib

No cross-compilation needed since it's a bootstrapped-only project.

Author: smarter

language-server/src/dotty/tools/languageserver/DottyLanguageServer.scala

@@ -432,10 +432,9 @@ class DottyLanguageServer extends LanguageServer
 
     val changes =
       refs.groupBy(ref => toUriOption(ref.source))
-        .flatMap((uriOpt, ref) => uriOpt.map(uri => (uri.toString, ref)))
-        .mapValues(refs =>
-          refs.flatMap(ref =>
-            range(ref.namePos).map(nameRange => new TextEdit(nameRange, newName))).distinct.asJava)
+        .flatMap { case (uriOpt, refs) => uriOpt.map(uri => (uri.toString, refs)) }
+        .transform((_, refs) => refs.flatMap(ref =>
+          range(ref.namePos).map(nameRange => new TextEdit(nameRange, newName))).distinct.asJava)
 
     new WorkspaceEdit(changes.asJava)
   }
@@ -584,7 +583,7 @@ class DottyLanguageServer extends LanguageServer
         definition <- definitions.toSet
         uri <- toUriOption(definition.pos.source).toSet
         config = configFor(uri)
-        project <- dependentProjects(config) + config
+        project <- dependentProjects(config) union Set(config)
       } yield project
     }
   }

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

@@ -48,8 +48,8 @@ class CodeRename(override val marker: CodeMarker,
 
     val results = query.get()
 
-    val changes = results.getChanges.asScala.mapValues(_.asScala.toSet.map(ch => (ch.getNewText, ch.getRange)))
-    val expectedChanges = expected.groupBy(_.file.uri).mapValues(_.map(range => (newName, range.toRange)))
+    val changes = results.getChanges.asScala.view.mapValues(_.asScala.toSet.map(ch => (ch.getNewText, ch.getRange))).toMap
+    val expectedChanges = expected.groupBy(_.file.uri).view.mapValues(_.map(range => (newName, range.toRange))).toMap
 
     assertNull(results.getDocumentChanges)
     assertEquals(expectedChanges, changes)

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

@@ -23,7 +23,7 @@ class Implementation(override val range: CodeRange, expected: List[CodeRange]) e
 
   override def onMarker(marker: CodeMarker): Exec[Unit] = {
     val expectedLocations = expected.map(_.toLocation)
-    val results: Seq[org.eclipse.lsp4j.Location] = server.implementation(marker.toTextDocumentPositionParams).get().asScala
+    val results: Seq[org.eclipse.lsp4j.Location] = server.implementation(marker.toTextDocumentPositionParams).get().asScala.toSeq
 
     assertEquals(expectedLocations.length, results.length)
     expectedLocations.sorted.zip(results.sorted).foreach {

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

@@ -41,9 +41,9 @@ class TestServer(testFolder: Path, projects: List[Project]) {
      * @return A JSON object representing the configuration for this project.
      */
     def projectSetup(project: Project): String = {
-      def showSeq[T](lst: Seq[T]): String =
+      def showSeq[T](lst: collection.Seq[T]): String =
         lst
-          .map(elem => '"' + elem.toString.replace('\\', '/') + '"')
+          .map(elem => s"'${elem.toString.replace('\\', '/')}'")
           .mkString("[ ", ", ", " ]")
 
       if (project.sources.exists(_.isInstanceOf[TastyWithPositions])) {
@@ -117,7 +117,7 @@ class TestServer(testFolder: Path, projects: List[Project]) {
       project.dependsOn.flatMap { dep =>
         classDirectory(dep, wipe = false).toString +: dependencyClasspath(dep)
       }
-  }.distinct
+  }.distinct.toSeq
 
   private def sourceDirectory(project: Project, wipe: Boolean): Path = {
     val path = TestFile.sourceDir.resolve(project.name).toAbsolutePath