Merge pull request #15489 from dotty-staging/fix-15479

Do cross version checks on import qualifiers

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/community-projects/http4s

@@ -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()

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

@@ -8,7 +8,7 @@ import dotty.tools.dotc.ast.tpd
 import dotty.tools.dotc.core.Phases.Phase
 
 import scala.collection.mutable
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import dotty.tools.dotc.transform.SymUtils._
 import dotty.tools.dotc.interfaces
 import dotty.tools.dotc.report
@@ -605,13 +605,13 @@ class GenBCodePipeline(val int: DottyBackendInterface, val primitives: DottyPrim
       // Statistics.stopTimer(BackendStats.bcodeWriteTimer, writeStart)
     catch
       case e: MethodTooLargeException =>
-        val method = 
+        val method =
           s"${e.getClassName.replaceAll("/", ".")}.${e.getMethodName}"
-        val msg = 
-          s"Generated bytecode for method '$method' is too large. Size: ${e.getCodeSize} bytes. Limit is 64KB" 
+        val msg =
+          s"Generated bytecode for method '$method' is too large. Size: ${e.getCodeSize} bytes. Limit is 64KB"
         report.error(msg)
       case e: ClassTooLargeException =>
-        val msg = 
+        val msg =
           s"Class '${e.getClassName.replaceAll("/", ".")}' is too large. Constant pool size: ${e.getConstantPoolCount}. Limit is 64K entries"
         report.error(msg)
 

compiler/src/dotty/tools/backend/jvm/GenBCode.scala

@@ -14,7 +14,7 @@ import dotty.tools.io.{AbstractFile, PlainFile, ClassPath, ClassRepresentation,
 import FileUtils._
 import PlainFile.toPlainFile
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.collection.immutable.ArraySeq
 import scala.util.control.NonFatal
 

compiler/src/dotty/tools/dotc/classpath/DirectoryClassPath.scala

@@ -4,7 +4,7 @@ import scala.annotation.tailrec
 import scala.collection.mutable.ArrayBuffer
 import java.lang.Character.isWhitespace
 import java.nio.file.{Files, Paths}
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 /** A simple enough command line parser.
  */

compiler/src/dotty/tools/dotc/config/CommandLineParser.scala

@@ -22,7 +22,7 @@ trait WrappedProperties extends PropertiesTrait {
   override def envOrNone(name: String): Option[String]       = wrap(super.envOrNone(name)).flatten
 
   def systemProperties: Iterator[(String, String)] = {
-    import scala.collection.JavaConverters._
+    import scala.jdk.CollectionConverters._
     wrap(System.getProperties.asScala.iterator) getOrElse Iterator.empty
   }
 }

compiler/src/dotty/tools/dotc/config/WrappedProperties.scala

@@ -81,7 +81,7 @@ private [profile] object NoOpProfiler extends Profiler {
   override def finished(): Unit = ()
 }
 private [profile] object RealProfiler {
-  import scala.collection.JavaConverters._
+  import scala.jdk.CollectionConverters._
   val runtimeMx: RuntimeMXBean = ManagementFactory.getRuntimeMXBean
   val memoryMx: MemoryMXBean = ManagementFactory.getMemoryMXBean
   val gcMx: List[GarbageCollectorMXBean] = ManagementFactory.getGarbageCollectorMXBeans.asScala.toList

compiler/src/dotty/tools/dotc/profile/Profiler.scala

@@ -2,7 +2,7 @@ package dotty.tools.dotc.semanticdb
 
 import java.nio.file._
 import java.nio.charset.StandardCharsets
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import dotty.tools.dotc.util.SourceFile
 import dotty.tools.dotc.semanticdb.Scala3.given
 

compiler/src/dotty/tools/dotc/semanticdb/Tools.scala

@@ -138,7 +138,6 @@ class FirstTransform extends MiniPhase with InfoTransformer { thisPhase =>
   }
 
   override def transformOther(tree: Tree)(using Context): Tree = tree match {
-    case tree: Import if untpd.languageImport(tree.expr).isEmpty => EmptyTree
     case tree: Export => EmptyTree
     case tree: NamedArg => transformAllDeep(tree.arg)
     case tree => if (tree.isType) toTypeTree(tree) else tree

compiler/src/dotty/tools/dotc/transform/FirstTransform.scala

@@ -33,7 +33,7 @@ class CrossVersionChecks extends MiniPhase:
     val xMigrationValue = ctx.settings.Xmigration.value
     if xMigrationValue != NoScalaVersion then
       checkMigration(sym, pos, xMigrationValue)
-
+  end checkUndesiredProperties
 
   /** If @deprecated is present, and the point of reference is not enclosed
    * in either a deprecated member or a scala bridge method, issue a warning.
@@ -176,6 +176,15 @@ class CrossVersionChecks extends MiniPhase:
     tree
   }
 
+  override def transformOther(tree: Tree)(using Context): Tree = tree match
+    case tree: Import =>
+      tree.foreachSubTree {
+        case t: RefTree => checkUndesiredProperties(t.symbol, t.srcPos)
+        case _ =>
+      }
+      tree
+    case _ => tree
+
 end CrossVersionChecks
 
 object CrossVersionChecks:

compiler/src/dotty/tools/dotc/typer/CrossVersionChecks.scala

@@ -36,7 +36,7 @@ import org.jline.reader._
 
 import scala.annotation.tailrec
 import scala.collection.mutable
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.util.Using
 
 /** The state of the REPL contains necessary bindings instead of having to have

compiler/src/dotty/tools/repl/ReplDriver.scala

@@ -5,7 +5,7 @@ import scala.language.unsafeNulls
 import java.io.File
 import java.nio.file._
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 object TestSources {
 

compiler/test/dotty/tools/TestSources.scala

@@ -5,7 +5,7 @@ import scala.language.unsafeNulls
 import scala.tools.asm
 import asm._
 import asm.tree._
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 /** Makes using ASM from tests more convenient.
  *

compiler/test/dotty/tools/backend/jvm/AsmConverters.scala

@@ -6,7 +6,7 @@ import java.lang.reflect.Modifier
 import scala.tools.asm
 import asm._
 import asm.tree._
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 sealed trait AsmNode[+T] {
   def node: T

compiler/test/dotty/tools/backend/jvm/AsmNode.scala

@@ -15,10 +15,9 @@ import dotty.tools.io.{VirtualDirectory => Directory}
 import scala.tools.asm
 import asm._
 import asm.tree._
-import scala.collection.JavaConverters._
 
 import io.{AbstractFile, JavaClassPath, VirtualDirectory}
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.tools.asm.{ClassWriter, ClassReader}
 import scala.tools.asm.tree._
 import java.io.{File => JFile, InputStream}

compiler/test/dotty/tools/backend/jvm/DottyBytecodeTest.scala

@@ -7,7 +7,7 @@ import org.junit.Test
 
 import scala.tools.asm.Opcodes._
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 class InlineBytecodeTests extends DottyBytecodeTest {
   import ASMConverters._

compiler/test/dotty/tools/backend/jvm/InlineBytecodeTests.scala

@@ -12,7 +12,7 @@ import org.junit.experimental.categories.Category
 import java.io.File
 import java.nio.file._
 import java.util.stream.{ Stream => JStream }
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.util.matching.Regex
 import scala.concurrent.duration._
 import TestSources.sources

compiler/test/dotty/tools/dotc/CompilationTests.scala

@@ -9,7 +9,7 @@ import dotty.tools.dotc.config.CompilerCommand
 import dotty.tools.dotc.core.Contexts.FreshContext
 import scala.tools.asm.tree.MethodNode
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 class ConstantFoldingTests extends DottyBytecodeTest {
 

compiler/test/dotty/tools/dotc/ConstantFoldingTests.scala

@@ -12,7 +12,7 @@ import org.junit.experimental.categories.Category
 import java.io.File
 import java.nio.file._
 import java.util.stream.{ Stream => JStream }
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.util.matching.Regex
 import scala.concurrent.duration._
 import TestSources.sources

compiler/test/dotty/tools/dotc/TastyBootstrapTests.scala

@@ -12,7 +12,7 @@ import java.util.jar.Attributes.Name
 import org.junit.Assert._
 import org.junit.Test
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.util.Properties
 
 class MultiReleaseJarTest extends dotty.tools.backend.jvm.DottyBytecodeTest {

compiler/test/dotty/tools/dotc/classpath/MultiReleaseJarTest.scala

@@ -10,7 +10,7 @@ import dotty.tools.backend.jvm.DottyBytecodeTest
 
 class SpecializeFunctionsTests extends DottyBytecodeTest {
 
-  import scala.collection.JavaConverters._
+  import scala.jdk.CollectionConverters._
 
   @Test def specializeParentIntToInt = {
     val source = """

compiler/test/dotty/tools/dotc/transform/SpecializeFunctionsTests.scala

@@ -63,7 +63,7 @@ final class NoSummaryReport extends SummaryReporting {
  *  which outputs to a log file in `./testlogs/`
  */
 final class SummaryReport extends SummaryReporting {
-  import scala.collection.JavaConverters._
+  import scala.jdk.CollectionConverters._
 
   private val startingMessages = new java.util.concurrent.ConcurrentLinkedDeque[String]
   private val failedTests = new java.util.concurrent.ConcurrentLinkedDeque[String]

compiler/test/dotty/tools/vulpix/SummaryReport.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/src/dotty/tools/languageserver/DottyLanguageServer.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/CodeCompletion.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/CodeDefinition.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/CodeDocumentHighlight.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/CodeDocumentSymbol.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/CodeHover.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/CodeReferences.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/CodeRename.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/CodeSymbol.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/Implementation.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/actions/SignatureHelp.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._
 

language-server/test/dotty/tools/languageserver/util/embedded/CodeMarker.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/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

@@ -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/DocContext.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/Main.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/ScalaModuleProvider.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 }