From 2015c5d41aa94f7d7e22c3543169e256485b2a4a Mon Sep 17 00:00:00 2001 From: Adrien Piquerez Date: Fri, 1 Nov 2024 12:25:23 +0100 Subject: [PATCH] Add ThisBuildScope --- main-settings/src/main/scala/sbt/Project.scala | 5 +++-- main-settings/src/main/scala/sbt/Scope.scala | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/main-settings/src/main/scala/sbt/Project.scala b/main-settings/src/main/scala/sbt/Project.scala index 27191d5f4..2e5b14a7d 100644 --- a/main-settings/src/main/scala/sbt/Project.scala +++ b/main-settings/src/main/scala/sbt/Project.scala @@ -15,6 +15,7 @@ import sbt.internal.util.Dag import sbt.internal.util.complete.Parser import sbt.internal.util.complete.DefaultParsers import Scope.ThisScope +import sbt.Scope.ThisBuildScope sealed trait ProjectDefinition[PR <: ProjectReference] { @@ -345,10 +346,10 @@ object Project: ss.map(_.mapReferenced(f)) def inThisBuild(ss: Seq[Setting[?]]): Seq[Setting[?]] = - inScope(ThisScope.copy(project = Select(ThisBuild)))(ss) + inScope(ThisBuildScope)(ss) private[sbt] def inThisBuild[T](i: Initialize[T]): Initialize[T] = - inScope(ThisScope.copy(project = Select(ThisBuild)), i) + inScope(ThisBuildScope, i) private[sbt] def inConfig[T](conf: Configuration, i: Initialize[T]): Initialize[T] = inScope(ThisScope.copy(config = Select(conf)), i) diff --git a/main-settings/src/main/scala/sbt/Scope.scala b/main-settings/src/main/scala/sbt/Scope.scala index d417d63b0..64b4aa6e4 100644 --- a/main-settings/src/main/scala/sbt/Scope.scala +++ b/main-settings/src/main/scala/sbt/Scope.scala @@ -56,6 +56,7 @@ object Scope: val ThisScope: Scope = new Scope(This, This, This, This) val Global: Scope = new Scope(Zero, Zero, Zero, Zero) + val ThisBuildScope: Scope = Scope(Select(ThisBuild), This, This, This) val GlobalScope: Scope = Global private[sbt] final val inIsDeprecated =