create scala3-repl subproject, fixup imports

Author: mpollmeier

build.sbt

@@ -6,6 +6,7 @@ val `scala3-compiler-bootstrapped` = Build.`scala3-compiler-bootstrapped`
 val `scala3-library` = Build.`scala3-library`
 val `scala3-library-bootstrapped` = Build.`scala3-library-bootstrapped`
 val `scala3-library-bootstrappedJS` = Build.`scala3-library-bootstrappedJS`
+val `scala3-repl` = Build.`scala3-repl`
 val `scala3-sbt-bridge` = Build.`scala3-sbt-bridge`
 val `scala3-sbt-bridge-tests` = Build.`scala3-sbt-bridge-tests`
 val `scala3-staging` = Build.`scala3-staging`

dist/src/dotty/dist/MainGenericCompiler.scala

@@ -15,6 +15,8 @@ import dotty.tools.io.Jar
 import dotty.tools.runner.ScalaClassLoader
 import java.nio.file.Paths
 import dotty.tools.dotc.config.CommandLineParser
+import dotty.tools.repl
+import dotty.tools.scripting
 import dotty.tools.scripting.StringDriver
 
 enum CompileMode:

dist/src/dotty/dist/MainGenericRunner.scala

@@ -15,6 +15,8 @@ import dotty.tools.io.Jar
 import dotty.tools.runner.ScalaClassLoader
 import java.nio.file.Paths
 import dotty.tools.dotc.config.CommandLineParser
+import dotty.tools.repl
+import dotty.tools.scripting
 import dotty.tools.scripting.{StringDriver, StringDriverException, ScriptingException}
 
 enum ExecuteMode:

project/Build.scala

@@ -896,6 +896,10 @@ object Build {
   lazy val `scala3-library` = project.in(file("library")).asDottyLibrary(NonBootstrapped)
   lazy val `scala3-library-bootstrapped`: Project = project.in(file("library")).asDottyLibrary(Bootstrapped)
 
+  lazy val `scala3-repl` = project.in(file("repl")).
+    asDottyLibrary(NonBootstrapped).
+    dependsOn(`scala3-compiler`)
+
   def dottyLibrary(implicit mode: Mode): Project = mode match {
     case NonBootstrapped => `scala3-library`
     case Bootstrapped => `scala3-library-bootstrapped`
@@ -1164,7 +1168,7 @@ object Build {
   lazy val `scala3-sbt-bridge` = project.in(file("sbt-bridge/src")).
     // We cannot depend on any bootstrapped project to compile the bridge, since the
     // bridge is needed to compile these projects.
-    dependsOn(`scala3-compiler` % Provided).
+    dependsOn(`scala3-compiler` % Provided, `scala3-repl` % Provided).
     settings(commonJavaSettings).
     settings(
       description := "sbt compiler bridge for Dotty",
@@ -2076,7 +2080,7 @@ object Build {
     def asDist(implicit mode: Mode): Project = project.
       enablePlugins(PackPlugin).
       withCommonSettings.
-      dependsOn(`scala3-interfaces`, dottyCompiler, dottyLibrary, tastyCore, `scala3-staging`, `scala3-tasty-inspector`, scaladoc).
+      dependsOn(`scala3-interfaces`, dottyCompiler, dottyLibrary, tastyCore, `scala3-staging`, `scala3-tasty-inspector`, `scala3-repl`, scaladoc).
       settings(commonDistSettings).
       bootstrappedSettings(
         target := baseDirectory.value / "target" // override setting in commonBootstrappedSettings

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

@@ -12,8 +12,8 @@ import dotty.tools.dotc.interfaces.{SourceFile => ISourceFile}
 import dotty.tools.dotc.reporting.{ Diagnostic, StoreReporter }
 import dotty.tools.dotc.parsing.Parsers.Parser
 import dotty.tools.dotc.{ Compiler, Run }
+import dotty.tools.AbstractFileClassLoader
 import dotty.tools.io.{AbstractFile, VirtualDirectory}
-import dotty.tools.repl.AbstractFileClassLoader
 import dotty.tools.dotc.util.Spans._
 import dotty.tools.dotc.interfaces.Diagnostic._
 import dotty.tools.dotc.util.{ SourcePosition, NoSourcePosition, SourceFile, NoSource }

staging/src/scala/quoted/staging/QuoteDriver.scala

@@ -6,7 +6,7 @@ import dotty.tools.dotc.Driver
 import dotty.tools.dotc.core.Contexts.{Context, ContextBase, FreshContext}
 import dotty.tools.dotc.quoted.QuotesCache
 import dotty.tools.io.{AbstractFile, Directory, PlainDirectory, VirtualDirectory}
-import dotty.tools.repl.AbstractFileClassLoader
+import dotty.tools.AbstractFileClassLoader
 import dotty.tools.dotc.reporting._
 import dotty.tools.dotc.util.ClasspathFromClassloader
 import scala.quoted._

tests/pos-with-compiler-cc/dotc/quoted/Interpreter.scala

@@ -9,6 +9,7 @@ import scala.reflect.ClassTag
 import java.io.{PrintWriter, StringWriter}
 import java.lang.reflect.{InvocationTargetException, Method => JLRMethod}
 
+import dotty.tools.AbstractFileClassLoader
 import dotty.tools.dotc.ast.tpd
 import dotty.tools.dotc.ast.TreeMapWithImplicits
 import dotty.tools.dotc.core.Annotations._
@@ -29,7 +30,6 @@ import dotty.tools.dotc.transform.TreeMapWithStages._
 import dotty.tools.dotc.typer.ImportInfo.withRootImports
 import dotty.tools.dotc.util.SrcPos
 import dotty.tools.dotc.reporting.Message
-import dotty.tools.repl.AbstractFileClassLoader
 
 /** Tree interpreter for metaprogramming constructs */
 abstract class Interpreter(pos: SrcPos, classLoader: ClassLoader)(using DetachedContext):

tests/pos-with-compiler-cc/dotc/transform/Splicer.scala

@@ -22,8 +22,8 @@ import dotty.tools.dotc.core.Constants.Constant
 import dotty.tools.dotc.quoted.Interpreter
 
 import scala.util.control.NonFatal
+import dotty.tools.AbstractFileClassLoader
 import dotty.tools.dotc.util.SrcPos
-import dotty.tools.repl.AbstractFileClassLoader
 
 import scala.reflect.ClassTag
 

tests/pos-with-compiler-cc/dotc/util/ClasspathFromClassloader.scala

@@ -5,7 +5,7 @@ import scala.language.unsafeNulls
 import java.net.URLClassLoader
 import java.nio.file.Paths
 
-import dotty.tools.repl.AbstractFileClassLoader
+import dotty.tools.AbstractFileClassLoader
 
 object ClasspathFromClassloader {