chore: drop shadding of repl dependencies

Author: hamzaremmal

.github/workflows/stdlib.yaml

@@ -279,6 +279,24 @@ jobs:
       - name: Compile `scala3-library` for Scala.js
         run: ./project/scripts/sbt scala3-library-sjs/compile
 
+  repl:
+    runs-on: ubuntu-latest
+    needs: [scala3-compiler-bootstrapped]
+    steps:
+      - name: Git Checkout
+        uses: actions/checkout@v5
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: 17
+          cache: 'sbt'
+      - uses: sbt/setup-sbt@v1
+
+      - name: Compile REPL
+        run: ./project/scripts/sbt scala3-repl/compile
+
   scaladoc:
     runs-on: ubuntu-latest
     needs: [scala3-compiler-bootstrapped, scala3-tasty-inspector]
@@ -547,6 +565,23 @@ jobs:
         run: ./project/scripts/sbt ";sjsJUnitTests/clean ;set sjsJUnitTests/scalaJSLinkerConfig ~= switchToLatestESVersion ;set Global/enableWebAssembly := true; sjsJUnitTests/test"
   # TODO Scala.js on Windows
 
+  test-repl:
+    runs-on: ubuntu-latest
+    needs: [repl]
+    steps:
+      - name: Git Checkout
+        uses: actions/checkout@v5
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: 17
+          cache: 'sbt'
+      - uses: sbt/setup-sbt@v1
+      - name: Test REPL
+        run: ./project/scripts/sbt scala3-repl/test
+
   scripted-tests:
     runs-on: ubuntu-latest
     needs: [scala3-compiler-bootstrapped, tasty-core-bootstrapped, scala3-staging, scala3-tasty-inspector, scala-library-sjs, scaladoc]

compiler/test/dotty/Properties.scala

