7 files changed, 26 insertions, 15 deletions
diff --git a/scalalib/test/resources/gen-idea-hello-world/build.sc b/scalalib/test/resources/gen-idea-hello-world/build.sc
new file mode 100644
index 00000000..53cd26a9
--- /dev/null
+++ b/scalalib/test/resources/gen-idea-hello-world/build.sc
@@ -0,0 +1,11 @@
+import mill.scalalib
+import $ivy.`com.lihaoyi::mill-contrib-buildinfo:0.4.0`
+
+trait HelloWorldModule extends scalalib.ScalaModule {
+  def scalaVersion = "2.12.4"
+  object test extends super.Tests {
+    def testFrameworks = Seq("utest.runner.Framework")
+  }
+}
+
+object HelloWorld extends HelloWorldModule
diff --git a/scalalib/test/resources/gen-idea/idea/libraries/scala-library-2.12.4.jar.xml b/scalalib/test/resources/gen-idea-hello-world/idea/libraries/scala-library-2.12.4.jar.xml
index 5f7c5056..5f7c5056 100644
--- a/scalalib/test/resources/gen-idea/idea/libraries/scala-library-2.12.4.jar.xml
+++ b/scalalib/test/resources/gen-idea-hello-world/idea/libraries/scala-library-2.12.4.jar.xml
diff --git a/scalalib/test/resources/gen-idea/idea/misc.xml b/scalalib/test/resources/gen-idea-hello-world/idea/misc.xml
index 2726692f..2726692f 100644
--- a/scalalib/test/resources/gen-idea/idea/misc.xml
+++ b/scalalib/test/resources/gen-idea-hello-world/idea/misc.xml
diff --git a/scalalib/test/resources/gen-idea/idea/modules.xml b/scalalib/test/resources/gen-idea-hello-world/idea/modules.xml
index d6334ea3..193fa62d 100644
--- a/scalalib/test/resources/gen-idea/idea/modules.xml
+++ b/scalalib/test/resources/gen-idea-hello-world/idea/modules.xml
@@ -2,8 +2,8 @@
     <component name="ProjectModuleManager">
         <modules>
             <module fileurl="file://$PROJECT_DIR$/.idea_modules/mill-build.iml" filepath="$PROJECT_DIR$/.idea_modules/mill-build.iml"/>
-            <module fileurl="file://$PROJECT_DIR$/.idea_modules/.iml" filepath="$PROJECT_DIR$/.idea_modules/.iml"/>
-            <module fileurl="file://$PROJECT_DIR$/.idea_modules/test.iml" filepath="$PROJECT_DIR$/.idea_modules/test.iml"/>
+            <module fileurl="file://$PROJECT_DIR$/.idea_modules/helloworld.iml" filepath="$PROJECT_DIR$/.idea_modules/helloworld.iml"/>
+            <module fileurl="file://$PROJECT_DIR$/.idea_modules/helloworld.test.iml" filepath="$PROJECT_DIR$/.idea_modules/helloworld.test.iml"/>
         </modules>
     </component>
 </project>
diff --git a/scalalib/test/resources/gen-idea/idea_modules/iml b/scalalib/test/resources/gen-idea-hello-world/idea_modules/helloworld.iml
index 13e8daf7..38ea17be 100644
--- a/scalalib/test/resources/gen-idea/idea_modules/iml
+++ b/scalalib/test/resources/gen-idea-hello-world/idea_modules/helloworld.iml
@@ -1,12 +1,12 @@
 <module type="JAVA_MODULE" version="4">
     <component name="NewModuleRootManager">
-        <output url="file://$MODULE_DIR$/../target/workspace/mill/scalalib/GenIdeaTests/helloWorldEvaluator/compile/dest/classes"/>
+        <output url="file://$MODULE_DIR$/../target/workspace/gen-idea-hello-world/out/HelloWorld/compile/dest/classes"/>
         <exclude-output/>
