Skip to content

Commit d3a71d0

Browse files
committed
Warn about --test not doing anything in fmt
1 parent 3aa4b87 commit d3a71d0

File tree

7 files changed

+27
-6
lines changed

7 files changed

+27
-6
lines changed

modules/cli/src/main/scala/scala/cli/commands/fmt/Fmt.scala

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import dependency.*
66

77
import scala.build.input.{Inputs, Script, SourceScalaFile}
88
import scala.build.internal.{Constants, ExternalBinaryParams, FetchExternalBinary, Runner}
9+
import scala.build.internals.ConsoleUtils.ScalaCliConsole.warnPrefix
910
import scala.build.options.BuildOptions
1011
import scala.build.{Logger, Sources}
1112
import scala.cli.CurrentParams
@@ -42,6 +43,12 @@ object Fmt extends ScalaCommand[FmtOptions] {
4243
override def runCommand(options: FmtOptions, args: RemainingArgs, logger: Logger): Unit = {
4344
val buildOptions = buildOptionsOrExit(options)
4445

46+
if options.scope.test then
47+
logger.message(
48+
s"""$warnPrefix Including the test scope does not change the behaviour of this command.
49+
|$warnPrefix Test scope inputs are formatted, regardless.""".stripMargin
50+
)
51+
4552
// TODO If no input is given, just pass '.' to scalafmt?
4653
val (sourceFiles, workspace, _) =
4754
if (args.all.isEmpty)

modules/cli/src/main/scala/scala/cli/commands/fmt/FmtOptions.scala

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,13 @@ import scala.build.errors.BuildException
88
import scala.build.internal.FetchExternalBinary
99
import scala.build.options.BuildOptions
1010
import scala.cli.ScalaCli.fullRunnerName
11-
import scala.cli.commands.shared.{HasSharedOptions, HelpGroup, HelpMessages, SharedOptions}
11+
import scala.cli.commands.shared.{
12+
HasSharedOptions,
13+
HelpGroup,
14+
HelpMessages,
15+
ScopeOptions,
16+
SharedOptions
17+
}
1218
import scala.cli.commands.{Constants, tags}
1319
import scala.cli.coursierVersion
1420
import scala.util.Properties
@@ -88,7 +94,9 @@ final case class FmtOptions(
8894
@HelpMessage(s"Pass scalafmt version before running it (${Constants.defaultScalafmtVersion} by default). If passed, this overrides whatever value is configured in the .scalafmt.conf file.")
8995
@Name("fmtVersion")
9096
@Tag(tags.inShortHelp)
91-
scalafmtVersion: Option[String] = None
97+
scalafmtVersion: Option[String] = None,
98+
@Recurse
99+
scope: ScopeOptions = ScopeOptions()
92100
) extends HasSharedOptions {
93101
// format: on
94102

website/docs/reference/cli-options.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1534,7 +1534,7 @@ Run scalafix rule(s) explicitly, overriding the configuration file default.
15341534

15351535
Available in commands:
15361536

1537-
[`compile`](./commands.md#compile), [`dependency-update`](./commands.md#dependency-update), [`doc`](./commands.md#doc), [`export`](./commands.md#export), [`package`](./commands.md#package), [`publish`](./commands.md#publish), [`publish local`](./commands.md#publish-local), [`repl` , `console`](./commands.md#repl), [`run`](./commands.md#run), [`shebang`](./commands.md#shebang)
1537+
[`compile`](./commands.md#compile), [`dependency-update`](./commands.md#dependency-update), [`doc`](./commands.md#doc), [`export`](./commands.md#export), [`fmt` , `format` , `scalafmt`](./commands.md#fmt), [`package`](./commands.md#package), [`publish`](./commands.md#publish), [`publish local`](./commands.md#publish-local), [`repl` , `console`](./commands.md#repl), [`run`](./commands.md#run), [`shebang`](./commands.md#shebang)
15381538

15391539
<!-- Automatically generated, DO NOT EDIT MANUALLY -->
15401540

website/docs/reference/commands.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ All standard Scala CLI inputs are accepted, but only Scala sources will be forma
159159

160160
For detailed documentation refer to our website: https://scala-cli.virtuslab.org/docs/commands/fmt
161161

162-
Accepts option groups: [benchmarking](./cli-options.md#benchmarking-options), [compilation server](./cli-options.md#compilation-server-options), [coursier](./cli-options.md#coursier-options), [debug](./cli-options.md#debug-options), [dependency](./cli-options.md#dependency-options), [fmt](./cli-options.md#fmt-options), [global suppress warning](./cli-options.md#global-suppress-warning-options), [help group](./cli-options.md#help-group-options), [input](./cli-options.md#input-options), [jvm](./cli-options.md#jvm-options), [logging](./cli-options.md#logging-options), [markdown](./cli-options.md#markdown-options), [power](./cli-options.md#power-options), [python](./cli-options.md#python-options), [Scala.js](./cli-options.md#scalajs-options), [Scala Native](./cli-options.md#scala-native-options), [scalac](./cli-options.md#scalac-options), [scalac extra](./cli-options.md#scalac-extra-options), [semantic db](./cli-options.md#semantic-db-options), [shared](./cli-options.md#shared-options), [snippet](./cli-options.md#snippet-options), [source generator](./cli-options.md#source-generator-options), [suppress warning](./cli-options.md#suppress-warning-options), [verbosity](./cli-options.md#verbosity-options), [version](./cli-options.md#version-options), [workspace](./cli-options.md#workspace-options)
162+
Accepts option groups: [benchmarking](./cli-options.md#benchmarking-options), [compilation server](./cli-options.md#compilation-server-options), [coursier](./cli-options.md#coursier-options), [debug](./cli-options.md#debug-options), [dependency](./cli-options.md#dependency-options), [fmt](./cli-options.md#fmt-options), [global suppress warning](./cli-options.md#global-suppress-warning-options), [help group](./cli-options.md#help-group-options), [input](./cli-options.md#input-options), [jvm](./cli-options.md#jvm-options), [logging](./cli-options.md#logging-options), [markdown](./cli-options.md#markdown-options), [power](./cli-options.md#power-options), [python](./cli-options.md#python-options), [Scala.js](./cli-options.md#scalajs-options), [Scala Native](./cli-options.md#scala-native-options), [scalac](./cli-options.md#scalac-options), [scalac extra](./cli-options.md#scalac-extra-options), [scope](./cli-options.md#scope-options), [semantic db](./cli-options.md#semantic-db-options), [shared](./cli-options.md#shared-options), [snippet](./cli-options.md#snippet-options), [source generator](./cli-options.md#source-generator-options), [suppress warning](./cli-options.md#suppress-warning-options), [verbosity](./cli-options.md#verbosity-options), [version](./cli-options.md#version-options), [workspace](./cli-options.md#workspace-options)
163163

164164
## help
165165

website/docs/reference/scala-command/cli-options.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -978,7 +978,7 @@ Turn verbosity on for scalac. This is an alias for --scalac-option -verbose
978978

979979
Available in commands:
980980

981-
[`compile`](./commands.md#compile), [`doc`](./commands.md#doc), [`repl` , `console`](./commands.md#repl), [`run`](./commands.md#run), [`shebang`](./commands.md#shebang)
981+
[`compile`](./commands.md#compile), [`doc`](./commands.md#doc), [`fmt` , `format` , `scalafmt`](./commands.md#fmt), [`repl` , `console`](./commands.md#repl), [`run`](./commands.md#run), [`shebang`](./commands.md#shebang)
982982

983983
<!-- Automatically generated, DO NOT EDIT MANUALLY -->
984984

website/docs/reference/scala-command/commands.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ All standard Scala CLI inputs are accepted, but only Scala sources will be forma
185185

186186
For detailed documentation refer to our website: https://scala-cli.virtuslab.org/docs/commands/fmt
187187

188-
Accepts option groups: [benchmarking](./cli-options.md#benchmarking-options), [compilation server](./cli-options.md#compilation-server-options), [coursier](./cli-options.md#coursier-options), [debug](./cli-options.md#debug-options), [dependency](./cli-options.md#dependency-options), [fmt](./cli-options.md#fmt-options), [global suppress warning](./cli-options.md#global-suppress-warning-options), [help group](./cli-options.md#help-group-options), [input](./cli-options.md#input-options), [jvm](./cli-options.md#jvm-options), [logging](./cli-options.md#logging-options), [markdown](./cli-options.md#markdown-options), [power](./cli-options.md#power-options), [python](./cli-options.md#python-options), [Scala.js](./cli-options.md#scalajs-options), [Scala Native](./cli-options.md#scala-native-options), [scalac](./cli-options.md#scalac-options), [scalac extra](./cli-options.md#scalac-extra-options), [semantic db](./cli-options.md#semantic-db-options), [shared](./cli-options.md#shared-options), [snippet](./cli-options.md#snippet-options), [source generator](./cli-options.md#source-generator-options), [suppress warning](./cli-options.md#suppress-warning-options), [verbosity](./cli-options.md#verbosity-options), [version](./cli-options.md#version-options), [workspace](./cli-options.md#workspace-options)
188+
Accepts option groups: [benchmarking](./cli-options.md#benchmarking-options), [compilation server](./cli-options.md#compilation-server-options), [coursier](./cli-options.md#coursier-options), [debug](./cli-options.md#debug-options), [dependency](./cli-options.md#dependency-options), [fmt](./cli-options.md#fmt-options), [global suppress warning](./cli-options.md#global-suppress-warning-options), [help group](./cli-options.md#help-group-options), [input](./cli-options.md#input-options), [jvm](./cli-options.md#jvm-options), [logging](./cli-options.md#logging-options), [markdown](./cli-options.md#markdown-options), [power](./cli-options.md#power-options), [python](./cli-options.md#python-options), [Scala.js](./cli-options.md#scalajs-options), [Scala Native](./cli-options.md#scala-native-options), [scalac](./cli-options.md#scalac-options), [scalac extra](./cli-options.md#scalac-extra-options), [scope](./cli-options.md#scope-options), [semantic db](./cli-options.md#semantic-db-options), [shared](./cli-options.md#shared-options), [snippet](./cli-options.md#snippet-options), [source generator](./cli-options.md#source-generator-options), [suppress warning](./cli-options.md#suppress-warning-options), [verbosity](./cli-options.md#verbosity-options), [version](./cli-options.md#version-options), [workspace](./cli-options.md#workspace-options)
189189

190190
### test
191191

website/docs/reference/scala-command/runner-specification.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3570,6 +3570,12 @@ Aliases: `--semanticdb-source-root` ,`--semanticdb-sourceroot`
35703570

35713571
Check if sources are well formatted
35723572

3573+
**--test**
3574+
3575+
Include test scope
3576+
3577+
Aliases: `--test-scope` ,`--with-test-scope` ,`--with-test`
3578+
35733579
<details><summary>
35743580

35753581
### Implementantation specific options

0 commit comments

Comments
 (0)