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

Merge pull request #6000 from eatkins/canonical-ctrl-d 

Handle ctrl+d in canonical mode
This commit is contained in:
eugene yokota 2020-10-20 22:58:50 -04:00 committed by GitHub
parent 9f7985a2d9 82d6a050de
commit d1ff067d54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/util-logging/src/main/scala/sbt/internal/util/Terminal.scala
View File

@ -450,12 +450,16 @@ object Terminal {
private[sbt] class WriteableInputStream(in: InputStream, name: String)
extends SimpleInputStream
with AutoCloseable {
private[this] val isRaw = new AtomicBoolean(false)
final def write(bytes: Int*): Unit = readThread.synchronized {
bytes.foreach(b => buffer.put(b))
}
def setRawMode(toggle: Boolean): Unit = in match {
case win: WindowsInputStream => win.setRawMode(toggle)
case _ =>
def setRawMode(toggle: Boolean): Unit = {
isRaw.set(toggle)
in match {
case win: WindowsInputStream => win.setRawMode(toggle)
case _ =>
}
}
private[this] val executor =
Executors.newSingleThreadExecutor(r => new Thread(r, s"sbt-$name-input-reader"))
@ -479,8 +483,8 @@ object Terminal {
val _ = readQueue.take
val b = in.read
buffer.put(b)
if (b != -1 && !Thread.interrupted()) impl()
else closed.set(true)
if (Thread.interrupted() || (b != -1 && !isRaw.get)) closed.set(true)
else impl()
}
try impl()
catch { case _: InterruptedException => closed.set(true) }