Upgrade scalariform version

This commit is contained in:
Dale Wijnand
2016-12-11 12:13:11 +00:00
parent 6a46c62524
commit 43821667bf
56 changed files with 469 additions and 371 deletions
@@ -78,7 +78,7 @@ object MainLoop {
Logger.transferLevels(old.backed, logging.backed)
(old.full, logging.full) match { // well, this is a hack
case (oldLog: AbstractLogger, newLog: AbstractLogger) => Logger.transferLevels(oldLog, newLog)
case _ => ()
case _ => ()
}
}
+2 -1
View File
@@ -32,7 +32,8 @@ final case class State(
history: State.History,
attributes: AttributeMap,
globalLogging: GlobalLogging,
next: State.Next) extends Identity {
next: State.Next
) extends Identity {
lazy val combinedParser = Command.combine(definedCommands)(this)
}
@@ -38,7 +38,6 @@ private[sbt] final class NetworkChannel extends CommandChannel {
server.publish(
if (cmdStatus.canEnter) StatusEvent(Ready)
else StatusEvent(Processing("TODO current command", cmdStatus.state.remainingCommands))
)
)
))
}
}
@@ -24,21 +24,29 @@ object Serialization {
def toMessage(event: Event): EventMessage =
event match {
case LogEvent(level, message) =>
EventMessage(`type` = "logEvent",
EventMessage(
`type` = "logEvent",
status = None, commandQueue = Vector(),
level = Some(level), message = Some(message), success = None, commandLine = None)
level = Some(level), message = Some(message), success = None, commandLine = None
)
case StatusEvent(Ready) =>
EventMessage(`type` = "statusEvent",
EventMessage(
`type` = "statusEvent",
status = Some("ready"), commandQueue = Vector(),
level = None, message = None, success = None, commandLine = None)
level = None, message = None, success = None, commandLine = None
)
case StatusEvent(Processing(command, commandQueue)) =>
EventMessage(`type` = "statusEvent",
EventMessage(
`type` = "statusEvent",
status = Some("processing"), commandQueue = commandQueue.toVector,
level = None, message = None, success = None, commandLine = None)
level = None, message = None, success = None, commandLine = None
)
case ExecutionEvent(command, status) =>
EventMessage(`type` = "executionEvent",
EventMessage(
`type` = "executionEvent",
status = None, commandQueue = Vector(),
level = None, message = None, success = Some(status), commandLine = Some(command))
level = None, message = None, success = Some(status), commandLine = Some(command)
)
}
/**