vendor ammonite.main code so we can properly handle arity-0 CLI args, fix GenIdea by making it take an Evaluator as an argument

1 files changed, 13 insertions, 5 deletions

diff --git a/scalalib/src/mill/scalalib/GenIdea.scala b/scalalib/src/mill/scalalib/GenIdea.scala
index 2f76b666..4b283e7c 100644
--- a/scalalib/src/mill/scalalib/GenIdea.scala
+++ b/scalalib/src/mill/scalalib/GenIdea.scala
@@ -12,15 +12,23 @@ import mill.util.Strict.Agg
 
 
 object GenIdeaModule extends ExternalModule {
-  def idea() = T.command{ mill.scalalib.GenIdea() }
+
+  def idea(ev: Evaluator[Any]) = T.command{
+    mill.scalalib.GenIdea(
+      implicitly,
+      ev.rootModule,
+      ev.discover
+    )
+  }
+
+  implicit def millScoptEvaluatorReads[T] = new mill.main.EvaluatorScopt[T]()
   def millDiscover = Discover[this.type]
 }
 object GenIdea {
 
-  def apply()(implicit ctx: Log,
-              rootModule0: BaseModule.Implicit,
-              discover: Discover[_]): Unit = {
-    val rootModule = rootModule0.value
+  def apply(ctx: Log,
+            rootModule: BaseModule,
+            discover: Discover[_]): Unit = {
     val pp = new scala.xml.PrettyPrinter(999, 4)
     rm! pwd/".idea"
     rm! pwd/".idea_modules"