Skip to content

add test case for not having test.resourceDir in main scope #3879

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

Closed
wants to merge 3 commits into from
Closed

add test case for not having test.resourceDir in main scope #3879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d2d3b4
add test case for bug
btomala Sep 22, 2025
ce1a868
first try to fix test scope
btomala Sep 24, 2025
03b6947
revert resourceDirectoriesFromDirectives and apply allInputs to resou…
btomala Oct 1, 2025
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
7 changes: 5 additions & 2 deletions modules/build/src/main/scala/scala/build/CrossSources.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,10 @@ object CrossSources {

val resourceDirectoriesFromDirectives = {
val resourceDirsFromCli =
allInputs.elements.flatMap { case rd: ResourceDirectory => Some(rd.path); case _ => None }
allInputs.elements.flatMap {
case rd: ResourceDirectory => Some(rd.path)
case _ => None
}
val resourceDirsFromBuildOptions: Seq[os.Path] =
buildOptions.flatMap(_.value.classPathOptions.resourcesDir).distinct
resourceDirsFromBuildOptions
Expand Down Expand Up @@ -318,7 +321,7 @@ object CrossSources {
}

val resourceDirs: Seq[WithBuildRequirements[os.Path]] =
resolveResourceDirs(finalInputs, preprocessedSources)
resolveResourceDirs(allInputs, preprocessedSources)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using allInpts instead of finalInputs solves the issue

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it does for this use case, but I do not think it would for all edge cases... I'm working on an alternative fix, sorry this took so long

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that being said, that your fix does work made me realise how much this part of the code is in need of a refactor 🙃


lazy val allPathsWithDirectivesByScope: Map[Scope, Seq[(os.Path, Position.File)]] =
(pathsWithDirectivePositions ++ inMemoryWithDirectivePositions ++ unwrappedScriptsWithDirectivePositions)
Expand Down
15 changes: 15 additions & 0 deletions modules/build/src/test/scala/scala/build/tests/DirectiveTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,21 @@ class DirectiveTests extends TestUtil.ScalaCliBuildSuite {
expect(resourceDirs == Seq(path))
}
}
test("do not include test.resourceDir into sources for main scope") {
val testInputs = TestInputs(
os.rel / "simple.sc" ->
"""//> using test.resourceDir foo
|""".stripMargin
)
testInputs.withBuild(baseOptions, buildThreads, bloopConfigOpt, scope = Scope.Main) {
(root, _, maybeBuild) =>
val build =
maybeBuild.toOption.flatMap(_.successfulOpt).getOrElse(sys.error("cannot happen"))
val resourceDirs = build.sources.resourceDirs

expect(resourceDirs.isEmpty)
}
}
test("parse boolean for publish.doc") {
val testInputs = TestInputs(
os.rel / "simple.sc" ->
Expand Down
Loading