Remove stale script module resolution code (#6061)

Fixes #6059

This code was hanging around from an earlier iteration of the
config-based/script module design
(#5836), where we loaded
config-based modules dynamically, and caused the spurious resolution
attempts and stack traces linked above. Since config-based modules are
now done during codegen and not resolved dynamically, we can remove this
extra resolution logic and simplify the code paths substantially

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

Author: lihaoyi

core/eval/src/mill/eval/EvaluatorImpl.scala

@@ -25,12 +25,7 @@ final class EvaluatorImpl private[mill] (
     private[mill] val allowPositionalCommandArgs: Boolean,
     private[mill] val selectiveExecution: Boolean = false,
     private val execution: Execution,
-    scriptModuleResolver: (
-        String,
-        String => Option[mill.Module],
-        Boolean,
-        Option[String]
-    ) => Seq[Result[mill.api.ExternalModule]]
+    scriptModuleResolver: (String, String => Option[Module]) => Seq[Result[ExternalModule]]
 ) extends Evaluator {
 
   private[mill] def workspace = execution.workspace
@@ -75,7 +70,7 @@ final class EvaluatorImpl private[mill] (
         selectMode,
         allowPositionalCommandArgs,
         resolveToModuleTasks,
-        scriptModuleResolver = scriptModuleResolver(_, resolveScriptModuleDep, _, _)
+        scriptModuleResolver = scriptModuleResolver(_, resolveScriptModuleDep)
       )
     }
   }
@@ -92,7 +87,7 @@ final class EvaluatorImpl private[mill] (
         selectMode,
         allowPositionalCommandArgs,
         resolveToModuleTasks,
-        scriptModuleResolver = scriptModuleResolver(_, resolveScriptModuleDep, _, _)
+        scriptModuleResolver = scriptModuleResolver(_, resolveScriptModuleDep)
       )
     }
   }
@@ -115,7 +110,7 @@ final class EvaluatorImpl private[mill] (
           selectMode,
           allowPositionalCommandArgs,
           resolveToModuleTasks,
-          scriptModuleResolver = scriptModuleResolver(_, resolveScriptModuleDep, _, _)
+          scriptModuleResolver = scriptModuleResolver(_, resolveScriptModuleDep)
         )
       }
     }
@@ -134,7 +129,7 @@ final class EvaluatorImpl private[mill] (
           selectMode,
           allowPositionalCommandArgs,
           resolveToModuleTasks,
-          scriptModuleResolver = scriptModuleResolver(_, resolveScriptModuleDep, _, _)
+          scriptModuleResolver = scriptModuleResolver(_, resolveScriptModuleDep)
         )
       }
     }
@@ -296,7 +291,7 @@ final class EvaluatorImpl private[mill] (
             scriptArgs,
             selectMode,
             allowPositionalCommandArgs,
-            scriptModuleResolver = scriptModuleResolver(_, resolveScriptModuleDep, _, _)
+            scriptModuleResolver = scriptModuleResolver(_, resolveScriptModuleDep)
           )
         }
       }

core/resolve/src/mill/resolve/Resolve.scala

