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

restrict configuration and project ID to valid values at parser level for tab completion

This commit is contained in:
Mark Harrah 2011-02-19 08:49:30 -05:00
parent 63c8fd715d
commit 552be510ad
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main/Act.scala
View File

@ -22,6 +22,8 @@ object Act
yield yield
ScopedKey( Scope( Select(proj), toAxis(conf map ConfigKey.apply, Global), Global, Global), key ) ScopedKey( Scope( Select(proj), toAxis(conf map ConfigKey.apply, Global), Global, Global), key )
} }
def examplesStrict(p: Parser[String], exs: Set[String]): Parser[String] =
p examples exs filter exs
def toAxis[T](opt: Option[T], ifNone: ScopeAxis[T]): ScopeAxis[T] = def toAxis[T](opt: Option[T], ifNone: ScopeAxis[T]): ScopeAxis[T] =
opt match { case Some(t) => Select(t); case None => ifNone } opt match { case Some(t) => Select(t); case None => ifNone }
@ -29,7 +31,7 @@ object Act
ThisProject in project get data flatMap( _.configurations.headOption.map(_.name)) ThisProject in project get data flatMap( _.configurations.headOption.map(_.name))
def config(confs: Set[String]): Parser[Option[String]] = def config(confs: Set[String]): Parser[Option[String]] =
token( (ID examples confs) <~ ':' ).? token( examplesStrict(ID, confs) <~ ':' ).?
def configs(explicit: Option[String], defaultConfig: ProjectRef => Option[String], proj: ProjectRef): List[Option[String]] = def configs(explicit: Option[String], defaultConfig: ProjectRef => Option[String], proj: ProjectRef): List[Option[String]] =
if(explicit.isDefined) explicit :: Nil else None :: defaultConfig(proj) :: Nil if(explicit.isDefined) explicit :: Nil else None :: defaultConfig(proj) :: Nil
@ -53,7 +55,7 @@ object Act
{ {
val uris = index.buildURIs val uris = index.buildURIs
val build = token( '(' ~> Uri(uris).map(uri => Scope.resolveBuild(currentBuild, uri)) <~ ')') ?? currentBuild val build = token( '(' ~> Uri(uris).map(uri => Scope.resolveBuild(currentBuild, uri)) <~ ')') ?? currentBuild
def projectID(uri: URI) = token( ID.examples(index projects uri) <~ '/' ) def projectID(uri: URI) = token( examplesStrict(ID, index projects uri) <~ '/' )
for(uri <- build; id <- projectID(uri)) yield for(uri <- build; id <- projectID(uri)) yield
ProjectRef(Some(uri), Some(id)) ProjectRef(Some(uri), Some(id))