Skip to content

Commit

Permalink
NIT Refactor options
Browse files Browse the repository at this point in the history
  • Loading branch information
@Gedochao
Gedochao committed Oct 26, 2022
1 parent 3b3ac13 commit 63369c7
Show file tree
Hide file tree
Showing 73 changed files with 109 additions and 111 deletions.
7 changes: 3 additions & 4 deletions modules/cli-options/src/main/scala/scala/cli/commands/AboutOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package scala.cli.commands

import caseapp._
import caseapp.*

import scala.cli.commands.common.HasLoggingOptions
import scala.cli.signing.shared.PasswordOption
import scala.cli.signing.util.ArgParsers._
import scala.cli.signing.util.ArgParsers.*

// format: off
@HelpMessage("Print details about this application")
Expand All @@ -17,8 +17,7 @@ final case class AboutOptions(
) extends HasLoggingOptions
// format: on


object AboutOptions {
implicit lazy val parser: Parser[AboutOptions] = Parser.derive
implicit lazy val help: Help[AboutOptions] = Help.derive
implicit lazy val help: Help[AboutOptions] = Help.derive
}
2 changes: 1 addition & 1 deletion modules/cli-options/src/main/scala/scala/cli/commands/AddPathOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package scala.cli.commands

import caseapp._
import caseapp.*

import scala.cli.commands.common.HasLoggingOptions

Expand Down
2 changes: 1 addition & 1 deletion modules/cli-options/src/main/scala/scala/cli/commands/BenchmarkingOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package scala.cli.commands

import caseapp._
import caseapp.*

