Skip to content

Filter out non-modules when trying to instantiate a module #6304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lihaoyi wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Filter out non-modules when trying to instantiate a module #6304

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions core/resolve/src/mill/resolve/ResolveCore.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,14 +284,18 @@ private object ResolveCore {
current.getClass,
Some(s),
cache = cache
).flatMap {
case Seq((_, Some(f))) => f(current)
case unknown =>
sys.error(
s"Unable to resolve single child " +
s"rootModule: ${rootModule}, segments: ${segments.render}," +
s"current: $current, s: ${s}, unknown: $unknown"
)
).flatMap { results =>
// When resolving a module, filter out non-module results (commands/tasks have None getter)
// This handles cases where a user module has the same name as a built-in command (e.g. "init")
results.filter(_._2.isDefined) match {
case Seq((_, Some(f))) => f(current)
case unknown =>
sys.error(
s"Unable to resolve single child " +
s"rootModule: ${rootModule}, segments: ${segments.render}," +
s"current: $current, s: ${s}, unknown: $unknown"
)
}
}

case (mill.api.Result.Success(current), Segment.Cross(vs)) =>
Expand Down
Loading