Remove SourceBridge / SourceAPI, and move SourceRuntime to compiler

com-lihaoyi · Jan 14, 2021 · e6559f5 · e6559f5
1 parent 5f1386a
commit e6559f5
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 145 deletions.
diff --git a/...a/ammonite/repl/tools/SourceRuntime.scala → ...monite/compiler/tools/SourceRuntime.scala b/...a/ammonite/repl/tools/SourceRuntime.scala → ...monite/compiler/tools/SourceRuntime.scala
@@ -1,4 +1,4 @@
-package ammonite.repl.tools
+package ammonite.compiler.tools
 
 import javassist.{ByteArrayClassPath, CtClass, CtMethod}
 
@@ -252,5 +252,23 @@ object SourceRuntime{
     }
   }
 
+  def failLoudly[T](res: Either[String, T]): T = res match{
+    case Left(s) => throw new Exception(s)
+    case Right(r) => r
+  }
+
+  def desugarImpl(s: String)(implicit colors: ammonite.util.CodeColors): Desugared = {
+
+    new Desugared(
+      ammonite.compiler.Highlighter.defaultHighlight(
+        s.toVector,
+        colors.comment,
+        colors.`type`,
+        colors.literal,
+        colors.keyword,
+        fansi.Attr.Reset
+      ).mkString
+    )
+  }
 
 }
diff --git a/...n/scala/ammonite/repl/tools/desugar.scala → ...ala/ammonite/compiler/tools/desugar.scala b/...n/scala/ammonite/repl/tools/desugar.scala → ...ala/ammonite/compiler/tools/desugar.scala
@@ -1,4 +1,4 @@
-package ammonite.repl.tools
+package ammonite.compiler.tools
 
 import sourcecode.Compat._
 import scala.language.experimental.macros
