Add exclusions defined by excluded.folders property also to

ParentProject .iml descriptor. Fixes #47.
mpeltonen · Feb 21, 2011 · eee2ca5 · eee2ca5
1 parent b7a75ea
commit eee2ca5
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 3 deletions.
diff --git a/sbt-idea-core/src/main/scala/ParentProjectIdeaModuleDescriptor.scala b/sbt-idea-core/src/main/scala/ParentProjectIdeaModuleDescriptor.scala
@@ -8,13 +8,21 @@ import sbt._
 import xml.Node
 
 class ParentProjectIdeaModuleDescriptor(val project: ParentProject, val log: Logger) extends SaveableXml with ProjectPaths {
+  val env = new IdeaEnvironment(project.rootProject)
   val path = String.format("%s/%s.iml", projectPath, project.name)
 
   def content: Node =
    <module type="JAVA_MODULE" version="4">
       <component name="NewModuleRootManager" inherit-compiler-output="true">
         <exclude-output />
-        <content url="file://$MODULE_DIR$" />
+        <content url="file://$MODULE_DIR$">
+          {
+            env.excludedFolders.value.split(",").toList.map(_.trim).sort(_ < _).map { entry =>
+              log.info(String.format("Excluding folder %s\n", entry))
+              <excludeFolder url={String.format("file://$MODULE_DIR$/%s", entry)} />
+            }
+          }
+        </content>
         <orderEntry type="inheritedJdk" />
         <orderEntry type="sourceFolder" forTests="false" />
       </component>

diff --git a/sbt-idea-tests/src/sbt-test/idea-plugin/multi-module/project/idea.properties b/sbt-idea-tests/src/sbt-test/idea-plugin/multi-module/project/idea.properties
@@ -0,0 +1 @@
+excluded.folders=target,.idea
diff --git a/sbt-idea-tests/src/sbt-test/idea-plugin/multi-module/scripted-test.iml.expected b/sbt-idea-tests/src/sbt-test/idea-plugin/multi-module/scripted-test.iml.expected
@@ -1,8 +1,11 @@
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$MODULE_DIR$" />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.idea" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
+</module>
diff --git a/sbt-idea-tests/src/sbt-test/idea-plugin/multi-module/subproject1/subproject1.iml.expected b/sbt-idea-tests/src/sbt-test/idea-plugin/multi-module/subproject1/subproject1.iml.expected
@@ -14,6 +14,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/scala" isTestSource="false"/>
       <sourceFolder url="file://$MODULE_DIR$/src/test/scala" isTestSource="true"/>
+      <excludeFolder url="file://$MODULE_DIR$/.idea"/>
       <excludeFolder url="file://$MODULE_DIR$/target"/>
     </content>
     <orderEntry type="inheritedJdk"/>

diff --git a/sbt-idea-tests/src/sbt-test/idea-plugin/multi-module/subproject2/subproject2.iml.expected b/sbt-idea-tests/src/sbt-test/idea-plugin/multi-module/subproject2/subproject2.iml.expected
@@ -13,6 +13,7 @@
     <exclude-output></exclude-output>
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/scala" isTestSource="false"/>
+      <excludeFolder url="file://$MODULE_DIR$/.idea"/>
       <excludeFolder url="file://$MODULE_DIR$/target"/>
     </content>
     <orderEntry type="inheritedJdk"/>