From 03cd1ec3abfa1dbcdb53e6b7037cae5f134b765c Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Wed, 9 Nov 2011 18:30:35 -0500 Subject: [PATCH] need to explicitly trim whitespace in semicolon separated commands now. fixes #261. --- main/Main.scala | 2 +- sbt/src/sbt-test/actions/join/test | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/main/Main.scala b/main/Main.scala index 0de72a4cc..47222277b 100644 --- a/main/Main.scala +++ b/main/Main.scala @@ -262,7 +262,7 @@ object BuiltinCommands } def multiParser(s: State): Parser[Seq[String]] = - ( token(';' ~> OptSpace) flatMap { _ => matched(s.combinedParser | token(charClass(_ != ';').+, hide= const(true))) <~ token(OptSpace) } ).+ + ( token(';' ~> OptSpace) flatMap { _ => matched(s.combinedParser | token(charClass(_ != ';').+, hide= const(true))) <~ token(OptSpace) } map (_.trim) ).+ def multiApplied(s: State) = Command.applyEffect( multiParser(s) )( _ ::: s ) diff --git a/sbt/src/sbt-test/actions/join/test b/sbt/src/sbt-test/actions/join/test index 5df2af1f3..98d932ad0 100644 --- a/sbt/src/sbt-test/actions/join/test +++ b/sbt/src/sbt-test/actions/join/test @@ -1 +1,2 @@ -> compile +# the ; clean ; part is to test that semicolon-separated commands work with spaces +> ; clean ; compile