Fix `dest`-assignment for overriden `T.command`s, and add basic unit tests to validate the `dest` paths of overriden commands and overriden targets

3 files changed, 14 insertions, 5 deletions

diff --git a/scalalib/src/mill/scalalib/GenIdea.scala b/scalalib/src/mill/scalalib/GenIdea.scala
index 927c39d7..45475368 100644
--- a/scalalib/src/mill/scalalib/GenIdea.scala
+++ b/scalalib/src/mill/scalalib/GenIdea.scala
@@ -1,7 +1,7 @@
 package mill.scalalib
 
 import ammonite.ops._
-import mill.define.{BaseModule, Segment, Segments, Target}
+import mill.define._
 import mill.eval.{Evaluator, PathRef}
 import mill.scalalib
 import mill.util.Ctx.LogCtx
@@ -10,14 +10,16 @@ import mill.util.Strict.Agg
 
 object GenIdea {
 
-  def apply()(implicit ctx: LogCtx, rootModule0: BaseModule.Implicit): Unit = {
+  def apply()(implicit ctx: LogCtx,
+              rootModule0: BaseModule.Implicit,
+              discover: Discover): Unit = {
     val rootModule = rootModule0.value
     val pp = new scala.xml.PrettyPrinter(999, 4)
     rm! pwd/".idea"
     rm! pwd/".idea_modules"
 
 
-    val evaluator = new Evaluator(pwd / 'out, pwd, rootModule , ctx.log)
+    val evaluator = new Evaluator(pwd / 'out, pwd, rootModule, discover, ctx.log)
 
     for((relPath, xml) <- xmlFileLayout(evaluator, rootModule)){
       write.over(pwd/relPath, pp.format(xml))
diff --git a/scalalib/test/src/mill/scalalib/GenIdeaTests.scala b/scalalib/test/src/mill/scalalib/GenIdeaTests.scala
index 3bafcfe3..d49e6a1c 100644
--- a/scalalib/test/src/mill/scalalib/GenIdeaTests.scala
+++ b/scalalib/test/src/mill/scalalib/GenIdeaTests.scala
@@ -2,7 +2,7 @@ package mill.scalalib
 
 import ammonite.ops._
 import mill._
-
+import mill.define.Discover
 import mill.util.{TestEvaluator, TestUtil}
 import utest._
 
@@ -21,6 +21,7 @@ object GenIdeaTests extends TestSuite {
 
   val helloWorldEvaluator = new TestEvaluator(
     HelloWorld,
+    Discover[HelloWorld.type],
     outPath,
     workingSrcPath
   )
diff --git a/scalalib/test/src/mill/scalalib/HelloWorldTests.scala b/scalalib/test/src/mill/scalalib/HelloWorldTests.scala
index 0f2826bb..85e53703 100644
--- a/scalalib/test/src/mill/scalalib/HelloWorldTests.scala
+++ b/scalalib/test/src/mill/scalalib/HelloWorldTests.scala
@@ -5,7 +5,7 @@ import java.util.jar.JarFile
 import ammonite.ops._
 import ammonite.ops.ImplicitWd._
 import mill._
-import mill.define.Target
+import mill.define.{Discover, Target}
 import mill.eval.{Evaluator, Result}
 import mill.scalalib.publish._
 import mill.util.{TestEvaluator, TestUtil}
@@ -84,31 +84,37 @@ object HelloWorldTests extends TestSuite {
 
   val helloWorldEvaluator = new TestEvaluator(
     HelloWorld,
+    Discover[HelloWorld.type],
     outPath,
     workingSrcPath
   )
   val helloWorldWithMainEvaluator = new TestEvaluator(
     HelloWorldWithMain,
+    Discover[HelloWorldWithMain.type],
     outPath,
     workingSrcPath
   )
   val helloWorldWithMainAssemblyEvaluator = new TestEvaluator(
     HelloWorldWithMainAssembly,
+    Discover[HelloWorldWithMainAssembly.type],
     outPath,
     workingSrcPath
   )
   val helloWorldFatalEvaluator = new TestEvaluator(
     HelloWorldFatalWarnings,
+    Discover[HelloWorldFatalWarnings.type],
     outPath,
     workingSrcPath
   )
   val helloWorldOverrideEvaluator = new TestEvaluator(
     HelloWorldScalaOverride,
+    Discover[HelloWorldScalaOverride.type],
     outPath,
     workingSrcPath
   )
   val helloWorldCrossEvaluator = new TestEvaluator(
     CrossHelloWorld,
+    Discover[CrossHelloWorld.type],
     outPath,
     workingSrcPath
   )