Add a MillBuildModule and improve BSP for build.sc

bsp/src/mill/bsp/MillBuildServer.scala

@@ -360,8 +360,7 @@ class MillBuildServer(
           }
         case (id, module: JavaModule) =>
           T.task {
-            val items = module.sources().map(p => sourceItem(p.path, false)) ++
-              module.generatedSources().map(p => sourceItem(p.path, true))
+            val items = module.allSources().map(p => sourceItem(p.path, false))
             new SourcesItem(id, items.asJava)
           }
       }
@@ -638,7 +637,7 @@ class MillBuildServer(
           case ((msg, cleaned), targetId) =>
             val module = bspModulesById(targetId)
             val mainModule = new MainModule {
-              override implicit def millDiscover: Discover[_] = Discover[this.type]
+              override implicit def millDiscover: Discover[this.type] = Discover[this.type]
             }
             val compileTargetName = (module.millModuleSegments ++ Segments(Label("compile"))).render
             log.debug(s"about to clean: ${compileTargetName}")

build.sc

@@ -174,6 +174,7 @@ object Deps {
   val sourcecode = ivy"com.lihaoyi::sourcecode:0.3.0"
   val upickle = ivy"com.lihaoyi::upickle:2.0.0"
   val utest = ivy"com.lihaoyi::utest:0.7.11"
+  val usingDirectives = ivy"org.virtuslab:using_directives:0.0.10"
   val windowsAnsi = ivy"io.github.alexarchambault.windows-ansi:windows-ansi:0.0.4"
   val zinc = ivy"org.scala-sbt::zinc:1.8.0"
   val bsp = ivy"ch.epfl.scala:bsp4j:2.1.0-M3"
@@ -338,8 +339,7 @@ trait MillModule extends MillApiModule with MillAutoTestSetup with WithMillCompi
     with AcyclicConfig
 
 object main extends MillModule {
-
-  override def moduleDeps = Seq(core, client)
+  override def moduleDeps = Seq(buildfile, core, client)
   override def ivyDeps = Agg(
     Deps.windowsAnsi
   )
@@ -350,6 +350,15 @@ object main extends MillModule {
     "-DMILL_VERSION=" + publishVersion()
   )
 
+  object buildfile extends MillInternalModule {
+    override def moduleDeps = Seq(main.api)
+    override def ivyDeps = Agg(
+      Deps.osLib,
+      Deps.usingDirectives,
+      Deps.upickle
+    )
+  }
+
   object api extends MillApiModule {
     override def ivyDeps = Agg(
       Deps.osLib,

integration/forked-server/src/forked-server-tests.scala

@@ -4,6 +4,7 @@ package forked.server
 object DocAnnotationsTests extends DocAnnotationsTests(fork = true, clientServer = true)
 object HygieneTests extends HygieneTests(fork = true, clientServer = true)
 object LargeProjectTests extends LargeProjectTests(fork = true, clientServer = true)
+object MillBuildModuleTests extends MillBuildModuleTests(fork = true, clientServer = true)
 object MillJvmOptsTests extends MillJvmOptsTests(fork = true, clientServer = true)
 object ScriptsInvalidationTests extends ScriptsInvalidationTests(fork = true, clientServer = true)
 object ScriptsInvalidationForeignTests

integration/forked/src/forked-tests.scala

@@ -4,6 +4,7 @@ package forked
 object DocAnnotationsTests extends DocAnnotationsTests(fork = true, clientServer = false)
 object HygieneTests extends HygieneTests(fork = true, clientServer = false)
 object LargeProjectTests extends LargeProjectTests(fork = true, clientServer = false)
+object MillBuildModuleTests extends MillBuildModuleTests(fork = true, clientServer = false)
 object MillJvmOptsTests extends MillJvmOptsTests(fork = true, clientServer = false)
 object ScriptsInvalidationTests extends ScriptsInvalidationTests(fork = true, clientServer = false)
 object ScriptsInvalidationForeignTests

integration/local/resources/mill-build-module/.mill-version

@@ -0,0 +1 @@
+0.10.7