From 8ed796fb2570956a2edfa9cc36e4c80ddb05438b Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Mon, 9 Apr 2018 00:11:17 -0400
Subject: [PATCH] Re-fixing console and JLine

Fixes #3482 take 2

I thought I tested #4054 using a local build, but when I ran 1.1.3, `console` did not display anything that I typed.
Switching to `usingTerminal` which calls `terminal.restore` similar to what I had in 1.1.1 fixes `console`.
---
 main-actions/src/main/scala/sbt/Console.scala | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/main-actions/src/main/scala/sbt/Console.scala b/main-actions/src/main/scala/sbt/Console.scala
index d94484030..61bfb9e47 100644
--- a/main-actions/src/main/scala/sbt/Console.scala
+++ b/main-actions/src/main/scala/sbt/Console.scala
@@ -41,7 +41,9 @@ final class Console(compiler: AnalyzingCompiler) {
       implicit log: Logger): Try[Unit] = {
     def console0() =
       compiler.console(classpath, options, initialCommands, cleanupCommands, log)(loader, bindings)
-    JLine.withJLine(Run.executeTrapExit(console0, log))
+    JLine.usingTerminal { _ =>
+      Run.executeTrapExit(console0, log)
+    }
   }
 }