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

Merge pull request #224 from softprops/masked_readLine_rebased 

add support for a masked readline
This commit is contained in:
Mark Harrah 2011-10-13 17:57:10 -07:00
parent dbe7eb8d24 762bac2975
commit 71ab0c5f98
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
util/complete/LineReader.scala
View File

@ -10,9 +10,12 @@ package sbt
abstract class JLine extends LineReader
{
protected[this] val reader: ConsoleReader
def readLine(prompt: String) = JLine.withJLine { unsynchronizedReadLine(prompt) }
private[this] def unsynchronizedReadLine(prompt: String) =
reader.readLine(prompt) match
def readLine(prompt: String, mask: Option[Char] = None) = JLine.withJLine { unsynchronizedReadLine(prompt, mask) }
private[this] def unsynchronizedReadLine(prompt: String, mask: Option[Char]) =
(mask match {
case Some(m) => reader.readLine(prompt, m)
case None => reader.readLine(prompt)
}) match
{
case null => None
case x => Some(x.trim)
@ -59,7 +62,7 @@ private object JLine
trait LineReader
{
def readLine(prompt: String): Option[String]
def readLine(prompt: String, mask: Option[Char] = None): Option[String]
}
final class FullReader(historyPath: Option[File], complete: Parser[_]) extends JLine
{
@ -81,4 +84,4 @@ class SimpleReader private[sbt] (historyPath: Option[File]) extends JLine
object SimpleReader extends JLine
{
protected[this] val reader = JLine.createReader()
}
}