rebase - import JsonFormatters in CodeGen

Author: bishabosha

runner/src/mill/runner/CodeGen.scala

@@ -15,7 +15,8 @@ object CodeGen {
       allScriptCode: Map[os.Path, String],
       targetDest: os.Path,
       enclosingClasspath: Seq[os.Path],
-      millTopLevelProjectRoot: os.Path
+      millTopLevelProjectRoot: os.Path,
+      isScala3: Boolean
   ): Unit = {
     for (scriptSource <- scriptSources) {
       val scriptPath = scriptSource.path
@@ -100,7 +101,8 @@ object CodeGen {
             pkgLine,
             aliasImports,
             scriptCode,
-            markerComment
+            markerComment,
+            isScala3
           )
         }
 
@@ -118,15 +120,17 @@ object CodeGen {
       pkgLine: String,
       aliasImports: String,
       scriptCode: String,
-      markerComment: String
+      markerComment: String,
+      isScala3: Boolean
   ) = {
     val segments = scriptFolderPath.relativeTo(projectRoot).segments
 
     val prelude = topBuildPrelude(
       segments,
       scriptFolderPath,
       enclosingClasspath,
-      millTopLevelProjectRoot
+      millTopLevelProjectRoot,
+      isScala3
     )
 
     val instrument = new ObjectDataInstrument(scriptCode)
@@ -182,10 +186,17 @@ object CodeGen {
       segments: Seq[String],
       scriptFolderPath: os.Path,
       enclosingClasspath: Seq[os.Path],
-      millTopLevelProjectRoot: os.Path
+      millTopLevelProjectRoot: os.Path,
+      isScala3: Boolean
   ): String = {
+    val scala3imports = if isScala3 then {
+      // (Scala 3) package is not part of implicit scope
+      s"""import _root_.mill.main.TokenReaders.given, _root_.mill.api.JsonFormatters.given"""
+    } else {
+      ""
+    }
     s"""import _root_.mill.runner.MillBuildRootModule
-       |import _root_.mill.main.TokenReaders.given // (Scala 3) package is not part of implicit scope
+       |$scala3imports
        |@_root_.scala.annotation.nowarn
        |object MillMiscInfo extends MillBuildRootModule.MillMiscInfo(
        |  ${enclosingClasspath.map(p => literalize(p.toString))},
@@ -216,11 +227,13 @@ object CodeGen {
 
     // User code needs to be put in a separate class for proper submodule
     // object initialization due to https://github.com/scala/scala3/issues/21444
-    s"""object $wrapperObjectName extends $wrapperObjectName{
+    s"""object $wrapperObjectName extends $wrapperObjectName {
        |  $childAliases
-       |  override lazy val millDiscover: _root_.mill.define.Discover = _root_.mill.define.Discover[this.type]
        |}
-       |abstract class $wrapperObjectName $extendsClause {""".stripMargin
+       |abstract class $wrapperObjectName $extendsClause {
+       |override lazy val millDiscover: _root_.mill.define.Discover = {
+       |  _root_.mill.define.Discover[this.type]
+       |}""".stripMargin
 
   }
 

runner/src/mill/runner/MillBuildRootModule.scala

@@ -114,13 +114,15 @@ abstract class MillBuildRootModule()(implicit
     val parsed = parseBuildFiles()
     if (parsed.errors.nonEmpty) Result.Failure(parsed.errors.mkString("\n"))
     else {
+      val isScala3 = scalaVersion().startsWith("3.")
       CodeGen.generateWrappedSources(
         millBuildRootModuleInfo.projectRoot / os.up,
         scriptSources(),
         parsed.seenScripts,
         T.dest,
         millBuildRootModuleInfo.enclosingClasspath,
-        millBuildRootModuleInfo.topLevelProjectRoot
+        millBuildRootModuleInfo.topLevelProjectRoot,
+        isScala3
       )
       Result.Success(Seq(PathRef(T.dest)))
     }