Keep ScalaSettings as a class

Author: szymon-rd

compiler/src/dotty/tools/dotc/Driver.scala

@@ -200,7 +200,6 @@ class Driver {
   }
 
   def main(args: Array[String]): Unit = {
-    println("settings: " + ScalaSettings.allSettings)
     // Preload scala.util.control.NonFatal. Otherwise, when trying to catch a StackOverflowError,
     // we may try to load it but fail with another StackOverflowError and lose the original exception,
     // see <https://groups.google.com/forum/#!topic/scala-user/kte6nak-zPM>.

compiler/src/dotty/tools/dotc/config/CompilerCommand.scala

@@ -5,7 +5,7 @@ import Settings.*
 import core.Contexts.*
 
 abstract class CompilerCommand extends CliCommand:
-  type ConcreteSettings = ScalaSettings.type
+  type ConcreteSettings = ScalaSettings
 
   final def helpMsg(using settings: ConcreteSettings)(using SettingsState, Context): String =
     settings.allSettings.find(isHelping) match

compiler/src/dotty/tools/dotc/config/ScalaSettings.scala

@@ -23,19 +23,7 @@ object ScalaSettingCategories:
   val AdvancedSetting = "X"
   val VerboseSetting = "V"
 
-object ScalaSettings extends SettingGroup with AllScalaSettings:
-
-  val settingsByCategory: Map[String, List[Setting[_]]] = 
-    allSettings.groupBy(_.category)
-      .view.mapValues(_.toList).toMap
-      .withDefaultValue(Nil)
-  def categories: List[String] = settingsByCategory.keys.toList
-  val rootSettings: List[Setting[_]] = settingsByCategory(RootSetting)
-  val warningSettings: List[Setting[_]] = settingsByCategory(WarningSetting)
-  val forkSettings: List[Setting[_]] = settingsByCategory(ForkSetting)
-  val advancedSettings: List[Setting[_]] = settingsByCategory(AdvancedSetting)
-  val verboseSettings: List[Setting[_]] = settingsByCategory(VerboseSetting)
-  val settingsByAliases: Map[String, Setting[_]] = allSettings.flatMap(s => s.aliases.map(_ -> s)).toMap
+object ScalaSettings:
 
   private lazy val minTargetVersion = classfileVersionMap.keysIterator.map(_.toInt).min
   private lazy val maxTargetVersion = classfileVersionMap.keysIterator.map(_.toInt).max
@@ -69,6 +57,19 @@ object ScalaSettings extends SettingGroup with AllScalaSettings:
       else defaultWidth
     else defaultWidth
   }
+  
+class ScalaSettings extends SettingGroup, AllScalaSettings:
+  val settingsByCategory: Map[String, List[Setting[_]]] = 
+    allSettings.groupBy(_.category)
+      .view.mapValues(_.toList).toMap
+      .withDefaultValue(Nil)
+  def categories: List[String] = settingsByCategory.keys.toList
+  val rootSettings: List[Setting[_]] = settingsByCategory(RootSetting)
+  val warningSettings: List[Setting[_]] = settingsByCategory(WarningSetting)
+  val forkSettings: List[Setting[_]] = settingsByCategory(ForkSetting)
+  val advancedSettings: List[Setting[_]] = settingsByCategory(AdvancedSetting)
+  val verboseSettings: List[Setting[_]] = settingsByCategory(VerboseSetting)
+  val settingsByAliases: Map[String, Setting[_]] = allSettings.flatMap(s => s.aliases.map(_ -> s)).toMap
 
 trait AllScalaSettings extends CommonScalaSettings, PluginSettings, VerboseSettings, WarningSettings, XSettings, YSettings:
   self: SettingGroup =>

compiler/src/dotty/tools/dotc/core/Contexts.scala

