Skip to content

Ensure variants with arbitrary values and a modifier are correctly matched in the RegEx based parser #12179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RobinMalfait merged 3 commits into from
Oct 11, 2023
Merged

Ensure variants with arbitrary values and a modifier are correctly matched in the RegEx based parser #12179

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8503678
add failing test
RobinMalfait Oct 11, 2023
70e3e9a
ensure variants can have modifiers in regex
RobinMalfait Oct 11, 2023
8f9a2ea
update changelog
RobinMalfait Oct 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
ensure variants can have modifiers in regex
  • Loading branch information
@RobinMalfait
RobinMalfait committed Oct 11, 2023
commit 70e3e9a53b3cb6254372e964be4544cb802bccd2
6 changes: 6 additions & 0 deletions src/lib/defaultExtractor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,18 @@ function* buildRegExps(context) {
// This is here to provide special support for the `@` variant
regex.pattern([/@\[[^\s"'`]+\](\/[^\s"'`]+)?/, separator]),

// With variant modifier (e.g.: group-[..]/modifier)
regex.pattern([/([^\s"'`\[\\]+-)?\[[^\s"'`]+\]\/\w+/, separator]),

regex.pattern([/([^\s"'`\[\\]+-)?\[[^\s"'`]+\]/, separator]),
regex.pattern([/[^\s"'`\[\\]+/, separator]),
]),

// With quotes allowed
regex.any([
// With variant modifier (e.g.: group-[..]/modifier)
regex.pattern([/([^\s"'`\[\\]+-)?\[[^\s`]+\]\/\w+/, separator]),

regex.pattern([/([^\s"'`\[\\]+-)?\[[^\s`]+\]/, separator]),
regex.pattern([/[^\s`\[\\]+/, separator]),
]),
Expand Down