Merge branch 'master' of github.com:lihaoyi/Ammonite

repl/src/main/scala/ammonite/repl/interp/Evaluator.scala

@@ -35,7 +35,7 @@ trait Evaluator{
    * passing in the callback ensures the printing is still done lazily, but within
    * the exception-handling block of the `Evaluator`
    */
-  def processLine(code: String, printCode: String, printer: Iterator[String] => Unit): Res[Evaluated]
+  def processLine(code: String, printCode: String, printer: Iterator[String] => Unit, extraImports: Seq[ImportData] = Seq()): Res[Evaluated]
   def processScriptBlock(code: String, scriptImports: Seq[ImportData]): Res[Evaluated]
 
   def previousImportBlock: String
@@ -154,14 +154,14 @@ object Evaluator{
     type InvEx = InvocationTargetException
     type InitEx = ExceptionInInitializerError
 
-    def processLine(code: String, printCode: String, printer: Iterator[String] => Unit) = for {
+    def processLine(code: String, printCode: String, printer: Iterator[String] => Unit, extraImports: Seq[ImportData] = Seq()) = for {
       wrapperName <- Res.Success("cmd" + getCurrentLine)
       _ <- Catching{ case e: ThreadDeath => interrupted() }
       (classFiles, newImports) <- compileClass(wrapCode(
         wrapperName,
         code,
         printCode,
-        previousImports.values.toSeq
+        previousImports.values.toSeq ++ extraImports
       ))
       _ = Timer("eval.processLine compileClass end")
       cls <- loadClass(wrapperName, classFiles)

repl/src/main/scala/ammonite/repl/interp/Interpreter.scala

@@ -51,21 +51,22 @@ class Interpreter(prompt0: Ref[String],
     } yield out
   }
 
-  def evaluateLine(code: String, printSnippet: Seq[String], printer: Iterator[String] => Unit) = {
+  def evaluateLine(code: String, printSnippet: Seq[String], printer: Iterator[String] => Unit, extraImports: Seq[ImportData] = Seq() ) = {
     val oldClassloader = Thread.currentThread().getContextClassLoader
     try{
       Thread.currentThread().setContextClassLoader(eval.evalClassloader)
       eval.processLine(
         code,
         s"ammonite.repl.frontend.ReplBridge.repl.Internal.combinePrints(${printSnippet.mkString(", ")})",
-        printer
+        printer,
+        extraImports
       )
     } finally Thread.currentThread().setContextClassLoader(oldClassloader)
   }
 
   def processModule(code: String) = processScript(hardcodedPredef + "\n@\n" + code, eval.processScriptBlock)
 
-  def processExec(code: String) = processScript(hardcodedPredef + "\n@\n" + code, { (c, _) => evaluateLine(c, Seq(), _ => ()) })
+  def processExec(code: String) = processScript(hardcodedPredef + "\n@\n" + code, { (c, i) => evaluateLine(c, Seq(), _ => (), i)})
 
   //common stuff in proccessModule and processExec
   def processScript(code: String, evaluate: (String, Seq[ImportData]) => Res[Evaluated]): Unit = {
@@ -84,22 +85,21 @@ class Interpreter(prompt0: Ref[String],
     else
       loop(blocks.collect{ case Res.Success(o) => o }, Seq())
     Timer("processScript 3")
-    @tailrec def loop(blocks: Seq[Preprocessor.Output], imports: Seq[ImportData]): Unit = {
+    @tailrec def loop(blocks: Seq[Preprocessor.Output], imports: Seq[Seq[ImportData]]): Unit = {
       if(!blocks.isEmpty){
         Timer("processScript loop 0")
         val Preprocessor.Output(code, _) = blocks.head //pretty printing results is disabled for scripts
         Timer("processScript loop 1")
-        val ev = evaluate(code, imports)
+        val ev = evaluate(code, imports.flatten)
         Timer("processScript loop 2")
         ev match {
           case Res.Failure(msg) =>
             throw new CompilationError(msg)
           case Res.Success(ev) =>
-            eval.update(ev.imports)
-            loop(blocks.tail, imports ++ ev.imports)
+            loop(blocks.tail, imports :+ ev.imports)
           case _ => loop(blocks.tail, imports)
         }
-      }
+      } else imports.lastOption.foreach(eval.update(_))
     }
   }
 

repl/src/test/resource/scripts/LimitImports.scala

@@ -0,0 +1,3 @@
+val res = 1
+@
+val asd = 1

repl/src/test/scala/ammonite/repl/ScriptTests.scala

@@ -68,6 +68,16 @@ object ScriptTests extends TestSuite{
             r: Int = 24
             """)
         }
+        'limitImports{
+          check.session(s"""
+            @ import ammonite.ops._
+
+            @ load.exec($printedScriptPath/"LimitImports.scala")
+
+            @ res
+            error: not found: value res
+            """)
+        }
       }
       'failures{
         'syntaxError{
@@ -115,9 +125,6 @@ object ScriptTests extends TestSuite{
             @ load.exec($printedScriptPath/"MultiBlockError.scala")
             error: Compilation Failed
 
-            @ val r1 = res1
-            r1: Int = 1
-
             @ val r2 = res2
             error: Compilation Failed
             Main.scala:\\d\\+: not found: value res2
@@ -179,6 +186,16 @@ object ScriptTests extends TestSuite{
             r: Int = 24
           """)
         }
+        'limitImports{
+          check.session(s"""
+            @ import ammonite.ops._
+
+            @ load.module($printedScriptPath/"LimitImports.scala")
+
+            @ res
+            error: not found: value res
+            """)
+        }
       }
       'failures{
         'syntaxError{
@@ -226,9 +243,6 @@ object ScriptTests extends TestSuite{
             @ load.module($printedScriptPath/"MultiBlockError.scala")
             error: Compilation Failed
 
-            @ val r1 = res1
-            r1: Int = 1
-
             @ val r2 = res2
             error: Compilation Failed
             Main.scala:\\d\\+: not found: value res2

terminal/src/main/scala/ammonite/terminal/ReadlineFilters.scala

@@ -33,10 +33,10 @@ object ReadlineFilters {
   // Ctrl-y     paste last cut
 
   lazy val navFilter = orElseAll(
-    Case(Ctrl('b'))((b, c, m) => (b, c-1)), // <- one char
-    Case(Ctrl('f'))((b, c, m) => (b, c-1)), // -> one char
-    Case(Alt+"b")((b, c, m) => AdvancedFilters.wordLeft(b, c)), // <- one word
-    Case(Alt+"f")((b, c, m) => AdvancedFilters.wordRight(b, c)), // -> one  word
+    Case(Ctrl('b'))((b, c, m) => (b, c - 1)), // <- one char
+    Case(Ctrl('f'))((b, c, m) => (b, c + 1)), // -> one char
+    Case(Alt + "b")((b, c, m) => AdvancedFilters.wordLeft(b, c)), // <- one word
+    Case(Alt + "f")((b, c, m) => AdvancedFilters.wordRight(b, c)), // -> one  word
     Case(Ctrl('a'))((b, c, m) => BasicFilters.moveStart(b, c, m.width)), // <- one line
     Case(Ctrl('e'))((b, c, m) => BasicFilters.moveEnd(b, c, m.width)) // -> one line
   )
@@ -73,7 +73,8 @@ object ReadlineFilters {
       Case(Ctrl('k'))((b, c, m) => cutAllRight(b, c)),
       Case(Alt + "d")((b, c, m) => cutWordRight(b, c)),
       Case(Ctrl('w'))((b, c, m) => cutWordLeft(b, c)),
-      Case(Ctrl('y'))((b, c, m) => paste(b, c))
+      Case(Ctrl('y'))((b, c, m) => paste(b, c)),
+      Case(Alt + "\u007f")((b, c, m) => cutWordLeft(b, c))
     )
   }