repl: Dedup setup & warning between initialCtx & :settings

Author: dwijnand

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

@@ -69,21 +69,26 @@ class ReplDriver(settings: Array[String],
    */
   override def sourcesRequired: Boolean = false
 
-  /** Create a fresh and initialized context with IDE mode enabled */
-  private def initialCtx = {
-    val rootCtx = initCtx.fresh.addMode(Mode.ReadPositions | Mode.Interactive)
-    rootCtx.setSetting(rootCtx.settings.YcookComments, true)
-    rootCtx.setSetting(rootCtx.settings.YreadComments, true)
+  private def setupRootCtx(settings: Array[String], rootCtx: Context) = {
     setup(settings, rootCtx) match
       case Some((files, ictx)) =>
         shouldStart = true
+        if files.nonEmpty then inContext(ictx)(out.println(i"Ignoring spurious arguments: $files%, %"))
         ictx.base.initialize()(using ictx)
         ictx
       case None =>
         shouldStart = false
         rootCtx
   }
 
+  /** Create a fresh and initialized context with IDE mode enabled */
+  private def initialCtx = {
+    val rootCtx = initCtx.fresh.addMode(Mode.ReadPositions | Mode.Interactive)
+    rootCtx.setSetting(rootCtx.settings.YcookComments, true)
+    rootCtx.setSetting(rootCtx.settings.YreadComments, true)
+    setupRootCtx(rootCtx, settings)
+  }
+
   /** the initial, empty state of the REPL session */
   final def initialState: State = State(0, 0, Map.empty, rootCtx)
 
@@ -423,14 +428,7 @@ class ReplDriver(settings: Array[String],
           out.println(s"${s.name} = ${if s.value == "" then "\"\"" else s.value}")
         state
       case _  =>
-        setup(tokenize(arg).toArray, rootCtx) match
-          case Some((files, ictx)) =>
-            inContext(ictx) {
-              if files.nonEmpty then out.println(i"Ignoring spurious arguments: $files%, %")
-              ictx.base.initialize()(using ictx)
-              rootCtx = ictx
-            }
-          case _ =>
+        rootCtx = setupRootCtx(tokenize(arg).toArray, rootCtx)
         state.copy(context = rootCtx)
 
     case Quit =>