Add the intellijModulePath as empty content url to ensure proper layout

com-lihaoyi · Aug 21, 2023 · 53cebcc · 53cebcc
1 parent 12501c0
commit 53cebcc
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 1 deletion.
diff --git a/idea/src/mill/idea/GenIdeaImpl.scala b/idea/src/mill/idea/GenIdeaImpl.scala
@@ -801,10 +801,12 @@ case class GenIdeaImpl(
       isTest: Boolean,
       facets: Seq[GenIdeaModule.JavaFacet]
   ): Elem = {
+    def relUrl(path: os.Path): String = "file://$MODULE_DIR$/" + relify(path)
+
     <module type="JAVA_MODULE" version={"" + ideaConfigVersion}>
       <component name="NewModuleRootManager">
         {
-      val outputUrl = "file://$MODULE_DIR$/" + relify(compileOutputPath)
+      val outputUrl = relUrl(compileOutputPath)
       if (isTest)
         <output-test url={outputUrl} />
       else
@@ -839,6 +841,13 @@ case class GenIdeaImpl(
                 <sourceFolder url={"file://$MODULE_DIR$/" + rel} type={resourceType} />
               </content>
       }
+    }
+        {
+      // the (potentially empty) content root to denote where a module lives
+      // this is to avoid some strange layout issues
+      // see details at: https://github.com/com-lihaoyi/mill/pull/2638#issuecomment-1685229512
+      <content url={relUrl(basePath)}>
+        </content>
     }
         <orderEntry type="inheritedJdk" />
         <orderEntry type="sourceFolder" forTests="false" />

diff --git a/integration/feature/gen-idea/repo/extended/idea/mill_modules/helloworld.iml b/integration/feature/gen-idea/repo/extended/idea/mill_modules/helloworld.iml
@@ -11,6 +11,7 @@
         <content url="file://$MODULE_DIR$/../../HelloWorld/resources">
             <sourceFolder url="file://$MODULE_DIR$/../../HelloWorld/resources" type="java-resource"/>
         </content>
+        <content url="file://$MODULE_DIR$/../../HelloWorld"> </content>
         <orderEntry type="inheritedJdk"/>
         <orderEntry type="sourceFolder" forTests="false"/>
         <orderEntry type="library" name="scala-library-2.13.6.jar" level="project"/>

diff --git a/integration/feature/gen-idea/repo/extended/idea/mill_modules/helloworld.subscala3.iml b/integration/feature/gen-idea/repo/extended/idea/mill_modules/helloworld.subscala3.iml
@@ -8,6 +8,7 @@
         <content url="file://$MODULE_DIR$/../../HelloWorld/subScala3/resources">
             <sourceFolder url="file://$MODULE_DIR$/../../HelloWorld/subScala3/resources" type="java-resource"/>
         </content>
+        <content url="file://$MODULE_DIR$/../../HelloWorld/subScala3"> </content>
         <orderEntry type="inheritedJdk"/>
         <orderEntry type="sourceFolder" forTests="false"/>
         <orderEntry type="library" name="scala-library-2.13.6.jar" level="project"/>

diff --git a/integration/feature/gen-idea/repo/extended/idea/mill_modules/helloworld.test.iml b/integration/feature/gen-idea/repo/extended/idea/mill_modules/helloworld.test.iml
@@ -8,6 +8,7 @@
         <content url="file://$MODULE_DIR$/../../HelloWorld/test/resources">
             <sourceFolder url="file://$MODULE_DIR$/../../HelloWorld/test/resources" type="java-test-resource"/>
         </content>
+        <content url="file://$MODULE_DIR$/../../HelloWorld/test"> </content>
         <orderEntry type="inheritedJdk"/>
         <orderEntry type="sourceFolder" forTests="false"/>
         <orderEntry type="module" module-name="helloworld" exported=""/>

diff --git a/integration/feature/gen-idea/repo/extended/idea/mill_modules/mill-build.iml b/integration/feature/gen-idea/repo/extended/idea/mill_modules/mill-build.iml
@@ -14,6 +14,7 @@
         <content url="file://$MODULE_DIR$/../../mill-build/resources">
             <sourceFolder url="file://$MODULE_DIR$/../../mill-build/resources" type="java-resource"/>
         </content>
+        <content url="file://$MODULE_DIR$/../.."> </content>
         <orderEntry type="inheritedJdk"/>
         <orderEntry type="sourceFolder" forTests="false"/>
 <!-- IGNORE -->

diff --git a/integration/feature/gen-idea/repo/extended/idea/mill_modules/mill-build.mill-build.iml b/integration/feature/gen-idea/repo/extended/idea/mill_modules/mill-build.mill-build.iml
@@ -8,6 +8,7 @@
         <content url="file://$MODULE_DIR$/../../mill-build/build.sc">
             <sourceFolder url="file://$MODULE_DIR$/../../mill-build/build.sc" isTestSource="false"/>
         </content>
+        <content url="file://$MODULE_DIR$/../../mill-build"> </content>
         <orderEntry type="inheritedJdk"/>
         <orderEntry type="sourceFolder" forTests="false"/>
 <!-- IGNORE -->

diff --git a/integration/feature/gen-idea/repo/hello-world/idea/mill_modules/helloworld.iml b/integration/feature/gen-idea/repo/hello-world/idea/mill_modules/helloworld.iml
@@ -8,6 +8,7 @@
         <content url="file://$MODULE_DIR$/../../HelloWorld/resources">
             <sourceFolder url="file://$MODULE_DIR$/../../HelloWorld/resources" type="java-resource"/>
         </content>
+        <content url="file://$MODULE_DIR$/../../HelloWorld"> </content>
         <orderEntry type="inheritedJdk"/>
         <orderEntry type="sourceFolder" forTests="false"/>
         <orderEntry type="library" name="scala-library-2.12.5.jar" level="project"/>

diff --git a/integration/feature/gen-idea/repo/hello-world/idea/mill_modules/helloworld.test.iml b/integration/feature/gen-idea/repo/hello-world/idea/mill_modules/helloworld.test.iml
@@ -8,6 +8,7 @@
         <content url="file://$MODULE_DIR$/../../HelloWorld/test/resources">
             <sourceFolder url="file://$MODULE_DIR$/../../HelloWorld/test/resources" type="java-test-resource"/>
         </content>
+        <content url="file://$MODULE_DIR$/../../HelloWorld/test"> </content>
         <orderEntry type="inheritedJdk"/>
         <orderEntry type="sourceFolder" forTests="false"/>
         <orderEntry type="module" module-name="helloworld" exported=""/>

diff --git a/integration/feature/gen-idea/repo/hello-world/idea/mill_modules/mill-build.iml b/integration/feature/gen-idea/repo/hello-world/idea/mill_modules/mill-build.iml
@@ -8,6 +8,7 @@
         <content url="file://$MODULE_DIR$/../../build.sc">
             <sourceFolder url="file://$MODULE_DIR$/../../build.sc" isTestSource="false"/>
         </content>
+        <content url="file://$MODULE_DIR$/../.."> </content>
         <orderEntry type="inheritedJdk"/>
         <orderEntry type="sourceFolder" forTests="false"/>
 <!-- IGNORE -->