From cf2079b2713f024ce6065b0733c731693ac32987 Mon Sep 17 00:00:00 2001
From: Li Haoyi <haoyi.sg@gmail.com>
Date: Wed, 9 Nov 2016 18:45:37 +0800
Subject: [PATCH] Tweak default imports to avoid ambiguous imports reported in
 #500

---
 amm/src/main/scala/ammonite/main/Defaults.scala | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/amm/src/main/scala/ammonite/main/Defaults.scala b/amm/src/main/scala/ammonite/main/Defaults.scala
index 1e0870a31..2ff6ab390 100644
--- 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._