Import typeOf in Scala 2 only

com-lihaoyi · Nov 14, 2023 · b5a75c0 · b5a75c0
1 parent a668e19
commit b5a75c0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/amm/repl/src/main/scala/ammonite/main/Defaults.scala b/amm/repl/src/main/scala/ammonite/main/Defaults.scala
@@ -1,9 +1,8 @@
-
 package ammonite.main
 
 import java.io.InputStream
 
-import ammonite.util.{ImportData, Imports, Util}
+import ammonite.util.{ImportData, Imports, Name, Util}
 import coursierapi.Dependency
 
 import scala.io.Codec
@@ -21,14 +20,20 @@ object Defaults{
     )
   }
 
-  val replImports = Imports(
-    ImportData("""ammonite.repl.ReplBridge.value.{
-      codeColorsImplicit,
-      tprintColorsImplicit,
-      show
-    }""")
-  )
-  def ammoniteHome = os.Path(System.getProperty("user.home"))/".ammonite"
+  def replImports(scalaVersion: String) = {
+    val sharedFields = Seq("codeColorsImplicit", "tprintColorsImplicit", "show")
+    val fields = if (scalaVersion.startsWith("2.")) sharedFields :+ "typeOf" else sharedFields
+    val importss = fields.map(field =>
+      ImportData(
+        Name(field),
+        Name(field),
+        Name("_root_") :: Name("ammonite") :: Name("repl") :: Name("ReplBridge") :: Name("value") :: Nil,
+        ImportData.Term
+      )
+    )
+    Imports(importss)
+  }
+  def ammoniteHome = os.Path(System.getProperty("user.home")) / ".ammonite"
 
   def alreadyLoadedDependencies(
     resourceName: String = "amm-dependencies.txt"

diff --git a/amm/repl/src/test/scala/ammonite/TestRepl.scala b/amm/repl/src/test/scala/ammonite/TestRepl.scala
@@ -62,7 +62,7 @@ class TestRepl(compilerBuilder: ICompilerBuilder = CompilerBuilder()) { self =>
   val frames = Ref(List(Frame.createInitial(initialClassLoader)))
   val sess0 = new SessionApiImpl(frames)
 
-  val baseImports = ammonite.main.Defaults.replImports ++ Interpreter.predefImports
+  val baseImports = ammonite.main.Defaults.replImports(compilerBuilder.scalaVersion) ++ Interpreter.predefImports
   val basePredefs = Seq(
     PredefInfo(Name("testPredef"), predef._1, false, predef._2)
   )

diff --git a/amm/src/main/scala/ammonite/Main.scala b/amm/src/main/scala/ammonite/Main.scala
@@ -113,7 +113,7 @@ case class Main(predefCode: String = "",
 
     loadedPredefFile.right.map{ predefFileInfoOpt =>
       val augmentedImports =
-        if (defaultPredef) Defaults.replImports ++ Interpreter.predefImports
+        if (defaultPredef) Defaults.replImports(compilerBuilder.scalaVersion) ++ Interpreter.predefImports
         else Imports()
 
       val argString = replArgs.zipWithIndex.map{ case (b, idx) =>