From b6a3ca19373c2ffa17c5660fa74a9a4204948b6e Mon Sep 17 00:00:00 2001 From: kczulko Date: Mon, 11 Sep 2017 11:49:10 +0200 Subject: [PATCH 1/2] Fix for text echo issue when running sbt. --- .../src/main/scala/sbt/internal/util/LineReader.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/util-complete/src/main/scala/sbt/internal/util/LineReader.scala b/internal/util-complete/src/main/scala/sbt/internal/util/LineReader.scala index 8d68e5945..fe2df7c43 100644 --- a/internal/util-complete/src/main/scala/sbt/internal/util/LineReader.scala +++ b/internal/util-complete/src/main/scala/sbt/internal/util/LineReader.scala @@ -119,8 +119,9 @@ private[sbt] object JLine { */ def usingTerminal[T](f: jline.Terminal => T): T = withTerminal { t => + val result = f(t) t.restore - f(t) + result } def createReader(): ConsoleReader = createReader(None, JLine.makeInputStream(true)) From e9fa4201fbc05afff774d5ccbb722451383a9dc6 Mon Sep 17 00:00:00 2001 From: kczulko Date: Thu, 14 Sep 2017 09:34:06 +0200 Subject: [PATCH 2/2] Fix review issue. Add 't.restore' before function call. --- .../src/main/scala/sbt/internal/util/LineReader.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/util-complete/src/main/scala/sbt/internal/util/LineReader.scala b/internal/util-complete/src/main/scala/sbt/internal/util/LineReader.scala index fe2df7c43..971f57620 100644 --- a/internal/util-complete/src/main/scala/sbt/internal/util/LineReader.scala +++ b/internal/util-complete/src/main/scala/sbt/internal/util/LineReader.scala @@ -119,6 +119,7 @@ private[sbt] object JLine { */ def usingTerminal[T](f: jline.Terminal => T): T = withTerminal { t => + t.restore val result = f(t) t.restore result