From 6f63b2ccfadf3e3429000ae51bac58579cae852c Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Tue, 20 Oct 2020 11:54:24 -0700 Subject: [PATCH] Don't ever use jline 3 dumb terminal When using the DumbTerminal, no input is successfully read. I must not have actually tested this when I added it. --- .../src/main/scala/sbt/internal/util/JLine3.scala | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/internal/util-logging/src/main/scala/sbt/internal/util/JLine3.scala b/internal/util-logging/src/main/scala/sbt/internal/util/JLine3.scala index f74326eaa..27e4a8ddb 100644 --- a/internal/util-logging/src/main/scala/sbt/internal/util/JLine3.scala +++ b/internal/util-logging/src/main/scala/sbt/internal/util/JLine3.scala @@ -16,7 +16,7 @@ import org.jline.utils.{ ClosedException, NonBlockingReader } import org.jline.terminal.{ Attributes, Size, Terminal => JTerminal } import org.jline.terminal.Attributes.{ InputFlag, LocalFlag } import org.jline.terminal.Terminal.SignalHandler -import org.jline.terminal.impl.{ AbstractTerminal, DumbTerminal } +import org.jline.terminal.impl.AbstractTerminal import org.jline.terminal.impl.jansi.JansiSupportImpl import org.jline.terminal.impl.jansi.win.JansiWinSysTerminal import org.jline.utils.OSUtils @@ -73,11 +73,6 @@ private[sbt] object JLine3 { term } private[sbt] def apply(term: Terminal): JTerminal = { - if (System.getProperty("jline.terminal", "") == "none" || !Terminal.isAnsiSupported) - new DumbTerminal(term.inputStream, term.outputStream) - else wrapTerminal(term) - } - private[this] def wrapTerminal(term: Terminal): JTerminal = { new AbstractTerminal( term.name, "nocapabilities",