From 2e38c8484b8ec81c20c26744ee29bcb3846c608b Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Sat, 1 Oct 2011 14:39:40 -0400 Subject: [PATCH] defer validation of ;-separated commands until individual command is run. fixes #201 --- main/Main.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/Main.scala b/main/Main.scala index a291092d4..52b5c0e0f 100644 --- a/main/Main.scala +++ b/main/Main.scala @@ -7,7 +7,7 @@ package sbt import complete.{DefaultParsers, HistoryCommands, Parser} import HistoryCommands.{Start => HistoryPrefix} import compiler.EvalImports - import Types.idFun + import Types.{const,idFun} import Command.applyEffect import Keys.{analysis,historyPath,globalLogging,shellPrompt} @@ -224,7 +224,7 @@ object BuiltinCommands } 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) = Command.applyEffect( multiParser(s) )( _ ::: s )