Skip to content

Commit b3ac4cc

Browse files
committed
Add description to help messages
1 parent 68d9c0a commit b3ac4cc

16 files changed

+136
-18
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package scala.cli.commands
33
import caseapp._
44

55
// format: off
6+
@HelpMessage("Start BSP server")
67
final case class BspOptions(
78
// FIXME There might be too many options in SharedOptions for the bsp command…
89
@Recurse

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import caseapp._
55
// format: off
66
final case class CompileCrossOptions(
77
@HelpMessage("Cross-compile sources")
8+
@Hidden
89
cross: Option[Boolean] = None
910
)
1011
// format: on

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ final case class CoursierOptions(
1111
@Group("Dependency")
1212
@HelpMessage("Specify a TTL for changing dependencies, such as snapshots")
1313
@ValueDescription("duration|Inf")
14+
@Hidden
1415
ttl: Option[String] = None
1516
) {
1617
// format: on

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ package scala.cli.commands
33
import caseapp._
44

55
object Directories extends ScalaCommand[DirectoriesOptions] {
6+
override def hidden: Boolean = true
7+
68
def run(options: DirectoriesOptions, args: RemainingArgs): Unit = {
79
if (args.all.nonEmpty) {
810
System.err.println("The directories command doesn't accept arguments.")

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package scala.cli.commands
33
import caseapp._
44

55
// format: off
6+
@HelpMessage("Prints directories used by scala-cli")
67
final case class DirectoriesOptions(
78
@Recurse
89
directories: SharedDirectoriesOptions = SharedDirectoriesOptions()

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,25 @@ import caseapp._
55
import scala.build.options.BuildOptions
66

77
// format: off
8+
@HelpMessage("Export current project to SBT or Mill")
89
final case class ExportOptions(
910
// FIXME There might be too many options for 'scala-cli export' there
1011
@Recurse
1112
shared: SharedOptions = SharedOptions(),
1213
@Recurse
1314
mainClass: MainClassOptions = MainClassOptions(),
14-
15+
16+
@Group("Build Tool export options")
1517
sbt: Option[Boolean] = None,
18+
@Group("Build Tool export options")
1619
mill: Option[Boolean] = None,
1720

1821
@Name("setting")
22+
@Group("Build Tool export options")
1923
sbtSetting: List[String] = Nil,
2024

2125
@Name("o")
26+
@Group("Build Tool export options")
2227
output: Option[String] = None
2328
) {
2429
// format: on

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@ import scala.cli.internal.{Argv0, ProfileFileUpdater}
1111

1212
object InstallCompletions extends ScalaCommand[InstallCompletionsOptions] {
1313
override def names = List(
14-
List("install", "completions")
14+
List("install", "completions"),
15+
List("install-completions")
1516
)
1617
private lazy val home = os.Path(sys.props("user.home"), os.pwd)
1718
def run(options: InstallCompletionsOptions, args: RemainingArgs): Unit = {
1819

1920
lazy val completionsDir =
20-
options.directory
21+
options.output
2122
.map(os.Path(_, os.pwd))
2223
.getOrElse(options.directories.directories.completionsDir)
2324

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,33 @@ package scala.cli.commands
33
import caseapp._
44

55
// format: off
6+
@HelpMessage("Installs completions into your shell")
67
final case class InstallCompletionsOptions(
78
@Recurse
89
logging: LoggingOptions = LoggingOptions(),
910
@Recurse
1011
directories: SharedDirectoriesOptions = SharedDirectoriesOptions(),
1112

1213
@Name("shell")
14+
@HelpMessage("Name of the shell, either zsh or bash")
1315
format: Option[String] = None,
1416

17+
@HelpMessage("Path to *rc file, defaults to .bashrc or .zshrc depending on shell")
1518
rcFile: Option[String] = None,
16-
directory: Option[String] = None,
19+
20+
@HelpMessage("Completions output directory")
21+
@Name("o")
22+
output: Option[String] = None,
23+
24+
@Hidden
25+
@HelpMessage("Custom banner in comment placed in rc file")
1726
banner: String = "{NAME} completions",
27+
28+
@Hidden
29+
@HelpMessage("Custom completions name")
1830
name: Option[String] = None,
31+
32+
@HelpMessage("Print completions to stdout")
1933
env: Boolean = false
2034
)
2135
// format: on

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,23 @@ final case class ScalaJsOptions(
1313
js: Boolean = false,
1414

1515
@Group("Scala.JS")
16+
@HelpMessage("Scala JS version")
1617
jsVersion: Option[String] = None,
1718
@Group("Scala.JS")
19+
@HelpMessage("Scala JS mode, either \"dev\" or \"release\"")
1820
jsMode: Option[String] = None,
21+
@HelpMessage("Scala JS module kind: commonjs/common, esmodule/es, nomodule/none")
1922
@Group("Scala.JS")
2023
jsModuleKind: Option[String] = None,
2124

25+
@Group("Scala.JS")
2226
jsCheckIr: Option[Boolean] = None,
2327

2428
@Group("Scala.JS")
29+
@HelpMessage("Emit source maps")
2530
jsEmitSourceMaps: Boolean = false,
2631
@Group("Scala.JS")
32+
@HelpMessage("Enable jsdom")
2733
jsDom: Option[Boolean] = None
2834

2935
) {

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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,38 @@ final case class ScalaNativeOptions(
1313
native: Boolean = false,
1414

1515
@Group("Scala Native")
16+
@HelpMessage("Scala Native version")
1617
nativeVersion: Option[String] = None,
1718
@Group("Scala Native")
19+
@HelpMessage("Scala Native compilation mode")
1820
nativeMode: Option[String] = None,
1921
@Group("Scala Native")
22+
@HelpMessage("Scala Native garbage collector")
2023
nativeGc: Option[String] = None,
2124

2225
@Group("Scala Native")
26+
@HelpMessage("Path to Clang command")
2327
nativeClang: Option[String] = None,
2428
@Group("Scala Native")
29+
@HelpMessage("Path to Clang++ command")
2530
nativeClangpp: Option[String] = None,
2631

2732
@Group("Scala Native")
33+
@HelpMessage("Extra options passed to clang verbatim during linking")
2834
nativeLinking: List[String] = Nil,
2935
@Group("Scala Native")
30-
nativeLinkingDefaults: Option[Boolean] = None,
36+
@HelpMessage("Use default linking settings")
37+
@Hidden
38+
nativeLinkingDefaults: Option[Boolean] = None, //TODO does it even work when we default it to true while handling?
3139

3240
@Group("Scala Native")
41+
@HelpMessage("List of compile options")
3342
nativeCompile: List[String] = Nil,
43+
3444
@Group("Scala Native")
35-
nativeCompileDefaults: Option[Boolean] = None
45+
@Hidden
46+
@HelpMessage("Use default compile options")
47+
nativeCompileDefaults: Option[Boolean] = None //TODO does it even work when we default it to true while handling?
3648

3749
) {
3850
// format: on

0 commit comments

Comments
 (0)