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

Fix ordering

This commit is contained in:
Dale Wijnand 2017-03-17 13:15:12 +00:00
parent 9f13499bcf
commit 8081661a7d
No known key found for this signature in database
GPG Key ID: 4F256E3D151DF5EF
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
main/src/main/scala/sbt/internal/server/NetworkChannel.scala
View File

@ -150,15 +150,6 @@ object SettingQuery {
} yield Act.taskKeyExtra(index, defaultConfigs, keyMap, proj, confAmb, partialMask) } yield Act.taskKeyExtra(index, defaultConfigs, keyMap, proj, confAmb, partialMask)
} }
def scopedKeyParser(structure: BuildStructure, currentBuild: URI): Parser[ScopedKey[_]] =
scopedKey(
structure.index.keyIndex,
currentBuild,
structure.extra.configurationsForAxis,
structure.index.keyMap,
structure.data
)
def scopedKeySelected( def scopedKeySelected(
index: KeyIndex, index: KeyIndex,
currentBuild: URI, currentBuild: URI,
@ -178,4 +169,13 @@ object SettingQuery {
data: Settings[Scope] data: Settings[Scope]
): Parser[ScopedKey[_]] = ): Parser[ScopedKey[_]] =
scopedKeySelected(index, currentBuild, defaultConfigs, keyMap, data).map(_.key) scopedKeySelected(index, currentBuild, defaultConfigs, keyMap, data).map(_.key)
def scopedKeyParser(structure: BuildStructure, currentBuild: URI): Parser[ScopedKey[_]] =
scopedKey(
structure.index.keyIndex,
currentBuild,
structure.extra.configurationsForAxis,
structure.index.keyMap,
structure.data
)
} }