Remove cli options extensions

Author: alexarchambault

modules/build/src/main/scala/scala/build/Build.scala

@@ -65,28 +65,31 @@ object Build {
       mainClasses: Seq[String],
       commandString: String,
       logger: Logger
-    ): Either[MainClassError, String] = {
+    ): Either[BuildException, String] = {
       val defaultMainClassOpt = sources.defaultMainClass
         .filter(name => mainClasses.contains(name))
-      def foundMainClass =
+      def foundMainClass: Either[BuildException, String] =
         mainClasses match {
           case Seq()          => Left(new NoMainClassFoundError)
           case Seq(mainClass) => Right(mainClass)
           case _ =>
-            inferredMainClass(mainClasses, logger).left.flatMap { mainClasses =>
-              options.interactive
-                .chooseOne(
-                  "Found several main classes. Which would you like to run?",
-                  mainClasses.toList
-                )
-                .toRight {
-                  SeveralMainClassesFoundError(
-                    ::(mainClasses.head, mainClasses.tail.toList),
-                    commandString,
-                    Nil
-                  )
+            inferredMainClass(mainClasses, logger)
+              .left.flatMap { mainClasses =>
+                options.interactive.flatMap { interactive =>
+                  interactive
+                    .chooseOne(
+                      "Found several main classes. Which would you like to run?",
+                      mainClasses.toList
+                    )
+                    .toRight {
+                      SeveralMainClassesFoundError(
+                        ::(mainClasses.head, mainClasses.tail.toList),
+                        commandString,
+                        Nil
+                      )
+                    }
                 }
-            }
+              }
         }
 
       defaultMainClassOpt match {

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

@@ -17,10 +17,8 @@ import scala.build.internal.{Constants, Runner}
 import scala.build.options.{BuildOptions, Scope}
 import scala.build.{Artifacts, Logger, Positioned, ReplArtifacts}
 import scala.cli.commands.shared.{HasLoggingOptions, ScalacOptions, SharedOptions}
-import scala.cli.commands.util.CommonOps.*
+import scala.cli.commands.util.CommandHelpers
 import scala.cli.commands.util.ScalacOptionsUtil.*
-import scala.cli.commands.util.SharedOptionsUtil.*
-import scala.cli.commands.util.{CommandHelpers, FmtOptionsUtil}
 import scala.cli.{CurrentParams, ScalaCli}
 import scala.util.{Properties, Try}
 

modules/cli/src/main/scala/scala/cli/commands/about/About.scala

@@ -6,7 +6,6 @@ import scala.build.Logger
 import scala.build.internal.Constants
 import scala.cli.CurrentParams
 import scala.cli.commands.update.Update
-import scala.cli.commands.util.CommonOps.*
 import scala.cli.commands.version.Version
 import scala.cli.commands.{CommandUtils, ScalaCommand}
 

modules/cli/src/main/scala/scala/cli/commands/addpath/AddPath.scala

@@ -7,7 +7,6 @@ import java.io.File
 
 import scala.build.Logger
 import scala.cli.CurrentParams
-import scala.cli.commands.util.CommonOps.*
 import scala.cli.commands.{CustomWindowsEnvVarUpdater, ScalaCommand}
 import scala.util.Properties
 

modules/cli/src/main/scala/scala/cli/commands/bloop/Bloop.scala

@@ -10,9 +10,6 @@ import scala.build.internal.OsLibc
 import scala.cli.CurrentParams
 import scala.cli.commands.ScalaCommand
 import scala.cli.commands.shared.{LoggingOptions, SharedOptions}
-import scala.cli.commands.util.CommonOps.*
-import scala.cli.commands.util.SharedCompilationServerOptionsUtil.*
-import scala.cli.commands.util.SharedOptionsUtil.*
 import scala.concurrent.Await
 import scala.concurrent.duration.Duration
 
@@ -25,7 +22,7 @@ object Bloop extends ScalaCommand[BloopOptions] {
 
   private def bloopRifleConfig0(opts: BloopOptions): BloopRifleConfig = {
 
-    // FIXME Basically a tweaked copy of SharedOptionsUtil.bloopRifleConfig
+    // FIXME Basically a tweaked copy of SharedOptions.bloopRifleConfig
     // Some in progress BuildOptions / JavaOptions refactoring of mine should allow
     // to stop using SharedOptions and BuildOptions here, and deal with JavaOptions
     // directly.

modules/cli/src/main/scala/scala/cli/commands/bloop/BloopExit.scala

@@ -6,8 +6,6 @@ import scala.build.blooprifle.{BloopRifle, BloopRifleConfig}
 import scala.build.{Logger, Os}
 import scala.cli.CurrentParams
 import scala.cli.commands.ScalaCommand
-import scala.cli.commands.util.CommonOps.*
-import scala.cli.commands.util.SharedCompilationServerOptionsUtil.*
 
 object BloopExit extends ScalaCommand[BloopExitOptions] {
   override def hidden                  = true

modules/cli/src/main/scala/scala/cli/commands/bloop/BloopOutput.scala

@@ -7,8 +7,6 @@ import scala.build.blooprifle.BloopRifleConfig
 import scala.cli.CurrentParams
 import scala.cli.commands.ScalaCommand
 import scala.cli.commands.shared.{CoursierOptions, LoggingOptions}
-import scala.cli.commands.util.CommonOps.*
-import scala.cli.commands.util.SharedCompilationServerOptionsUtil.*
 
 object BloopOutput extends ScalaCommand[BloopOutputOptions] {
 

modules/cli/src/main/scala/scala/cli/commands/bloop/BloopStart.scala

@@ -9,9 +9,7 @@ import scala.build.options.{BuildOptions, InternalOptions}
 import scala.build.{Logger, Os}
 import scala.cli.CurrentParams
 import scala.cli.commands.ScalaCommand
-import scala.cli.commands.util.CommonOps.*
 import scala.cli.commands.util.JvmUtils
-import scala.cli.commands.util.SharedCompilationServerOptionsUtil.*
 import scala.concurrent.Await
 import scala.concurrent.duration.Duration
 

modules/cli/src/main/scala/scala/cli/commands/bsp/Bsp.scala

@@ -14,8 +14,6 @@ import scala.cli.CurrentParams
 import scala.cli.commands.ScalaCommand
 import scala.cli.commands.publish.ConfigUtil.*
 import scala.cli.commands.shared.SharedOptions
-import scala.cli.commands.util.CommonOps.*
-import scala.cli.commands.util.SharedOptionsUtil.*
 import scala.cli.config.{ConfigDb, Keys}
 import scala.concurrent.Await
 import scala.concurrent.duration.Duration
@@ -78,7 +76,7 @@ object Bsp extends ScalaCommand[BspOptions] {
 
     val inputs = argsToInputs(args.all).orExit(logger)
     CurrentParams.workspaceOpt = Some(inputs.workspace)
-    val configDb = options.shared.configDb
+    val configDb = options.shared.configDb.orExit(logger)
     val actionableDiagnostics =
       options.shared.logging.verbosityOptions.actions.orElse(
         configDb.get(Keys.actions).getOrElse(None)

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

@@ -7,7 +7,6 @@ import scala.build.internal.Constants
 import scala.build.{Logger, Os}
 import scala.cli.commands.ScalaCommand
 import scala.cli.commands.setupide.SetupIde
-import scala.cli.commands.util.CommonOps.*
 import scala.cli.{CurrentParams, ScalaCli}
 
 object Clean extends ScalaCommand[CleanOptions] {