Skip to content

Commit c651f68

Browse files
GedochaoGedochao
committed
Move --scalac-help to shared options root rather than a separate class
1 parent 4c36584 commit c651f68

File tree

5 files changed

+9
-53
lines changed

5 files changed

+9
-53
lines changed

‎modules/cli-options/src/main/scala/scala/cli/commands/ScalacExtraOptions.scala‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎modules/cli-options/src/main/scala/scala/cli/commands/SharedOptions.scala‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ final case class SharedOptions(
2121
dependencies: SharedDependencyOptions = SharedDependencyOptions(),
2222
@Recurse
2323
scalac: ScalacOptions = ScalacOptions(),
24-
@Recurse
25-
scalacExtra: ScalacExtraOptions = ScalacExtraOptions(),
2624
@Recurse
2725
jvm: SharedJvmOptions = SharedJvmOptions(),
2826
@Recurse
@@ -44,6 +42,10 @@ final case class SharedOptions(
4442
@Name("scalaBin")
4543
@Name("B")
4644
scalaBinaryVersion: Option[String] = None,
45+
46+
@Group("Scala")
47+
@HelpMessage("Show help for scalac. This is an alias for --scalac-option -help")
48+
scalacHelp: Boolean = false,
4749

4850
@Group("Java")
4951
@HelpMessage("Add extra JARs in the class path")

‎modules/cli/src/main/scala/scala/cli/commands/ScalacLikeCommand.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ trait ScalacLikeCommand[T] { self: ScalaCommand[T] =>
2424
build = buildOptions(options)
2525
scalacOptions = shared.scalac.scalacOption.toSeq
2626
updatedScalacOptions =
27-
if (shared.scalacExtra.scalacHelp && !scalacOptions.contains("-help"))
27+
if (shared.scalacHelp && !scalacOptions.contains("-help"))
2828
scalacOptions.appended("-help")
2929
else scalacOptions
3030
if (updatedScalacOptions intersect ScalacOptions.ScalacPrintOptions.toSeq).nonEmpty

‎website/docs/reference/cli-options.md‎

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1419,31 +1419,6 @@ Aliases: `--scala-opt`, `-O`
14191419

14201420
Add a `scalac` option. Note that options starting with `-g`, `-language`, `-opt`, `-P`, `-target`, `-V`, `-W`, `-X`, and `-Y` are assumed to be Scala compiler options and don't require to be passed after `-O` or `--scalac-option`.
14211421

1422-
## Scalac extra options
1423-
1424-
Available in commands:
1425-
- [`bsp`](./commands.md#bsp)
1426-
- [`compile`](./commands.md#compile)
1427-
- [`doc`](./commands.md#doc)
1428-
- [`export`](./commands.md#export)
1429-
- [`fmt` / `format` / `scalafmt`](./commands.md#fmt)
1430-
- [`browse` / `metabrowse`](./commands.md#browse)
1431-
- [`package`](./commands.md#package)
1432-
- [`publish`](./commands.md#publish)
1433-
- [`publish local`](./commands.md#publish-local)
1434-
- [`console` / `repl`](./commands.md#console)
1435-
- [`run`](./commands.md#run)
1436-
- [`setup-ide`](./commands.md#setup-ide)
1437-
- [`shebang`](./commands.md#shebang)
1438-
- [`test`](./commands.md#test)
1439-
1440-
1441-
<!-- Automatically generated, DO NOT EDIT MANUALLY -->
1442-
1443-
#### `--scalac-help`
1444-
1445-
Show help for scalac. This is an alias for --scalac-option -help
1446-
14471422
## Secret options
14481423

14491424
Available in commands:
@@ -1520,6 +1495,10 @@ Aliases: `--scala-binary`, `--scala-bin`, `-B`
15201495

15211496
Set the Scala binary version
15221497

1498+
#### `--scalac-help`
1499+
1500+
Show help for scalac. This is an alias for --scalac-option -help
1501+
15231502
#### `--extra-jars`
15241503

15251504
Aliases: `--jar`, `--jars`, `--extra-jar`

‎website/docs/reference/commands.md‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ Accepts options:
3939
- [Scala.js](./cli-options.md#scalajs-options)
4040
- [Scala Native](./cli-options.md#scala-native-options)
4141
- [scalac](./cli-options.md#scalac-options)
42-
- [scalac extra](./cli-options.md#scalac-extra-options)
4342
- [shared](./cli-options.md#shared-options)
4443
- [verbosity](./cli-options.md#verbosity-options)
4544
- [watch](./cli-options.md#watch-options)
@@ -61,7 +60,6 @@ Accepts options:
6160
- [Scala.js](./cli-options.md#scalajs-options)
6261
- [Scala Native](./cli-options.md#scala-native-options)
6362
- [scalac](./cli-options.md#scalac-options)
64-
- [scalac extra](./cli-options.md#scalac-extra-options)
6563
- [shared](./cli-options.md#shared-options)
6664
- [verbosity](./cli-options.md#verbosity-options)
6765
- [workspace](./cli-options.md#workspace-options)
@@ -91,7 +89,6 @@ Accepts options:
9189
- [Scala.js](./cli-options.md#scalajs-options)
9290
- [Scala Native](./cli-options.md#scala-native-options)
9391
- [scalac](./cli-options.md#scalac-options)
94-
- [scalac extra](./cli-options.md#scalac-extra-options)
9592
- [shared](./cli-options.md#shared-options)
9693
- [verbosity](./cli-options.md#verbosity-options)
9794
- [workspace](./cli-options.md#workspace-options)
@@ -116,7 +113,6 @@ Accepts options:
116113
- [Scala.js](./cli-options.md#scalajs-options)
117114
- [Scala Native](./cli-options.md#scala-native-options)
118115
- [scalac](./cli-options.md#scalac-options)
119-
- [scalac extra](./cli-options.md#scalac-extra-options)
120116
- [shared](./cli-options.md#shared-options)
121117
- [verbosity](./cli-options.md#verbosity-options)
122118
- [workspace](./cli-options.md#workspace-options)
@@ -159,7 +155,6 @@ Accepts options:
159155
- [Scala.js](./cli-options.md#scalajs-options)
160156
- [Scala Native](./cli-options.md#scala-native-options)
161157
- [scalac](./cli-options.md#scalac-options)
162-
- [scalac extra](./cli-options.md#scalac-extra-options)
163158
- [shared](./cli-options.md#shared-options)
164159
- [verbosity](./cli-options.md#verbosity-options)
165160
- [watch](./cli-options.md#watch-options)
@@ -184,7 +179,6 @@ Accepts options:
184179
- [Scala.js](./cli-options.md#scalajs-options)
185180
- [Scala Native](./cli-options.md#scala-native-options)
186181
- [scalac](./cli-options.md#scalac-options)
187-
- [scalac extra](./cli-options.md#scalac-extra-options)
188182
- [shared](./cli-options.md#shared-options)
189183
- [verbosity](./cli-options.md#verbosity-options)
190184
- [watch](./cli-options.md#watch-options)
@@ -208,7 +202,6 @@ Accepts options:
208202
- [Scala.js](./cli-options.md#scalajs-options)
209203
- [Scala Native](./cli-options.md#scala-native-options)
210204
- [scalac](./cli-options.md#scalac-options)
211-
- [scalac extra](./cli-options.md#scalac-extra-options)
212205
- [shared](./cli-options.md#shared-options)
213206
- [verbosity](./cli-options.md#verbosity-options)
214207
- [watch](./cli-options.md#watch-options)
@@ -231,7 +224,6 @@ Accepts options:
231224
- [Scala.js](./cli-options.md#scalajs-options)
232225
- [Scala Native](./cli-options.md#scala-native-options)
233226
- [scalac](./cli-options.md#scalac-options)
234-
- [scalac extra](./cli-options.md#scalac-extra-options)
235227
- [shared](./cli-options.md#shared-options)
236228
- [verbosity](./cli-options.md#verbosity-options)
237229
- [watch](./cli-options.md#watch-options)
@@ -262,7 +254,6 @@ Accepts options:
262254
- [Scala.js](./cli-options.md#scalajs-options)
263255
- [Scala Native](./cli-options.md#scala-native-options)
264256
- [scalac](./cli-options.md#scalac-options)
265-
- [scalac extra](./cli-options.md#scalac-extra-options)
266257
- [shared](./cli-options.md#shared-options)
267258
- [verbosity](./cli-options.md#verbosity-options)
268259
- [watch](./cli-options.md#watch-options)
@@ -306,7 +297,6 @@ Accepts options:
306297
- [Scala.js](./cli-options.md#scalajs-options)
307298
- [Scala Native](./cli-options.md#scala-native-options)
308299
- [scalac](./cli-options.md#scalac-options)
309-
- [scalac extra](./cli-options.md#scalac-extra-options)
310300
- [setup IDE](./cli-options.md#setup-ide-options)
311301
- [shared](./cli-options.md#shared-options)
312302
- [verbosity](./cli-options.md#verbosity-options)
@@ -355,7 +345,6 @@ Accepts options:
355345
- [Scala.js](./cli-options.md#scalajs-options)
356346
- [Scala Native](./cli-options.md#scala-native-options)
357347
- [scalac](./cli-options.md#scalac-options)
358-
- [scalac extra](./cli-options.md#scalac-extra-options)
359348
- [shared](./cli-options.md#shared-options)
360349
- [verbosity](./cli-options.md#verbosity-options)
361350
- [watch](./cli-options.md#watch-options)
@@ -378,7 +367,6 @@ Accepts options:
378367
- [Scala.js](./cli-options.md#scalajs-options)
379368
- [Scala Native](./cli-options.md#scala-native-options)
380369
- [scalac](./cli-options.md#scalac-options)
381-
- [scalac extra](./cli-options.md#scalac-extra-options)
382370
- [shared](./cli-options.md#shared-options)
383371
- [test](./cli-options.md#test-options)
384372
- [verbosity](./cli-options.md#verbosity-options)
@@ -452,7 +440,6 @@ Accepts options:
452440
- [Scala.js](./cli-options.md#scalajs-options)
453441
- [Scala Native](./cli-options.md#scala-native-options)
454442
- [scalac](./cli-options.md#scalac-options)
455-
- [scalac extra](./cli-options.md#scalac-extra-options)
456443
- [shared](./cli-options.md#shared-options)
457444
- [verbosity](./cli-options.md#verbosity-options)
458445
- [workspace](./cli-options.md#workspace-options)
@@ -499,7 +486,6 @@ Accepts options:
499486
- [Scala.js](./cli-options.md#scalajs-options)
500487
- [Scala Native](./cli-options.md#scala-native-options)
501488
- [scalac](./cli-options.md#scalac-options)
502-
- [scalac extra](./cli-options.md#scalac-extra-options)
503489
- [shared](./cli-options.md#shared-options)
504490
- [verbosity](./cli-options.md#verbosity-options)
505491
- [workspace](./cli-options.md#workspace-options)

0 commit comments

Comments
 (0)