@@ -60,6 +60,9 @@ object Properties {
   /** dotty-compiler jar */
   def dottyCompiler: String = sys.props("dotty.tests.classes.dottyCompiler")
 
+  /** dotty-repl jar */
+  def dottyRepl: String = sys.props("dotty.tests.classes.dottyRepl")
+
   /** dotty-staging jar */
   def dottyStaging: String = sys.props("dotty.tests.classes.dottyStaging")
 

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

@@ -156,22 +156,17 @@ class BootstrappedOnlyCompilationTests {
 
   @Test def picklingWithCompiler: Unit = {
     implicit val testGroup: TestGroup = TestGroup("testPicklingWithCompiler")
-    // Exclude this file from the test as it contains some changes that require scala 2.13.17
-    // This filter can be dropped once we drop the dependency to Scala 2 (in 3.8.0)
-    val rlibscala3 = FileFilter.exclude(List("ScalaRunTime.scala"))
-
     aggregateTests(
       compileDir("compiler/src/dotty/tools", picklingWithCompilerOptions, recursive = false),
       compileDir("compiler/src/dotty/tools/dotc", picklingWithCompilerOptions, recursive = false),
       compileDir("library/src/scala/runtime/function", picklingWithCompilerOptions),
-      compileFilesInDir("library/src/scala/runtime", picklingWithCompilerOptions, rlibscala3),
+      compileFilesInDir("library/src/scala/runtime", picklingWithCompilerOptions),
       compileFilesInDir("compiler/src/dotty/tools/backend/jvm", picklingWithCompilerOptions),
       compileDir("compiler/src/dotty/tools/dotc/ast", picklingWithCompilerOptions),
       compileDir("compiler/src/dotty/tools/dotc/core", picklingWithCompilerOptions, recursive = false),
       compileDir("compiler/src/dotty/tools/dotc/config", picklingWithCompilerOptions),
       compileDir("compiler/src/dotty/tools/dotc/parsing", picklingWithCompilerOptions),
       compileDir("compiler/src/dotty/tools/dotc/printing", picklingWithCompilerOptions),
-      compileDir("compiler/src/dotty/tools/repl", picklingWithCompilerOptions),
       compileDir("compiler/src/dotty/tools/dotc/rewrites", picklingWithCompilerOptions),
       compileDir("compiler/src/dotty/tools/dotc/transform", picklingWithCompilerOptions),
       compileDir("compiler/src/dotty/tools/dotc/typer", picklingWithCompilerOptions),

compiler/test/dotty/tools/vulpix/TestConfiguration.scala

@@ -34,8 +34,6 @@ object TestConfiguration {
   val withCompilerClasspath = mkClasspath(List(
     Properties.scalaLibrary,
     Properties.scalaAsm,
-    Properties.jlineTerminal,
-    Properties.jlineReader,
     Properties.compilerInterface,
     Properties.dottyInterfaces,
     Properties.tastyCore,
@@ -54,6 +52,16 @@ object TestConfiguration {
     Properties.scalaJSLibrary,
   ))
 
+  lazy val replClassPath =
+    withCompilerClasspath + File.pathSeparator + mkClasspath(List(
+      Properties.dottyRepl,
+      Properties.jlineTerminal,
+      Properties.jlineReader,
+  ))
+
+  lazy val replWithStagingClasspath = 
+    replClassPath + File.pathSeparator + mkClasspath(List(Properties.dottyStaging))
+
   def mkClasspath(classpaths: List[String]): String =
     classpaths.map({ p =>
       val file = new java.io.File(p)
@@ -71,6 +79,8 @@ object TestConfiguration {
   val unindentOptions = TestFlags(basicClasspath, Array("-no-indent") ++ checkOptions ++ noCheckOptions ++ yCheckOptions)
   val withCompilerOptions =
     defaultOptions.withClasspath(withCompilerClasspath).withRunClasspath(withCompilerClasspath)
+  val withReplOptions =
+    defaultOptions.withRunClasspath(replClassPath)
   lazy val withStagingOptions =
     defaultOptions.withClasspath(withStagingClasspath).withRunClasspath(withStagingClasspath)
   lazy val withTastyInspectorOptions =

project/Build.scala

@@ -727,8 +727,6 @@ object Build {
         ("io.get-coursier" %% "coursier" % "2.0.16" % Test).cross(CrossVersion.for3Use2_13),
       ),
 
-      (Compile / sourceGenerators) += ShadedSourceGenerator.task.taskValue,
-
       // For convenience, change the baseDirectory when running the compiler
       Compile / forkOptions := (Compile / forkOptions).value.withWorkingDirectory((ThisBuild / baseDirectory).value),
       Compile / run / forkOptions := (Compile / run / forkOptions).value.withWorkingDirectory((ThisBuild / baseDirectory).value),
@@ -770,8 +768,6 @@ object Build {
           "-Ddotty.tests.classes.compilerInterface=" + findArtifactPath(externalDeps, "compiler-interface"),
           "-Ddotty.tests.classes.scalaLibrary=" + findArtifactPath(externalDeps, "scala-library"),
           "-Ddotty.tests.classes.scalaAsm=" + findArtifactPath(externalDeps, "scala-asm"),
-          "-Ddotty.tests.classes.jlineTerminal=" + findArtifactPath(externalDeps, "jline-terminal"),
-          "-Ddotty.tests.classes.jlineReader=" + findArtifactPath(externalDeps, "jline-reader"),
         )
       },
 
@@ -1781,11 +1777,13 @@ object Build {
       version       := dottyVersion,
       versionScheme := Some("semver-spec"),
       scalaVersion  := referenceVersion,
-      crossPaths    := true, // org.scala-lang:scala3-tasty-inspector has a crosspath
-      autoScalaLibrary := false, // do not add a dependency to stdlib, we depend transitively on the stdlib from `scala3-compiler-bootstrapped`
+      crossPaths    := true,
+      autoScalaLibrary := false,
       // Add the source directories for the sbt-bridge (boostrapped)
-      Compile / unmanagedSourceDirectories := Seq(baseDirectory.value / "src"),
-      Test    / unmanagedSourceDirectories := Seq(baseDirectory.value / "test"),
+      Compile / unmanagedSourceDirectories   := Seq(baseDirectory.value / "src"),
+      Compile / unmanagedResourceDirectories := Seq(baseDirectory.value / "resources"),
+      Test    / unmanagedSourceDirectories   := Seq(baseDirectory.value / "test"),
+      Test    / unmanagedResourceDirectories := Seq(baseDirectory.value / "test-resources"),
       // NOTE: The only difference here is that we drop `-Werror` and semanticDB for now
       Compile / scalacOptions := Seq("-deprecation", "-feature", "-unchecked", "-encoding", "UTF8", "-language:implicitConversions"),
       // Make sure that the produced artifacts have the minimum JVM version in the bytecode
@@ -1799,6 +1797,12 @@ object Build {
       Test    / publishArtifact := false,
       publish / skip := false,
       libraryDependencies ++= Seq(
+        "org.jline" % "jline-reader" % "3.29.0",
+        "org.jline" % "jline-terminal" % "3.29.0",
+        "org.jline" % "jline-terminal-jni" % "3.29.0",
+        "com.lihaoyi" %% "pprint"     % "0.9.3",
+        "com.lihaoyi" %% "fansi"      % "0.5.1",
+        "com.lihaoyi" %% "sourcecode" % "0.4.4",
         "com.github.sbt" % "junit-interface" % "0.13.3" % Test,
       ),
       // Configure to use the non-bootstrapped compiler
@@ -1839,7 +1843,8 @@ object Build {
         Seq(
           s"-Ddotty.tests.dottyCompilerManagedSources=${managedSrcDir}",
           s"-Ddotty.tests.classes.dottyInterfaces=${(`scala3-interfaces` / Compile / packageBin).value}",
-          s"-Ddotty.tests.classes.dottyCompiler=${(ThisProject / Compile / packageBin).value}",
+          s"-Ddotty.tests.classes.dottyCompiler=${(`scala3-compiler-bootstrapped-new` / Compile / packageBin).value}",
+          s"-Ddotty.tests.classes.dottyRepl=${(ThisProject / Compile / packageBin).value}",
           s"-Ddotty.tests.classes.tastyCore=${(`tasty-core-bootstrapped-new` / Compile / packageBin).value}",
           s"-Ddotty.tests.classes.compilerInterface=${findArtifactPath(externalDeps, "compiler-interface")}",
           s"-Ddotty.tests.classes.scalaLibrary=${(`scala-library-bootstrapped` / Compile / packageBin).value}",
@@ -1852,8 +1857,6 @@ object Build {
           s"-Ddotty.tools.dotc.semanticdb.test=${(ThisBuild / baseDirectory).value/"tests"/"semanticdb"}",
         )
       },
-      Test / forkOptions := 
-        (Test / forkOptions).value.withWorkingDirectory((ThisBuild / baseDirectory).value),
     )
 
   // ==============================================================================================
@@ -2416,9 +2419,6 @@ object Build {
         "com.github.sbt" % "junit-interface" % "0.13.3" % Test,
         "org.scala-lang.modules" % "scala-asm" % "9.8.0-scala-1",
         Dependencies.compilerInterface,
-        "org.jline" % "jline-reader" % "3.29.0",
-        "org.jline" % "jline-terminal" % "3.29.0",
-        "org.jline" % "jline-terminal-jni" % "3.29.0",
         ("io.get-coursier" %% "coursier" % "2.0.16" % Test).cross(CrossVersion.for3Use2_13),
       ),
       // NOTE: The only difference here is that we drop `-Werror` and semanticDB for now
@@ -2462,7 +2462,6 @@ object Build {
 
         Seq(file)
       }.taskValue,
-      (Compile / sourceGenerators) += ShadedSourceGenerator.task.taskValue,
       // sbt adds all the projects to scala-tool config which breaks building the scalaInstance
       // as a workaround, I build it manually by only adding the compiler
       managedScalaInstance := false,
@@ -2558,8 +2557,6 @@ object Build {
           s"-Ddotty.tests.classes.compilerInterface=${findArtifactPath(externalDeps, "compiler-interface")}",
           s"-Ddotty.tests.classes.scalaLibrary=${(`scala-library-nonbootstrapped` / Compile / packageBin).value}",
           s"-Ddotty.tests.classes.scalaAsm=${findArtifactPath(externalDeps, "scala-asm")}",
-          s"-Ddotty.tests.classes.jlineTerminal=${findArtifactPath(externalDeps, "jline-terminal")}",
-          s"-Ddotty.tests.classes.jlineReader=${findArtifactPath(externalDeps, "jline-reader")}",
           s"-Ddotty.tools.dotc.semanticdb.test=${(ThisBuild / baseDirectory).value/"tests"/"semanticdb"}",
         )
       },
@@ -2589,9 +2586,6 @@ object Build {
       libraryDependencies ++= Seq(
         "org.scala-lang.modules" % "scala-asm" % "9.8.0-scala-1",
         Dependencies.compilerInterface,
-        "org.jline" % "jline-reader" % "3.29.0",
-        "org.jline" % "jline-terminal" % "3.29.0",
-        "org.jline" % "jline-terminal-jni" % "3.29.0",
         "com.github.sbt" % "junit-interface" % "0.13.3" % Test,
         ("io.get-coursier" %% "coursier" % "2.0.16" % Test).cross(CrossVersion.for3Use2_13),
       ),
@@ -2704,7 +2698,6 @@ object Build {
           sjsSources
         } (Set(scalaJSIRSourcesJar)).toSeq
       }.taskValue,
-      (Compile / sourceGenerators) += ShadedSourceGenerator.task.taskValue,
       Compile / run / forkOptions := (Compile / run / forkOptions).value
         .withWorkingDirectory((ThisBuild / baseDirectory).value),
       // Configuration of the test suite
@@ -2733,8 +2726,6 @@ object Build {
           s"-Ddotty.tests.classes.scalaLibrary=${(`scala-library-bootstrapped` / Compile / packageBin).value}",
           s"-Ddotty.tests.classes.scalaJSScalalib=${(`scala-library-sjs` / Compile / packageBin).value}",
           s"-Ddotty.tests.classes.scalaAsm=${findArtifactPath(externalDeps, "scala-asm")}",
-          s"-Ddotty.tests.classes.jlineTerminal=${findArtifactPath(externalDeps, "jline-terminal")}",
-          s"-Ddotty.tests.classes.jlineReader=${findArtifactPath(externalDeps, "jline-reader")}",
           s"-Ddotty.tests.classes.dottyStaging=${(LocalProject("scala3-staging-new") / Compile / packageBin).value}",
           s"-Ddotty.tests.classes.dottyTastyInspector=${(LocalProject("scala3-tasty-inspector-new") / Compile / packageBin).value}",
           s"-Ddotty.tools.dotc.semanticdb.test=${(ThisBuild / baseDirectory).value/"tests"/"semanticdb"}",
@@ -3356,8 +3347,6 @@ object Build {
           s"-Ddotty.tests.classes.compilerInterface=${findArtifactPath(externalDeps, "compiler-interface")}",
           s"-Ddotty.tests.classes.scalaLibrary=${(`scala-library-nonbootstrapped` / Compile / packageBin).value}",
           s"-Ddotty.tests.classes.scalaAsm=${findArtifactPath(externalDeps, "scala-asm")}",
-          s"-Ddotty.tests.classes.jlineTerminal=${findArtifactPath(externalDeps, "jline-terminal")}",
-          s"-Ddotty.tests.classes.jlineReader=${findArtifactPath(externalDeps, "jline-reader")}",
           s"-Ddotty.tools.dotc.semanticdb.test=${(ThisBuild / baseDirectory).value/"tests"/"semanticdb"}",
           "-Ddotty.tests.classes.scalaJSScalalib=" + (`scala-library-sjs` / Compile / packageBin).value,
           "-Ddotty.tests.classes.scalaJSJavalib=" + findArtifactPath(externalJSDeps, "scalajs-javalib"),

project/ShadedSourceGenerator.scala

@@ -1 +1 @@
-scala.tools.repl.ScriptEngine$Factory
+dotty.tools.repl.ScriptEngine$Factory

repl/resources/META-INF/services/javax.script.ScriptEngineFactory

@@ -27,32 +27,9 @@ private[repl] class Rendering(parentClassLoader: Option[ClassLoader] = None):
   var myClassLoader: AbstractFileClassLoader = uninitialized
 
   private def pprintRender(value: Any, width: Int, height: Int, initialOffset: Int)(using Context): String = {
-    def fallback() =
-      dotty.shaded.pprint.PPrinter.BlackWhite
-        .apply(value, width = width, height = height, initialOffset = initialOffset)
-        .plainText
-    try
-      val cl = classLoader()
-      val pprintCls = Class.forName("dotty.shaded.pprint.PPrinter$BlackWhite$", false, cl)
-      val fansiStrCls = Class.forName("dotty.shaded.fansi.Str", false, cl)
-      val BlackWhite = pprintCls.getField("MODULE$").get(null)
-      val BlackWhite_apply = pprintCls.getMethod("apply",
-        classOf[Any],     // value
-        classOf[Int],     // width
-        classOf[Int],     // height
-        classOf[Int],     // indentation
-        classOf[Int],     // initialOffset
-        classOf[Boolean], // escape Unicode
-        classOf[Boolean], // show field names
-      )
-      val FansiStr_plainText = fansiStrCls.getMethod("plainText")
-      val fansiStr = BlackWhite_apply.invoke(
-        BlackWhite, value, width, height, 2, initialOffset, false, true
-      )
-      FansiStr_plainText.invoke(fansiStr).asInstanceOf[String]
-    catch
-      case _: ClassNotFoundException => fallback()
-      case _: NoSuchMethodException  => fallback()
+    pprint.PPrinter.BlackWhite
+      .apply(value, width = width, height = height, initialOffset = initialOffset)
+      .plainText
   }