summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-02-09 23:42:36 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2018-02-09 23:42:36 -0800
commit9fe80b1f7e45e9cf6dc1f2a6586c4285e3e6103e (patch)
tree86bff40a55e2eba6afe142af0a5840084a16cc7e /core
parent79ac10f8d8f093477e2f96e9624be40a1d894d53 (diff)
downloadmill-9fe80b1f7e45e9cf6dc1f2a6586c4285e3e6103e.tar.gz
mill-9fe80b1f7e45e9cf6dc1f2a6586c4285e3e6103e.tar.bz2
mill-9fe80b1f7e45e9cf6dc1f2a6586c4285e3e6103e.zip
- DRY up `Resolve.scala`
- Add a version of `Resolve` that resolves names only, but works on entrypoints/etc. without needing arguments - Fix tests to compile with new `multiSelect` parsing flag
Diffstat (limited to 'core')
-rw-r--r--core/src/mill/define/Module.scala6
1 files changed, 4 insertions, 2 deletions
diff --git a/core/src/mill/define/Module.scala b/core/src/mill/define/Module.scala
index bfc15191..93537f76 100644
--- a/core/src/mill/define/Module.scala
+++ b/core/src/mill/define/Module.scala
@@ -6,13 +6,15 @@ import ammonite.ops.Path
import scala.language.experimental.macros
import scala.reflect.ClassTag
+
/**
* `Module` is a class meant to be extended by `trait`s *only*, in order to
* propagate the implicit parameters forward to the final concrete
* instantiation site so they can capture the enclosing/line information of
* the concrete instance.
*/
-class Module(implicit outerCtx0: mill.define.Ctx) extends mill.moduledefs.Cacher{ outer =>
+class Module(implicit outerCtx0: mill.define.Ctx)
+ extends mill.moduledefs.Cacher{ outer =>
/**
* Miscellaneous machinery around traversing & querying the build hierarchy,
@@ -20,7 +22,7 @@ class Module(implicit outerCtx0: mill.define.Ctx) extends mill.moduledefs.Cacher
*/
object millInternal extends Module.Internal(this)
- lazy val millModuleDirectChildren = millInternal.reflectNestedObjects[Module]
+ lazy val millModuleDirectChildren = millInternal.reflectNestedObjects[Module].toSeq
def millOuterCtx = outerCtx0
def millSourcePath: Path = millOuterCtx.millSourcePath / millOuterCtx.segment.pathSegments
implicit def millModuleExternal: Ctx.External = Ctx.External(millOuterCtx.external)