luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix resolving Select(ThisProject)

This commit is contained in:
Dan Sanduleac 2014-05-20 18:13:06 +01:00 committed by Dan Sanduleac
parent d8a8792946
commit 5deb103ef6
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
main/settings/src/main/scala/sbt/Scope.scala
View File

@ -20,10 +20,10 @@ object Scope {
val GlobalScope = Scope(Global, Global, Global, Global)
def resolveScope(thisScope: Scope, current: URI, rootProject: URI => String): Scope => Scope =
resolveProject(current, rootProject) compose replaceThis(thisScope)
resolveProject(current, rootProject) compose replaceThis(thisScope) compose subThisProject
def resolveBuildScope(thisScope: Scope, current: URI): Scope => Scope =
buildResolve(current) compose replaceThis(thisScope)
buildResolve(current) compose replaceThis(thisScope) compose subThisProject
def replaceThis(thisScope: Scope): Scope => Scope = (scope: Scope) =>
Scope(subThis(thisScope.project, scope.project), subThis(thisScope.config, scope.config), subThis(thisScope.task, scope.task), subThis(thisScope.extra, scope.extra))
@ -31,6 +31,15 @@ object Scope {
def subThis[T](sub: ScopeAxis[T], into: ScopeAxis[T]): ScopeAxis[T] =
if (into == This) sub else into
/**
* `Select(ThisProject)` cannot be resolved by [[resolveProject]] (it doesn't know what to replace it with), so we
* perform this transformation so that [[replaceThis]] picks it up.
*/
def subThisProject: Scope => Scope = {
case s @ Scope(Select(ThisProject), _, _, _) => s.copy(project = This)
case s => s
}
def fillTaskAxis(scope: Scope, key: AttributeKey[_]): Scope =
scope.task match {
case _: Select[_] => scope
@ -59,7 +68,6 @@ object Scope {
}
def resolveProjectBuild(current: URI, ref: ProjectReference): ProjectReference =
ref match {
case ThisProject => RootProject(current)
case LocalRootProject => RootProject(current)
case LocalProject(id) => ProjectRef(current, id)
case RootProject(uri) => RootProject(resolveBuild(current, uri))
@ -79,8 +87,8 @@ object Scope {
def resolveProjectRef(current: URI, rootProject: URI => String, ref: ProjectReference): ProjectRef =
ref match {
case ThisProject | LocalRootProject => ProjectRef(current, rootProject(current))
case LocalProject(id) => ProjectRef(current, id)
case LocalRootProject => ProjectRef(current, rootProject(current))
case LocalProject(id) => ProjectRef(current, id)
case RootProject(uri) =>
val res = resolveBuild(current, uri); ProjectRef(res, rootProject(res))
case ProjectRef(uri, id) => ProjectRef(resolveBuild(current, uri), id)