Merge pull request #87 from alexarchambault/topic/merge-upstream

Merge latest upstream developments
jupyter-scala · May 30, 2017 · ca2d67d · ca2d67d
2 parents 9f67d0e + 38ecd79
commit ca2d67d
Show file tree

Hide file tree

Showing 91 changed files with 2,947 additions and 2,115 deletions.
diff --git a/amm/interp/src/main/scala/ammonite/interp/AmmonitePlugin.scala b/amm/interp/src/main/scala/ammonite/interp/AmmonitePlugin.scala
@@ -1,6 +1,6 @@
 package ammonite.interp
 
-import ammonite.util.{ImportData, Name}
+import ammonite.util.{ImportData, Name, Util}
 
 import scala.reflect.NameTransformer
 import scala.tools.nsc._
@@ -220,7 +220,7 @@ object AmmonitePlugin{
     // together v.s. having them by sent in the arbitrary-jumbled order they
     // come out of the `grouped` map in
 
-    output(open.toVector.sortBy(_.prefix.map(_.backticked).mkString(".")))
+    output(open.toVector.sortBy(x => Util.encodeScalaSourcePath(x.prefix)))
   }
 }
 

diff --git a/amm/interp/src/main/scala/ammonite/interp/Compiler.scala b/amm/interp/src/main/scala/ammonite/interp/Compiler.scala
@@ -1,6 +1,6 @@
 package ammonite.interp
 
-import acyclic.file
+
 import ammonite.runtime.Evaluator
 import ammonite.util.{ImportData, Imports, Printer}
 import ammonite.util.Util.newLine

diff --git a/...in/scala/ammonite/runtime/InterpAPI.scala → ...ain/scala/ammonite/interp/InterpAPI.scala b/...in/scala/ammonite/runtime/InterpAPI.scala → ...ain/scala/ammonite/interp/InterpAPI.scala
@@ -1,19 +1,17 @@
-package ammonite.runtime
+package ammonite.interp
 
 import ammonite.ops._
 import ammonite.runtime.tools.Resolver
 import ammonite.util.Ref
-import acyclic.file
-import scala.util.control.ControlThrowable
 
+import ammonite.runtime.APIHolder
+import ammonite.runtime.Evaluator.AmmoniteExit
 
-object InterpBridge extends APIHolder[InterpAPI]
+import scala.collection.mutable
+import scala.util.control.ControlThrowable
 
-/**
- * Thrown to exit the REPL cleanly
- */
-case class ReplExit(value: Any) extends ControlThrowable
 
+object InterpBridge extends APIHolder[InterpAPI]
 
 trait InterpAPI {
 
@@ -27,6 +25,12 @@ trait InterpAPI {
    */
   def repositories: Ref[List[Resolver]]
 
+  /**
+    * Configures the current compiler, or if the compiler hasn't been initialized
+    * yet, registers the configuration callback and applies it to the compiler
+    * when it ends up being initialized later
+    */
+  def configureCompiler(c: scala.tools.nsc.Global => Unit): Unit
 }