diff options
author | Adriaan Moors <adriaan@lightbend.com> | 2016-10-18 11:07:40 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan@lightbend.com> | 2016-10-18 11:07:40 -0700 |
commit | 2d8bae6f21288ba259c59ae150255f3aafd641fe (patch) | |
tree | c2c5e37e656066082b932395ba6f28988fa40278 /src | |
parent | 4376a02516a8d85a57e454043b0c01c07fc417fa (diff) | |
parent | 9f7c26e8ccc809c48484921f87b52eb56b978dcf (diff) | |
download | scala-2d8bae6f21288ba259c59ae150255f3aafd641fe.tar.gz scala-2d8bae6f21288ba259c59ae150255f3aafd641fe.tar.bz2 scala-2d8bae6f21288ba259c59ae150255f3aafd641fe.zip |
Merge 2.11.x into 2.12.x
Fix conflict in #5453:
```
- def help: String = {
+ override def help: String = {
```
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/scala/tools/nsc/settings/MutableSettings.scala | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/nsc/settings/MutableSettings.scala b/src/compiler/scala/tools/nsc/settings/MutableSettings.scala index 7b4c55c2af..822e0f16bf 100644 --- a/src/compiler/scala/tools/nsc/settings/MutableSettings.scala +++ b/src/compiler/scala/tools/nsc/settings/MutableSettings.scala @@ -751,11 +751,19 @@ class MutableSettings(val errorFn: String => Unit) override def isHelping: Boolean = sawHelp override def help: String = { - val choiceLength = choices.map(_.length).max + 1 - val formatStr = s" %-${choiceLength}s %s" - choices.zipAll(descriptions, "", "").map { - case (arg, descr) => formatStr.format(arg, descr) - } mkString (f"$descr%n", f"%n", "") + val describe: ((String, String)) => String = { + val choiceWidth = choices.map(_.length).max + 1 + val formatStr = s" %-${choiceWidth}s %s" + locally { + case (choice, description) => formatStr.format(choice, description) + } + } + val verboseDefault = default match { + case Some("_" :: Nil) => Some("All choices are enabled by default." :: Nil) + case _ => default + } + val orelse = verboseDefault.map(_.mkString(f"%nDefault: ", ", ", f"%n")).getOrElse("") + choices.zipAll(descriptions, "", "").map(describe).mkString(f"${descr}%n", f"%n", orelse) } def clear(): Unit = { |