// format: off
final case class BenchmarkingOptions(
Expand Down
2 changes: 1 addition & 1 deletion modules/cli-options/src/main/scala/scala/cli/commands/BloopExitOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package scala.cli.commands

import caseapp._
import caseapp.*

import scala.cli.commands.common.HasLoggingOptions

Expand Down
3 changes: 1 addition & 2 deletions modules/cli-options/src/main/scala/scala/cli/commands/BloopStartOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package scala.cli.commands

import caseapp._
import caseapp.*

import scala.cli.commands.common.HasLoggingOptions

Expand All @@ -22,7 +22,6 @@ final case class BloopStartOptions(
// format: on

object BloopStartOptions {

implicit lazy val parser: Parser[BloopStartOptions] = Parser.derive
implicit lazy val help: Help[BloopStartOptions] = Help.derive
}
2 changes: 1 addition & 1 deletion modules/cli-options/src/main/scala/scala/cli/commands/BspOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package scala.cli.commands

import caseapp._
import caseapp.*

import scala.cli.commands.common.HasSharedOptions

Expand Down
2 changes: 1 addition & 1 deletion modules/cli-options/src/main/scala/scala/cli/commands/CleanOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package scala.cli.commands

import caseapp._
import caseapp.*

import scala.cli.commands.common.HasLoggingOptions

Expand Down
2 changes: 1 addition & 1 deletion modules/cli-options/src/main/scala/scala/cli/commands/CompileOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package scala.cli.commands

import caseapp._
import caseapp.*
import caseapp.core.help.Help

import scala.cli.commands.common.HasSharedOptions
Expand Down
6 changes: 3 additions & 3 deletions modules/cli-options/src/main/scala/scala/cli/commands/CoursierOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package scala.cli.commands

import caseapp._
import com.github.plokhotnyuk.jsoniter_scala.core._
import com.github.plokhotnyuk.jsoniter_scala.macros._
import caseapp.*
import com.github.plokhotnyuk.jsoniter_scala.core.*
import com.github.plokhotnyuk.jsoniter_scala.macros.*

// format: off
final case class CoursierOptions(
Expand Down
2 changes: 1 addition & 1 deletion modules/cli-options/src/main/scala/scala/cli/commands/CrossOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package scala.cli.commands

import caseapp._
import caseapp.*

// format: off
final case class CrossOptions(
Expand Down
2 changes: 1 addition & 1 deletion modules/cli-options/src/main/scala/scala/cli/commands/DefaultOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package scala.cli.commands

import caseapp._
import caseapp.*

import scala.cli.commands.common.HasSharedOptions

Expand Down
2 changes: 1 addition & 1 deletion modules/cli-options/src/main/scala/scala/cli/commands/DependencyUpdateOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package scala.cli.commands

import caseapp._
import caseapp.*
import caseapp.core.help.Help

import scala.cli.commands.common.HasSharedOptions
Expand Down
2 changes: 1 addition & 1 deletion modules/cli-options/src/main/scala/scala/cli/commands/DirectoriesOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package scala.cli.commands

import caseapp._
import caseapp.*

import scala.cli.commands.common.HasLoggingOptions

Expand Down
2 changes: 1 addition & 1 deletion modules/cli-options/src/main/scala/scala/cli/commands/DocOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package scala.cli.commands

import caseapp._
import caseapp.*
import caseapp.core.help.Help

import scala.cli.commands.common.HasSharedOptions
Expand Down
4 changes: 2 additions & 2 deletions modules/cli-options/src/main/scala/scala/cli/commands/DoctorOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package scala.cli.commands

import caseapp._
import caseapp.*

import scala.cli.commands.common.HasLoggingOptions
import scala.cli.signing.shared.PasswordOption
import scala.cli.signing.util.ArgParsers._
import scala.cli.signing.util.ArgParsers.*

// format: off
@HelpMessage("Print details about this application")
Expand Down
2 changes: 1 addition & 1 deletion modules/cli-options/src/main/scala/scala/cli/commands/ExportOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package scala.cli.commands

import caseapp._
import caseapp.*

import scala.cli.commands.common.HasSharedOptions

Expand Down
2 changes: 1 addition & 1 deletion modules/cli-options/src/main/scala/scala/cli/commands/FmtOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package scala.cli.commands

import caseapp._
import caseapp.*

import scala.cli.commands.common.HasSharedOptions

Expand Down
6 changes: 3 additions & 3 deletions modules/cli-options/src/main/scala/scala/cli/commands/HelpGroupOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package scala.cli.commands

import caseapp._
import caseapp.*
import caseapp.core.help.{Help, HelpFormat}
import com.github.plokhotnyuk.jsoniter_scala.core._
import com.github.plokhotnyuk.jsoniter_scala.macros._
import com.github.plokhotnyuk.jsoniter_scala.core.*
import com.github.plokhotnyuk.jsoniter_scala.macros.*

@HelpMessage("Print help message")
case class HelpGroupOptions(
Expand Down
2 changes: 1 addition & 1 deletion modules/cli-options/src/main/scala/scala/cli/commands/HelpOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package scala.cli.commands

import caseapp._
import caseapp.*

import scala.cli.commands.common.HasLoggingOptions

Expand Down
2 changes: 1 addition & 1 deletion modules/cli-options/src/main/scala/scala/cli/commands/InstallCompletionsOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package scala.cli.commands

import caseapp._
import caseapp.*

import scala.cli.commands.common.HasLoggingOptions

Expand Down
2 changes: 1 addition & 1 deletion modules/cli-options/src/main/scala/scala/cli/commands/InstallHomeOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package scala.cli.commands

import caseapp._
import caseapp.*

import scala.cli.commands.common.HasLoggingOptions

Expand Down
6 changes: 3 additions & 3 deletions modules/cli-options/src/main/scala/scala/cli/commands/LoggingOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package scala.cli.commands

import caseapp._
import com.github.plokhotnyuk.jsoniter_scala.core._
import com.github.plokhotnyuk.jsoniter_scala.macros._
import caseapp.*
import com.github.plokhotnyuk.jsoniter_scala.core.*
import com.github.plokhotnyuk.jsoniter_scala.macros.*

// format: off
final case class LoggingOptions(
Expand Down
2 changes: 1 addition & 1 deletion modules/cli-options/src/main/scala/scala/cli/commands/MainClassOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package scala.cli.commands

import caseapp._
import caseapp.*

// format: off
final case class MainClassOptions(
Expand Down
2 changes: 1 addition & 1 deletion modules/cli-options/src/main/scala/scala/cli/commands/MetabrowseOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package scala.cli.commands

import caseapp._
import caseapp.*

import scala.cli.commands.common.HasSharedOptions

Expand Down
2 changes: 1 addition & 1 deletion modules/cli-options/src/main/scala/scala/cli/commands/PackageOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package scala.cli.commands

import caseapp._
import caseapp.*
import caseapp.core.help.Help

import scala.cli.commands.common.HasSharedOptions
Expand Down
2 changes: 1 addition & 1 deletion modules/cli-options/src/main/scala/scala/cli/commands/ReplOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package scala.cli.commands

import caseapp._
import caseapp.*

import scala.cli.commands.common.HasSharedOptions

Expand Down
2 changes: 1 addition & 1 deletion modules/cli-options/src/main/scala/scala/cli/commands/RunOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package scala.cli.commands

import caseapp._
import caseapp.*
import caseapp.core.help.Help

import scala.cli.commands.common.HasSharedOptions
Expand Down
6 changes: 3 additions & 3 deletions modules/cli-options/src/main/scala/scala/cli/commands/ScalaJsOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package scala.cli.commands

import caseapp._
import com.github.plokhotnyuk.jsoniter_scala.core._
import com.github.plokhotnyuk.jsoniter_scala.macros._
import caseapp.*
import com.github.plokhotnyuk.jsoniter_scala.core.*
import com.github.plokhotnyuk.jsoniter_scala.macros.*

// format: off
final case class ScalaJsOptions(
Expand Down
6 changes: 3 additions & 3 deletions modules/cli-options/src/main/scala/scala/cli/commands/ScalaNativeOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package scala.cli.commands

import caseapp._
import com.github.plokhotnyuk.jsoniter_scala.core._
import com.github.plokhotnyuk.jsoniter_scala.macros._
import caseapp.*
import com.github.plokhotnyuk.jsoniter_scala.core.*
import com.github.plokhotnyuk.jsoniter_scala.macros.*

// format: off
final case class ScalaNativeOptions(
Expand Down
6 changes: 3 additions & 3 deletions modules/cli-options/src/main/scala/scala/cli/commands/ScalacOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package scala.cli.commands

import caseapp._
import caseapp.*
import caseapp.core.{Arg, Error}
import caseapp.core.parser.{Argument, NilParser, StandardArgument}
import caseapp.core.util.Formatter
import com.github.plokhotnyuk.jsoniter_scala.core._
import com.github.plokhotnyuk.jsoniter_scala.macros._
import com.github.plokhotnyuk.jsoniter_scala.core.*
import com.github.plokhotnyuk.jsoniter_scala.macros.*

// format: off
final case class ScalacOptions(
Expand Down
2 changes: 1 addition & 1 deletion modules/cli-options/src/main/scala/scala/cli/commands/SetupIdeOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package scala.cli.commands

import caseapp._
import caseapp.*

import scala.cli.commands.common.HasSharedOptions

Expand Down
2 changes: 1 addition & 1 deletion modules/cli-options/src/main/scala/scala/cli/commands/SharedBspFileOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package scala.cli.commands

import caseapp._
import caseapp.*

// format: off
final case class SharedBspFileOptions(
Expand Down
6 changes: 3 additions & 3 deletions modules/cli-options/src/main/scala/scala/cli/commands/SharedCompilationServerOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package scala.cli.commands

import caseapp._
import com.github.plokhotnyuk.jsoniter_scala.core._
import com.github.plokhotnyuk.jsoniter_scala.macros._
import caseapp.*
import com.github.plokhotnyuk.jsoniter_scala.core.*
import com.github.plokhotnyuk.jsoniter_scala.macros.*


// format: off
Expand Down
6 changes: 3 additions & 3 deletions modules/cli-options/src/main/scala/scala/cli/commands/SharedDependencyOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package scala.cli.commands

import caseapp._
import com.github.plokhotnyuk.jsoniter_scala.core._
import com.github.plokhotnyuk.jsoniter_scala.macros._
import caseapp.*
import com.github.plokhotnyuk.jsoniter_scala.core.*
import com.github.plokhotnyuk.jsoniter_scala.macros.*

// format: off
final case class SharedDependencyOptions(
Expand Down
6 changes: 3 additions & 3 deletions modules/cli-options/src/main/scala/scala/cli/commands/SharedDirectoriesOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package scala.cli.commands

import caseapp._
import com.github.plokhotnyuk.jsoniter_scala.core._
import com.github.plokhotnyuk.jsoniter_scala.macros._
import caseapp.*
import com.github.plokhotnyuk.jsoniter_scala.core.*
import com.github.plokhotnyuk.jsoniter_scala.macros.*

// format: off
final case class SharedDirectoriesOptions(
Expand Down
2 changes: 1 addition & 1 deletion modules/cli-options/src/main/scala/scala/cli/commands/SharedInputOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package scala.cli.commands

import caseapp._
import caseapp.*

// format: off
final case class SharedInputOptions(
Expand Down
2 changes: 1 addition & 1 deletion modules/cli-options/src/main/scala/scala/cli/commands/SharedJavaOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package scala.cli.commands

import caseapp._
import caseapp.*

// format: off
final case class SharedJavaOptions(
Expand Down
6 changes: 3 additions & 3 deletions modules/cli-options/src/main/scala/scala/cli/commands/SharedJvmOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package scala.cli.commands

import caseapp._
import com.github.plokhotnyuk.jsoniter_scala.core._
import com.github.plokhotnyuk.jsoniter_scala.macros._
import caseapp.*
import com.github.plokhotnyuk.jsoniter_scala.core.*
import com.github.plokhotnyuk.jsoniter_scala.macros.*

// format: off
final case class SharedJvmOptions(
Expand Down
6 changes: 3 additions & 3 deletions modules/cli-options/src/main/scala/scala/cli/commands/SharedOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package scala.cli.commands

import caseapp._
import caseapp.*
import caseapp.core.help.Help
import com.github.plokhotnyuk.jsoniter_scala.core._
import com.github.plokhotnyuk.jsoniter_scala.macros._
import com.github.plokhotnyuk.jsoniter_scala.core.*
import com.github.plokhotnyuk.jsoniter_scala.macros.*

import scala.cli.commands.common.HasLoggingOptions

Expand Down
2 changes: 1 addition & 1 deletion modules/cli-options/src/main/scala/scala/cli/commands/SharedPythonOptions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package scala.cli.commands

import caseapp._
import caseapp.*

// format: off
final case class SharedPythonOptions(
Expand Down
Loading

0 comments on commit 63369c7

Please sign in to comment.