Remove mill.idea from mill-libs classpath, make it work on broken build.mills (#5012)

lihaoyi · autofix-ci[bot] · web-flow · commit 92d084d98eb2 · 2025-04-28T16:13:12.000+08:00
Fixes #5007 Basically the same thing we did with `mill.bsp`. Also did some minor cleanups to shrink the `mill-libs` classpath further --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
diff --git a/dist/package.mill b/dist/package.mill
@@ -12,7 +12,7 @@ trait InstallModule extends build.MillPublishJavaModule {
   lazy val allPublishModules = build.moduleInternal.modules.collect {
     case m: PublishModule if (m ne build.dist) && (m ne build.dist.native) => m
   }
-  def moduleDeps = Seq(build.runner, build.libs.idea, build.libs.init)
+  def moduleDeps = Seq(build.runner)
 
   def jar = executableRaw()
   def executableRaw: T[PathRef]
@@ -70,7 +70,7 @@ object `package` extends InstallModule {
    */
   object dist0 extends build.MillPublishJavaModule {
     // disable scalafix here because it crashes when a module has no sources
-    def moduleDeps = Seq(build.runner, build.libs.idea)
+    def moduleDeps = Seq(build.runner)
 
     def testTransitiveDeps = build.runner.testTransitiveDeps() ++ Seq(
       build.libs.graphviz.testDep(),
@@ -90,7 +90,6 @@ object `package` extends InstallModule {
       build.contrib.playlib.worker("2.8").testDep(),
       build.contrib.testng.testDep(),
       build.runner.bsp.worker.testDep(),
-      build.libs.idea.testDep(),
       build.testkit.testDep(),
       build.runner.worker.testDep(),
       build.libs.scalalib.worker.testDep(),
diff --git a/integration/ide/build-classpath-contents/src/BuildClasspathContentsTests.scala b/integration/ide/build-classpath-contents/src/BuildClasspathContentsTests.scala
@@ -28,7 +28,6 @@ object BuildClasspathContentsTests extends UtestIntegrationTestSuite {
           "mill-core-define_3.jar",
           "mill-core-util_3.jar",
           "mill-libs-androidlib_3.jar",
-          "mill-libs-idea_3.jar",
           "mill-libs-init_3.jar",
           "mill-libs-javascriptlib_3.jar",
           "mill-libs-kotlinlib-worker_3.jar",
@@ -44,8 +43,7 @@ object BuildClasspathContentsTests extends UtestIntegrationTestSuite {
           "mill-libs-testrunner-entrypoint.jar",
           "mill-libs-testrunner_3.jar",
           "mill-libs_3.jar",
-          "mill-moduledefs_3-0.11.3-M5.jar",
-          "mill-runner-bsp_3.jar"
+          "mill-moduledefs_3-0.11.3-M5.jar"
         )
 
         assert(millPublishedJars == expected)
diff --git a/integration/ide/gen-idea/resources/extended/idea/mill_modules/mill-build.iml b/integration/ide/gen-idea/resources/extended/idea/mill_modules/mill-build.iml
@@ -66,7 +66,6 @@
         <orderEntry type="library" scope="RUNTIME" name="mill-core-resolve_3.jar" level="project"/>
         <orderEntry type="library" name="mill-core-util_3.jar" level="project"/>
         <orderEntry type="library" name="mill-libs-androidlib_3.jar" level="project"/>
-        <orderEntry type="library" name="mill-libs-idea_3.jar" level="project"/>
         <orderEntry type="library" name="mill-libs-init_3.jar" level="project"/>
         <orderEntry type="library" name="mill-libs-javascriptlib_3.jar" level="project"/>
         <orderEntry type="library" name="mill-libs-kotlinlib-worker_3.jar" level="project"/>
@@ -83,7 +82,6 @@
         <orderEntry type="library" name="mill-libs-testrunner_3.jar" level="project"/>
         <orderEntry type="library" name="mill-libs_3.jar" level="project"/>
         <orderEntry type="library" name="mill-moduledefs_3-0.11.3-M5.jar" level="project"/>
-        <orderEntry type="library" name="mill-runner-bsp_3.jar" level="project"/>
         <orderEntry type="library" name="munit_3-0.7.29.jar" level="project"/>
         <orderEntry type="library" name="native-terminal-no-ffm-0.0.9.1.jar" level="project"/>
         <orderEntry type="library" name="os-lib_3-0.11.5-M2.jar" level="project"/>
diff --git a/integration/ide/gen-idea/resources/extended/idea/mill_modules/mill-build.mill-build.iml b/integration/ide/gen-idea/resources/extended/idea/mill_modules/mill-build.mill-build.iml
@@ -65,7 +65,6 @@
         <orderEntry type="library" scope="RUNTIME" name="mill-core-resolve_3.jar" level="project"/>
         <orderEntry type="library" name="mill-core-util_3.jar" level="project"/>
         <orderEntry type="library" name="mill-libs-androidlib_3.jar" level="project"/>
-        <orderEntry type="library" name="mill-libs-idea_3.jar" level="project"/>
         <orderEntry type="library" name="mill-libs-init_3.jar" level="project"/>
         <orderEntry type="library" name="mill-libs-javascriptlib_3.jar" level="project"/>
         <orderEntry type="library" name="mill-libs-kotlinlib-worker_3.jar" level="project"/>
@@ -82,7 +81,6 @@
         <orderEntry type="library" name="mill-libs-testrunner_3.jar" level="project"/>
         <orderEntry type="library" name="mill-libs_3.jar" level="project"/>
         <orderEntry type="library" name="mill-moduledefs_3-0.11.3-M5.jar" level="project"/>
-        <orderEntry type="library" name="mill-runner-bsp_3.jar" level="project"/>
         <orderEntry type="library" name="mill-runner-codesig_3.jar" level="project"/>
         <orderEntry type="library" name="mill-runner-meta_3.jar" level="project"/>
         <orderEntry type="library" name="mill-runner-worker-api_3.jar" level="project"/>
diff --git a/integration/ide/gen-idea/resources/hello-idea/idea/mill_modules/mill-build.iml b/integration/ide/gen-idea/resources/hello-idea/idea/mill_modules/mill-build.iml
@@ -63,7 +63,6 @@
         <orderEntry type="library" scope="RUNTIME" name="mill-core-resolve_3.jar" level="project"/>
         <orderEntry type="library" name="mill-core-util_3.jar" level="project"/>
         <orderEntry type="library" name="mill-libs-androidlib_3.jar" level="project"/>
-        <orderEntry type="library" name="mill-libs-idea_3.jar" level="project"/>
         <orderEntry type="library" name="mill-libs-init_3.jar" level="project"/>
         <orderEntry type="library" name="mill-libs-javascriptlib_3.jar" level="project"/>
         <orderEntry type="library" name="mill-libs-kotlinlib-worker_3.jar" level="project"/>
@@ -80,7 +79,6 @@
         <orderEntry type="library" name="mill-libs-testrunner_3.jar" level="project"/>
         <orderEntry type="library" name="mill-libs_3.jar" level="project"/>
         <orderEntry type="library" name="mill-moduledefs_3-0.11.3-M5.jar" level="project"/>
-        <orderEntry type="library" name="mill-runner-bsp_3.jar" level="project"/>
         <orderEntry type="library" name="native-terminal-no-ffm-0.0.9.1.jar" level="project"/>
         <orderEntry type="library" name="os-lib_3-0.11.5-M2.jar" level="project"/>
         <orderEntry type="library" name="plexus-archiver-4.10.0.jar" level="project"/>
diff --git a/integration/ide/gen-idea/src/GenIdeaExtendedTests.scala b/integration/ide/gen-idea/src/GenIdeaExtendedTests.scala
@@ -16,7 +16,7 @@ object GenIdeaExtendedTests extends UtestIntegrationTestSuite {
       val expectedBase = workspacePath / "idea"
       val resources = os.walk(expectedBase).filter(os.isFile).map(_.subRelativeTo(expectedBase))
 
-      eval("mill.idea/", check = true, stdout = os.Inherit, stderr = os.Inherit)
+      eval("mill.idea.GenIdea/", check = true, stdout = os.Inherit, stderr = os.Inherit)
 
       for (resource <- resources)
         assertIdeaXmlResourceMatchesFile(tester.workspaceSourcePath, workspacePath, resource)
diff --git a/integration/ide/gen-idea/src/GenIdeaTests.scala b/integration/ide/gen-idea/src/GenIdeaTests.scala
@@ -15,7 +15,7 @@ object GenIdeaTests extends UtestIntegrationTestSuite {
       val expectedBase = tester.workspaceSourcePath / "idea"
       val resources = os.walk(expectedBase).filter(os.isFile).map(_.subRelativeTo(expectedBase))
 
-      eval("mill.idea/", check = true, stdout = os.Inherit, stderr = os.Inherit)
+      eval("mill.idea.GenIdea/", check = true, stdout = os.Inherit, stderr = os.Inherit)
 
       for (resource <- resources)
         assertIdeaXmlResourceMatchesFile(tester.workspaceSourcePath, workspacePath, resource)
diff --git a/libs/idea/src/mill/idea/GenIdea.scala b/libs/idea/src/mill/idea/GenIdea.scala
diff --git a/libs/idea/src/mill/idea/package.scala b/libs/idea/src/mill/idea/package.scala
diff --git a/libs/package.mill b/libs/package.mill
@@ -16,8 +16,6 @@ object `package` extends build.MillStableScalaModule {
     build.libs.javascriptlib,
     build.libs.pythonlib,
     build.libs.init,
-    build.libs.idea,
-    build.libs.main,
-    build.runner.bsp
+    build.libs.main
   )
 }
diff --git a/runner/idea/package.mill b/runner/idea/package.mill
@@ -1,4 +1,4 @@
-package build.libs.idea
+package build.runner.idea
 import mill._
 
 object `package` extends build.MillPublishScalaModule {
diff --git a/runner/idea/src/mill/idea/GenIdeaImpl.scala b/runner/idea/src/mill/idea/GenIdeaImpl.scala
@@ -26,9 +26,10 @@ import mill.util.BuildInfo
 import collection.mutable
 import java.net.URL
 import mill.api.internal._
+
 class GenIdeaImpl(
     private val evaluators: Seq[EvaluatorApi]
-)(implicit ctx: TaskCtx) {
+) {
   def transitiveModules(module: ModuleApi): Seq[ModuleApi] = {
     Seq(module) ++ module.moduleDirectChildren.flatMap(transitiveModules)
   }
@@ -43,18 +44,18 @@ class GenIdeaImpl(
     val jdkInfo = extractCurrentJdk(ideaDir / "misc.xml")
       .getOrElse(("JDK_1_8", "1.8 (1)"))
 
-    ctx.log.info("Analyzing modules ...")
+    println("Analyzing modules ...")
     val layout: Seq[(os.SubPath, Node)] =
       xmlFileLayout(evaluators, jdkInfo)
 
-    ctx.log.debug("Cleaning obsolete IDEA project files ...")
+    println("Cleaning obsolete IDEA project files ...")
     os.remove.all(ideaDir / "libraries")
     os.remove.all(ideaDir / "scala_compiler.xml")
     os.remove.all(ideaDir / "mill_modules")
 
-    ctx.log.info(s"Writing ${layout.size} IDEA project files to ${ideaDir} ...")
+    println(s"Writing ${layout.size} IDEA project files to ${ideaDir} ...")
     for ((subPath, xml) <- layout) {
-      ctx.log.debug(s"Writing ${subPath} ...")
+      println(s"Writing ${subPath} ...")
       os.write.over(ideaDir / subPath, pp.format(xml), createFolders = true)
     }
   }
@@ -178,7 +179,7 @@ class GenIdeaImpl(
               s"Config collision in file `${conf.subPath}` and component `${conf.component}`: ${details(
                   conf.config
                 )} vs. ${details(existing)}"
-            ctx.log.error(msg)
+            println(msg)
         }
       }
       result
@@ -495,7 +496,7 @@ class GenIdeaImpl(
           .groupBy(_._1)
           .filter(_._2.size > 1)
       if (map.nonEmpty) {
-        ctx.log.error(
+        println(
           s"Config file collisions detected. Check you `ideaConfigFiles` targets. Colliding files: ${map
               .map(_._1)}. All project files: ${map}"
         )
diff --git a/runner/package.mill b/runner/package.mill
@@ -92,6 +92,7 @@ object `package` extends build.MillPublishScalaModule {
     build.Deps.fansi
   )
   def moduleDeps = Seq(
+    build.runner.idea,
     build.runner.bsp,
     build.runner.bsp.worker,
     build.core.eval,
diff --git a/runner/src/mill/runner/MillMain.scala b/runner/src/mill/runner/MillMain.scala
@@ -335,6 +335,15 @@ object MillMain {
                           ).result
                       )
 
+                      (true, RunnerState(None, Nil, None))
+                    } else if (
+                      config.leftoverArgs.value == Seq("mill.idea.GenIdea/idea") ||
+                      config.leftoverArgs.value == Seq("mill.idea.GenIdea/")
+                    ) {
+                      val runnerState = runMillBootstrap(false, None, Seq("version"), streams)
+                      new mill.idea.GenIdeaImpl(
+                        runnerState.result.frames.flatMap(_.evaluator)
+                      ).run()
                       (true, RunnerState(None, Nil, None))
                     } else {
                       // When starting a --watch, clear the `mill-selective-execution.json`

Original file line number	Diff line number	Diff line change
@@ -16,8 +16,6 @@ object `package` extends build.MillStableScalaModule {
`16`	`16`	`build.libs.javascriptlib,`
`17`	`17`	`build.libs.pythonlib,`
`18`	`18`	`build.libs.init,`
`19`		`- build.libs.idea,`
`20`		`- build.libs.main,`
`21`		`- build.runner.bsp`
	`19`	`+ build.libs.main`
`22`	`20`	`)`
`23`	`21`	`}`