Fix trivia in custom character classes #278
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
Rather than matching and not advancing the input, we should always return `nil` to never match against the trivia.
Previously we would check for an empty array of members when deciding whether an initial `]` is literal, or if the operands of a set operation are invalid. Switch to checking whether we have any semantic members instead.
|
@swift-ci please test |
natecook1000
approved these changes
Apr 14, 2022
Comment on lines
+1213
to
+1222
| firstMatchTest(#" \t "#, input: " \t ", match: " \t ") | ||
| firstMatchTest(#"(?xx) \t "#, input: " \t ", match: "\t") | ||
|
|
||
| firstMatchTest(#"[ \t]+"#, input: " \t ", match: " \t ") | ||
| firstMatchTest(#"(?xx)[ \t]+"#, input: " \t ", match: "\t") | ||
| firstMatchTest(#"(?xx)[ \t]+"#, input: " \t\t ", match: "\t\t") | ||
| firstMatchTest(#"(?xx)[ \t]+"#, input: " \t \t", match: "\t") | ||
|
|
||
| firstMatchTest("(?xx)[ a && ab ]+", input: " aaba ", match: "aa") | ||
| firstMatchTest("(?xx)[ ] a ]+", input: " a]]a ] ", match: "a]]a") |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 trivia matching logic in custom character classes, rather than matching and not advancing the input, we should always return
nilto never match against the trivia. Resolves #275.Additionally, fix custom character class parsing logic such that trivia is suitably ignored for set operations and the case where the first semantic member is
].