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

Merge pull request #6807 from eed3si9n/bport/6803 

[1.6.x] fix: propagate `InterruptedException` from JLine.readLine
This commit is contained in:
eugene yokota 2022-01-31 22:11:10 -05:00 committed by GitHub
parent ca0fd3db8c 4f9fe2af64
commit 611b8cf01b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/util-complete/src/main/scala/sbt/internal/util/LineReader.scala
View File

@ -178,13 +178,7 @@ abstract class JLine extends LineReader {
protected[this] lazy val in: InputStream = Terminal.wrappedSystemIn protected[this] lazy val in: InputStream = Terminal.wrappedSystemIn
override def readLine(prompt: String, mask: Option[Char] = None): Option[String] = override def readLine(prompt: String, mask: Option[Char] = None): Option[String] =
try { unsynchronizedReadLine(prompt, mask)
unsynchronizedReadLine(prompt, mask)
} catch {
case _: InterruptedException =>
// println("readLine: InterruptedException")
Option("")
}
private[this] def unsynchronizedReadLine(prompt: String, mask: Option[Char]): Option[String] = private[this] def unsynchronizedReadLine(prompt: String, mask: Option[Char]): Option[String] =
readLineWithHistory(prompt, mask) map { x => readLineWithHistory(prompt, mask) map { x =>