summaryrefslogtreecommitdiff
path: root/scalaplugin/src/main
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2017-11-23 09:34:00 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2017-11-23 09:34:00 -0800
commit5e37900b677e5c00203bce5d21651ac889de04a4 (patch)
treefec452884e8f630576f174bed1a9f43e2eae85fa /scalaplugin/src/main
parent3a87314737bea39b5d194ad2a9e7a88085011755 (diff)
downloadmill-5e37900b677e5c00203bce5d21651ac889de04a4.tar.gz
mill-5e37900b677e5c00203bce5d21651ac889de04a4.tar.bz2
mill-5e37900b677e5c00203bce5d21651ac889de04a4.zip
unwrap Segments when generating Intellij project files
Diffstat (limited to 'scalaplugin/src/main')
-rw-r--r--scalaplugin/src/main/scala/mill/scalaplugin/GenIdea.scala5
1 files changed, 3 insertions, 2 deletions
diff --git a/scalaplugin/src/main/scala/mill/scalaplugin/GenIdea.scala b/scalaplugin/src/main/scala/mill/scalaplugin/GenIdea.scala
index fd360d8b..56eaf5b2 100644
--- a/scalaplugin/src/main/scala/mill/scalaplugin/GenIdea.scala
+++ b/scalaplugin/src/main/scala/mill/scalaplugin/GenIdea.scala
@@ -1,6 +1,7 @@
package mill.scalaplugin
import ammonite.ops._
+import mill.discover.Mirror.Segment
import mill.discover.{Discovered, Mirror}
import mill.eval.{Evaluator, PathRef}
import mill.util.OSet
@@ -44,7 +45,7 @@ object GenIdea {
".idea"/"modules.xml",
allModulesXmlTemplate(
for((path, mod) <- modules)
- yield path.mkString(".").toLowerCase
+ yield path.collect{case Segment.Label(v) => v}.mkString(".").toLowerCase
)
),
Tuple2(".idea_modules"/"root.iml", rootXmlTemplate())
@@ -80,7 +81,7 @@ object GenIdea {
for(m <- mod.projectDeps)
yield moduleLabels(m).mkString(".").toLowerCase
)
- Tuple2(".idea_modules"/s"${path.mkString(".").toLowerCase}.iml", elem)
+ Tuple2(".idea_modules"/s"${path.collect{case Segment.Label(v) => v}.mkString(".").toLowerCase}.iml", elem)
}
fixedFiles ++ libraries ++ moduleFiles
}