wip

Author: lihaoyi

runner/daemon/src/mill/daemon/MillScalaParserImpl.scala

@@ -35,6 +35,7 @@ object MillScalaParserImpl extends MillScalaParser {
       rawCode: String,
       fileName: String
   ): Either[String, (String, Seq[String], Seq[String])] = {
+    mill.constants.DebugLog.println("rawCode " + pprint.apply(rawCode))
     val source = SourceFile.virtual(fileName, rawCode)
     def mergeErrors(errors: List[String]): String =
       s"$fileName failed to parse:" + System.lineSeparator + errors.mkString(System.lineSeparator)
@@ -56,7 +57,7 @@ object MillScalaParserImpl extends MillScalaParser {
           if (!trees.head.startPos.exists) ""
           else new String(source.file.toByteArray).take(trees.head.startPos.start)
       }
-
+      mill.constants.DebugLog.println("pkgs " + pprint.apply(pkgs))
       (prefix, pkgs, stmts)
     }
   }

runner/meta/src/mill/meta/CodeGen.scala

@@ -18,6 +18,7 @@ object CodeGen {
   def generateWrappedAndSupportSources(
       projectRoot: os.Path,
       allScriptCode: Map[os.Path, String],
+      allPackageStatements: Map[os.Path, String],
       wrappedDest: os.Path,
       supportDest: os.Path,
       millTopLevelProjectRoot: os.Path,
@@ -66,18 +67,23 @@ object CodeGen {
         }
         .mkString("\n  ")
 
-      val pkg = pkgSelector0(Some(CGConst.globalPackagePrefix), None)
-
       val aliasImports = Seq(
         // Provide `build` as an alias to the root `build_.package_`, since from the user's
         // perspective it looks like they're writing things that live in `package build`,
         // but at compile-time we rename things, we so provide an alias to preserve the fiction
         "import build_.{package_ => build}"
       ).mkString("\n")
 
-      val scriptCode = allScriptCode(scriptPath)
+      val strippedPackageStatementComment = allPackageStatements.get(scriptPath) match {
+        // Add another comment after the marker comment to substitute any package statement
+        // that was stripped during codegen and ensure the offsets line up properly
+        case Some(s) => "\n//" + s.drop(2)
+        case None => ""
+      }
+
+      val markerComment = s"///SOURCE_CODE_START:$scriptPath" + strippedPackageStatementComment
+
 
-      val markerComment = s"///SOURCE_CODE_START:$scriptPath"
 
       val siblingScripts = scriptSources
         .filter(_ != scriptPath)
@@ -196,19 +202,6 @@ object CodeGen {
 
           val scriptCode = allScriptCode(scriptPath)
 
-          val markerComment =
-            s"""//SOURCECODE_ORIGINAL_FILE_PATH=$scriptPath
-               |//SOURCECODE_ORIGINAL_CODE_START_MARKER""".stripMargin
-
-          val siblingScripts = scriptSources
-            .filter(_ != scriptPath)
-            .filter(p => (p / os.up) == (scriptPath / os.up))
-            .map(_.last.split('.').head + "_")
-
-          val importSiblingScripts = siblingScripts
-            .filter(s => s != "build_" && s != "package_")
-            .map(s => s"import $pkg.${backtickWrap(s)}.*").mkString("\n")
-
           if (isBuildScript) {
             os.write.over(supportDestDir / "MillMiscInfo.scala", miscInfo, createFolders = true)
           }

runner/meta/src/mill/meta/FileImportGraph.scala

@@ -17,7 +17,9 @@ import mill.internal.Util.backtickWrap
  * @param metaBuild If `true`, a meta-build is enabled
  */
 @internal
-case class FileImportGraph(seenScripts: Map[os.Path, String], errors: Seq[String])
+case class FileImportGraph(seenScripts: Map[os.Path, String],
+                           errors: Seq[String],
+                           seenPkgStatements: Map[os.Path, String])
 
 /**
  * Logic around traversing the `import $file` graph, extracting necessary info
@@ -42,11 +44,11 @@ object FileImportGraph {
       walked: Seq[os.Path]
   ): FileImportGraph = {
     val seenScripts = mutable.Map.empty[os.Path, String]
+    val seenPkgStatements = mutable.Map.empty[os.Path, String]
     val errors = mutable.Buffer.empty[String]
 
     def processScript(s: os.Path, useDummy: Boolean = false): Unit =
       try {
-
         val content = if (useDummy) "" else os.read(s)
         val fileName = s.relativeTo(topLevelProjectRoot).toString
         val buildHeaderError =
@@ -79,6 +81,7 @@ object FileImportGraph {
               )
             }
             seenScripts(s) = prefix + stmts.mkString
+            seenPkgStatements(s) = "package " + importSegments
           case Left(error) =>
             seenScripts(s) = ""
             errors.append(error)
@@ -95,7 +98,7 @@ object FileImportGraph {
 
     walked.foreach(processScript(_))
 
-    new FileImportGraph(seenScripts.toMap, errors.toSeq)
+    new FileImportGraph(seenScripts.toMap, errors.toSeq, seenPkgStatements.toMap)
   }
 
   def findRootBuildFiles(projectRoot: os.Path) = {

runner/meta/src/mill/meta/MillBuildRootModule.scala

@@ -120,6 +120,7 @@ trait MillBuildRootModule()(using
       CodeGen.generateWrappedAndSupportSources(
         rootModuleInfo.projectRoot / os.up,
         parsed.seenScripts,
+        parsed.seenPkgStatements,
         wrapped,
         support,
         rootModuleInfo.topLevelProjectRoot,
@@ -131,11 +132,7 @@ trait MillBuildRootModule()(using
   }
 
   def millBuildRootModuleResult = Task {
-    Tuple3(
-      runClasspath(),
-      compile().classes,
-      codeSignatures()
-    )
+    Tuple3(runClasspath(), compile().classes, codeSignatures())
   }
 
   def codeSignatures: T[Map[String, Int]] = Task(persistent = true) {