Skip to content

Commit

Permalink
NIT Refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
Gedochao committed Aug 31, 2022
1 parent d153427 commit 6b342f5
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 18 deletions.
7 changes: 3 additions & 4 deletions modules/cli/src/main/scala/scala/cli/commands/Default.scala
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@ class Default(

override protected def commandLength = 0

override def group = "Main"
override def sharedOptions(options: DefaultOptions) =
Some[scala.cli.commands.SharedOptions](options.shared)
private[cli] var rawArgs = Array.empty[String]
override def group = "Main"
override def sharedOptions(options: DefaultOptions): Option[SharedOptions] = Some(options.shared)
private[cli] var rawArgs = Array.empty[String]
override def helpAsked(progName: String, maybeOptions: Either[Error, DefaultOptions]): Nothing = {
println(defaultHelp)
sys.exit(0)
Expand Down
8 changes: 4 additions & 4 deletions modules/cli/src/main/scala/scala/cli/commands/Repl.scala
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ import scala.cli.commands.util.CommonOps.SharedDirectoriesOptionsOps

object Repl extends ScalaCommand[ReplOptions] {
override def group = "Main"
override def names = List(
override def names: List[List[String]] = List(
List("console"),
List("repl")
)
override def sharedOptions(options: ReplOptions) = Some(options.shared)
override def sharedOptions(options: ReplOptions): Option[SharedOptions] = Some(options.shared)

def buildOptions(ops: ReplOptions): BuildOptions = {
import ops._
Expand All @@ -33,7 +33,7 @@ object Repl extends ScalaCommand[ReplOptions] {
javaOptions = baseOptions.javaOptions.copy(
javaOpts =
baseOptions.javaOptions.javaOpts ++
sharedJava.allJavaOpts.map(JavaOpt(_)).map(Positioned.commandLine _)
sharedJava.allJavaOpts.map(JavaOpt(_)).map(Positioned.commandLine)
),
notForBloopOptions = baseOptions.notForBloopOptions.copy(
replOptions = baseOptions.notForBloopOptions.replOptions.copy(
Expand Down Expand Up @@ -225,7 +225,7 @@ object Repl extends ScalaCommand[ReplOptions] {
.map(_.last.stripSuffix(".class"))
.sorted
val warnRootClasses = rootClasses.nonEmpty &&
options.notForBloopOptions.replOptions.useAmmoniteOpt.exists(_ == true)
options.notForBloopOptions.replOptions.useAmmoniteOpt.contains(true)
if (warnRootClasses)
logger.message(
s"Warning: found classes defined in the root package (${rootClasses.mkString(", ")})." +
Expand Down
18 changes: 8 additions & 10 deletions modules/cli/src/main/scala/scala/cli/commands/ScalaCommand.scala
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ abstract class ScalaCommand[T](implicit parser: Parser[T], help: Help[T])
}

// TODO Manage to have case-app give use the exact command name that was used instead
protected def commandLength = names.headOption.fold(1)(_.length)
protected def commandLength: Int = names.headOption.fold(1)(_.length)

override def error(message: Error): Nothing = {
System.err.println(message.message)
Expand All @@ -48,19 +48,17 @@ abstract class ScalaCommand[T](implicit parser: Parser[T], help: Help[T])
// FIXME Report this in case-app default NameFormatter
override lazy val nameFormatter: Formatter[Name] = {
val parent = super.nameFormatter
new Formatter[Name] {
def format(t: Name): String =
if (t.name.startsWith("-")) t.name
else parent.format(t)
}
(t: Name) =>
if (t.name.startsWith("-")) t.name
else parent.format(t)
}

override def completer: Completer[T] = {
val parent = super.completer
new Completer[T] {
def optionName(prefix: String, state: Option[T]) =
def optionName(prefix: String, state: Option[T]): List[CompletionItem] =
parent.optionName(prefix, state)
def optionValue(arg: Arg, prefix: String, state: Option[T]) = {
def optionValue(arg: Arg, prefix: String, state: Option[T]): List[CompletionItem] = {
val candidates = arg.name.name match {
case "dependency" =>
state.flatMap(sharedOptions).toList.flatMap { sharedOptions =>
Expand Down Expand Up @@ -92,7 +90,7 @@ abstract class ScalaCommand[T](implicit parser: Parser[T], help: Help[T])
}
candidates ++ parent.optionValue(arg, prefix, state)
}
def argument(prefix: String, state: Option[T]) =
def argument(prefix: String, state: Option[T]): List[CompletionItem] =
parent.argument(prefix, state)
}
}
Expand Down Expand Up @@ -137,7 +135,7 @@ abstract class ScalaCommand[T](implicit parser: Parser[T], help: Help[T])
sys.exit(exitCode)
}

override def helpFormat =
override def helpFormat: HelpFormat =
HelpFormat.default()
.withSortedGroups(Some(Seq(
"Help",
Expand Down

0 comments on commit 6b342f5

Please sign in to comment.