@@ -11,7 +11,7 @@ object desugar{
   def transformer(c: Context)(expr: c.Expr[Any]): c.Expr[Desugared] = {
     import c.universe._
     c.Expr[Desugared](
-      q"ammonite.repl.api.SourceBridge.value.desugarImpl(${c.universe.showCode(expr.tree)})"
+      q"ammonite.compiler.tools.SourceRuntime.desugarImpl(${c.universe.showCode(expr.tree)})"
     )
   }
 

diff --git a/...in/scala/ammonite/repl/tools/source.scala → ...cala/ammonite/compiler/tools/source.scala b/...in/scala/ammonite/repl/tools/source.scala → ...cala/ammonite/compiler/tools/source.scala
@@ -1,4 +1,4 @@
-package ammonite.repl.tools
+package ammonite.compiler.tools
 
 import ammonite.runtime.tools.browse.Strings
 import ammonite.util.CodeColors
@@ -53,7 +53,7 @@ object source{
                   colors: c.Expr[CodeColors]): c.Expr[Unit] = {
     import c.universe._
     val defaultBrowseExpr = c.Expr[Int => Strings](
-      q"_root_.ammonite.repl.api.SourceBridge.value.browseSourceCommand"
+      q"${prefix(c)}.browseSourceCommand"
     )
 
     applyCustomizeCommandMacro(c)(f, defaultBrowseExpr)(pprinter, colors)
@@ -86,7 +86,7 @@ object source{
 
   def prefix(c: Context) = {
     import c.universe._
-    q"ammonite.repl.api.SourceBridge.value"
+    q"ammonite.compiler.tools.SourceRuntime"
   }
   /**
     * Attempts to up an expression, into either a LHS + methodcall + rhs. We

diff --git a/amm/interp/src/main/scala/ammonite/interp/Interpreter.scala b/amm/interp/src/main/scala/ammonite/interp/Interpreter.scala
@@ -720,7 +720,7 @@ object Interpreter{
     ),
     ImportData("ammonite.runtime.tools.{browse, grep, time}"),
     ImportData("ammonite.runtime.tools.tail", importType = ImportData.TermType),
-    ImportData("ammonite.repl.tools.{desugar, source}"),
+    ImportData("ammonite.compiler.tools.{desugar, source}"),
     ImportData("mainargs.{arg, main}"),
     ImportData("ammonite.repl.tools.Util.PathRead")
   )

diff --git a/amm/repl/api/src/main/scala/ammonite/repl/api/SourceAPI.scala b/amm/repl/api/src/main/scala/ammonite/repl/api/SourceAPI.scala
diff --git a/amm/repl/src/main/scala/ammonite/repl/ApiImpls.scala b/amm/repl/src/main/scala/ammonite/repl/ApiImpls.scala
@@ -1,8 +1,7 @@
 package ammonite.repl
 
 import ammonite.ops.Internals
-import ammonite.repl.api.{Clipboard, FrontEnd, FrontEndAPI, Session, SourceAPI}
-import ammonite.repl.tools.{Desugared, SourceRuntime}
+import ammonite.repl.api.{Clipboard, FrontEnd, FrontEndAPI, Session}
 import ammonite.runtime._
 import ammonite.util.Util._
 import ammonite.util.{Frame => _, _}
@@ -138,70 +137,6 @@ object ClipboardImpl extends Clipboard {
   }
 }
 
-trait SourceAPIImpl extends SourceAPI {
-
-  def loadObjectMemberInfo(symbolOwnerCls: Class[_],
-                           value: Option[Any],
-                           memberName: String,
-                           returnType: Class[_],
-                           argTypes: Class[_]*): Either[String, Location] =
-    SourceRuntime.loadObjectMemberInfo(
-      symbolOwnerCls,
-      value,
-      memberName,
-      returnType,
-      argTypes: _*
-    )
-
-  def loadObjectInfo(value: Any): Either[String, Location] =
-    SourceRuntime.loadObjectInfo(value)
-
-  def browseObjectMember(symbolOwnerCls: Class[_],
-                         value: Option[Any],
-                         memberName: String,
-                         pprinter: pprint.PPrinter,
-                         colors: CodeColors,
-                         command: Int => Seq[String],
-                         returnType: Class[_],
-                         argTypes: Class[_]*): Any =
-    SourceRuntime.browseObjectMember(
-      symbolOwnerCls,
-      value,
-      memberName,
-      pprinter,
-      colors,
-      n => command(n),
-      returnType,
-      argTypes: _*
-    )
-
-  def browseObject(value: Any,
-                   pprinter: pprint.PPrinter,
-                   colors: CodeColors,
-                   command: Int => Seq[String]): Any =
-    SourceRuntime.browseObject(
-      value,
-      pprinter,
-      colors,
-      n => command(n)
-    )
-
-  def desugarImpl(s: String)(implicit colors: ammonite.util.CodeColors): Desugared = {
-
-    new Desugared(
-      ammonite.compiler.Highlighter.defaultHighlight(
-        s.toVector,
-        colors.comment,
-        colors.`type`,
-        colors.literal,
-        colors.keyword,
-        fansi.Attr.Reset
-      ).mkString
-    )
-  }
-
-}
-
 trait FrontEndAPIImpl extends FrontEndAPI {
   def apply(name: String): FrontEnd =
     name.toLowerCase(Locale.ROOT) match {

diff --git a/amm/repl/src/main/scala/ammonite/repl/Repl.scala b/amm/repl/src/main/scala/ammonite/repl/Repl.scala
@@ -128,11 +128,6 @@ class Repl(input: InputStream,
         }
       }
     ),
-    (
-      "ammonite.repl.api.SourceBridge",
-      "source",
-      new SourceAPIImpl {}
-    ),
     (
       "ammonite.repl.api.FrontEndBridge",
       "frontEnd",

diff --git a/amm/repl/src/test/scala-2.12/ammonite/unit/SourceTests212.scala b/amm/repl/src/test/scala-2.12/ammonite/unit/SourceTests212.scala
@@ -1,18 +1,14 @@
 package ammonite.unit
 
 
-import ammonite.repl.SourceAPIImpl
-import ammonite.repl.api.SourceBridge
 import utest._
-import ammonite.repl.tools.source.load
+import ammonite.compiler.tools.source.load
 import ammonite.util.Util
 import ammonite.util.Util.Location
 //import fastparse.utils.{ElemSetHelper, Generator, IndexedParserInput}
 
 object SourceTests212 extends TestSuite{
   val tests = Tests{
-    if (SourceBridge.value0 == null)
-      SourceBridge.value0 = new SourceAPIImpl {}
     def check(loaded: Location, expectedFileName: String, expected: String, slop: Int = 10) = {
 
 

diff --git a/amm/repl/src/test/scala/ammonite/DualTestRepl.scala b/amm/repl/src/test/scala/ammonite/DualTestRepl.scala
@@ -1,18 +1,13 @@
 package ammonite
 
 import ammonite.compiler.CodeClassWrapper
-import ammonite.repl.api.SourceBridge
-import ammonite.repl.SourceAPIImpl
 import ammonite.util.{Evaluated, Res}
 
 /**
   * Wraps several [[TestRepl]], and runs its tests against all of them.
   */
 class DualTestRepl { dual =>
 
-  if (SourceBridge.value0 == null)
-    SourceBridge.value0 = new SourceAPIImpl {}
-
   def predef: (String, Option[os.Path]) = ("", None)
 
   val repls = Seq(

diff --git a/amm/repl/src/test/scala/ammonite/session/AdvancedTests.scala b/amm/repl/src/test/scala/ammonite/session/AdvancedTests.scala
@@ -373,7 +373,7 @@ object AdvancedTests extends TestSuite{
     test("desugar"){
       check.session("""
         @ desugar{1 + 2 max 3}
-        res0: ammonite.repl.tools.Desugared = scala.Predef.intWrapper(3).max(3)
+        res0: compiler.tools.Desugared = scala.Predef.intWrapper(3).max(3)
       """)
     }
     test("loadingModulesInPredef"){

diff --git a/amm/repl/src/test/scala/ammonite/unit/SourceTests.scala b/amm/repl/src/test/scala/ammonite/unit/SourceTests.scala
@@ -1,20 +1,15 @@
 package ammonite.unit
 
 
-import ammonite.repl.SourceAPIImpl
-import ammonite.repl.api.SourceBridge
 import utest._
-import ammonite.repl.tools.source.load
+import ammonite.compiler.tools.source.load
 import ammonite.util.Util
 import ammonite.util.Util.Location
 
 import java.io.InputStream
 object SourceTests extends TestSuite{
   val tests = Tests{
 
-    if (SourceBridge.value0 == null)
-      SourceBridge.value0 = new SourceAPIImpl {}
-
     def check(loaded: Location, expectedFileName: String, expected: String, slop: Int = 10) = {
 
 

diff --git a/amm/src/main/scala/ammonite/Main.scala b/amm/src/main/scala/ammonite/Main.scala
@@ -9,7 +9,7 @@ import ammonite.interp.{Watchable, Interpreter, PredefInitialization}
 import ammonite.interp.script.AmmoniteBuildServer
 import ammonite.runtime.{Frame, Storage}
 import ammonite.main._
-import ammonite.repl.{FrontEndAPIImpl, Repl, SourceAPIImpl}
+import ammonite.repl.{FrontEndAPIImpl, Repl}
 import ammonite.util.Util.newLine
 import ammonite.util._
 
@@ -176,11 +176,6 @@ case class Main(predefCode: String = "",
         classPathWhitelist = classPathWhitelist
       )
       val bridges = Seq(
-        (
-          "ammonite.repl.api.SourceBridge",
-          "source",
-          new SourceAPIImpl {}
-        ),
         (
           "ammonite.repl.api.FrontEndBridge",
           "frontEnd",