Add close method to interactive console

sbt · Aug 11, 2020 · 7df6749 · 7df6749
1 parent a3adcfd
commit 7df6749
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/internal/compiler-bridge-test/src/test/scala/sbt/internal/inc/CompilingSpecification.scala b/internal/compiler-bridge-test/src/test/scala/sbt/internal/inc/CompilingSpecification.scala
@@ -327,6 +327,10 @@ trait CompilingSpecification extends AbstractBridgeProviderTestkit {
   def withInteractiveConsole[A](f: InteractiveConsoleInterface => A): A =
     IO.withTemporaryDirectory { tempDir =>
       val repl = interactiveConsole(tempDir.toPath)()
-      f(repl)
+      try {
+        f(repl)
+      } finally {
+        repl.close()
+      }
     }
 }
diff --git a/...ridge-test/src/test/scala/sbt/internal/inc/InteractiveConsoleInterfaceSpecification.scala b/...ridge-test/src/test/scala/sbt/internal/inc/InteractiveConsoleInterfaceSpecification.scala
@@ -63,9 +63,13 @@ object InteractiveConsoleInterfaceSpecification
   test("it should evaluate postfix op without warning when -language:postfixOps arg passed") {
     IO.withTemporaryDirectory { tempDir =>
       val repl = interactiveConsole(tempDir.toPath)("-language:postfixOps")
-      val response = repl.interpret(postfixOpExpression, false)
-      assert(!response.output.trim.startsWith("warning"))
-      assert(response.result == InteractiveConsoleResult.Success)
+      try {
+        val response = repl.interpret(postfixOpExpression, false)
+        assert(!response.output.trim.startsWith("warning"))
+        assert(response.result == InteractiveConsoleResult.Success)
+      } finally {
+        repl.close()
+      }
     }
   }
 

diff --git a/...la/xsbt/InteractiveConsoleInterface.scala → ...scala/xsbt/InteractiveConsoleBridge.scala b/...la/xsbt/InteractiveConsoleInterface.scala → ...scala/xsbt/InteractiveConsoleBridge.scala
@@ -48,7 +48,7 @@ class InteractiveConsoleBridge(
   val interpreter: IMain =
     new IMain(compilerSettings, replReporter(compilerSettings, new PrintWriter(outWriter)))
 
-  def interpret(line: String, synthetic: Boolean): InteractiveConsoleResponse = {
+  override def interpret(line: String, synthetic: Boolean): InteractiveConsoleResponse = {
     clearBuffer()
     val r = interpreter.interpret(line, synthetic)
     InteractiveConsoleResponse(r, outWriter.toString)
@@ -59,11 +59,18 @@ class InteractiveConsoleBridge(
     outWriter.getBuffer.setLength(0)
   }
 
-  def reset(): Unit = {
+  override def reset(): Unit = {
     clearBuffer()
     interpreter.reset()
   }
 
+  override def close(): Unit = {
+    interpreter match {
+      case c: java.io.Closeable => c.close()
+      case _                    => ()
+    }
+  }
+
   private def onError(str: String) = log error Message(str)
 }
 

diff --git a/internal/compiler-interface/src/main/java/xsbti/InteractiveConsoleInterface.java b/internal/compiler-interface/src/main/java/xsbti/InteractiveConsoleInterface.java
@@ -11,7 +11,7 @@
 
 package xsbti;
 
-public interface InteractiveConsoleInterface {
+public interface InteractiveConsoleInterface extends java.io.Closeable {
   void reset();
   InteractiveConsoleResponse interpret(String line, boolean synthetic);
 }