luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4160 from ninjalama/1.1.x 

Display first line of task/setting of multiline description
This commit is contained in:
Dale Wijnand 2018-05-23 12:12:08 +01:00 committed by GitHub
parent 250874dde0 667a6be99e
commit 807fc8035a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
main/src/main/scala/sbt/Main.scala
View File

@ -313,8 +313,14 @@ object BuiltinCommands {
'v'.id.+.map(_.size + 1) | 'v'.id.+.map(_.size + 1) |
("V" ^^^ Int.MaxValue) ("V" ^^^ Int.MaxValue)
)) ))
def taskDetail(keys: Seq[AttributeKey[_]], firstOnly: Boolean): Seq[(String, String)] =
sortByLabel(withDescription(keys)) flatMap { t =>
taskStrings(t, firstOnly)
}
def taskDetail(keys: Seq[AttributeKey[_]]): Seq[(String, String)] = def taskDetail(keys: Seq[AttributeKey[_]]): Seq[(String, String)] =
sortByLabel(withDescription(keys)) flatMap taskStrings taskDetail(keys, false)
def allTaskAndSettingKeys(s: State): Seq[AttributeKey[_]] = { def allTaskAndSettingKeys(s: State): Seq[AttributeKey[_]] = {
val extracted = Project.extract(s) val extracted = Project.extract(s)
@ -349,16 +355,19 @@ object BuiltinCommands {
def tasksHelp(s: State, def tasksHelp(s: State,
filter: Seq[AttributeKey[_]] => Seq[AttributeKey[_]], filter: Seq[AttributeKey[_]] => Seq[AttributeKey[_]],
arg: Option[String]): String = { arg: Option[String]): String = {
val commandAndDescription = taskDetail(filter(allTaskAndSettingKeys(s))) val commandAndDescription = taskDetail(filter(allTaskAndSettingKeys(s)), true)
arg match { arg match {
case Some(selected) => detail(selected, commandAndDescription.toMap) case Some(selected) => detail(selected, commandAndDescription.toMap)
case None => aligned(" ", " ", commandAndDescription) mkString ("\n", "\n", "") case None => aligned(" ", " ", commandAndDescription) mkString ("\n", "\n", "")
} }
} }
def taskStrings(key: AttributeKey[_]): Option[(String, String)] = key.description map { d => def taskStrings(key: AttributeKey[_], firstOnly: Boolean): Option[(String, String)] =
(key.label, d) key.description map { d =>
} if (firstOnly) (key.label, d.split("\r?\n")(0)) else (key.label, d)
}
def taskStrings(key: AttributeKey[_]): Option[(String, String)] = taskStrings(key, false)
def defaults = Command.command(DefaultsCommand) { s => def defaults = Command.command(DefaultsCommand) { s =>
s.copy(definedCommands = DefaultCommands) s.copy(definedCommands = DefaultCommands)