Misc cleanups (#6107)

- Use `enableBsp = false` to skip useless IntelliJ modules for
`example.{local,packaged,native}.{daemon,nodaemon}` modules, speeds up
intellij import from 10+min to 2+min
- Flesh out `ScriptHeaderChanges` integration tests to cover more cases
- Remove `@compileTimeOnly` from `ModuleCtx.dummyInfo` and `Task` macro,
using runtime exceptions instead to avoid spurious intellij error
highlighting
- Bump Mill version
- Add retries around `mill.server.Server.tryLockBlock` to make it robust
in case of collisions with the client polling the lock, which should fix
#5895. Remove older incorrect
fixes

Author: lihaoyi

build.mill

@@ -1,4 +1,4 @@
-//| mill-version: 1.0.6-95-b08901
+//| mill-version: 1.0.6-114-ed0e74
 //| mill-jvm-opts: ["-XX:NonProfiledCodeHeapSize=250m", "-XX:ReservedCodeCacheSize=500m"]
 //| mill-opts: ["--jobs=0.5C"]
 

core/api/src/mill/api/ModuleCtx.scala

@@ -2,7 +2,7 @@ package mill.api
 
 import mill.api.internal.OverrideMapping
 
-import scala.annotation.{compileTimeOnly, implicitNotFound}
+import scala.annotation.implicitNotFound
 
 /**
  * The contextual information provided to a [[mill.api.Module]] or [[mill.api.Task]]
@@ -163,11 +163,10 @@ object ModuleCtx extends LowPriCtx {
 }
 
 trait LowPriCtx {
-  // Dummy `Ctx` available in implicit scope but never actually used.
+  // Dummy `Ctx` available in implicit scope but must not be actually used.
   // as it is provided by the codegen. Defined for IDEs to think that one is available
   // and not show errors in build.mill/package.mill even though they can't see the codegen
-  @compileTimeOnly(
+  implicit def dummyInfo: ModuleCtx = sys.error(
     "Modules and Tasks can only be defined within a mill Module (in `build.mill` or `package.mill` files)"
   )
-  implicit def dummyInfo: ModuleCtx = sys.error("implicit Ctx must be provided")
 }

core/api/src/mill/api/internal/Cacher.scala

@@ -72,9 +72,9 @@ private[mill] object Cacher {
 
       val thisSel = This(owner.owner).asExprOf[Cacher]
       '{ $thisSel.cachedTask[T](${ t })(using $enclosingCtx) }
-    } else report.errorAndAbort(
-      "Task{} members must be defs defined in a Module class/trait/object body",
-      Position.ofMacroExpansion
-    )
+    } else '{
+      // Use a runtime exception to prevent false error highlighting in IntelliJ
+      throw new Exception("Task{} members must be defs defined in a Module class/trait/object body")
+    }
   }
 }

core/api/test/src/mill/api/MacroErrorTests.scala

@@ -8,15 +8,6 @@ import scala.annotation.unused
 object MacroErrorTests extends TestSuite {
 
   val tests = Tests {
-
-    test("errors") {
-      val expectedMsg =
-        "Task{} members must be defs defined in a Module class/trait/object body"
-
-      val err = assertCompileError("object Foo extends TestRootModule{ val x = Task {1} }")
-      assert(err.msg == expectedMsg)
-    }
-
     test("badParameterSets") {
       test("command") {
         val e = assertCompileError("""
@@ -119,19 +110,7 @@ object MacroErrorTests extends TestSuite {
           lazy val millDiscover = Discover[this.type]
         }
       }
-      test("neg1") {
-        val e = assertCompileError("""def a = Task { 1 }""")
-        assert(e.msg.contains(
-          "Task{} members must be defs defined in a Module class/trait/object body"
-        ))
-      }
 
-      test("neg2") {
-        val e = assertCompileError("object foo extends TestRootModule{ val a = Task { 1 } }")
-        assert(e.msg.contains(
-          "Task{} members must be defs defined in a Module class/trait/object body"
-        ))
-      }
       test("neg3") {
 
         val expectedMsg =

integration/failure/build-yaml-errors/resources/build.mill.yaml

@@ -0,0 +1,2 @@
+extends: [mill.javalib.JavaModule]
+mvnDepsTypo: []

integration/failure/build-yaml-errors/resources/invalidtaskname/package.mill.yaml

@@ -0,0 +1 @@
+extends: [mill.javalib.JavaModuleTypod]

integration/failure/build-yaml-errors/resources/mispelledextends/package.mill.yaml

@@ -0,0 +1,25 @@
+package mill.integration
+
+import mill.testkit.UtestIntegrationTestSuite
+
+import utest._
+
+// Basic tests for errors in build.mill.yaml an package.mill.yaml files. The errors don't
+// look great, but for now just assert on them and make sure they don't regress
+object BuildYamlErrorsTests extends UtestIntegrationTestSuite {
+  val tests: Tests = Tests {
+    integrationTest { tester =>
+      val res = tester.eval("version")
+      assert(res.err.replace('\\', '/').contains("mispelledextends/package.mill.yaml"))
+      assert(res.err.contains("trait package_ extends mill.javalib.JavaModuleTypod"))
+      assert(res.err.contains("type JavaModuleTypod is not a member of mill.javalib"))
+
+      os.remove.all(tester.workspacePath / "mispelledextends")
+
+      val res2 = tester.eval("version")
+      assert(res2.err.replace('\\', '/').contains("invalidtaskname/package.mill.yaml"))
+      assert(res2.err.contains("override def mvnDepsTypo = Task.Literal(\"\"\"[]\"\"\")"))
+      assert(res2.err.contains("method mvnDepsTypo overrides nothin"))
+    }
+  }
+}