Fix predefined ANSI styles in JAnsiTextRenderer - #4259
Open
kalayciburak wants to merge 1 commit into
Open
Conversation
Style=Spock and Style=Kirk never applied because special-token keys were mixed-case while createMap stores upper-case keys, and predefined style maps kept mixed-case names. Also emit valid SGR sequences from entry(). Fixes apache#4254 Signed-off-by: Burak KALAYCI <kalayciburak1996@gmail.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Fixes #4254.
Style=SpockandStyle=Kirknever applied:AnsiEscape.createMapstores keys in root upper-case, butJAnsiTextRendererlooked up mixed-case special tokens (Style,BeginToken,EndToken) and merged predefined maps with mixed-case names such asName. Lookups then fell through tocreateSequence("Name")and rendered an empty SGR. Predefinedentry()values were also concatenated without;separators or a trailingm.This change:
createMapas case-insensitiveAnsiEscape.createSequenceTest
Executed:
JAnsiTextRendererTest: 7 tests, 0 failures (RED then GREEN for the Spock/Kirk cases).Checklist
2.xbranch if you are targeting Log4j 2; usemainotherwiseJAnsiTextRendererTestpassed as abovesrc/changelog/.2.x.x