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

InteractionService#terminalWidth 

Adds `def terminalWidth: Int` to InteractionService to wrap JLine 2 (or 3 in the future).

Fixes #3352
This commit is contained in:
Eugene Yokota 2017-07-24 22:44:18 -04:00
parent ac7b1498a9
commit f96c8b9668
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main/src/main/scala/sbt/CommandLineUIService.scala
View File

@ -1,6 +1,6 @@
package sbt package sbt
import sbt.internal.util.SimpleReader import sbt.internal.util.{ JLine, SimpleReader }
trait CommandLineUIService extends InteractionService { trait CommandLineUIService extends InteractionService {
override def readLine(prompt: String, mask: Boolean): Option[String] = { override def readLine(prompt: String, mask: Boolean): Option[String] = {
@ -19,6 +19,10 @@ trait CommandLineUIService extends InteractionService {
case _ => false case _ => false
} }
} }
override def terminalWidth: Int = JLine.usingTerminal(_.getWidth)
override def terminalHeight: Int = JLine.usingTerminal(_.getHeight)
} }
object CommandLineUIService extends CommandLineUIService object CommandLineUIService extends CommandLineUIService

4
main/src/main/scala/sbt/InteractionService.scala
View File

@ -13,5 +13,9 @@ abstract class InteractionService {
/** Ask the user to confirm something (yes or no) before continuing. */ /** Ask the user to confirm something (yes or no) before continuing. */
def confirm(msg: String): Boolean def confirm(msg: String): Boolean
def terminalWidth: Int
def terminalHeight: Int
// TODO - Ask for input with autocomplete? // TODO - Ask for input with autocomplete?
} }