Tweak default imports to avoid ambiguous imports reported in #500

com-lihaoyi · Nov 9, 2016 · cf2079b · cf2079b
1 parent 6bc4ddd
commit cf2079b
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/amm/src/main/scala/ammonite/main/Defaults.scala b/amm/src/main/scala/ammonite/main/Defaults.scala
@@ -35,9 +35,21 @@ object Defaults{
     |  _
     |"""
 
+  // Need to import stuff from ammonite.ops manually, rather than from the
+  // ammonite.ops.Extensions bundle, because otherwise they result in ambiguous
+  // imports if someone else imports maunally
   val predefString = s"""
-    |import ammonite.ops.Extensions.{
-    |  $ignoreUselessImports
+    |import ammonite.ops.{
+    |  Pipeable,
+    |  FilterMapExt,
+    |  FilterMapArrays,
+    |  FilterMapIterators,
+    |  FilterMapGenerators,
+    |  SeqFactoryFunc,
+    |  ChainableConversions,
+    |  RegexContextMaker,
+    |  Callable1,
+    |  Callable2
     |}
     |import ammonite.runtime.tools._
     |import ammonite.repl.tools._