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

include space in token in `whatDependsOn` parser for better suggestions, fixes #91

This commit is contained in:
Johannes Rudolph 2016-02-10 12:48:00 +01:00
parent 96aee390df
commit d989e8fa01
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/scala/net/virtualvoid/sbt/graph/DependencyGraphSettings.scala
View File

@ -186,14 +186,9 @@ object DependencyGraphSettings {
val graph = loadFromContext(moduleGraphStore, ctx, state) getOrElse ModuleGraph(Nil, Nil) val graph = loadFromContext(moduleGraphStore, ctx, state) getOrElse ModuleGraph(Nil, Nil)
import sbt.complete.DefaultParsers._ import sbt.complete.DefaultParsers._
def moduleFrom(modules: Seq[ModuleId]) = graph.nodes.map(_.id).map {
modules.map { m ⇒ case id @ ModuleId(org, name, version) ⇒
(token(m.name) ~ Space ~ token(m.version)).map(_ ⇒ m) (Space ~ token(org) ~ token(Space ~ name) ~ token(Space ~ version)).map(_ ⇒ id)
}.reduce(_ | _)
graph.nodes.map(_.id).groupBy(_.organisation).map {
case (org, modules) ⇒
Space ~ token(org) ~ Space ~> moduleFrom(modules)
}.reduceOption(_ | _).getOrElse { }.reduceOption(_ | _).getOrElse {
(Space ~> token(StringBasic, "organization") ~ Space ~ token(StringBasic, "module") ~ Space ~ token(StringBasic, "version")).map { (Space ~> token(StringBasic, "organization") ~ Space ~ token(StringBasic, "module") ~ Space ~ token(StringBasic, "version")).map {
case ((((org, _), mod), _), version) ⇒ case ((((org, _), mod), _), version) ⇒