Skip to content

Commit 8b76d96

Browse files
authored
Merge pull request #320 from alvinj/aa-reference-review
Review Reference files (and under-the-hood)
2 parents 2662a65 + 7f7a98e commit 8b76d96

37 files changed

+213
-177
lines changed

modules/build/src/main/scala/scala/build/preprocessing/directives/UsingCustomJarDirectiveHandler.scala

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,13 @@ import scala.build.preprocessing.ScopePath
88

99
case object UsingCustomJarDirectiveHandler extends UsingDirectiveHandler {
1010
def name = "Custom JAR"
11-
def description = "Manually adds JAR to the class path"
12-
def usage = "using jar _path_ | using jars _path1_ _path2_ …"
11+
def description = "Manually add JAR(s) to the class path"
12+
def usage = "`using jar `_path_ | `using jars `_path1_ _path2_ …"
1313
override def usageMd =
14-
"`using jar `_path_ | `using jars `_path1_ _path2_ …"
14+
"""using jar _path_
15+
|
16+
|using jars _path1_ _path2_ …""".stripMargin
17+
1518
override def examples = Seq(
1619
"using jar \"/Users/alexandre/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/com/chuusai/shapeless_2.13/2.3.7/shapeless_2.13-2.3.7.jar\""
1720
)

modules/build/src/main/scala/scala/build/preprocessing/directives/UsingDependencyDirectiveHandler.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import scala.build.{Position, Positioned}
1212

1313
case object UsingDependencyDirectiveHandler extends UsingDirectiveHandler {
1414
def name = "Dependency"
15-
def description = "Adds dependencies"
15+
def description = "Add dependencies"
1616
def usage = "using lib org:name:ver | using libs org:name:ver org2:name2:ver2"
1717
override def usageMd = "`using lib `_org_`:`name`:`ver"
1818
override def examples = Seq(

modules/build/src/main/scala/scala/build/preprocessing/directives/UsingJavaHomeDirectiveHandler.scala

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,13 @@ import scala.build.options.{BuildOptions, JavaOptions}
77
import scala.build.preprocessing.ScopePath
88

99
case object UsingJavaHomeDirectiveHandler extends UsingDirectiveHandler {
10-
def name = "Java home"
11-
def description = "Sets Java home used to run your application or tests"
12-
def usage = "using java-home|javaHome _path_"
13-
override def usageMd = "`using java-home `_path_ | `using javaHome `_path_"
10+
def name = "Java home"
11+
def description = "Sets Java home used to run your application or tests"
12+
def usage = "using java-home|javaHome _path_"
13+
override def usageMd =
14+
"""`using java-home `_path_
15+
|
16+
|`using javaHome `_path_""".stripMargin
1417
override def examples = Seq(
1518
"using java-home \"/Users/Me/jdks/11\""
1619
)

modules/build/src/main/scala/scala/build/preprocessing/directives/UsingJavaOptionsDirectiveHandler.scala

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@ import scala.build.preprocessing.ScopePath
77

88
case object UsingJavaOptionsDirectiveHandler extends UsingDirectiveHandler {
99
def name = "Java options"
10-
def description = "Adds Java options"
10+
def description = "Add Java options"
1111
def usage = "using java-opt _options_ | using javaOpt _options_"
1212
override def usageMd =
13-
"`using java-opt `_options_ | `using javaOpt `_options_"
13+
"""`using java-opt `_options_
14+
|
15+
|`using javaOpt `_options_""".stripMargin
1416
override def examples = Seq(
1517
"using javaOpt -Xmx2g -Dsomething=a"
1618
)

modules/build/src/main/scala/scala/build/preprocessing/directives/UsingRepositoryDirectiveHandler.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import scala.build.preprocessing.ScopePath
77

88
case object UsingRepositoryDirectiveHandler extends UsingDirectiveHandler {
99
def name = "Repository"
10-
def description = "Adds a repository for dependency resolution"
10+
def description = "Add a repository for dependency resolution"
1111
def usage = "using repository _repository_"
1212
override def usageMd = "`using repository `_repository_"
1313
override def examples = Seq(

modules/build/src/main/scala/scala/build/preprocessing/directives/UsingResourcesDirectiveHandler.scala

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,14 @@ import scala.build.preprocessing.ScopePath
88

99
case object UsingResourcesDirectiveHandler extends UsingDirectiveHandler {
1010
def name = "Resources"
11-
def description = "Manually adds a resource directory to the class path"
12-
def usage = "using resource _path_ | using resources _path1_ _path2_ …"
11+
def description = "Manually add a resource directory to the class path"
12+
def usage = """using resource _path_
13+
|
14+
|using resources _path1_ _path2_ …""".stripMargin
1315
override def usageMd =
14-
"`using resource `_path_ | `using resources `_path1_ _path2_ …"
16+
"""`using resource `_path_
17+
|
18+
|`using resources `_path1_ _path2_ …""".stripMargin
1519
override def examples = Seq(
1620
"using resource \"./resources\""
1721
)

modules/build/src/main/scala/scala/build/preprocessing/directives/UsingScalaVersionDirectiveHandler.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import scala.build.preprocessing.ScopePath
77

88
case object UsingScalaVersionDirectiveHandler extends UsingDirectiveHandler {
99
def name = "Scala version"
10-
def description = "Sets the default Scala version"
10+
def description = "Set the default Scala version"
1111
def usage = "using scala _version_+"
1212
override def usageMd = "`using scala `_version_+"
1313
override def examples = Seq(

modules/build/src/main/scala/scala/build/preprocessing/directives/UsingTestFrameworkDirectiveHandler.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import scala.build.preprocessing.ScopePath
1111

1212
case object UsingTestFrameworkDirectiveHandler extends UsingDirectiveHandler {
1313
def name = "Test framework"
14-
def description = "Sets test framework"
14+
def description = "Set the test framework"
1515
def usage = "using test-framework _class_name_"
1616
override def usageMd =
1717
"`using test-framework `_class_name_"

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

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

55
// format: off
6-
@HelpMessage("Clean-up workspace")
6+
@HelpMessage("Clean the workspace")
77
final case class CleanOptions(
88
@Recurse
99
logging: LoggingOptions = LoggingOptions(),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ final case class CompileOptions(
1717

1818
@Name("p")
1919
@Name("classpath")
20-
@HelpMessage("Print resulting class path")
20+
@HelpMessage("Print the resulting class path")
2121
classPath: Boolean = false
2222
) {
2323
// format: on

0 commit comments

Comments
 (0)