Skip to content

Commit ba5e53b

Browse files
authored
Add missing Scala.js mode aliases (#2655)
1 parent 02ad465 commit ba5e53b

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

modules/integration/src/test/scala/scala/cli/integration/RunScalaJsTestDefinitions.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,24 @@ trait RunScalaJsTestDefinitions { _: RunTestDefinitions =>
3030
simpleJsTestOutput()
3131
}
3232

33-
test(s"simple script JS in fullLinkJs mode") {
34-
val output = simpleJsTestOutput("--js-mode", "fullLinkJs", "-v", "-v", "-v")
33+
test(s"simple script JS in fullLinkJS mode") {
34+
val output = simpleJsTestOutput("--js-mode", "fullLinkJS", "-v", "-v", "-v")
3535
expect(output.contains("--fullOpt"))
3636

3737
expect(!output.contains("--fastOpt"))
3838
expect(!output.contains("--noOpt"))
3939
}
4040

41-
test(s"simple script JS in fastLinkJs mode") {
42-
val output = simpleJsTestOutput("--js-mode", "fastLinkJs", "-v", "-v", "-v")
41+
test(s"simple script JS in fastLinkJS mode") {
42+
val output = simpleJsTestOutput("--js-mode", "fastLinkJS", "-v", "-v", "-v")
4343
expect(output.contains("--fastOpt"))
4444

4545
expect(!output.contains("--fullOpt"))
4646
expect(!output.contains("--noOpt"))
4747
}
4848

4949
test(s"simple script JS with noOpt") {
50-
val output = simpleJsTestOutput("--js-mode", "fullLinkJs", "--js-no-opt", "-v", "-v", "-v")
50+
val output = simpleJsTestOutput("--js-mode", "fullLinkJS", "--js-no-opt", "-v", "-v", "-v")
5151
expect(output.contains("--noOpt"))
5252

5353
expect(!output.contains("--fastOpt"))

modules/options/src/main/scala/scala/build/options/ScalaJsOptions.scala

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,22 +154,23 @@ final case class ScalaJsOptions(
154154
}
155155

156156
case class ScalaJsMode(nameOpt: Option[String] = None) {
157-
lazy val isValid = nameOpt.isEmpty ||
158-
nameOpt.exists(
159-
ScalaJsMode.validFullLinkAliases.union(ScalaJsMode.validFastLinkAliases).contains
160-
)
157+
lazy val isValid: Boolean = nameOpt.isEmpty || nameOpt.exists(ScalaJsMode.allAliases.contains)
161158
}
162159
object ScalaJsMode {
163160
val validFullLinkAliases = Set(
164161
"release",
165162
"fullLinkJs",
163+
"fullLinkJS",
166164
"full"
167165
)
168166
val validFastLinkAliases = Set(
169167
"dev",
170168
"fastLinkJs",
169+
"fastLinkJS",
171170
"fast"
172171
)
172+
def allAliases: Set[String] =
173+
ScalaJsMode.validFullLinkAliases.union(ScalaJsMode.validFastLinkAliases)
173174
}
174175

175176
object ScalaJsOptions {

0 commit comments

Comments
 (0)