First pass at providing new pretty-prints for build `Module`s/`Target`s/`Cross`s in the Mill REPL, making use of `sourcecode.*` values captured and definition-site and contextual information made available in the build `Mirror`

8 files changed, 22 insertions, 17 deletions

diff --git a/core/src/test/scala/mill/define/GraphTests.scala b/core/src/test/scala/mill/define/GraphTests.scala
index d17f125f..a850a0d2 100644
--- a/core/src/test/scala/mill/define/GraphTests.scala
+++ b/core/src/test/scala/mill/define/GraphTests.scala
@@ -157,7 +157,7 @@ object GraphTests extends TestSuite{
           Graph.transitiveTargets(OSet.from(goals))
         )
         val grouped = Graph.groupAroundImportantTargets(topoSorted) {
-          case t: NamedTask[Any] if mapping.modules.contains(t.owner) => t
+          case t: NamedTask[Any] if mapping.modulesToPaths.contains(t.owner) => t
           case t if goals.contains(t) => t
         }
         grouped.keyCount
diff --git a/core/src/test/scala/mill/discover/CrossModuleTests.scala b/core/src/test/scala/mill/discover/CrossModuleTests.scala
index 99d33800..e0a7a1a0 100644
--- a/core/src/test/scala/mill/discover/CrossModuleTests.scala
+++ b/core/src/test/scala/mill/discover/CrossModuleTests.scala
@@ -77,14 +77,14 @@ object CrossModuleTests extends TestSuite{
 
       val discovered = Discovered.mapping(singleCross)
 
-      val segments = discovered.targets.values.toSet
+      val segments = discovered.targetsToSegments.values.toSet
       val expectedSegments = Set(
         List(Label("cross"), Segment.Cross(List("210")), Label("suffix")),
         List(Label("cross"), Segment.Cross(List("211")), Label("suffix")),
         List(Label("cross"), Segment.Cross(List("212")), Label("suffix"))
       )
       assert(segments == expectedSegments)
-      val targets = discovered.targets.keys.toSet
+      val targets = discovered.targetsToSegments.keys.toSet
       val expected = Set(
         singleCross.cross("210").suffix,
         singleCross.cross("211").suffix,
@@ -95,7 +95,7 @@ object CrossModuleTests extends TestSuite{
 
     'doubleCrossTargetDiscovery - {
       val discovered = Discovered.mapping(doubleCross)
-      val targets = discovered.targets.keys.toSet
+      val targets = discovered.targetsToSegments.keys.toSet
 
       val expected = Set(
         doubleCross.cross("jvm", "210").suffix,
@@ -110,7 +110,7 @@ object CrossModuleTests extends TestSuite{
     }
 
     'nestedCrosses - {
-      val discovered = Discovered.mapping(nestedCrosses).targets
+      val discovered = Discovered.mapping(nestedCrosses).targetsToSegments
       assert(discovered.size == 9)
     }
   }
diff --git a/core/src/test/scala/mill/discover/DiscoveredTests.scala b/core/src/test/scala/mill/discover/DiscoveredTests.scala
index 8501f4cc..1a22e901 100644
--- a/core/src/test/scala/mill/discover/DiscoveredTests.scala
+++ b/core/src/test/scala/mill/discover/DiscoveredTests.scala
@@ -26,7 +26,7 @@ object DiscoveredTests extends TestSuite{
       )
       assert(flattenedHierarchy == expectedHierarchy)
 
-      val mapped = discovered.targets.map(_.swap)
+      val mapped = discovered.targetsToSegments.map(_.swap)
 
       val expected = Seq(
         (List(Label("classInstance"), Label("single")), nestedModule.classInstance.single),
@@ -38,7 +38,7 @@ object DiscoveredTests extends TestSuite{
 
     'traitWithModule - {
       val discovered = Discovered.mapping(TraitWithModuleObject)
-      val mapped = discovered.targets.map(_.swap)
+      val mapped = discovered.targetsToSegments.map(_.swap)
       val expected = Map(
         (
           List(Label("TraitModule"), Label("testFramework")),
diff --git a/core/src/test/scala/mill/discover/LabelingTests.scala b/core/src/test/scala/mill/discover/LabelingTests.scala
index 71c6a6bf..595d3ad9 100644
--- a/core/src/test/scala/mill/discover/LabelingTests.scala
+++ b/core/src/test/scala/mill/discover/LabelingTests.scala
@@ -16,7 +16,7 @@ object LabelingTests extends TestSuite{
       def check(mapping: Discovered.Mapping[_], t: Task[_], relPath: Option[String]) = {
 
 
-        val names: Seq[(Task[_], Seq[Mirror.Segment])] = mapping.targets.toSeq
+        val names: Seq[(Task[_], Seq[Mirror.Segment])] = mapping.targetsToSegments.toSeq
         val nameMap = names.toMap
 
         val targetLabel = nameMap.get(t).map(_.map{case Label(v) => v}.mkString("."))
diff --git a/core/src/test/scala/mill/eval/JavaCompileJarTests.scala b/core/src/test/scala/mill/eval/JavaCompileJarTests.scala
index 5ddbb68e..ca317a06 100644
--- a/core/src/test/scala/mill/eval/JavaCompileJarTests.scala
+++ b/core/src/test/scala/mill/eval/JavaCompileJarTests.scala
@@ -58,7 +58,7 @@ object JavaCompileJarTests extends TestSuite{
           Right(Tuple2(
             evaluated.rawValues(0).asInstanceOf[Result.Success[T]].value,
             evaluated.evaluated.collect{
-              case t: Target[_] if mapping.targets.contains(t) => t
+              case t: Target[_] if mapping.targetsToSegments.contains(t) => t
               case t: mill.define.Command[_] => t
             }.size
           ))
@@ -73,7 +73,7 @@ object JavaCompileJarTests extends TestSuite{
         val evaluated = evaluator.evaluate(targets)
           .evaluated
           .flatMap(_.asTarget)
-          .filter(mapping.targets.contains)
+          .filter(mapping.targetsToSegments.contains)
           .filter(!_.isInstanceOf[Input[_]])
         assert(evaluated == expected)
       }
diff --git a/core/src/test/scala/mill/util/TestEvaluator.scala b/core/src/test/scala/mill/util/TestEvaluator.scala
index 646ca418..f18cfabf 100644
--- a/core/src/test/scala/mill/util/TestEvaluator.scala
+++ b/core/src/test/scala/mill/util/TestEvaluator.scala
@@ -18,7 +18,7 @@ class TestEvaluator(mapping: Discovered.Mapping[_],
         Tuple2(
           evaluated.rawValues.head.asInstanceOf[Result.Success[T]].value,
           evaluated.evaluated.collect {
-            case t: Target[_] if mapping.targets.contains(t) && !t.isInstanceOf[Input[_]] => t
+            case t: Target[_] if mapping.targetsToSegments.contains(t) && !t.isInstanceOf[Input[_]] => t
             case t: mill.define.Command[_]           => t
           }.size
         ))
diff --git a/core/src/test/scala/mill/util/TestGraphs.scala b/core/src/test/scala/mill/util/TestGraphs.scala
index 0f2c769f..25c806fa 100644
--- a/core/src/test/scala/mill/util/TestGraphs.scala
+++ b/core/src/test/scala/mill/util/TestGraphs.scala
@@ -92,7 +92,10 @@ class TestGraphs(){
     val e = {
       val c = test.anon(a)
       val d = test.anon(a)
-      test(test.anon(test.anon(), test.anon(c)), test.anon(test.anon(c, test.anon(d, b))))
+      test(
+        test.anon(test.anon(), test.anon(c)),
+        test.anon(test.anon(c, test.anon(d, b)))
+      )
     }
     val f = test(test.anon(test.anon(), test.anon(e)))
 
diff --git a/core/src/test/scala/mill/util/TestUtil.scala b/core/src/test/scala/mill/util/TestUtil.scala
index b1e37481..0d28fcf6 100644
--- a/core/src/test/scala/mill/util/TestUtil.scala
+++ b/core/src/test/scala/mill/util/TestUtil.scala
@@ -36,14 +36,16 @@ object TestUtil {
     * test how changes propagate.
     */
   class TestTarget(inputs: Seq[Task[Int]],
-             val pure: Boolean)
-            (implicit enclosing0: sourcecode.Enclosing,
-             owner0: Caller[mill.Module],
-             name0: sourcecode.Name,
-             o: Overrides)
+                   val pure: Boolean)
+                  (implicit enclosing0: sourcecode.Enclosing,
+                   lineNum0: sourcecode.Line,
+                   owner0: Caller[mill.Module],
+                   name0: sourcecode.Name,
+                   o: Overrides)
     extends Test(inputs) with Target[Int]{
     val overrides = o.value
     val enclosing = enclosing0.value
+    val lineNum = lineNum0.value
     val owner = owner0.value
     val name = name0.value
     val readWrite = upickle.default.IntRW