apply formatting

This commit is contained in:
Eugene Yokota 2019-04-20 23:23:13 -04:00
parent 2ac7501c7c
commit 98ec0075f4
9 changed files with 105 additions and 67 deletions

View File

@ -7,20 +7,26 @@ import java.io.IOException
object ErrorHandling { object ErrorHandling {
def translate[T](msg: => String)(f: => T) = def translate[T](msg: => String)(f: => T) =
try { f } catch { try {
f
} catch {
case e: IOException => throw new TranslatedIOException(msg + e.toString, e) case e: IOException => throw new TranslatedIOException(msg + e.toString, e)
case e: Exception => throw new TranslatedException(msg + e.toString, e) case e: Exception => throw new TranslatedException(msg + e.toString, e)
} }
def wideConvert[T](f: => T): Either[Throwable, T] = def wideConvert[T](f: => T): Either[Throwable, T] =
try { Right(f) } catch { try {
Right(f)
} catch {
case ex @ (_: Exception | _: StackOverflowError) => Left(ex) case ex @ (_: Exception | _: StackOverflowError) => Left(ex)
case err @ (_: ThreadDeath | _: VirtualMachineError) => throw err case err @ (_: ThreadDeath | _: VirtualMachineError) => throw err
case x: Throwable => Left(x) case x: Throwable => Left(x)
} }
def convert[T](f: => T): Either[Exception, T] = def convert[T](f: => T): Either[Exception, T] =
try { Right(f) } catch { case e: Exception => Left(e) } try {
Right(f)
} catch { case e: Exception => Left(e) }
def reducedToString(e: Throwable): String = def reducedToString(e: Throwable): String =
if (e.getClass == classOf[RuntimeException]) { if (e.getClass == classOf[RuntimeException]) {

View File

@ -50,7 +50,11 @@ class BufferedAppender private[BufferedAppender] (name: String, delegate: Append
def record() = synchronized { recording = true } def record() = synchronized { recording = true }
def buffer[T](f: => T): T = { def buffer[T](f: => T): T = {
record() record()
try { f } finally { stopQuietly() } try {
f
} finally {
stopQuietly()
}
} }
def bufferQuietly[T](f: => T): T = { def bufferQuietly[T](f: => T): T = {
record() record()
@ -60,7 +64,11 @@ class BufferedAppender private[BufferedAppender] (name: String, delegate: Append
result result
} catch { case e: Throwable => stopQuietly(); throw e } } catch { case e: Throwable => stopQuietly(); throw e }
} }
def stopQuietly() = synchronized { try { stopBuffer() } catch { case _: Exception => () } } def stopQuietly() = synchronized {
try {
stopBuffer()
} catch { case _: Exception => () }
}
/** /**
* Flushes the buffer to the delegate logger. This method calls logAll on the delegate * Flushes the buffer to the delegate logger. This method calls logAll on the delegate
@ -99,7 +107,11 @@ class BufferedLogger(delegate: AbstractLogger) extends BasicLogger {
def record() = synchronized { recording = true } def record() = synchronized { recording = true }
def buffer[T](f: => T): T = { def buffer[T](f: => T): T = {
record() record()
try { f } finally { stopQuietly() } try {
f
} finally {
stopQuietly()
}
} }
def bufferQuietly[T](f: => T): T = { def bufferQuietly[T](f: => T): T = {
record() record()
@ -109,7 +121,11 @@ class BufferedLogger(delegate: AbstractLogger) extends BasicLogger {
result result
} catch { case e: Throwable => stopQuietly(); throw e } } catch { case e: Throwable => stopQuietly(); throw e }
} }
def stopQuietly() = synchronized { try { stop() } catch { case _: Exception => () } } def stopQuietly() = synchronized {
try {
stop()
} catch { case _: Exception => () }
}
/** /**
* Flushes the buffer to the delegate logger. This method calls logAll on the delegate * Flushes the buffer to the delegate logger. This method calls logAll on the delegate

View File

@ -438,7 +438,8 @@ class ConsoleAppender private[ConsoleAppender] (
out.lockObject.synchronized { out.lockObject.synchronized {
message.linesIterator.foreach { line => message.linesIterator.foreach { line =>
val builder = new java.lang.StringBuilder( val builder = new java.lang.StringBuilder(
labelColor.length + label.length + messageColor.length + line.length + reset.length * 3 + 3) labelColor.length + label.length + messageColor.length + line.length + reset.length * 3 + 3
)
def fmted(a: String, b: String) = builder.append(reset).append(a).append(b).append(reset) def fmted(a: String, b: String) = builder.append(reset).append(a).append(b).append(reset)
builder.append(reset).append('[') builder.append(reset).append('[')
fmted(labelColor, label) fmted(labelColor, label)
@ -468,7 +469,8 @@ class ConsoleAppender private[ConsoleAppender] (
s"$ScrollUp$DeleteLine$msg${CursorLeft1000}" + ( s"$ScrollUp$DeleteLine$msg${CursorLeft1000}" + (
if (scrollNum <= 1) "" if (scrollNum <= 1) ""
else scrollUp(scrollNum - 1) else scrollUp(scrollNum - 1)
)) )
)
out.flush() out.flush()
} else { } else {
out.println(msg) out.println(msg)

View File

@ -28,8 +28,10 @@ class ManagedLogger(
private val SuccessEventTag = scala.reflect.runtime.universe.typeTag[SuccessEvent] private val SuccessEventTag = scala.reflect.runtime.universe.typeTag[SuccessEvent]
// send special event for success since it's not a real log level // send special event for success since it's not a real log level
override def success(message: => String): Unit = { override def success(message: => String): Unit = {
infoEvent[SuccessEvent](SuccessEvent(message))(implicitly[JsonFormat[SuccessEvent]], infoEvent[SuccessEvent](SuccessEvent(message))(
SuccessEventTag) implicitly[JsonFormat[SuccessEvent]],
SuccessEventTag
)
} }
def registerStringCodec[A: ShowLines: TypeTag]: Unit = { def registerStringCodec[A: ShowLines: TypeTag]: Unit = {

View File

@ -46,7 +46,8 @@ object InterfaceUtil {
sourcePath0: Option[String], sourcePath0: Option[String],
sourceFile0: Option[File] sourceFile0: Option[File]
): Position = ): Position =
position(line0, position(
line0,
content, content,
offset0, offset0,
pointer0, pointer0,
@ -58,7 +59,8 @@ object InterfaceUtil {
None, None,
None, None,
None, None,
None) None
)
def position( def position(
line0: Option[Integer], line0: Option[Integer],
@ -75,7 +77,8 @@ object InterfaceUtil {
endLine0: Option[Integer], endLine0: Option[Integer],
endColumn0: Option[Integer] endColumn0: Option[Integer]
): Position = ): Position =
new ConcretePosition(line0, new ConcretePosition(
line0,
content, content,
offset0, offset0,
pointer0, pointer0,
@ -87,17 +90,20 @@ object InterfaceUtil {
startLine0, startLine0,
startColumn0, startColumn0,
endLine0, endLine0,
endColumn0) endColumn0
)
@deprecated("Use the overload of this method with more arguments", "1.2.2") @deprecated("Use the overload of this method with more arguments", "1.2.2")
def problem(cat: String, pos: Position, msg: String, sev: Severity): Problem = def problem(cat: String, pos: Position, msg: String, sev: Severity): Problem =
problem(cat, pos, msg, sev, None) problem(cat, pos, msg, sev, None)
def problem(cat: String, def problem(
cat: String,
pos: Position, pos: Position,
msg: String, msg: String,
sev: Severity, sev: Severity,
rendered: Option[String]): Problem = rendered: Option[String]
): Problem =
new ConcreteProblem(cat, pos, msg, sev, rendered) new ConcreteProblem(cat, pos, msg, sev, rendered)
private final class ConcreteT2[A1, A2](a1: A1, a2: A2) extends T2[A1, A2] { private final class ConcreteT2[A1, A2](a1: A1, a2: A2) extends T2[A1, A2] {

View File

@ -15,7 +15,9 @@ class ScriptRunner {
def processStatement(handler: StatementHandler, statement: Statement): Unit = { def processStatement(handler: StatementHandler, statement: Statement): Unit = {
val state = states(handler).asInstanceOf[handler.State] val state = states(handler).asInstanceOf[handler.State]
val nextState = val nextState =
try { Right(handler(statement.command, statement.arguments, state)) } catch { try {
Right(handler(statement.command, statement.arguments, state))
} catch {
case e: Exception => Left(e) case e: Exception => Left(e)
} }
nextState match { nextState match {
@ -42,7 +44,9 @@ class ScriptRunner {
statements foreach (Function.tupled(processStatement)) statements foreach (Function.tupled(processStatement))
} finally { } finally {
for (handler <- handlers; state <- states.get(handler)) { for (handler <- handlers; state <- states.get(handler)) {
try { handler.finish(state.asInstanceOf[handler.State]) } catch { case e: Exception => () } try {
handler.finish(state.asInstanceOf[handler.State])
} catch { case e: Exception => () }
} }
} }
} }

View File

@ -75,8 +75,7 @@ final class ScriptedTests(
val g = groupDir.getName val g = groupDir.getName
val n = nme.getName val n = nme.getName
val str = s"$g / $n" val str = s"$g / $n"
() => () => {
{
println("Running " + str) println("Running " + str)
testResources.readWriteResourceDirectory(g, n) { testDirectory => testResources.readWriteResourceDirectory(g, n) { testDirectory =>
val disabled = new File(testDirectory, "disabled").isFile val disabled = new File(testDirectory, "disabled").isFile
@ -84,7 +83,9 @@ final class ScriptedTests(
log.info("D " + str + " [DISABLED]") log.info("D " + str + " [DISABLED]")
None None
} else { } else {
try { scriptedTest(str, testDirectory, prescripted, log); None } catch { try {
scriptedTest(str, testDirectory, prescripted, log); None
} catch {
case _: TestException | _: PendingTestSuccessException => Some(str) case _: TestException | _: PendingTestSuccessException => Some(str)
} }
} }
@ -149,7 +150,9 @@ final class ScriptedTests(
case e: Exception => case e: Exception =>
testFailed() testFailed()
if (!pending) throw e if (!pending) throw e
} finally { buffered.clearBuffer() } } finally {
buffered.clearBuffer()
}
} }
} }

View File

@ -137,8 +137,7 @@ object FileFunction {
): Set[File] => Set[File] = { ): Set[File] => Set[File] = {
lazy val inCache = Difference.inputs(storeFactory.make("in-cache"), inStyle) lazy val inCache = Difference.inputs(storeFactory.make("in-cache"), inStyle)
lazy val outCache = Difference.outputs(storeFactory.make("out-cache"), outStyle) lazy val outCache = Difference.outputs(storeFactory.make("out-cache"), outStyle)
inputs => inputs => {
{
inCache(inputs) { inReport => inCache(inputs) { inReport =>
outCache { outReport => outCache { outReport =>
if (inReport.modified.isEmpty && outReport.modified.isEmpty) if (inReport.modified.isEmpty && outReport.modified.isEmpty)