@@ -513,7 +513,7 @@ object Contexts {
       s"""Context(
          |${outersIterator.map(ctx => cinfo(using ctx)).mkString("\n\n")})""".stripMargin
 
-    def settings: ScalaSettings.type            = base.settings
+    def settings: ScalaSettings            = base.settings
     def definitions: Definitions           = base.definitions
     def platform: Platform                 = base.platform
     def pendingUnderlying: util.HashSet[Type]      = base.pendingUnderlying
@@ -861,7 +861,7 @@ object Contexts {
                        with Phases.PhasesBase
                        with Plugins {
 
-    val settings: ScalaSettings.type = ScalaSettings
+    val settings: ScalaSettings = new ScalaSettings()
 
     /** The initial context */
     val initialCtx: Context = FreshContext.initial(this: @unchecked, settings)

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

@@ -17,7 +17,7 @@ class ScalaCommandTest:
   def temporaryFolder = _temporaryFolder
 
   @Test def `Simple one parameter`: Unit = inContext {
-    val settings = config.ScalaSettings
+    val settings = new config.ScalaSettings()
     val args = "-cp path/to/classes1:other/path/to/classes2 files".split(" ")
     val summary = ScalacCommand.distill(args, settings)()
     given SettingsState = summary.sstate
@@ -26,7 +26,7 @@ class ScalaCommandTest:
   }
 
   @Test def `Unfold @file`: Unit = inContext {
-    val settings = config.ScalaSettings
+    val settings = new config.ScalaSettings()
     val file = temporaryFolder.newFile("config")
     val writer = java.io.FileWriter(file);
     writer.write("-sourceroot myNewRoot someMoreFiles");

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

@@ -51,7 +51,7 @@ class TastyBootstrapTests {
         Properties.compilerInterface, Properties.scalaLibrary, Properties.scalaAsm,
         Properties.dottyInterfaces, Properties.jlineTerminal, Properties.jlineReader,
       ).mkString(File.pathSeparator),
-      Array("-Ycheck-reentrant", "-language:postfixOps", "-Xsemanticdb")
+      Array("-Ycheck-reentrant", "-Ylog:checkReentrant+", "-language:postfixOps", "-Xsemanticdb")
     )
 
     val libraryDirs = List(Paths.get("library/src"), Paths.get("library/src-bootstrapped"))
@@ -61,6 +61,7 @@ class TastyBootstrapTests {
       compileList("lib", librarySources,
         defaultOptions.and("-Ycheck-reentrant",
           "-language:experimental.erasedDefinitions", // support declaration of scala.compiletime.erasedValue
+          "-Ylog:checkReentrant+",
           //  "-source", "future",  // TODO: re-enable once library uses updated syntax for vararg splices, wildcard imports, and import renaming
           ))(libGroup)
 

compiler/test/dotty/tools/dotc/config/ScalaSettingsTests.scala

@@ -67,7 +67,7 @@ class ScalaSettingsTests:
 
   @Test def `WConf setting is parsed`: Unit =
     import reporting.{Action, Diagnostic, NoExplanation}
-    val sets = ScalaSettings
+    val sets = new ScalaSettings()
     val args = List("-Wconf:cat=deprecation:s,cat=feature:e", "-Wconf:msg=a problem\\.:s")
     val sumy = ArgsSummary(sets.defaultState, args, errors = Nil, warnings = Nil)
     val proc = sets.processArguments(sumy, processAll = true, skipped = Nil)
@@ -85,7 +85,7 @@ class ScalaSettingsTests:
 
   @Test def `i18367 rightmost WConf flags take precedence over flags to the left`: Unit =
     import reporting.{Action, Diagnostic}
-    val sets = ScalaSettings
+    val sets = new ScalaSettings()
     val args = List("-Wconf:cat=deprecation:e", "-Wconf:cat=deprecation:s")
     val sumy = ArgsSummary(sets.defaultState, args, errors = Nil, warnings = Nil)
     val proc = sets.processArguments(sumy, processAll = true, skipped = Nil)