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

Improve the default prompt 

Fixes #3313

This changes the default prompt to include "sbt:" + current project name.
See https://twitter.com/eed3si9n/status/884914670351659009
This commit is contained in:
Eugene Yokota 2017-07-13 14:58:10 -04:00
parent 9429b76d67
commit 42a1e2a291
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
main-settings/src/main/scala/sbt/Def.scala
View File

@ -1,7 +1,7 @@
package sbt package sbt
import sbt.internal.util.Types.const import sbt.internal.util.Types.const
import sbt.internal.util.{ Attributed, AttributeKey, Init } import sbt.internal.util.{ Attributed, AttributeKey, Init, ConsoleAppender }
import sbt.util.Show import sbt.util.Show
import sbt.internal.util.complete.Parser import sbt.internal.util.complete.Parser
import java.io.File import java.io.File
@ -36,7 +36,7 @@ object Def extends Init[Scope] with TaskMacroExtra {
Show[ScopedKey[_]]( Show[ScopedKey[_]](
(key: ScopedKey[_]) => (key: ScopedKey[_]) =>
Scope.display(key.scope, Scope.display(key.scope,
colored(key.key.label, keyNameColor), withColor(key.key.label, keyNameColor),
ref => displayRelative(current, multi, ref))) ref => displayRelative(current, multi, ref)))
def showBuildRelativeKey(currentBuild: URI, def showBuildRelativeKey(currentBuild: URI,
@ -45,7 +45,7 @@ object Def extends Init[Scope] with TaskMacroExtra {
Show[ScopedKey[_]]( Show[ScopedKey[_]](
(key: ScopedKey[_]) => (key: ScopedKey[_]) =>
Scope.display(key.scope, Scope.display(key.scope,
colored(key.key.label, keyNameColor), withColor(key.key.label, keyNameColor),
ref => displayBuildRelative(currentBuild, multi, ref))) ref => displayBuildRelative(currentBuild, multi, ref)))
def displayRelative(current: ProjectRef, multi: Boolean, project: Reference): String = def displayRelative(current: ProjectRef, multi: Boolean, project: Reference): String =
@ -63,13 +63,16 @@ object Def extends Init[Scope] with TaskMacroExtra {
} }
def displayFull(scoped: ScopedKey[_]): String = displayFull(scoped, None) def displayFull(scoped: ScopedKey[_]): String = displayFull(scoped, None)
def displayFull(scoped: ScopedKey[_], keyNameColor: Option[String]): String = def displayFull(scoped: ScopedKey[_], keyNameColor: Option[String]): String =
Scope.display(scoped.scope, colored(scoped.key.label, keyNameColor)) Scope.display(scoped.scope, withColor(scoped.key.label, keyNameColor))
def displayMasked(scoped: ScopedKey[_], mask: ScopeMask): String = def displayMasked(scoped: ScopedKey[_], mask: ScopeMask): String =
Scope.displayMasked(scoped.scope, scoped.key.label, mask) Scope.displayMasked(scoped.scope, scoped.key.label, mask)
def colored(s: String, color: Option[String]): String = color match { def withColor(s: String, color: Option[String]): String = {
case Some(c) => c + s + scala.Console.RESET val useColor = ConsoleAppender.formatEnabled
case None => s color match {
case Some(c) if useColor => c + s + scala.Console.RESET
case _ => s
}
} }
override def deriveAllowed[T](s: Setting[T], allowDynamic: Boolean): Option[String] = override def deriveAllowed[T](s: Setting[T], allowDynamic: Boolean): Option[String] =

11
main/src/main/scala/sbt/Defaults.scala
View File

@ -1746,7 +1746,8 @@ object Classpaths {
} }
val base = ModuleID(id.groupID, id.name, sbtVersion.value).withCrossVersion(cross) val base = ModuleID(id.groupID, id.name, sbtVersion.value).withCrossVersion(cross)
CrossVersion(scalaVersion, binVersion)(base).withCrossVersion(Disabled()) CrossVersion(scalaVersion, binVersion)(base).withCrossVersion(Disabled())
} },
shellPrompt := shellPromptFromState
)) ))
val ivyBaseSettings: Seq[Setting[_]] = baseGlobalDefaults ++ sbtClassifiersTasks ++ Seq( val ivyBaseSettings: Seq[Setting[_]] = baseGlobalDefaults ++ sbtClassifiersTasks ++ Seq(
@ -2873,6 +2874,14 @@ object Classpaths {
} }
} }
} }
def shellPromptFromState: State => String = { s: State =>
val extracted = Project.extract(s)
(name in extracted.currentRef).get(extracted.structure.data) match {
case Some(name) => s"sbt:$name" + Def.withColor("> ", Option(scala.Console.CYAN))
case _ => "> "
}
}
} }
trait BuildExtra extends BuildCommon with DefExtra { trait BuildExtra extends BuildCommon with DefExtra {