Skip to content

Commit 44bde5d

Browse files
committed
NIT Fix inconsistent formatting in using directive definitions
1 parent 45f163a commit 44bde5d

File tree

15 files changed

+15
-56
lines changed

15 files changed

+15
-56
lines changed

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,8 @@ import scala.cli.commands.SpecificationLevel
2222
@DirectiveUsage("//> using computeVersion git:tag", "`//> using computeVersion` _method_")
2323
@DirectiveDescription("Method used to compute the version for BuildInfo")
2424
@DirectiveLevel(SpecificationLevel.RESTRICTED)
25-
// format: off
26-
final case class ComputeVersion(
27-
computeVersion: Option[Positioned[String]] = None
28-
) extends HasBuildOptions {
29-
// format: on
25+
final case class ComputeVersion(computeVersion: Option[Positioned[String]] = None)
26+
extends HasBuildOptions {
3027

3128
def buildOptions: Either[BuildException, BuildOptions] = either {
3229
BuildOptions(

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,7 @@ import scala.util.Try
2222
)
2323
@DirectiveDescription("Exclude sources from the project")
2424
@DirectiveLevel(SpecificationLevel.SHOULD)
25-
// format: off
26-
final case class Exclude(
27-
exclude: List[Positioned[String]] = Nil
28-
) extends HasBuildOptions {
29-
// format: on
25+
final case class Exclude(exclude: List[Positioned[String]] = Nil) extends HasBuildOptions {
3026
def buildOptions: Either[BuildException, BuildOptions] = either {
3127
BuildOptions(
3228
internal = InternalOptions(

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,10 @@ import scala.util.Try
1616
)
1717
@DirectiveDescription("Sets Java home used to run your application or tests")
1818
@DirectiveLevel(SpecificationLevel.SHOULD)
19-
// format: off
2019
final case class JavaHome(
2120
javaHome: DirectiveValueParser.WithScopePath[Option[Positioned[String]]] =
2221
DirectiveValueParser.WithScopePath.empty(None)
2322
) extends HasBuildOptions {
24-
// format: on
2523
def buildOptions: Either[BuildException, BuildOptions] = either {
2624
javaHome.value match {
2725
case None => BuildOptions()

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,7 @@ import scala.cli.commands.SpecificationLevel
1919
"scala-cli uses [coursier](https://get-coursier.io/) to fetch JVMs, so you can use `cs java --available` to list the available JVMs."
2020
)
2121
@DirectiveLevel(SpecificationLevel.SHOULD)
22-
// format: off
23-
final case class Jvm(
24-
jvm: Option[Positioned[String]] = None
25-
) extends HasBuildOptions {
26-
// format: on
22+
final case class Jvm(jvm: Option[Positioned[String]] = None) extends HasBuildOptions {
2723
def buildOptions: Either[BuildException, BuildOptions] = {
2824
val buildOpt = BuildOptions(
2925
javaOptions = options.JavaOptions(

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

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,9 @@ import scala.cli.commands.SpecificationLevel
1414
)
1515
@DirectiveDescription("Specify default main class")
1616
@DirectiveLevel(SpecificationLevel.MUST)
17-
// format: off
18-
final case class MainClass(
19-
mainClass: Option[String] = None
20-
) extends HasBuildOptions {
21-
// format: on
22-
def buildOptions: Either[BuildException, BuildOptions] = {
23-
val buildOpt = BuildOptions(
24-
mainClass = mainClass
25-
)
26-
Right(buildOpt)
27-
}
17+
final case class MainClass(mainClass: Option[String] = None) extends HasBuildOptions {
18+
def buildOptions: Either[BuildException, BuildOptions] =
19+
Right(BuildOptions(mainClass = mainClass))
2820
}
2921

3022
object MainClass {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ import scala.cli.commands.SpecificationLevel
6161
)
6262
@DirectiveDescription("Set parameters for packaging")
6363
@DirectiveLevel(SpecificationLevel.RESTRICTED)
64-
// format: off
6564
final case class Packaging(
6665
packageType: Option[Positioned[String]] = None,
6766
output: Option[String] = None,
@@ -73,7 +72,6 @@ final case class Packaging(
7372
dockerImageRepository: Option[String] = None,
7473
dockerCmd: Option[String] = None
7574
) extends HasBuildOptions {
76-
// format: on
7775
def buildOptions: Either[BuildException, BuildOptions] = either {
7876
val maybePackageTypeOpt = packageType
7977
.map { input =>

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,10 @@ import scala.cli.commands.SpecificationLevel
3030
)
3131
@DirectiveDescription("Set the default platform to Scala.js or Scala Native")
3232
@DirectiveLevel(SpecificationLevel.SHOULD)
33-
// format: off
3433
final case class Platform(
3534
@DirectiveName("platform")
36-
platforms: List[Positioned[String]] = Nil
35+
platforms: List[Positioned[String]] = Nil
3736
) extends HasBuildOptions {
38-
// format: on
3937

4038
private def split(input: String): (String, Option[String]) = {
4139
val idx = input.indexOf(':')

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ import scala.cli.commands.SpecificationLevel
5959
)
6060
@DirectiveDescription("Set parameters for publishing")
6161
@DirectiveLevel(SpecificationLevel.EXPERIMENTAL)
62-
// format: off
6362
final case class Publish(
6463
organization: Option[Positioned[String]] = None,
6564
name: Option[Positioned[String]] = None,
@@ -69,14 +68,13 @@ final case class Publish(
6968
license: Option[Positioned[String]] = None,
7069
@DirectiveName("scm")
7170
@DirectiveName("versionControl")
72-
vcs: Option[Positioned[String]] = None,
71+
vcs: Option[Positioned[String]] = None,
7372
description: Option[String] = None,
7473
@DirectiveName("developer")
75-
developers: List[Positioned[String]] = Nil,
74+
developers: List[Positioned[String]] = Nil,
7675
scalaVersionSuffix: Option[String] = None,
7776
scalaPlatformSuffix: Option[String] = None
7877
) extends HasBuildOptions {
79-
// format: on
8078
def buildOptions: Either[BuildException, BuildOptions] = either {
8179

8280
val maybeLicense = license

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,10 @@ import scala.cli.commands.SpecificationLevel
1919
)
2020
@DirectiveDescription(Repository.usageMsg)
2121
@DirectiveLevel(SpecificationLevel.SHOULD)
22-
// format: off
2322
final case class Repository(
2423
@DirectiveName("repository")
25-
repositories: List[String] = Nil
24+
repositories: List[String] = Nil
2625
) extends HasBuildOptions {
27-
// format: on
2826
def buildOptions: Either[BuildException, BuildOptions] = {
2927
val buildOpt = BuildOptions(
3028
classPathOptions = ClassPathOptions(

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,10 @@ import scala.cli.commands.SpecificationLevel
1818
"`//> using target.platform` _platform_"
1919
)
2020
@DirectiveLevel(SpecificationLevel.EXPERIMENTAL)
21-
// format: off
2221
final case class RequirePlatform(
2322
@DirectiveName("platform")
24-
platforms: List[Positioned[String]] = Nil
23+
platforms: List[Positioned[String]] = Nil
2524
) extends HasBuildRequirements {
26-
// format: on
2725
def buildRequirements: Either[BuildException, BuildRequirements] = either {
2826
val platformSet = value {
2927
Platform.parseSpec(platforms.map(_.value).map(options.Platform.normalize)).toRight {

0 commit comments

Comments
 (0)