Polishing

Author: allanrenucci

compiler/src/dotty/tools/repl/JLineTerminal.scala

@@ -14,7 +14,10 @@ import org.jline.reader.impl.history.DefaultHistory
 import org.jline.terminal.TerminalBuilder
 import org.jline.utils.AttributedString
 
-final class JLineTerminal {
+final class JLineTerminal extends java.io.Closeable {
+  // import java.util.logging.{Logger, Level}
+  // Logger.getLogger("org.jline").setLevel(Level.FINEST)
+
   private val terminal = TerminalBuilder.terminal()
   private val history = new DefaultHistory
 
@@ -52,6 +55,8 @@ final class JLineTerminal {
     lineReader.readLine(prompt)
   }
 
+  def close() = terminal.close()
+
   /** Provide syntax highlighting */
   private class Highlighter extends reader.Highlighter {
     def highlight(reader: LineReader, buffer: String): AttributedString = {

compiler/src/dotty/tools/repl/ReplDriver.scala

@@ -114,19 +114,39 @@ class ReplDriver(settings: Array[String],
    *  `protected final` to facilitate testing.
    */
   final def runUntilQuit(): State = {
+    val terminal = new JLineTerminal()
+
+    /** Blockingly read a line, getting back a parse result */
+    def readLine(state: State): ParseResult = {
+      val completer: Completer = { (_, line, candidates) =>
+        val comps = completions(line.cursor, line.line, state)
+        candidates.addAll(comps.asJava)
+      }
+      implicit val ctx = state.run.runContext
+      try {
+        val line = terminal.readLine(completer)
+        ParseResult(line)
+      }
+      catch {
+        case _: EndOfFileException => // Ctrl+D
+          Quit
+      }
+    }
+
     @tailrec def loop(state: State): State = {
-      val res = readLine()(state)
+      val res = readLine(state)
 
       if (res == Quit) state
       else {
         // readLine potentially destroys the run, so a new one is needed for the
         // rest of the interpretation:
-        implicit val freshState = state.newRun(compiler, rootCtx)
-        loop(interpret(res))
+        val freshState = state.newRun(compiler, rootCtx)
+        loop(interpret(res)(freshState))
       }
     }
 
-    withRedirectedOutput { loop(initState) }
+    try withRedirectedOutput { loop(initState) }
+    finally terminal.close()
   }
 
   final def run(input: String)(implicit state: State): State = withRedirectedOutput {
@@ -167,26 +187,6 @@ class ReplDriver(settings: Array[String],
       .getOrElse(Nil)
   }
 
-  // lazy because the REPL tests do not rely on the JLine reader
-  private lazy val terminal = new JLineTerminal()
-
-  /** Blockingly read a line, getting back a parse result */
-  private def readLine()(implicit state: State): ParseResult = {
-    implicit val ctx = state.run.runContext
-    val completer: Completer = { (_, line, candidates) =>
-      val comps = completions(line.cursor, line.line, state)
-      candidates.addAll(comps.asJava)
-    }
-    try {
-      val line = terminal.readLine(completer)
-      ParseResult(line)
-    }
-    catch {
-      case _: EndOfFileException => // Ctrl+D
-        Quit
-    }
-  }
-
   private def extractImports(trees: List[untpd.Tree]): List[untpd.Import] =
     trees.collect { case imp: untpd.Import => imp }