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
@@ -50,7 +50,11 @@ class BufferedAppender private[BufferedAppender] (name: String, delegate: Append
def record() = synchronized { recording = true }
def buffer[T](f: => T): T = {
record()
try { f } finally { stopQuietly() }
try {
f
} finally {
stopQuietly()
}
}
def bufferQuietly[T](f: => T): T = {
record()
@@ -60,7 +64,11 @@ class BufferedAppender private[BufferedAppender] (name: String, delegate: Append
result
} 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
@@ -99,7 +107,11 @@ class BufferedLogger(delegate: AbstractLogger) extends BasicLogger {
def record() = synchronized { recording = true }
def buffer[T](f: => T): T = {
record()
try { f } finally { stopQuietly() }
try {
f
} finally {
stopQuietly()
}
}
def bufferQuietly[T](f: => T): T = {
record()
@@ -109,7 +121,11 @@ class BufferedLogger(delegate: AbstractLogger) extends BasicLogger {
result
} 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
@@ -438,7 +438,8 @@ class ConsoleAppender private[ConsoleAppender] (
out.lockObject.synchronized {
message.linesIterator.foreach { line =>
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)
builder.append(reset).append('[')
fmted(labelColor, label)
@@ -468,7 +469,8 @@ class ConsoleAppender private[ConsoleAppender] (
s"$ScrollUp$DeleteLine$msg${CursorLeft1000}" + (
if (scrollNum <= 1) ""
else scrollUp(scrollNum - 1)
))
)
)
out.flush()
} else {
out.println(msg)
@@ -28,8 +28,10 @@ class ManagedLogger(
private val SuccessEventTag = scala.reflect.runtime.universe.typeTag[SuccessEvent]
// send special event for success since it's not a real log level
override def success(message: => String): Unit = {
infoEvent[SuccessEvent](SuccessEvent(message))(implicitly[JsonFormat[SuccessEvent]],
SuccessEventTag)
infoEvent[SuccessEvent](SuccessEvent(message))(
implicitly[JsonFormat[SuccessEvent]],
SuccessEventTag
)
}
def registerStringCodec[A: ShowLines: TypeTag]: Unit = {
@@ -46,19 +46,21 @@ object InterfaceUtil {
sourcePath0: Option[String],
sourceFile0: Option[File]
): Position =
position(line0,
content,
offset0,
pointer0,
pointerSpace0,
sourcePath0,
sourceFile0,
None,
None,
None,
None,
None,
None)
position(
line0,
content,
offset0,
pointer0,
pointerSpace0,
sourcePath0,
sourceFile0,
None,
None,
None,
None,
None,
None
)
def position(
line0: Option[Integer],
@@ -75,29 +77,33 @@ object InterfaceUtil {
endLine0: Option[Integer],
endColumn0: Option[Integer]
): Position =
new ConcretePosition(line0,
content,
offset0,
pointer0,
pointerSpace0,
sourcePath0,
sourceFile0,
startOffset0,
endOffset0,
startLine0,
startColumn0,
endLine0,
endColumn0)
new ConcretePosition(
line0,
content,
offset0,
pointer0,
pointerSpace0,
sourcePath0,
sourceFile0,
startOffset0,
endOffset0,
startLine0,
startColumn0,
endLine0,
endColumn0
)
@deprecated("Use the overload of this method with more arguments", "1.2.2")
def problem(cat: String, pos: Position, msg: String, sev: Severity): Problem =
problem(cat, pos, msg, sev, None)
def problem(cat: String,
pos: Position,
msg: String,
sev: Severity,
rendered: Option[String]): Problem =
def problem(
cat: String,
pos: Position,
msg: String,
sev: Severity,
rendered: Option[String]
): Problem =
new ConcreteProblem(cat, pos, msg, sev, rendered)
private final class ConcreteT2[A1, A2](a1: A1, a2: A2) extends T2[A1, A2] {