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

Merge pull request #2782 from bantonsson/lazily-concatenate-failed-errors 

Lazily concatenate failed errors for completion
This commit is contained in:
eugene yokota 2016-10-14 16:17:08 -04:00 committed by GitHub
parent a6cfb528c9 127c164f81
commit 2a4e955e77
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
util/complete/src/main/scala/sbt/complete/Parser.scala
View File

@ -559,8 +559,8 @@ trait ParserMain {
def seq[T](p: Seq[Parser[T]]): Parser[Seq[T]] = seq0(p, Nil) def seq[T](p: Seq[Parser[T]]): Parser[Seq[T]] = seq0(p, Nil)
def seq0[T](p: Seq[Parser[T]], errors: => Seq[String]): Parser[Seq[T]] = def seq0[T](p: Seq[Parser[T]], errors: => Seq[String]): Parser[Seq[T]] =
{ {
val (newErrors, valid) = separate(p) { case Invalid(f) => Left(f.errors); case ok => Right(ok) } val (newErrors, valid) = separate(p) { case Invalid(f) => Left(f.errors _); case ok => Right(ok) }
def combinedErrors = errors ++ newErrors.flatten def combinedErrors = errors ++ newErrors.flatMap(_())
if (valid.isEmpty) invalid(combinedErrors) else new ParserSeq(valid, combinedErrors) if (valid.isEmpty) invalid(combinedErrors) else new ParserSeq(valid, combinedErrors)
} }