diff options
| author | Li Haoyi <haoyi.sg@gmail.com> | 2018-01-14 13:26:29 -0800 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-01-14 13:26:29 -0800 |
| commit | 298d18bda6a9f6e795ac9b9e4c2eca50aa9118fe (patch) | |
| tree | 1facc8641a42cad9654cc5df90bcbd26ff0b9827 | |
| parent | 04e752ec47a39af20c66dc05e731399afd99a1cc (diff) | |
| download | mill-298d18bda6a9f6e795ac9b9e4c2eca50aa9118fe.tar.gz mill-298d18bda6a9f6e795ac9b9e4c2eca50aa9118fe.tar.bz2 mill-298d18bda6a9f6e795ac9b9e4c2eca50aa9118fe.zip | |
More fixes for `GenIdea` dealing with nested modules
| -rw-r--r-- | core/src/main/scala/mill/define/Module.scala | 2 | ||||
| -rw-r--r-- | scalalib/src/main/scala/mill/scalalib/GenIdea.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/src/main/scala/mill/define/Module.scala b/core/src/main/scala/mill/define/Module.scala index b690d7c2..0236ac5a 100644 --- a/core/src/main/scala/mill/define/Module.scala +++ b/core/src/main/scala/mill/define/Module.scala @@ -21,7 +21,7 @@ class Module(implicit parentCtx0: mill.define.Ctx) extends mill.moduledefs.Cache rec(this) } - lazy val segmentsToModules = traverse{m => Seq(m.parentCtx.segments -> m)} + lazy val segmentsToModules = traverse{m => Seq(m.millModuleSegments -> m)} .toMap lazy val modules = this.reflectNestedObjects[Module] diff --git a/scalalib/src/main/scala/mill/scalalib/GenIdea.scala b/scalalib/src/main/scala/mill/scalalib/GenIdea.scala index 2dd972d7..499e2589 100644 --- a/scalalib/src/main/scala/mill/scalalib/GenIdea.scala +++ b/scalalib/src/main/scala/mill/scalalib/GenIdea.scala @@ -27,7 +27,7 @@ object GenIdea { def xmlFileLayout[T](evaluator: Evaluator[T], rootModule: mill.Module): Seq[(RelPath, scala.xml.Node)] = { - val modules = rootModule.modules.collect{case x: scalalib.Module => (x.millModuleSegments, x)}.toSeq + val modules = rootModule.segmentsToModules.values.collect{case x: scalalib.Module => (x.millModuleSegments, x)}.toSeq val resolved = for((path, mod) <- modules) yield { val Seq(resolvedCp: Loose.Agg[PathRef], resolvedSrcs: Loose.Agg[PathRef]) = |