Fix #3614: Do not allow the SyntaxFormatter to recolor code #3616
Conversation
| @@ -86,7 +86,8 @@ object Formatting { | |||
| case hb: HighlightBuffer => | |||
| hb.toString | |||
| case str: String if ctx.settings.color.value != "never" => | |||
| new String(SyntaxHighlighting(str).toArray) | |||
| if (str.matches(".*\u001b\\[.*?m.*")) str // was already colored by some other printer | |||
There was a problem hiding this comment.
This seems very expensive. Error messages are colored because of the hl string interpolator. The interpolator call show on its arguments. Can we instead disable syntax highlighting when calling show for the argument of the interpolator?
There was a problem hiding this comment.
Redefining hl as:
def hl(args: Any*)(implicit ctx: Context): String = {
val nestedCtx = ctx.fresh.setSetting(ctx.settings. color, true)
new SyntaxFormatter(sc).assemble(args)(nestedCtx).stripMargin
)should work. I am wondering how expensive is ctx.fresh though.
There was a problem hiding this comment.
This might work if the argument in args is still of type Text.
There was a problem hiding this comment.
At this point it is too late. I created instead an AlreadyColored that fixes the issue for each specific case. It should be added to any printed tree that is already colored.
nicolasstucki
force-pushed
the
fix-#3614
branch
4 times, most recently
from
7670223 to
610d37f
Compare
nicolasstucki
requested review from
allanrenucci
and removed request for
OlivierBlanvillain
nicolasstucki
force-pushed
the
fix-#3614
branch
from
610d37f to
23e7026
Compare
| case hl: Highlight => | ||
| hl.show | ||
| case hb: HighlightBuffer => | ||
| hb.toString | ||
| case str: String if ctx.settings.color.value != "never" => | ||
| new String(SyntaxHighlighting(str).toArray) | ||
| case _ => super.showArg(arg) | ||
| case x :: xs => | ||
| showArg(x) + (if (xs.isEmpty) "" else ", " + showArg(xs)) |
There was a problem hiding this comment.
I would remove this special case. This seems completely arbitrary to special case List.
If a user want to pretty print a List like this, then he should do it himself.
nicolasstucki
force-pushed
the
fix-#3614
branch
from
23e7026 to
450c0d8
Compare
No description provided.