luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #153 from jrudolph/jr/optimize-initStringCodecs 

In initStringCodecs avoid reflect universe initialization
This commit is contained in:
Dale Wijnand 2018-02-19 10:11:49 +00:00 committed by GitHub
parent 9891f07bda 0ebb7a5662
commit 85f7d807e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
internal/util-logging/src/main/scala/sbt/util/LogExchange.scala
View File

@ -67,9 +67,15 @@ sealed abstract class LogExchange {
import sbt.internal.util.codec.TraceEventShowLines._
import sbt.internal.util.codec.SuccessEventShowLines._
registerStringCodec[Throwable]
registerStringCodec[TraceEvent]
registerStringCodec[SuccessEvent]
// Register these StringCodecs manually, because this method will be called at the very startup of sbt
// and we'll try not to initialize the universe in StringTypeTag.apply
// If these classes are moved around, both the fully qualified names and the strings need to be adapted.
// A better long-term solution could be to make StringTypeTag.apply a macro.
registerStringCodecByStringTypeTag[_root_.scala.Throwable](StringTypeTag("scala.Throwable"))
registerStringCodecByStringTypeTag[_root_.sbt.internal.util.TraceEvent](
StringTypeTag("sbt.internal.util.TraceEvent"))
registerStringCodecByStringTypeTag[_root_.sbt.internal.util.SuccessEvent](
StringTypeTag("sbt.internal.util.SuccessEvent"))
}
// This is a dummy layout to avoid casting error during PatternLayout.createDefaultLayout()
@ -102,6 +108,10 @@ sealed abstract class LogExchange {
def registerStringCodec[A: ShowLines: TypeTag]: Unit = {
val tag = StringTypeTag[A]
registerStringCodecByStringTypeTag(tag)
}
private[sbt] def registerStringCodecByStringTypeTag[A: ShowLines](tag: StringTypeTag[A]): Unit = {
val ev = implicitly[ShowLines[A]]
val _ = getOrElseUpdateStringCodec(tag.key, ev)
}