Add basic support for colored printers #3526
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nicolasstucki
force-pushed
the
color-printer
branch
from
cd36bdc to
9295619
Compare
nicolasstucki
force-pushed
the
color-printer
branch
from
9295619 to
2e0ea4c
Compare
| @@ -346,29 +346,31 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) { | |||
| case id: Trees.SearchFailureIdent[_] => | |||
| tree.typeOpt match { | |||
| case reason: Implicits.SearchFailureType => | |||
| toText(id.name) ~ "implicitly[" ~ toText(reason.expectedType) ~ "]" | |||
There was a problem hiding this comment.
A [ disappeared, not sure if it's intentional
| case CaseDef(pat, guard, body) => | ||
| "case " ~ inPattern(toText(pat)) ~ optText(guard)(" if " ~ _) ~ " => " ~ caseBlockText(body) | ||
| keywordStr("case ") ~ inPattern(toText(pat)) ~ optText(guard)(" if " ~ _) ~ " => " ~ caseBlockText(body) |
There was a problem hiding this comment.
this if is not highlighted
| @@ -17,6 +17,7 @@ object SyntaxHighlighting { | |||
| val KeywordColor = Console.YELLOW | |||
| val ValDefColor = Console.CYAN | |||
| val LiteralColor = Console.RED | |||
| val StringColor = Console.GREEN | |||
There was a problem hiding this comment.
Missing space ^^'
There was a problem hiding this comment.
Nooooo. Shame on me.
| !Character.isAlphabetic(c) && !Character.isDigit(c) && | ||
| !Character.isMirrored(c) && !Character.isWhitespace(c) | ||
| val (token, rest) = | ||
| if (head == '\u001b') { // ansi color token |
There was a problem hiding this comment.
val ansiColorToken = '\u001b'(also to be used below)
| @@ -69,25 +65,21 @@ object DiffUtil { | |||
| } | |||
|
|
|||
| val expectedDiff = | |||
| if (expected eq EOF) ANSI_EOF + expected + ANSI_DEFAULT | |||
| if (expected eq EOF) eof() | |||
There was a problem hiding this comment.
You are printing less here (expected is not shown), is it intentional?
There was a problem hiding this comment.
The string for expected is in this case "EOF". EOF is a string that has "EOF" but is also meant to be unique.
OlivierBlanvillain
approved these changes
Nov 27, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
With this change, both
dotc -decompileanddotc -Xprintget colored outputs.