-        <content url="file://$MODULE_DIR$/../target/workspace/mill/scalalib/GenIdeaTests/helloWorldEvaluator/generatedSources/dest"/>
-        <content url="file://$MODULE_DIR$/../target/workspace/gen-idea">
-            <sourceFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea/src" isTestSource="false"/>
-            <sourceFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea/resources" type="java-resource"/>
-            <excludeFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea/target"/>
+        <content url="file://$MODULE_DIR$/../target/workspace/gen-idea-hello-world/out/HelloWorld/generatedSources/dest"/>
+        <content url="file://$MODULE_DIR$/../target/workspace/gen-idea-hello-world/HelloWorld">
+            <sourceFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea-hello-world/HelloWorld/src" isTestSource="false"/>
+            <sourceFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea-hello-world/HelloWorld/resources" type="java-resource"/>
+            <excludeFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea-hello-world/HelloWorld/target"/>
         </content>
         <orderEntry type="inheritedJdk"/>
         <orderEntry type="sourceFolder" forTests="false"/>
diff --git a/scalalib/test/resources/gen-idea/idea_modules/test.iml b/scalalib/test/resources/gen-idea-hello-world/idea_modules/helloworld.test.iml
index aecae2e3..bfe0ff3c 100644
--- a/scalalib/test/resources/gen-idea/idea_modules/test.iml
+++ b/scalalib/test/resources/gen-idea-hello-world/idea_modules/helloworld.test.iml
@@ -1,18 +1,18 @@
 <module type="JAVA_MODULE" version="4">
     <component name="NewModuleRootManager">
-        <output-test url="file://$MODULE_DIR$/../target/workspace/mill/scalalib/GenIdeaTests/helloWorldEvaluator/test/compile/dest/classes"/>
+        <output-test url="file://$MODULE_DIR$/../target/workspace/gen-idea-hello-world/out/HelloWorld/test/compile/dest/classes"/>
         <exclude-output/>
-        <content url="file://$MODULE_DIR$/../target/workspace/mill/scalalib/GenIdeaTests/helloWorldEvaluator/test/generatedSources/dest"/>
-        <content url="file://$MODULE_DIR$/../target/workspace/gen-idea/test">
-            <sourceFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea/test/src" isTestSource="true"/>
-            <sourceFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea/test/resources" type="java-test-resource"/>
-            <excludeFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea/test/target"/>
+        <content url="file://$MODULE_DIR$/../target/workspace/gen-idea-hello-world/out/HelloWorld/test/generatedSources/dest"/>
+        <content url="file://$MODULE_DIR$/../target/workspace/gen-idea-hello-world/HelloWorld/test">
+            <sourceFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea-hello-world/HelloWorld/test/src" isTestSource="true"/>
+            <sourceFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea-hello-world/HelloWorld/test/resources" type="java-test-resource"/>
+            <excludeFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea-hello-world/HelloWorld/test/target"/>
         </content>
         <orderEntry type="inheritedJdk"/>
         <orderEntry type="sourceFolder" forTests="false"/>
         <orderEntry type="library" name="scala-sdk-2.12.4" level="application"/>
         <orderEntry type="library" name="scala-library-2.12.4-sources.jar" level="project"/>
         <orderEntry type="library" name="scala-library-2.12.4.jar" level="project"/>
-        <orderEntry type="module" module-name="" exported=""/>
+        <orderEntry type="module" module-name="helloworld" exported=""/>
     </component>
 </module>
diff --git a/scalalib/test/resources/gen-idea/idea_modules/mill-build.iml b/scalalib/test/resources/gen-idea-hello-world/idea_modules/mill-build.iml
index 46fd8c3b..46fd8c3b 100644
--- a/scalalib/test/resources/gen-idea/idea_modules/mill-build.iml
+++ b/scalalib/test/resources/gen-idea-hello-world/idea_modules/mill-build.iml