support scala 3.3.6 LTS (mpollmeier#212)

Author: mpollmeier

build.sbt

@@ -2,7 +2,8 @@ name := "scala-repl-pp-root"
 ThisBuild/organization := "com.michaelpollmeier"
 publish/skip := true
 
-lazy val scalaVersions = Seq("3.5.2", "3.6.4", "3.7.0")
+val scalaLTSVersion = "3.3.6"
+val scalaVersions = Seq(scalaLTSVersion, "3.6.4", "3.7.0")
 ThisBuild/scalaVersion := scalaVersions.max
 lazy val Slf4jVersion = "2.0.16"
 
@@ -27,8 +28,9 @@ lazy val core_364 = Build
   .enablePlugins(JavaAppPackaging)
   .settings(coreSettings)
 
-lazy val core_352 = Build
-  .newProject("core", "3.5.2", "scala-repl-pp")
+// Scala LTS version, only replace with next LTS release
+lazy val core_336 = Build
+  .newProject("core", "3.3.6", "scala-repl-pp")
   .dependsOn(shadedLibs)
   .enablePlugins(JavaAppPackaging)
   .settings(coreSettings)
@@ -64,9 +66,9 @@ lazy val server_364 = Build
   .enablePlugins(JavaAppPackaging)
   .settings(serverSettings)
 
-lazy val server_352 = Build
-  .newProject("server", "3.5.2", "scala-repl-pp-server")
-  .dependsOn(core_352)
+lazy val server_336 = Build
+  .newProject("server", "3.3.6", "scala-repl-pp-server")
+  .dependsOn(core_336)
   .enablePlugins(JavaAppPackaging)
   .settings(serverSettings)
 

core/src/main/scala-3.5.2/replpp/DottyRandomStuff.scala renamed to core/src/main/scala-3.3.6/replpp/DottyRandomStuff.scala

@@ -8,26 +8,27 @@ import dotty.tools.repl.*
 private[replpp] object DottyRandomStuff {
 
   /** Create empty outer store reporter
-   * copied from https://github.com/lampepfl/dotty/blob/3.3.0-RC5/compiler/src/dotty/tools/repl/package.scala#L6  */
+   * copied from https://github.com/lampepfl/dotty/blob/3.3.6/compiler/src/dotty/tools/repl/package.scala#L6  */
   def newStoreReporter: StoreReporter = {
     new StoreReporter(null) with UniqueMessagePositions with HideNonSensicalMessages
   }
 
-  /** Based on https://github.com/scala/scala3/blob/3.5.2/compiler/src/dotty/tools/repl/ParseResult.scala#L130
+  /** Based on https://github.com/scala/scala3/blob/3.3.6/compiler/src/dotty/tools/repl/ParseResult.scala#L135
     * change: removed [private] classifier so we can access it...
     * alternatively we could use reflection...
     */
   object ParseResult {
     val commands: List[(String, String => ParseResult)] = List(
       Quit.command -> (_ => Quit),
       Quit.alias -> (_ => Quit),
-      Help.command -> (_ => Help),
-      Reset.command -> (arg => Reset(arg)),
-      Imports.command -> (_ => Imports),
+      Help.command -> (_  => Help),
+      Reset.command -> (arg  => Reset(arg)),
+      Imports.command -> (_  => Imports),
       Load.command -> (arg => Load(arg)),
       TypeOf.command -> (arg => TypeOf(arg)),
       DocOf.command -> (arg => DocOf(arg)),
       Settings.command -> (arg => Settings(arg)),
+      Silent.command -> (_ => Silent),
     )
   }
 }

core/src/main/scala-3.5.2/replpp/DottyReplDriver.scala renamed to core/src/main/scala-3.3.6/replpp/DottyReplDriver.scala

@@ -44,7 +44,7 @@ import scala.language.implicitConversions
 import scala.util.control.NonFatal
 import scala.util.Using
 
-/** Based on https://github.com/lampepfl/dotty/blob/3.4.2/compiler/src/dotty/tools/repl/ReplDriver.scala
+/** Based on https://github.com/lampepfl/dotty/blob/3.3.6/compiler/src/dotty/tools/repl/ReplDriver.scala
  * Main REPL instance, orchestrating input, compilation and presentation
  * */
 class DottyReplDriver(settings: Array[String],
@@ -61,8 +61,8 @@ class DottyReplDriver(settings: Array[String],
   /** Create a fresh and initialized context with IDE mode enabled */
   private def initialCtx(settings: List[String]): Context = {
     val rootCtx = initCtx.fresh.addMode(Mode.ReadPositions | Mode.Interactive)
-    rootCtx.setSetting(rootCtx.settings.XcookComments, true)
-    rootCtx.setSetting(rootCtx.settings.XreadComments, true)
+    rootCtx.setSetting(rootCtx.settings.YcookComments, true)
+    rootCtx.setSetting(rootCtx.settings.YreadComments, true)
     setupRootCtx(this.settings ++ settings, rootCtx)
   }
 
@@ -81,7 +81,7 @@ class DottyReplDriver(settings: Array[String],
 
   /** the initial, empty state of the REPL session */
   final def initialState: State =
-    State(0, 0, Map.empty, Set.empty, rootCtx)
+    State(0, 0, Map.empty, Set.empty, false, rootCtx)
 
   /** Reset state of repl to the initial state
    *
@@ -507,6 +507,8 @@ class DottyReplDriver(settings: Array[String],
         rootCtx = setupRootCtx(tokenize(arg).toArray, rootCtx)
         state.copy(context = rootCtx)
 
+    case Silent => state.copy(quiet = !state.quiet)
+
     case Quit =>
       // end of the world!
       // MP: slight variation from original DottyReplDriver to support exiting via the Quit command
@@ -524,7 +526,6 @@ class DottyReplDriver(settings: Array[String],
   private object ReplConsoleReporter extends ConsoleReporter.AbstractConsoleReporter {
     override def posFileStr(pos: SourcePosition) = "" // omit file paths
     override def printMessage(msg: String): Unit = out.println(msg)
-    override def echoMessage(msg: String): Unit  = printMessage(msg)
     override def flush()(using Context): Unit    = out.flush()
   }
 

core/src/main/scala-3.5.2/replpp/InteractiveShell.scala renamed to core/src/main/scala-3.3.6/replpp/InteractiveShell.scala

@@ -1,6 +1,7 @@
 package replpp.util
 
 import dotty.tools.dotc.Driver
+import dotty.tools.dotc.config.Settings
 import dotty.tools.dotc.core.Contexts
 import dotty.tools.dotc.core.Contexts.Context
 import dotty.tools.dotc.reporting.{Diagnostic, Reporter}
@@ -52,12 +53,25 @@ class SimpleDriver(linesBeforeRunBeforeCode: Int = 0, linesBeforeScript: Int = 0
         }
 
         ctx.setSetting(rootCtx.settings.outputDir, new PlainDirectory(Directory(outDir)))
-           .setSetting(rootCtx.settings.XnoEnrichErrorMessages, !verbose)
            .setSetting(rootCtx.settings.help, verbose)
            .setSetting(rootCtx.settings.XshowPhases, verbose)
            .setSetting(rootCtx.settings.Vhelp, verbose)
            .setSetting(rootCtx.settings.Vprofile, verbose)
            .setSetting(rootCtx.settings.explain, verbose)
+
+        // Scala 3.3.6 has `YnoEnrichErrorMessages` rather than `XnoEnrichErrorMessages`
+        // So as long as we still support 3.3.6 (i.e. until the next LTS release) we need the
+        // following section.
+        val noEnrichErrorMessagesRegex = "-[XY]no-enrich-error-messages".r
+        rootCtx.settings.allSettings
+          .find(setting => noEnrichErrorMessagesRegex.matches(setting.name))
+          .foreach { noEnrichErrorMessagesSetting =>
+//            println(s"setting $noEnrichErrorMessagesSetting to ${!verbose}")
+            ctx.setSetting(noEnrichErrorMessagesSetting.asInstanceOf[Settings.Setting[Boolean]], !verbose)
+          }
+        // Once that's not required any longer, replace the above with this:
+        // ctx.setSetting(rootCtx.settings.XnoEnrichErrorMessages, !verbose)
+        ctx
       }
 
       if (doCompile(newCompiler, toCompile).hasErrors) {