fix: fix regexes for mouse escape sequences#5943
Merged
willmcgugan merged 1 commit intoJul 10, 2025
Merged
Conversation
Fix potential issues with the regexes for mouse escape sequences, which were recently updated to allow negative coordinates. - Fix the updated character class `[-?\d;]`. This will match the literal character `?` which I assume was not the intention. - Fix the regex for SGR mouse sequences, where the first parameter is the button value and should not be negative.
willmcgugan
reviewed
Jul 10, 2025
|
|
||
| class XTermParser(Parser[Message]): | ||
| _re_sgr_mouse = re.compile(r"\x1b\[<(-?\d+);(-?\d+);(-?\d+)([Mm])") | ||
| _re_sgr_mouse = re.compile(r"\x1b\[<(\d+);(-?\d+);(-?\d+)([Mm])") |
Member
There was a problem hiding this comment.
The irony is that the terminal shouldn't send hyphens in any of those fields. But I guess we haven't seen negative mouse buttons in the wild, so this makes sense.
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
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.
Fix potential issues with the regexes for mouse escape sequences, which were recently updated to allow negative coordinates.
[-?\d;]. This will match the literal character?which I assume was not the intention.(Note for reviewers: These regexes are the same as my original PR #5688 which was superseded, so if I've just misunderstood why the updated regexes are more correct please let me know!)
Please review the following checklist.