From efc073009550976814b750aa5436b1cda1d8ef5b Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Mon, 25 Dec 2017 18:42:35 -0800 Subject: WIP: provide Mapping as a Ctx argument that can be accessed from within Tasks, for usage within `GenIdea` and similar --- scalaplugin/src/main/scala/mill/scalaplugin/GenIdea.scala | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'scalaplugin/src/main') diff --git a/scalaplugin/src/main/scala/mill/scalaplugin/GenIdea.scala b/scalaplugin/src/main/scala/mill/scalaplugin/GenIdea.scala index 07a9e998..86e33d8d 100644 --- a/scalaplugin/src/main/scala/mill/scalaplugin/GenIdea.scala +++ b/scalaplugin/src/main/scala/mill/scalaplugin/GenIdea.scala @@ -16,20 +16,19 @@ object GenIdea { val workspacePath = pwd / 'out - val evaluator = new Evaluator(workspacePath, mapping.value, new PrintLogger(true)) + val evaluator = new Evaluator(workspacePath, mapping, new PrintLogger(true)) for((relPath, xml) <- xmlFileLayout(mapping, evaluator)){ write.over(pwd/relPath, pp.format(xml)) } } - def xmlFileLayout[T](mapping: Discovered.Mapping[T], - evaluator: Evaluator): Seq[(RelPath, scala.xml.Node)] = { + def xmlFileLayout[T](evaluator: Evaluator): Seq[(RelPath, scala.xml.Node)] = { val modules = Mirror - .traverse(mapping.base, mapping.mirror){ (h, p) => - h.node(mapping.base, p.reverse.map{case Mirror.Segment.Cross(vs) => vs.toList case _ => Nil}.toList) match { + .traverse(evaluator.mapping.base, evaluator.mapping.mirror){ (h, p) => + h.node(evaluator.mapping.base, p.reverse.map{case Mirror.Segment.Cross(vs) => vs.toList case _ => Nil}.toList) match { case m: ScalaModule => Seq(p -> m) case _ => Nil } -- cgit v1.2.3