diff options
| author | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-06 22:15:37 -0800 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-06 22:42:21 -0800 |
| commit | bb4f2691f26f20dd8e6bdc1108eef9a83af0944e (patch) | |
| tree | e81661dcfe7a9792fadca2269ec22f61bd1fbf2b /core | |
| parent | b97acb6f671502f57134932d0e7908e333b7cbbe (diff) | |
| parent | 3eaa2a12bbe6ee4ecf6d8f839b60f2e000c4d1a1 (diff) | |
| download | mill-bb4f2691f26f20dd8e6bdc1108eef9a83af0944e.tar.gz mill-bb4f2691f26f20dd8e6bdc1108eef9a83af0944e.tar.bz2 mill-bb4f2691f26f20dd8e6bdc1108eef9a83af0944e.zip | |
Merge branch 'master' of github.com:lihaoyi/mill
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/mill/define/BaseModule.scala | 1 | ||||
| -rw-r--r-- | core/src/mill/main/MainRunner.scala | 1 | ||||
| -rw-r--r-- | core/src/mill/main/ReplApplyHandler.scala | 4 |
3 files changed, 2 insertions, 4 deletions
diff --git a/core/src/mill/define/BaseModule.scala b/core/src/mill/define/BaseModule.scala index a449a6a0..ad138a0b 100644 --- a/core/src/mill/define/BaseModule.scala +++ b/core/src/mill/define/BaseModule.scala @@ -70,7 +70,6 @@ class TargetScopt[T, M <: BaseModule](rootModule: M, d: => Discover[M]) } mill.main.Resolve.resolve(segments.value.toList, externalRootModule, d, Nil, crossSelectors.toList, Nil) case (None, segments) => - rootModule.millInternal.segmentsToModules(segments).asInstanceOf[T] val crossSelectors = segments.value.map { case mill.define.Segment.Cross(x) => x.toList.map(_.toString) case _ => Nil diff --git a/core/src/mill/main/MainRunner.scala b/core/src/mill/main/MainRunner.scala index e312aa7a..e3820e3d 100644 --- a/core/src/mill/main/MainRunner.scala +++ b/core/src/mill/main/MainRunner.scala @@ -99,7 +99,6 @@ class MainRunner(config: ammonite.main.Cli.Config, | // even if it does nothing... | def $$main() = Iterator[String]() | - | implicit def millScoptReads = new mill.main.ModuleScopt(this, millDiscover) | implicit def millDiscover: mill.define.Discover[this.type] = mill.define.Discover[this.type] | // Need to wrap the returned Module in Some(...) to make sure it | // doesn't get picked up during reflective child-module discovery diff --git a/core/src/mill/main/ReplApplyHandler.scala b/core/src/mill/main/ReplApplyHandler.scala index 33013e2d..5a84c344 100644 --- a/core/src/mill/main/ReplApplyHandler.scala +++ b/core/src/mill/main/ReplApplyHandler.scala @@ -82,8 +82,8 @@ class ReplApplyHandler(pprinter0: pprint.PPrinter, (if (m.millInternal.reflect[mill.Module].isEmpty) Nil else ctx.applyPrefixColor("\nChildren:").toString +: - m.millInternal.reflect[mill.Module].map("\n ." + _.millOuterCtx.segments.render)) ++ - (evaluator.discover.value.get(m.getClass) match{ + m.millInternal.reflect[mill.Module].map("\n ." + _.millOuterCtx.segment.pathSegments.mkString("."))) ++ + (evaluator.discover.value.get(m.getClass) match{ case None => Nil case Some(commands) => ctx.applyPrefixColor("\nCommands:").toString +: commands.map{c => |