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

Fix parser for new command

This commit is contained in:
Eugene Yokota 2016-08-22 11:29:35 -04:00
parent 954e744408
commit f29932e594
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main/command/src/main/scala/sbt/BasicCommands.scala
View File

@ -72,13 +72,17 @@ object BasicCommands {
def templateCommand = Command.make(TemplateCommand, templateBrief, templateDetailed)(templateCommandParser) def templateCommand = Command.make(TemplateCommand, templateBrief, templateDetailed)(templateCommandParser)
def templateCommandParser(state: State) = def templateCommandParser(state: State) =
{ {
val p = token(Space).* ~> repsep(StringBasic, token(Space)) val p = (token(Space) ~> repsep(StringBasic, token(Space))) | (token(EOF) map { case _ => Nil })
val trs = (state get templateResolvers) match { val trs = (state get templateResolvers) match {
case Some(trs) => trs.toList case Some(trs) => trs.toList
case None => Nil case None => Nil
} }
applyEffect(p)({ inputArg => applyEffect(p)({ inputArg =>
val arguments = inputArg.toList ++ state.remainingCommands val arguments = inputArg.toList ++
(state.remainingCommands.toList match {
case "shell" :: Nil => Nil
case xs => xs
})
trs find { tr => trs find { tr =>
tr.isDefined(arguments.toArray) tr.isDefined(arguments.toArray)
} match { } match {