Add test case to catch duplicated items, and fixed the impl

com-lihaoyi · Aug 9, 2024 · ed681b3 · ed681b3
1 parent e51f88f
commit ed681b3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/integration/ide/gen-idea/repo/hello-idea/build.sc b/integration/ide/gen-idea/repo/hello-idea/build.sc
@@ -53,3 +53,7 @@ object moduleD extends JavaModule {
   override def compileModuleDeps = Seq(moduleC)
 }
 object moduleE extends JavaModule
+object moduleF extends JavaModule {
+  override def compileModuleDeps = Seq(moduleC)
+  override def moduleDeps = Seq(moduleB, moduleA)
+}
diff --git a/integration/ide/gen-idea/repo/hello-idea/idea/modules.xml b/integration/ide/gen-idea/repo/hello-idea/idea/modules.xml
@@ -13,6 +13,7 @@
             <module fileurl="file://$PROJECT_DIR$/.idea/mill_modules/modulec.iml" filepath="$PROJECT_DIR$/.idea/mill_modules/modulec.iml"/>
             <module fileurl="file://$PROJECT_DIR$/.idea/mill_modules/moduled.iml" filepath="$PROJECT_DIR$/.idea/mill_modules/moduled.iml"/>
             <module fileurl="file://$PROJECT_DIR$/.idea/mill_modules/modulee.iml" filepath="$PROJECT_DIR$/.idea/mill_modules/modulee.iml"/>
+            <module fileurl="file://$PROJECT_DIR$/.idea/mill_modules/modulef.iml" filepath="$PROJECT_DIR$/.idea/mill_modules/modulef.iml"/>
         </modules>
     </component>
 </project>
diff --git a/scalalib/src/mill/scalalib/internal/ModuleUtils.scala b/scalalib/src/mill/scalalib/internal/ModuleUtils.scala
@@ -36,7 +36,8 @@ object ModuleUtils {
                 throw new BuildScriptException(msg)
               }
               rec(
-                seenModules ++ Seq(cand),
+                if (seenModules.contains(cand)) seenModules
+                else { seenModules ++ Seq(cand) },
                 toAnalyze = ((cand :: trace, deps(cand).toList)) :: (trace, remaining) :: rest
               )
           }