NIT: Refactor: Rely on global --power option where able in cli commands (#2480)

Author: Gedochao

modules/cli/src/main/scala/scala/cli/ScalaCli.scala

@@ -265,7 +265,7 @@ object ScalaCli {
       // Enable ANSI output in Windows terminal
       coursier.jniutils.WindowsAnsiTerminal.enableAnsiOutput()
 
-    new ScalaCliCommands(progName, baseRunnerName, fullRunnerName, isSipScala)
+    new ScalaCliCommands(progName, baseRunnerName, fullRunnerName)
       .main(scalaCliArgs)
   }
 }

modules/cli/src/main/scala/scala/cli/ScalaCliCommands.scala

@@ -11,11 +11,10 @@ import scala.cli.commands.shared.ScalaCliHelp
 class ScalaCliCommands(
   val progName: String,
   baseRunnerName: String,
-  fullRunnerName: String,
-  isSipScala: Boolean
+  fullRunnerName: String
 ) extends CommandsEntryPoint {
 
-  lazy val actualDefaultCommand = new default.Default(help, isSipScala)
+  lazy val actualDefaultCommand = new default.Default(help)
 
   // for debugging purposes - allows to run the scala-cli-signing binary from the Scala CLI JVM launcher
   private lazy val pgpUseBinaryCommands =

modules/cli/src/main/scala/scala/cli/commands/ScalaCommand.scala

@@ -23,7 +23,7 @@ import scala.build.internals.FeatureType
 import scala.build.options.{BuildOptions, ScalacOpt, Scope}
 import scala.build.{Artifacts, Directories, Logger, Positioned, ReplArtifacts}
 import scala.cli.commands.default.LegacyScalaOptions
-import scala.cli.commands.shared._
+import scala.cli.commands.shared.*
 import scala.cli.commands.util.CommandHelpers
 import scala.cli.commands.util.ScalacOptionsUtil.*
 import scala.cli.config.{ConfigDb, Keys}
@@ -35,15 +35,19 @@ import scala.util.{Properties, Try}
 abstract class ScalaCommand[T <: HasGlobalOptions](implicit myParser: Parser[T], help: Help[T])
     extends Command()(myParser, help)
     with NeedsArgvCommand with CommandHelpers with RestrictableCommand[T] {
+  private val globalOptionsAtomic: AtomicReference[GlobalOptions] =
+    new AtomicReference(GlobalOptions.default)
+
+  private def globalOptions: GlobalOptions = globalOptionsAtomic.get()
 
   def sharedOptions(t: T): Option[SharedOptions] = // hello borked unused warning
     None
-  override def hasFullHelp = true
-  override def hidden      = shouldExcludeInSip
-  protected var argvOpt    = Option.empty[Array[String]]
-
-  private val shouldExcludeInSip =
-    (isRestricted || isExperimental) && !ScalaCli.allowRestrictedFeatures
+  override def hasFullHelp     = true
+  override def hidden: Boolean = shouldExcludeInSip
+  protected var argvOpt        = Option.empty[Array[String]]
+  protected def allowRestrictedFeatures: Boolean =
+    ScalaCli.allowRestrictedFeatures || globalOptions.powerOptions.power
+  private def shouldExcludeInSip = (isRestricted || isExperimental) && !allowRestrictedFeatures
   override def setArgv(argv: Array[String]): Unit = {
     argvOpt = Some(argv)
   }
@@ -316,10 +320,6 @@ abstract class ScalaCommand[T <: HasGlobalOptions](implicit myParser: Parser[T],
       sharedOptions(options).foreach(_.logger.debug("build options could not be initialized"))
       sys.exit(1)
     }
-
-  private val globalOptionsAtomic: AtomicReference[GlobalOptions] =
-    new AtomicReference(GlobalOptions.default)
-  private def globalOptions: GlobalOptions = globalOptionsAtomic.get()
   override def shouldSuppressExperimentalFeatureWarnings: Boolean =
     globalOptions.globalSuppress.suppressExperimentalFeatureWarning
       .orElse {

modules/cli/src/main/scala/scala/cli/commands/clean/Clean.scala

@@ -5,10 +5,10 @@ import caseapp.*
 import scala.build.input.Inputs
 import scala.build.internal.Constants
 import scala.build.{Logger, Os}
+import scala.cli.CurrentParams
 import scala.cli.commands.ScalaCommand
 import scala.cli.commands.setupide.SetupIde
 import scala.cli.commands.shared.HelpCommandGroup
-import scala.cli.{CurrentParams, ScalaCli}
 
 object Clean extends ScalaCommand[CleanOptions] {
   override def group: String = HelpCommandGroup.Main.toString
@@ -21,7 +21,7 @@ object Clean extends ScalaCommand[CleanOptions] {
       Os.pwd,
       defaultInputs = () => Inputs.default(),
       forcedWorkspace = options.workspace.forcedWorkspaceOpt,
-      allowRestrictedFeatures = ScalaCli.allowRestrictedFeatures,
+      allowRestrictedFeatures = allowRestrictedFeatures,
       extraClasspathWasPassed = false
     ) match {
       case Left(message) =>

modules/cli/src/main/scala/scala/cli/commands/config/Config.scala

@@ -11,7 +11,6 @@ import scala.build.errors.{BuildException, CompositeBuildException, MalformedCli
 import scala.build.internal.util.WarningMessages
 import scala.build.internals.FeatureType
 import scala.build.{Directories, Logger}
-import scala.cli.ScalaCli.allowRestrictedFeatures
 import scala.cli.commands.pgp.PgpScalaSigningOptions
 import scala.cli.commands.publish.ConfigUtil.*
 import scala.cli.commands.shared.HelpGroup

modules/cli/src/main/scala/scala/cli/commands/default/Default.scala

@@ -1,26 +1,18 @@
 package scala.cli.commands.default
 
-import caseapp.core.help.{Help, HelpCompanion, RuntimeCommandsHelp}
+import caseapp.core.help.RuntimeCommandsHelp
 import caseapp.core.{Error, RemainingArgs}
 
 import scala.build.Logger
 import scala.build.input.{Inputs, ScalaCliInvokeData, SubCommand}
-import scala.build.internal.Constants
-import scala.build.options.BuildOptions
-import scala.cli.CurrentParams
+import scala.cli.commands.ScalaCommandWithCustomHelp
 import scala.cli.commands.repl.{Repl, ReplOptions}
 import scala.cli.commands.run.{Run, RunOptions}
-import scala.cli.commands.shared.ScalaCliHelp.helpFormat
 import scala.cli.commands.shared.{HelpCommandGroup, SharedOptions}
 import scala.cli.commands.version.{Version, VersionOptions}
-import scala.cli.commands.{ScalaCommand, ScalaCommandWithCustomHelp}
-import scala.cli.launcher.LauncherOptions
-
-class Default(
-  actualHelp: => RuntimeCommandsHelp,
-  isSipScala: Boolean
-) extends ScalaCommandWithCustomHelp[DefaultOptions](actualHelp) {
 
+class Default(actualHelp: => RuntimeCommandsHelp)
+    extends ScalaCommandWithCustomHelp[DefaultOptions](actualHelp) {
   private lazy val defaultCommandHelp: String =
     s"""
        |When no subcommand is passed explicitly, an implicit subcommand is used based on context:

modules/cli/src/main/scala/scala/cli/commands/shared/ScalaCliHelp.scala

@@ -3,8 +3,6 @@ package scala.cli.commands.shared
 import caseapp.core.Arg
 import caseapp.core.help.HelpFormat
 
-import scala.cli.ScalaCli.allowRestrictedFeatures
-import scala.cli.commands.shared.HelpGroup
 import scala.cli.util.ArgHelpers.*
 import scala.util.{Properties, Try}
 

modules/cli/src/main/scala/scala/cli/util/ArgHelpers.scala

@@ -5,7 +5,7 @@ import caseapp.core.help.HelpFormat
 
 import scala.build.input.ScalaCliInvokeData
 import scala.build.internal.util.WarningMessages
-import scala.cli.ScalaCli.allowRestrictedFeatures
+import scala.cli.ScalaCli
 import scala.cli.commands.shared.{HelpCommandGroup, HelpGroup}
 import scala.cli.commands.{SpecificationLevel, tags}
 
@@ -17,7 +17,7 @@ object ArgHelpers {
 
     def isExperimentalOrRestricted: Boolean = arg.isRestricted || arg.isExperimental
 
-    def isSupported: Boolean = allowRestrictedFeatures || !arg.isExperimentalOrRestricted
+    def isSupported: Boolean = ScalaCli.allowRestrictedFeatures || !arg.isExperimentalOrRestricted
     def isImportant: Boolean = arg.hasTag(tags.inShortHelp)
 
     def isMust: Boolean = arg.hasTag(tags.must)

modules/cli/src/test/scala/cli/tests/HelpCheck.scala

@@ -8,7 +8,7 @@ import scala.cli.{ScalaCli, ScalaCliCommands}
 class HelpCheck extends munit.FunSuite {
 
   test("help message should be shorter then 80 lines") {
-    val scalaCli = new ScalaCliCommands("scala-cli", "scala-cli", "Scala CLI", isSipScala = false)
+    val scalaCli    = new ScalaCliCommands("scala-cli", "scala-cli", "Scala CLI")
     val helpMessage = scalaCli.help.help(scalaCli.helpFormat)
 
     val lines = helpMessage.split("\r\n|\r|\n").length

modules/cli/src/test/scala/cli/tests/OptionsCheck.scala

@@ -7,7 +7,7 @@ class OptionsCheck extends munit.FunSuite {
 
   for (
     command <-
-      (new ScalaCliCommands("scala-cli", "scala-cli", "Scala CLI", isSipScala = false)).commands
+      new ScalaCliCommands("scala-cli", "scala-cli", "Scala CLI").commands
   )
     test(s"No duplicated options in ${command.names.head.mkString(" ")}") {
       command.ensureNoDuplicates()