@@ -310,14 +310,10 @@ private[mill] trait Resolve[T] {
       selectMode: SelectMode,
       allowPositionalCommandArgs: Boolean = false,
       resolveToModuleTasks: Boolean = false,
-      scriptModuleResolver: (
-          String,
-          Boolean,
-          Option[String]
-      ) => Seq[Result[mill.api.ExternalModule]]
+      scriptModuleResolver: String => Seq[Result[mill.api.ExternalModule]]
   ): Result[List[T]] = {
     val nullCommandDefaults = selectMode == SelectMode.Multi
-    val cache = new ResolveCore.Cache(scriptModuleChildResolver = scriptModuleResolver(_, true, _))
+    val cache = new ResolveCore.Cache()
     def handleScriptModule(args: Seq[String], fallback: => Result[Seq[T]]): Result[Seq[T]] = {
       val (first, selector, remaining) = args match {
         case Seq(s"$prefix:$suffix", rest*) => (prefix, Some(suffix), rest)
@@ -336,21 +332,14 @@ private[mill] trait Resolve[T] {
             Segments.labels(segments*),
             nullCommandDefaults,
             allowPositionalCommandArgs,
-            resolveToModuleTasks,
-            scriptModuleResolver
+            resolveToModuleTasks
           )
         )
       }
 
-      scriptModuleResolver(first, false, None) match {
+      scriptModuleResolver(first) match {
         case Seq(resolved) => handleResolved(resolved, selector.toSeq, remaining)
-        case Nil =>
-          if (selector.isEmpty) { // if the `:selector` is empty, try treating the `first` as a selector
-            scriptModuleResolver(".", false, None) match {
-              case Seq(resolved) => handleResolved(resolved, Seq(first), remaining)
-              case Nil => fallback
-            }
-          } else fallback
+        case Nil => fallback
       }
     }
     val resolvedGroups = ParseArgs.separate(scriptArgs).map { group =>
@@ -392,14 +381,9 @@ private[mill] trait Resolve[T] {
       sel: Segments,
       nullCommandDefaults: Boolean,
       allowPositionalCommandArgs: Boolean,
-      resolveToModuleTasks: Boolean,
-      scriptModuleResolver: (
-          String,
-          Boolean,
-          Option[String]
-      ) => Seq[Result[mill.api.ExternalModule]]
+      resolveToModuleTasks: Boolean
   ): Result[Seq[T]] = {
-    val cache = new ResolveCore.Cache(scriptModuleChildResolver = scriptModuleResolver(_, true, _))
+    val cache = new ResolveCore.Cache()
     resolveNonEmptyAndHandle2(
       rootModule,
       args,

core/resolve/src/mill/resolve/ResolveCore.scala

@@ -59,11 +59,7 @@ private object ResolveCore {
           java.lang.reflect.Method,
           String
       )]] =
-        collection.mutable.Map(),
-      val scriptModuleChildResolver: (
-          String,
-          Option[String]
-      ) => Seq[mill.api.Result[mill.api.ExternalModule]]
+        collection.mutable.Map()
   ) {
     def decode(s: String): String = {
       decodedNames.getOrElseUpdate(s, scala.reflect.NameTransformer.decode(s))
@@ -429,7 +425,7 @@ private object ResolveCore {
               )
         }
       } else mill.api.Result.Success {
-        val reflectMemberObjects = Reflect
+        Reflect
           .reflectNestedObjects02[Module](cls, namePred, cache.getMethods)
           .collect {
             case (name, memberCls, getter) =>
@@ -439,18 +435,6 @@ private object ResolveCore {
               (resolved, getter2)
           }
           .toSeq
-
-        val simpleModuleObjects =
-          if (!segments.value.forall(_.isInstanceOf[Segment.Label])) Nil
-          else {
-            val scriptKey = segments.value.flatMap(_.pathSegments).mkString("/")
-            val resolvedScript = cache.scriptModuleChildResolver(scriptKey, nameOpt)
-            for (mod <- resolvedScript) yield {
-              val newSegments = Segments.labels(mod.get.moduleSegments.last.value)
-              (Resolved.Module(newSegments, mod.get.getClass), Some((_: Module) => mod))
-            }
-          }
-        reflectMemberObjects ++ simpleModuleObjects
       }
     }
 

core/resolve/test/src/mill/resolve/Checker.scala

@@ -53,7 +53,7 @@ class Checker[T <: RootModule0](module: T) {
       SelectMode.Separated,
       false,
       false,
-      (_, _, _) => Nil
+      _ => Nil
     )
   }
 
@@ -64,7 +64,7 @@ class Checker[T <: RootModule0](module: T) {
       SelectMode.Separated,
       false,
       false,
-      (_, _, _) => Nil
+      _ => Nil
     ).map(_.map(_.render))
   }
 }

libs/script/src/ScriptModuleInit.scala

@@ -4,14 +4,7 @@ import mill.api.{ExternalModule, Result}
 import mill.script.ScriptModule.parseHeaderData
 
 object ScriptModuleInit
-    extends (
-        (
-            String,
-            String => Option[mill.Module],
-            Boolean,
-            Option[String]
-        ) => Seq[Result[mill.api.ExternalModule]]
-    ) {
+    extends ((String, String => Option[mill.Module]) => Seq[Result[mill.api.ExternalModule]]) {
 
   // Cache instantiated script modules on a per-classloader basis. This lets us avoid
   // instantiating the same script twice, e.g. once directly and once when resolving a
@@ -156,24 +149,12 @@ object ScriptModuleInit
 
   def apply(
       scriptFileString: String,
-      resolveModuleDep: String => Option[mill.Module],
-      resolveChildren: Boolean,
-      nameOpt: Option[String]
+      resolveModuleDep: String => Option[mill.Module]
   ) = {
-    val workspace = mill.api.BuildCtx.workspaceRoot
+    mill.api.BuildCtx.workspaceRoot
 
     mill.api.BuildCtx.withFilesystemCheckerDisabled {
-      val scriptFile0 = os.Path(scriptFileString, workspace)
-      if (resolveChildren) {
-        nameOpt match {
-          case Some(n) => resolveScriptModule((scriptFile0 / n).toString, resolveModuleDep).toSeq
-          case None =>
-            if (!os.isDir(scriptFile0)) Nil
-            else os.list(scriptFile0).filter(os.isDir).flatMap(p =>
-              resolveScriptModule(p.toString, resolveModuleDep)
-            )
-        }
-      } else resolveScriptModule(scriptFileString, resolveModuleDep).toSeq
+      resolveScriptModule(scriptFileString, resolveModuleDep).toSeq
     }
   }
 }

testkit/src/mill/testkit/UnitTester.scala

@@ -143,7 +143,7 @@ class UnitTester(
     allowPositionalCommandArgs = false,
     selectiveExecution = false,
     execution = execution,
-    scriptModuleResolver = (_, _, _, _) => Nil
+    scriptModuleResolver = (_, _) => Nil
   )
 
   def apply(args: String*): Either[ExecResult.Failing[?], UnitTester.Result[Seq[?]]] = {
@@ -152,7 +152,7 @@ class UnitTester(
         evaluator.rootModule,
         args,
         SelectMode.Separated,
-        scriptModuleResolver = (_, _, _) => Nil
+        scriptModuleResolver = _ => Nil
       )
     } match {
       case Result.Failure(err) => Left(ExecResult.Failure(err))