chore: drop shadding of repl dependencies

Author: hamzaremmal

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),
@@ -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
@@ -2416,9 +2420,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 +2463,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,
@@ -2589,9 +2589,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 +2701,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

project/ShadedSourceGenerator.scala

@@ -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
   }
 
 

repl/src/dotty/tools/repl/Rendering.scala

@@ -682,4 +682,4 @@ class ReplDriver(settings: Array[String],
 
 end ReplDriver
 object ReplDriver:
-  def pprintImport = "import dotty.shaded.pprint.pprintln\n"
+  def pprintImport = "import pprint.pprintln\n"