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

Remove dead guessedConfigIdents code

This commit is contained in:
Dale Wijnand 2018-12-22 02:20:31 +00:00
parent 4c553835a0
commit a254341b6f
No known key found for this signature in database
GPG Key ID: 4F256E3D151DF5EF
1 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
main/src/main/scala/sbt/internal/KeyIndex.scala
View File

@ -65,7 +65,6 @@ object KeyIndex {
case Some(idx) => idx.fromConfigIdent(proj)(configIdent) case Some(idx) => idx.fromConfigIdent(proj)(configIdent)
case _ => Scope.unguessConfigIdent(configIdent) case _ => Scope.unguessConfigIdent(configIdent)
} }
private[sbt] def guessedConfigIdents = concat(_.guessedConfigIdents)
def tasks(proj: Option[ResolvedReference], conf: Option[String]) = concat(_.tasks(proj, conf)) def tasks(proj: Option[ResolvedReference], conf: Option[String]) = concat(_.tasks(proj, conf))
def tasks(proj: Option[ResolvedReference], conf: Option[String], key: String) = def tasks(proj: Option[ResolvedReference], conf: Option[String], key: String) =
concat(_.tasks(proj, conf, key)) concat(_.tasks(proj, conf, key))
@ -114,7 +113,6 @@ trait KeyIndex {
): Set[String] ): Set[String]
private[sbt] def configIdents(project: Option[ResolvedReference]): Set[String] private[sbt] def configIdents(project: Option[ResolvedReference]): Set[String]
private[sbt] def fromConfigIdent(proj: Option[ResolvedReference])(configIdent: String): String private[sbt] def fromConfigIdent(proj: Option[ResolvedReference])(configIdent: String): String
private[sbt] def guessedConfigIdents: Set[(Option[ProjectReference], String, String)]
} }
trait ExtendableKeyIndex extends KeyIndex { trait ExtendableKeyIndex extends KeyIndex {
def add(scoped: ScopedKey[_]): ExtendableKeyIndex def add(scoped: ScopedKey[_]): ExtendableKeyIndex
@ -229,25 +227,6 @@ private[sbt] final class KeyIndex0(val data: BuildIndex) extends ExtendableKeyIn
private[sbt] def fromConfigIdent(proj: Option[ResolvedReference])(configIdent: String): String = private[sbt] def fromConfigIdent(proj: Option[ResolvedReference])(configIdent: String): String =
confIndex(proj).fromConfigIdent(configIdent) confIndex(proj).fromConfigIdent(configIdent)
private[sbt] def guessedConfigIdents: Set[(Option[ProjectReference], String, String)] = {
val guesses = for {
(build, projIndex) <- data.data
(project, confIndex) <- projIndex.data
(config, data) <- confIndex.data
if data.ident.isEmpty && !Scope.configIdents.contains(config)
} yield (projRef(build, project), config, Scope.guessConfigIdent(config))
guesses.toSet
}
private def projRef(build: Option[URI], project: Option[String]): Option[ProjectReference] = {
(build, project) match {
case (Some(uri), Some(proj)) => Some(ProjectRef(uri, proj))
case (Some(uri), None) => Some(RootProject(uri))
case (None, Some(proj)) => Some(LocalProject(proj))
case (None, None) => None
}
}
def tasks(proj: Option[ResolvedReference], conf: Option[String]): Set[AttributeKey[_]] = def tasks(proj: Option[ResolvedReference], conf: Option[String]): Set[AttributeKey[_]] =
keyIndex(proj, conf).tasks keyIndex(proj, conf).tasks
def tasks( def tasks(