Use CodeWrapper from compiler-interface

com-lihaoyi · Jan 14, 2021 · f9fe98c · f9fe98c
1 parent b9ac9af
commit f9fe98c
Show file tree

Hide file tree

Showing 15 changed files with 30 additions and 32 deletions.
diff --git a/amm/compiler/src/main/scala/ammonite/compiler/CodeClassWrapper.scala b/amm/compiler/src/main/scala/ammonite/compiler/CodeClassWrapper.scala
@@ -1,5 +1,6 @@
 package ammonite.compiler
 
+import ammonite.compiler.iface.CodeWrapper
 import ammonite.util._
 import ammonite.util.Util.{CodeSource, newLine, normalizeNewlines}
 

diff --git a/...scala/ammonite/compiler/CodeWrapper.scala → ...mmonite/compiler/DefaultCodeWrapper.scala b/...scala/ammonite/compiler/CodeWrapper.scala → ...mmonite/compiler/DefaultCodeWrapper.scala
@@ -1,20 +1,11 @@
 package ammonite.compiler
 
+import ammonite.compiler.iface.CodeWrapper
 import ammonite.util._
 import ammonite.util.Util.{CodeSource, normalizeNewlines}
 
-trait CodeWrapper{
-  def wrapperPath: Seq[Name] = Nil
-  def apply(
-    code: String,
-    source: CodeSource,
-    imports: Imports,
-    printCode: String,
-    indexedWrapperName: Name,
-    extraCode: String
-  ): (String, String, Int)
-}
-object CodeWrapper extends CodeWrapper{
+
+object DefaultCodeWrapper extends CodeWrapper{
   private val userCodeNestingLevel = 1
   def apply(
     code: String,

diff --git a/amm/compiler/src/main/scala/ammonite/compiler/DefaultPreprocessor.scala b/amm/compiler/src/main/scala/ammonite/compiler/DefaultPreprocessor.scala
@@ -1,5 +1,6 @@
 package ammonite.compiler
 
+import ammonite.compiler.iface.CodeWrapper
 import ammonite.util._
 import ammonite.util.Util.{CodeSource, newLine}
 

diff --git a/amm/compiler/src/main/scala/ammonite/compiler/Preprocessor.scala b/amm/compiler/src/main/scala/ammonite/compiler/Preprocessor.scala
@@ -1,5 +1,6 @@
 package ammonite.compiler
 
+import ammonite.compiler.iface.CodeWrapper
 import ammonite.util._
 import ammonite.util.Util.{CodeSource, newLine, normalizeNewlines, windowsPlatform}
 import fastparse._

diff --git a/amm/interp/src/main/scala/ammonite/interp/Interpreter.scala b/amm/interp/src/main/scala/ammonite/interp/Interpreter.scala
@@ -4,6 +4,7 @@ import java.io.{File, OutputStream, PrintStream}
 import java.util.regex.Pattern
 
 import ammonite.compiler._
+import ammonite.compiler.iface.CodeWrapper
 import ammonite.interp.api.{InterpAPI, InterpLoad, LoadJar}
 
 import scala.collection.mutable

diff --git a/amm/interp/src/main/scala/ammonite/interp/script/AmmoniteBuildServer.scala b/amm/interp/src/main/scala/ammonite/interp/script/AmmoniteBuildServer.scala
@@ -8,6 +8,7 @@ import java.util.concurrent.{CompletableFuture, Executors, ThreadFactory}
 import java.util.UUID
 
 import ammonite.compiler._
+import ammonite.compiler.iface.CodeWrapper
 import ammonite.interp.api.InterpAPI
 import ammonite.interp.DependencyLoader
 import ammonite.runtime.{ImportHook, Storage}
@@ -25,7 +26,7 @@ class AmmoniteBuildServer(
   initialScripts: Seq[os.Path] = Nil,
   initialImports: Imports = AmmoniteBuildServer.defaultImports,
   defaultRepositories: Seq[Repository] = Repository.defaults().asScala.toList,
-  codeWrapper: CodeWrapper = CodeWrapper,
+  codeWrapper: CodeWrapper = DefaultCodeWrapper,
   importHooks: Map[Seq[String], ImportHook] = ImportHook.defaults
 ) extends BuildServer with ScalaBuildServer with DummyBuildServerImplems {
 

diff --git a/amm/interp/src/main/scala/ammonite/interp/script/ScriptCompiler.scala b/amm/interp/src/main/scala/ammonite/interp/script/ScriptCompiler.scala
@@ -2,10 +2,8 @@ package ammonite.interp.script
 
 import java.util.concurrent.ConcurrentHashMap
 
-import ammonite.compiler.{
-  CodeWrapper,
-  Compiler => AmmCompiler
-}
+import ammonite.compiler.{Compiler => AmmCompiler}
+import ammonite.compiler.iface.CodeWrapper
 import ammonite.runtime.Storage
 import ammonite.util.{Imports, Printer}
 

diff --git a/amm/interp/src/main/scala/ammonite/interp/script/ScriptProcessor.scala b/amm/interp/src/main/scala/ammonite/interp/script/ScriptProcessor.scala
@@ -2,7 +2,8 @@ package ammonite.interp.script
 
 import java.io.File
 
-import ammonite.compiler.{CodeWrapper, Parsers, Preprocessor}
+import ammonite.compiler.{DefaultCodeWrapper, Parsers, Preprocessor}
+import ammonite.compiler.iface.CodeWrapper
 import ammonite.interp.{DependencyLoader, Interpreter}
 import ammonite.runtime.{Frame, ImportHook, Storage}
 import ammonite.util.{ImportTree, Name, Util}
@@ -16,7 +17,7 @@ final case class ScriptProcessor(
   defaultRepositories: Seq[Repository],
   extraPluginDependencies: Seq[Dependency] = Nil,
   wd: os.Path = os.pwd,
-  codeWrapper: CodeWrapper = CodeWrapper,
+  codeWrapper: CodeWrapper = DefaultCodeWrapper,
   importHooks: Map[Seq[String], ImportHook] = ImportHook.defaults
 ) {
 

diff --git a/amm/interp/src/main/scala/ammonite/interp/script/SingleScriptCompiler.scala b/amm/interp/src/main/scala/ammonite/interp/script/SingleScriptCompiler.scala
@@ -1,10 +1,10 @@
 package ammonite.interp.script
 
 import ammonite.compiler.{
-  CodeWrapper,
   Compiler => AmmCompiler,
   MakeReporter
 }
+import ammonite.compiler.iface.CodeWrapper
 import ammonite.interp.Interpreter
 import ammonite.runtime.{Frame, Storage}
 import ammonite.util.{Classpath, Imports, Name, Printer, Res}

diff --git a/amm/repl/src/main/scala/ammonite/repl/Repl.scala b/amm/repl/src/main/scala/ammonite/repl/Repl.scala
@@ -7,7 +7,8 @@ import ammonite.runtime._
 import ammonite.terminal.Filter
 import ammonite.util.Util.{newLine, normalizeNewlines}
 import ammonite.util._
-import ammonite.compiler.{CodeWrapper, Parsers, Preprocessor}
+import ammonite.compiler.{Parsers, Preprocessor}
+import ammonite.compiler.iface.CodeWrapper
 import ammonite.interp.Interpreter
 import coursierapi.Dependency
 

diff --git a/amm/repl/src/test/scala/ammonite/TestRepl.scala b/amm/repl/src/test/scala/ammonite/TestRepl.scala
@@ -2,7 +2,8 @@ package ammonite
 
 import java.io.PrintStream
 
-import ammonite.compiler.{CodeWrapper, Preprocessor}
+import ammonite.compiler.{DefaultCodeWrapper, Preprocessor}
+import ammonite.compiler.iface.CodeWrapper
 import ammonite.interp.Interpreter
 import ammonite.main.Defaults
 import ammonite.repl._
@@ -24,7 +25,7 @@ import ammonite.runtime.ImportHook
 class TestRepl {
   var allOutput = ""
   def predef: (String, Option[os.Path]) = ("", None)
-  def codeWrapper: CodeWrapper = CodeWrapper
+  def codeWrapper: CodeWrapper = DefaultCodeWrapper
 
   val tempDir = os.Path(
     java.nio.file.Files.createTempDirectory("ammonite-tester")

diff --git a/amm/repl/src/test/scala/ammonite/TestUtils.scala b/amm/repl/src/test/scala/ammonite/TestUtils.scala
@@ -2,7 +2,7 @@ package ammonite
 
 import java.io.PrintStream
 
-import ammonite.compiler.{CodeWrapper, Preprocessor}
+import ammonite.compiler.{DefaultCodeWrapper, Preprocessor}
 import ammonite.interp.Interpreter
 import ammonite.main.Defaults
 import ammonite.runtime.{Frame, Storage}
@@ -35,8 +35,8 @@ object TestUtils {
       getFrame = () => startFrame,
       createFrame = () => throw new Exception("unsupported"),
       initialClassLoader = initialClassLoader,
-      replCodeWrapper = CodeWrapper,
-      scriptCodeWrapper = CodeWrapper,
+      replCodeWrapper = DefaultCodeWrapper,
+      scriptCodeWrapper = DefaultCodeWrapper,
       alreadyLoadedDependencies = Defaults.alreadyLoadedDependencies("amm-test-dependencies.txt"),
       importHooks = ImportHook.defaults,
       classPathWhitelist = ammonite.repl.Repl.getClassPathWhitelist(thin = true)

diff --git a/amm/src/main/scala/ammonite/Main.scala b/amm/src/main/scala/ammonite/Main.scala
@@ -4,7 +4,8 @@ import java.io.{InputStream, OutputStream, PrintStream}
 import java.net.URLClassLoader
 import java.nio.file.NoSuchFileException
 
-import ammonite.compiler.{CodeClassWrapper, CodeWrapper}
+import ammonite.compiler.{CodeClassWrapper, DefaultCodeWrapper}
+import ammonite.compiler.iface.CodeWrapper
 import ammonite.interp.{Watchable, Interpreter, PredefInitialization}
 import ammonite.interp.script.AmmoniteBuildServer
 import ammonite.runtime.{Frame, Storage}
@@ -70,8 +71,8 @@ case class Main(predefCode: String = "",
                 verboseOutput: Boolean = true,
                 remoteLogging: Boolean = true,
                 colors: Colors = Colors.Default,
-                replCodeWrapper: CodeWrapper = CodeWrapper,
-                scriptCodeWrapper: CodeWrapper = CodeWrapper,
+                replCodeWrapper: CodeWrapper = DefaultCodeWrapper,
+                scriptCodeWrapper: CodeWrapper = DefaultCodeWrapper,
                 alreadyLoadedDependencies: Seq[Dependency] =
                   Defaults.alreadyLoadedDependencies(),
                 importHooks: Map[Seq[String], ImportHook] = ImportHook.defaults,
@@ -450,7 +451,7 @@ class MainRunner(cliConfig: Config,
 
     val codeWrapper =
       if (cliConfig.repl.classBased.value) CodeClassWrapper
-      else CodeWrapper
+      else DefaultCodeWrapper
 
     Main(
       cliConfig.predef.predefCode,

diff --git a/amm/src/main/scala/ammonite/main/Scripts.scala b/amm/src/main/scala/ammonite/main/Scripts.scala
@@ -50,7 +50,7 @@ object Scripts {
       }
 
       scriptMains = interp.scriptCodeWrapper match{
-        case ammonite.compiler.CodeWrapper =>
+        case ammonite.compiler.DefaultCodeWrapper =>
           Some(
             interp
               .evalClassloader

diff --git a/build.sc b/build.sc
@@ -200,7 +200,7 @@ object amm extends Cross[MainModule](fullCrossScalaVersions:_*){
     }
   }
   class CompilerModule(val crossScalaVersion: String) extends AmmModule{
-    def moduleDeps = Seq(amm.util(), amm.repl.api())
+    def moduleDeps = Seq(amm.compiler.interface(), amm.util(), amm.repl.api())
     def crossFullScalaVersion = true
     def ivyDeps = T {
       Agg(