Add support for external modules, useful for things `GenIdea` support

3 files changed, 8 insertions, 3 deletions

diff --git a/core/test/src/mill/eval/ModuleTests.scala b/core/test/src/mill/eval/ModuleTests.scala
index b452a854..c6061abb 100644
--- a/core/test/src/mill/eval/ModuleTests.scala
+++ b/core/test/src/mill/eval/ModuleTests.scala
@@ -3,6 +3,7 @@ package mill.eval
 import ammonite.ops._
 import mill.util.{TestEvaluator, TestUtil}
 import mill.T
+import mill.define.Discover
 import mill.util.TestEvaluator.implicitDisover
 import utest._
 
@@ -13,6 +14,7 @@ object ModuleTests extends TestSuite{
     object inner extends mill.Module{
       def y = T{17}
     }
+    def millDiscover = Discover[this.type]
   }
   object Build extends TestUtil.BaseModule{
     def z = T{ ExternalModule.x() + ExternalModule.inner.y() }
@@ -35,6 +37,7 @@ object ModuleTests extends TestSuite{
       object Build extends mill.define.ExternalModule {
 
         def z = T{ ExternalModule.x() + ExternalModule.inner.y() }
+        def millDiscover = Discover[this.type]
       }
 
       intercept[java.lang.AssertionError]{ Build }
diff --git a/core/test/src/mill/main/MainTests.scala b/core/test/src/mill/main/MainTests.scala
index 3d8e4d5c..22f93ae0 100644
--- a/core/test/src/mill/main/MainTests.scala
+++ b/core/test/src/mill/main/MainTests.scala
@@ -14,8 +14,10 @@ object MainTests extends TestSuite{
     val expected = expected0.map(_.map(_(module)))
     val resolved = for{
       selectors <- mill.main.ParseArgs(Seq(selectorString)).map(_._1.head)
-      val crossSelectors = selectors.map{case Segment.Cross(x) => x.toList.map(_.toString) case _ => Nil}
-      task <- mill.main.Resolve.resolve(selectors, module, discover, Nil, crossSelectors, Nil)
+      val crossSelectors = selectors._2.value.map{case Segment.Cross(x) => x.toList.map(_.toString) case _ => Nil}
+      task <- mill.main.Resolve.resolve(
+        selectors._2.value.toList, module, discover, Nil, crossSelectors.toList, Nil
+      )
     } yield task
     assert(resolved == expected)
   }
diff --git a/core/test/src/mill/util/ScriptTestSuite.scala b/core/test/src/mill/util/ScriptTestSuite.scala
index 7a963ef9..1aa74de1 100644
--- a/core/test/src/mill/util/ScriptTestSuite.scala
+++ b/core/test/src/mill/util/ScriptTestSuite.scala
@@ -22,7 +22,7 @@ abstract class ScriptTestSuite extends TestSuite{
   def meta(s: String) = {
     val (List(selector), args) = ParseArgs.apply(Seq(s)).right.get
 
-    read(workspacePath / "out" / selector.flatMap(_.pathSegments) / "meta.json")
+    read(workspacePath / "out" / selector._2.value.flatMap(_.pathSegments) / "meta.json")
   }