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

defer validation of ;-separated commands until individual command is run. fixes #201

This commit is contained in:
Mark Harrah 2011-10-01 14:39:40 -04:00
parent 7702d30f40
commit 2e38c8484b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/Main.scala
View File

@ -7,7 +7,7 @@ package sbt
import complete.{DefaultParsers, HistoryCommands, Parser} import complete.{DefaultParsers, HistoryCommands, Parser}
import HistoryCommands.{Start => HistoryPrefix} import HistoryCommands.{Start => HistoryPrefix}
import compiler.EvalImports import compiler.EvalImports
import Types.idFun import Types.{const,idFun}
import Command.applyEffect import Command.applyEffect
import Keys.{analysis,historyPath,globalLogging,shellPrompt} import Keys.{analysis,historyPath,globalLogging,shellPrompt}
@ -224,7 +224,7 @@ object BuiltinCommands
} }
def multiParser(s: State): Parser[Seq[String]] = def multiParser(s: State): Parser[Seq[String]] =
( token(';' ~> OptSpace) flatMap { _ => matched(s.combinedParser) <~ token(OptSpace) } ).+ ( token(';' ~> OptSpace) flatMap { _ => matched(s.combinedParser | token(charClass(_ != ';').+, hide= const(true))) <~ token(OptSpace) } ).+
def multiApplied(s: State) = def multiApplied(s: State) =
Command.applyEffect( multiParser(s) )( _ ::: s ) Command.applyEffect( multiParser(s) )( _ ::: s )