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

Avoid ParseKey failing due to homonymous axes

This commit is contained in:
Dale Wijnand 2018-12-22 12:50:34 +00:00
parent 645f484184
commit e533bc93e8
No known key found for this signature in database
GPG Key ID: 4F256E3D151DF5EF
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
main/src/test/scala/ParseKey.scala
View File

@ -30,13 +30,18 @@ object ParseKey extends Properties("Key parser test") {
def roundtrip(skm: StructureKeyMask) = { def roundtrip(skm: StructureKeyMask) = {
import skm.{ structure, key } import skm.{ structure, key }
// if the configuration axis == Zero
// then a scoped key like `proj/Zero/Zero/name` could render potentially as `Zero/name`
// which would be interpreted as `Zero/Zero/Zero/name` (Global/name)
// so we mitigate this by explicitly displaying the configuration axis set to Zero
val hasZeroConfig = key.scope.config == Zero val hasZeroConfig = key.scope.config == Zero
val mask = if (hasZeroConfig) skm.mask.copy(project = true) else skm.mask
// Note that this explicitly displays the configuration axis set to Zero. val showZeroConfig = hasZeroConfig || hasAmbiguousLowercaseAxes(key)
// This is to disambiguate `proj/Zero/name`, which could render potentially val mask = if (showZeroConfig) skm.mask.copy(project = true) else skm.mask
// as `Zero/name`, but could be interpreted as `Zero/Zero/name`.
val expected = resolve(structure, key, mask) val expected = resolve(structure, key, mask)
parseCheck(structure, key, mask, hasZeroConfig)( parseCheck(structure, key, mask, showZeroConfig)(
sk => sk =>
Project.equal(sk, expected, mask) Project.equal(sk, expected, mask)
:| s"$sk.key == $expected.key: ${sk.key == expected.key}" :| s"$sk.key == $expected.key: ${sk.key == expected.key}"
@ -53,7 +58,8 @@ object ParseKey extends Properties("Key parser test") {
val mask = skm.mask.copy(project = false) val mask = skm.mask.copy(project = false)
// skip when config axis is set to Zero // skip when config axis is set to Zero
val hasZeroConfig = key.scope.config == Zero val hasZeroConfig = key.scope.config == Zero
parseCheck(structure, key, mask)( val showZeroConfig = hasAmbiguousLowercaseAxes(key)
parseCheck(structure, key, mask, showZeroConfig)(
sk => sk =>
(hasZeroConfig || sk.scope.project == Select(structure.current)) (hasZeroConfig || sk.scope.project == Select(structure.current))
:| s"Current: ${structure.current}" :| s"Current: ${structure.current}"
@ -77,7 +83,8 @@ object ParseKey extends Properties("Key parser test") {
import skm.{ structure, key } import skm.{ structure, key }
val mask = ScopeMask(config = false) val mask = ScopeMask(config = false)
val resolvedConfig = Resolve.resolveConfig(structure.extra, key.key, mask)(key.scope).config val resolvedConfig = Resolve.resolveConfig(structure.extra, key.key, mask)(key.scope).config
parseCheck(structure, key, mask)( val showZeroConfig = hasAmbiguousLowercaseAxes(key)
parseCheck(structure, key, mask, showZeroConfig)(
sk => (sk.scope.config == resolvedConfig) || (sk.scope == Scope.GlobalScope) sk => (sk.scope.config == resolvedConfig) || (sk.scope == Scope.GlobalScope)
) :| s"Expected configuration: ${resolvedConfig map (_.name)}" ) :| s"Expected configuration: ${resolvedConfig map (_.name)}"
} }
@ -360,4 +367,12 @@ object ParseKey extends Properties("Key parser test") {
case (delegates, key) => Taskk(key, delegates) case (delegates, key) => Taskk(key, delegates)
} }
} }
// if both a project and a key share the same name (e.g. "foo")
// then a scoped key like `foo/<conf>/foo/name` would render as `foo/name`
// which would be interpreted as `foo/Zero/Zero/name`
// so we mitigate this by explicitly displaying the configuration axis set to Zero
def hasAmbiguousLowercaseAxes(key: ScopedKey[_]) = PartialFunction.cond(key.scope) {
case Scope(Select(ProjectRef(_, proj)), _, Select(key), _) => proj == key.label
}
} }