Update JavaConverters in tests, language server, and scaladoc

Author: odersky

bench/src/main/scala/Benchmarks.scala

@@ -15,7 +15,7 @@ import org.openjdk.jmh.results.format._
 import java.util.concurrent.TimeUnit
 
 import java.io.{File, FileOutputStream, BufferedWriter, FileWriter}
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.io.Source
 import scala.util.Using
 

community-build/src/scala/dotty/communitybuild/projects.scala

@@ -22,7 +22,7 @@ def log(msg: String) = println(Console.GREEN + msg + Console.RESET)
 
 /** Executes shell command, returns false in case of error. */
 def exec(projectDir: Path, binary: String, arguments: Seq[String], environment: Map[String, String]): Int =
-  import collection.JavaConverters._
+  import scala.jdk.CollectionConverters._
   val command = binary +: arguments
   log(command.mkString(" "))
   val builder = new ProcessBuilder(command: _*).directory(projectDir.toFile).inheritIO()

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

@@ -12,7 +12,7 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import org.eclipse.lsp4j
 
 import scala.collection._
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.util.control.NonFatal
 import scala.io.Codec
 

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

@@ -7,7 +7,7 @@ import dotty.tools.languageserver.util.server.TestFile
 import org.eclipse.lsp4j.{CompletionItem, CompletionItemKind}
 import org.junit.Assert.{assertEquals, assertFalse, assertTrue}
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 /**
  * An action requesting for code completion at `marker`, expecting `expected`.

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

@@ -3,7 +3,7 @@ package dotty.tools.languageserver.util.actions
 import dotty.tools.languageserver.util.{CodeRange, PositionContext}
 import dotty.tools.languageserver.util.embedded.CodeMarker
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 import org.junit.Assert.assertEquals
 

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

@@ -5,7 +5,7 @@ import dotty.tools.languageserver.util.{CodeRange, PositionContext}
 import org.eclipse.lsp4j.DocumentHighlightKind
 import org.junit.Assert.assertEquals
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 /**
  * An action requesting for the ranges that should be highlighted, when a position within `range`

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

@@ -4,7 +4,7 @@ import dotty.tools.languageserver.util.embedded.CodeMarker
 import dotty.tools.languageserver.util.{PositionContext, SymInfo}
 import org.junit.Assert.assertEquals
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 /**
  * An action requesting for the symbols found in the document matching `marker`.

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

@@ -5,7 +5,7 @@ import dotty.tools.languageserver.util.{CodeRange, PositionContext}
 
 import org.junit.Assert.{assertEquals, assertNull, assertTrue}
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 /**
  * An action requesting for the info shown when `range` is hovered.

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

@@ -7,7 +7,7 @@ import org.junit.Assert.assertEquals
 
 import org.eclipse.lsp4j.Location
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 /**
  * An action requesting for all the references to the symbol in `range` within the workspace.

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

@@ -10,7 +10,7 @@ import org.eclipse.lsp4j.{MessageActionItem, ShowMessageRequestParams}
 
 import java.util.concurrent.CompletableFuture
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 /**
  * An action requesting for a rename of the symbol at `marker`.

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

@@ -4,7 +4,7 @@ import dotty.tools.languageserver.util.{PositionContext, SymInfo}
 import org.eclipse.lsp4j.WorkspaceSymbolParams
 import org.junit.Assert.assertEquals
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 /**
  * An action requesting for all the symbols in the workspace matching `query`.

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

@@ -7,7 +7,7 @@ import org.eclipse.lsp4j.Location
 
 import org.junit.Assert.assertEquals
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 /**
  * An action requesting the implementations of the symbol inside `range`.

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

@@ -9,7 +9,7 @@ import dotty.tools.dotc.util.Signatures.Signature
 import org.eclipse.lsp4j.{MarkupContent, ParameterInformation, SignatureInformation}
 import org.junit.Assert.{assertEquals, assertFalse, assertTrue}
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 import SignatureHelp._
 

language-server/test/dotty/tools/languageserver/util/embedded/CodeMarker.scala

@@ -3,7 +3,7 @@ package dotty.tools.languageserver.util.embedded
 import dotty.tools.languageserver.util.server.TestFile
 import dotty.tools.languageserver.util.{CodeRange, PositionContext}
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 import org.eclipse.lsp4j._
 

sbt-test/source-dependencies/typeargref/A.scala

@@ -1,4 +1,4 @@
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import java.util.{ Map => JMap }
 
 class A {

sbt-test/source-dependencies/typeargref/changes/A1.scala

@@ -1,4 +1,4 @@
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import java.util.{ Map => JMap }
 
 class A {

scaladoc/src/dotty/tools/scaladoc/DocContext.scala

@@ -5,7 +5,7 @@ import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.Paths
 
-import collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import dotty.tools.scaladoc.site.StaticSiteContext
 import dotty.tools.dotc.core.Contexts._
 import dotty.tools.dotc.util.SourceFile

scaladoc/src/dotty/tools/scaladoc/Main.scala

@@ -3,7 +3,7 @@ package dotty.tools.scaladoc
 import java.util.ServiceLoader
 import java.io.File
 import java.util.jar._
-import collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import collection.immutable.ArraySeq
 
 import java.nio.file.Files

scaladoc/src/dotty/tools/scaladoc/ScalaModuleProvider.scala

@@ -1,7 +1,7 @@
 package dotty.tools.scaladoc
 
 import dotty.tools.scaladoc.tasty.ScaladocTastyInspector
-import collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import transformers._
 
 case class Module(rootPackage: Member, members: Map[DRI, Member])

scaladoc/src/dotty/tools/scaladoc/Scaladoc.scala

@@ -4,7 +4,7 @@ import java.util.ServiceLoader
 import java.io.File
 import java.io.FileWriter
 import java.util.jar._
-import collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import collection.immutable.ArraySeq
 
 import java.nio.file.{ Files, Paths }

scaladoc/src/dotty/tools/scaladoc/ScaladocCommand.scala

@@ -3,7 +3,7 @@ package dotty.tools.scaladoc
 import java.util.ServiceLoader
 import java.io.File
 import java.util.jar._
-import collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import collection.immutable.ArraySeq
 
 import java.nio.file.Files

scaladoc/src/dotty/tools/scaladoc/ScaladocSettings.scala

@@ -3,7 +3,7 @@ package dotty.tools.scaladoc
 import java.util.ServiceLoader
 import java.io.File
 import java.util.jar._
-import collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import collection.immutable.ArraySeq
 
 import java.nio.file.Files

scaladoc/src/dotty/tools/scaladoc/compat.scala

@@ -6,7 +6,7 @@ import java.util.Collections
 import java.nio.file.Path
 import com.vladsch.flexmark.util.ast.{Node => MdNode}
 import dotty.tools.scaladoc.tasty.comments.wiki.WikiDocElement
-import collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 def JList[T](e: T*): JList[T] = e.asJava
 def JSet[T](e: T*): JSet[T] = e.toSet.asJava

scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala

@@ -2,7 +2,7 @@ package dotty.tools.scaladoc
 package renderers
 
 import util.HTML._
-import collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import java.net.URI
 import java.net.URL
 import dotty.tools.scaladoc.site._

scaladoc/src/dotty/tools/scaladoc/renderers/Locations.scala

@@ -2,7 +2,7 @@ package dotty.tools.scaladoc
 package renderers
 
 import util.HTML._
-import collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import java.net.URI
 import java.net.URL
 import dotty.tools.scaladoc.site._

scaladoc/src/dotty/tools/scaladoc/renderers/MarkdownRenderer.scala

@@ -2,7 +2,7 @@ package dotty.tools.scaladoc
 package renderers
 
 import util.HTML._
-import collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import java.net.URI
 import java.net.URL
 import dotty.tools.scaladoc.site._

scaladoc/src/dotty/tools/scaladoc/renderers/MemberRenderer.scala

@@ -3,7 +3,7 @@ package renderers
 
 import scala.collection.immutable.SortedMap
 import util.HTML._
-import collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import dotty.tools.scaladoc.translators.FilterAttributes
 import dotty.tools.scaladoc.tasty.comments.markdown.DocFlexmarkRenderer
 import com.vladsch.flexmark.util.ast.{Node => MdNode}
@@ -30,7 +30,7 @@ class MemberRenderer(signatureRenderer: SignatureRenderer)(using DocContext) ext
 
   def inheritedFrom(m: Member) = m.inheritedFrom match
     case Some(InheritedFrom(name, dri, isSourceSuperclassHidden)) =>
-      val hiddenNameSuffix = if isSourceSuperclassHidden then " (hidden)" else "" 
+      val hiddenNameSuffix = if isSourceSuperclassHidden then " (hidden)" else ""
       tableRow("Inherited from:", signatureRenderer.renderLink(name + hiddenNameSuffix, dri))
     case _ => Nil
 

scaladoc/src/dotty/tools/scaladoc/renderers/Renderer.scala

@@ -2,7 +2,7 @@ package dotty.tools.scaladoc
 package renderers
 
 import util.HTML._
-import collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import collection.mutable.ListBuffer
 import java.net.URI
 import java.net.URL

scaladoc/src/dotty/tools/scaladoc/renderers/Resources.scala

@@ -2,7 +2,7 @@ package dotty.tools.scaladoc
 package renderers
 
 import util.HTML._
-import collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import java.net.URI
 import java.net.URL
 import dotty.tools.scaladoc.site._

scaladoc/src/dotty/tools/scaladoc/renderers/SignatureRenderer.scala

@@ -2,7 +2,7 @@ package dotty.tools.scaladoc
 package renderers
 
 import util.HTML._
-import collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import java.net.URI
 import java.net.URL
 import java.util.{List => JList, Set => JSet}

scaladoc/src/dotty/tools/scaladoc/renderers/SiteRenderer.scala

@@ -2,7 +2,7 @@ package dotty.tools.scaladoc
 package renderers
 
 import util.HTML._
-import collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import java.net.URI
 import java.net.URL
 import dotty.tools.scaladoc.site._

scaladoc/src/dotty/tools/scaladoc/site/FlexmarkSectionWrapper.scala

@@ -5,7 +5,7 @@ import com.vladsch.flexmark.util.{ast => mdu, sequence}
 import com.vladsch.flexmark.{ast => mda}
 import com.vladsch.flexmark.formatter.Formatter
 import com.vladsch.flexmark.util.options.MutableDataSet
-import collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 import dotty.tools.scaladoc.tasty.comments.markdown.Section
 

scaladoc/src/dotty/tools/scaladoc/site/LoadedTemplate.scala

@@ -6,7 +6,7 @@ import java.nio.file.Files
 import java.nio.file.Paths
 
 import org.jsoup.Jsoup
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 
 case class LazyEntry(getKey: String, value: () => String) extends JMapEntry[String, Object]:

scaladoc/src/dotty/tools/scaladoc/site/SidebarParser.scala

@@ -4,7 +4,7 @@ package site
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.core.`type`.TypeReference;
-import collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import java.util.Optional
 import scala.beans._
 

scaladoc/src/dotty/tools/scaladoc/site/StaticSiteContext.scala

@@ -8,7 +8,7 @@ import java.nio.file.Path
 import java.nio.file.Paths
 
 import scala.util.Try
-import collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.annotation.static
 
 class StaticSiteContext(
@@ -23,8 +23,8 @@ class StaticSiteContext(
   val docsPath = root.toPath.resolve("_docs")
   val blogPath = root.toPath.resolve("_blog")
 
-  def relativize(path: Path): Path = 
-    if args.apiSubdirectory then 
+  def relativize(path: Path): Path =
+    if args.apiSubdirectory then
       docsPath.relativize(path)
     else
       val relativised = docsPath.relativize(path)

scaladoc/src/dotty/tools/scaladoc/site/common.scala

@@ -17,7 +17,7 @@ import com.vladsch.flexmark.ext.wikilink.WikiLinkExtension
 import com.vladsch.flexmark.formatter.Formatter
 import com.vladsch.flexmark.html.HtmlRenderer
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 val docsRootDRI: DRI = DRI(location = "_docs/index", symbolUUID = staticFileSymbolUUID)
 val apiPageDRI: DRI = DRI(location = "api/index")

scaladoc/src/dotty/tools/scaladoc/site/templates.scala

@@ -20,7 +20,7 @@ import liqp.parser.Flavor
 import liqp.TemplateContext
 import liqp.tags.Tag
 import liqp.nodes.LNode
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 import scala.io.Source
 import dotty.tools.scaladoc.snippets._

scaladoc/src/dotty/tools/scaladoc/snippets/FlexmarkSnippetProcessor.scala

@@ -5,7 +5,7 @@ import com.vladsch.flexmark.util.{ast => mdu, sequence}
 import com.vladsch.flexmark.{ast => mda}
 import com.vladsch.flexmark.formatter.Formatter
 import com.vladsch.flexmark.util.options.MutableDataSet
-import collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 import dotty.tools.scaladoc.tasty.comments.markdown.ExtendedFencedCodeBlock
 import dotty.tools.scaladoc.tasty.comments.PreparsedComment

scaladoc/src/dotty/tools/scaladoc/tasty/BasicSupport.scala

@@ -1,7 +1,7 @@
 package dotty.tools.scaladoc
 package tasty
 
-import collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import dotty.tools.scaladoc._
 import scala.quoted._
 

scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala

@@ -1,6 +1,6 @@
 package dotty.tools.scaladoc.tasty
 
-import collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import dotty.tools.scaladoc._
 import dotty.tools.scaladoc.{Signature => DSignature}
 import dotty.tools.scaladoc.Inkuire

scaladoc/src/dotty/tools/scaladoc/tasty/InkuireSupport.scala

@@ -1,6 +1,6 @@
 package dotty.tools.scaladoc.tasty
 
-import collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import dotty.tools.scaladoc._
 import dotty.tools.scaladoc.{Signature => DSignature}
 import dotty.tools.scaladoc.Inkuire

scaladoc/src/dotty/tools/scaladoc/tasty/PackageSupport.scala

@@ -1,7 +1,7 @@
 package dotty.tools.scaladoc
 package tasty
 
-import collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 import SymOps._
 

scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala

@@ -1,7 +1,7 @@
 package dotty.tools.scaladoc
 package tasty
 
-import collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 import scala.quoted._