fix bad merge resulting in t11838 failure

scala · Feb 26, 2020 · 5630398 · 5630398
1 parent 1d00fe0
commit 5630398
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/repl-frontend/scala/tools/nsc/interpreter/shell/ILoop.scala b/src/repl-frontend/scala/tools/nsc/interpreter/shell/ILoop.scala
@@ -863,7 +863,12 @@ class ILoop(config: ShellConfig, inOverride: BufferedReader = null,
         case Incomplete =>
           in.completion.reset()
           in.readLine(paste.ContinuePrompt) match {
-            case null => intp.compileString(code) ; None    // EOF, report error
+            case null =>
+              // partial input with no input forthcoming,
+              // so ask again for parse error message.
+              // This happens at EOF of a :load file.
+              intp.interpretFinally(code)
+              None
             case line => in.accumulator += line ; loop()
           }
       }