Support carriage returns, tabs, and "[0;m" #7
Conversation
This file contains 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
This is in an effort to support cleaning the GitLab CI trace files returned from their API. The regex change is done to support "[0;m" tough to find docs but seemingly identical to "[0m"
zaquestion
commented
Jun 21, 2018
| @@ -7,7 +7,7 @@ import ( | |||
| ) | |||
|
|
|||
| // see regex.txt for a slightly separated version of this regex | |||
| var vt100re = regexp.MustCompile(`^\033([\[\]]([\d\?]+)?(;[\d\?]+)*)?(.)`) | |||
| var vt100re = regexp.MustCompile(`^\033([\[\]]([\d\?]+)?(;[\d\?]*)*)?([m@GCDPK;l])`) | |||
There was a problem hiding this comment.
I'm honestly not thrilled about ([m@GCDPK;l]), however leaving it as (.) broke this test as the r would get matched
"ccc \033]4;1;rgb:38/54/71test": "ccc rgb:38/54/71test",
|
Can you send me an example CI trace that needed these changes to work so I can think about cleaning this up?
|
|
Oops, sorry put this up late meant to include one out.txt |
lunixbochs
reviewed
Jun 21, 2018
|
|
||
| // [0;m cases | ||
| // TODO: trailing [0;m should probably not be overridden with [0m | ||
| // TODO: when [0;m seen, may not want to append [0m to the end |
There was a problem hiding this comment.
can you explain these TODOs?
|
Merged manually |
|
I ended up diving into ECMA-48 and coming up with a much stronger primary regex. Thanks for the PR! I also might use |
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.
This is in an effort to support cleaning the GitLab CI trace files returned from their API. The regex change is done to support "[0;m" tough to find docs but seemingly identical to "[0m"
Note: This duplicates some changes in #6 -- in testing just the carriage return handling was suitable for gitlab ci trace file cases