Final review round

Add header to repl-frontend/scala/tools/nsc/interpreter/jline/Reader.scala Still display parse errors
scala · Aug 9, 2019 · a562a24 · a562a24
1 parent 4999155
commit a562a24
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/src/repl-frontend/scala/tools/nsc/interpreter/jline/Reader.scala b/src/repl-frontend/scala/tools/nsc/interpreter/jline/Reader.scala
@@ -1,3 +1,14 @@
+/*
+ * Scala (https://www.scala-lang.org)
+ *
+ * Copyright EPFL and Lightbend, Inc.
+ *
+ * Licensed under Apache License 2.0
+ * (http://www.apache.org/licenses/LICENSE-2.0).
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ */
 
 package scala.tools.nsc.interpreter
 package jline

diff --git a/src/repl-frontend/scala/tools/nsc/interpreter/shell/ILoop.scala b/src/repl-frontend/scala/tools/nsc/interpreter/shell/ILoop.scala
@@ -186,11 +186,12 @@ class ILoop(config: ShellConfig, inOverride: BufferedReader = null,
 
   /** Standard commands **/
   lazy val standardCommands = List(
-    cmd("completions", "<string>", "output completions for the given string", completionsCommand),
-    cmd("edit", "<id>|<line>", "edit history", editCommand),
     cmd("help", "[command]", "print this summary or command-specific help", helpCommand),
-    historyCommand,
-    cmd("h?", "<string>", "search the history", searchHistory),
+    cmd("completions", "<string>", "output completions for the given string", completionsCommand),
+    // TODO maybe just drop these commands, as jline subsumes them -- before reenabling, finish scala.tools.nsc.interpreter.jline.HistoryAdaptor
+    //cmd("edit", "<id>|<line>", "edit history", editCommand),
+    //historyCommand,
+    //cmd("h?", "<string>", "search the history", searchHistory),
     cmd("imports", "[name name ...]", "show import history, identifying sources of names", importsCommand),
     cmd("implicits", "[-v]", "show the implicits in scope", implicitsCommand),
     cmd("javap", "<path|class>", "disassemble a file or class name", javapCommand),
@@ -910,7 +911,7 @@ class ILoop(config: ShellConfig, inOverride: BufferedReader = null,
           case Some(s) => interpretStartingWith(s)
           case _       => None
         }
-      case invocation() => interpretStartingWith(intp.mostRecentVar + start)
+      case invocation() => in.accumulator += intp.mostRecentVar + start ; loop()
       case _ => in.accumulator += start ; loop()
     }
   }
@@ -961,8 +962,6 @@ class ILoop(config: ShellConfig, inOverride: BufferedReader = null,
       }
 
       echoOff { interpretPreamble }
-
-      //if (doCompletion) in.initCompletion(newCompleter())
     })
 
     // start full loop (if initialization was successful)

diff --git a/src/repl-frontend/scala/tools/nsc/interpreter/shell/InteractiveReader.scala b/src/repl-frontend/scala/tools/nsc/interpreter/shell/InteractiveReader.scala
@@ -44,6 +44,7 @@ trait InteractiveReader {
     else readOneLine(prompt)
     */
 
+  @deprecated("No longer used", "2.13.1")
   def initCompletion(completion: Completion): Unit = ()
 }
 

diff --git a/src/repl/scala/tools/nsc/interpreter/IMain.scala b/src/repl/scala/tools/nsc/interpreter/IMain.scala
@@ -1115,6 +1115,7 @@ class IMain(val settings: Settings, parentClassLoaderOverride: Option[ClassLoade
     var isIncomplete = false
     currentRun.parsing.withIncompleteHandler((_, _) => isIncomplete = true) {
       reporter.reset()
+
       val unit = newCompilationUnit(line, label)
       val trees = newUnitParser(unit).parseStats()
       if (reporter.hasErrors) Left(Error)